From f7797e3c5073338896838d0779a9bf036ddbbbe1 Mon Sep 17 00:00:00 2001 From: Austin Vazquez Date: Thu, 6 Feb 2025 10:58:46 -0800 Subject: [PATCH] fix: formatting for byo credential helper bashrc Signed-off-by: Austin Vazquez --- pkg/config/nerdctl_config_applier.go | 6 +++--- pkg/config/nerdctl_config_applier_test.go | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/config/nerdctl_config_applier.go b/pkg/config/nerdctl_config_applier.go index 78c6ee157..55d7f1339 100644 --- a/pkg/config/nerdctl_config_applier.go +++ b/pkg/config/nerdctl_config_applier.go @@ -95,9 +95,9 @@ func updateEnvironment(fs afero.Fs, fc *Finch, finchDir, homeDir, limaVMHomeDir } //nolint:gosec // G101: Potential hardcoded credentials false positive - const configureCredHelperTemplate = `([ -e "$FINCH_DIR"/cred-helpers/docker-credential-%s ] -|| (echo "error: docker-credential-%s not found in $FINCH_DIR/cred-helpers directory.")) && -([ -L /usr/local/bin/docker-credential-%s ] || sudo ln -s "$FINCH_DIR"/cred-helpers/docker-credential-%s /usr/local/bin)` + const configureCredHelperTemplate = `([ -e "$FINCH_DIR"/cred-helpers/docker-credential-%s ] || \ + (echo "error: docker-credential-%s not found in $FINCH_DIR/cred-helpers directory.")) && \ + ([ -L /usr/local/bin/docker-credential-%s ] || sudo ln -s "$FINCH_DIR"/cred-helpers/docker-credential-%s /usr/local/bin)` for _, credHelper := range fc.CredsHelpers { cmdArr = append(cmdArr, fmt.Sprintf(configureCredHelperTemplate, credHelper, credHelper, credHelper, credHelper)) diff --git a/pkg/config/nerdctl_config_applier_test.go b/pkg/config/nerdctl_config_applier_test.go index 4903d46a6..649245ef6 100644 --- a/pkg/config/nerdctl_config_applier_test.go +++ b/pkg/config/nerdctl_config_applier_test.go @@ -163,9 +163,9 @@ export DOCKER_CONFIG="$FINCH_DIR" "AWS_DIR=/home/dir/.aws\n"+ "export DOCKER_CONFIG=\"$FINCH_DIR\"\n"+ "[ -L /root/.aws ] || sudo ln -fs \"$AWS_DIR\" /root/.aws\n"+ - "([ -e \"$FINCH_DIR\"/cred-helpers/docker-credential-ecr-login ] \n"+ - "|| (echo \"error: docker-credential-ecr-login not found in $FINCH_DIR/cred-helpers directory.\")) && \n"+ - "([ -L /usr/local/bin/docker-credential-ecr-login ] "+ + "([ -e \"$FINCH_DIR\"/cred-helpers/docker-credential-ecr-login ] || \\\n"+ + " (echo \"error: docker-credential-ecr-login not found in $FINCH_DIR/cred-helpers directory.\")) && \\\n"+ + " ([ -L /usr/local/bin/docker-credential-ecr-login ] "+ "|| sudo ln -s \"$FINCH_DIR\"/cred-helpers/docker-credential-ecr-login /usr/local/bin)\n"+ "[ -L /home/mock_user.linux/.finch ] || ln -s $FINCH_DIR /home/mock_user.linux/.finch"), string(fileBytes), @@ -199,13 +199,13 @@ export DOCKER_CONFIG="$FINCH_DIR" "AWS_DIR=/home/dir/.aws\n"+ "export DOCKER_CONFIG=\"$FINCH_DIR\"\n"+ "[ -L /root/.aws ] || sudo ln -fs \"$AWS_DIR\" /root/.aws\n"+ - "([ -e \"$FINCH_DIR\"/cred-helpers/docker-credential-ecr-login ] \n"+ - "|| (echo \"error: docker-credential-ecr-login not found in $FINCH_DIR/cred-helpers directory.\")) && \n"+ - "([ -L /usr/local/bin/docker-credential-ecr-login ] "+ + "([ -e \"$FINCH_DIR\"/cred-helpers/docker-credential-ecr-login ] || \\\n"+ + " (echo \"error: docker-credential-ecr-login not found in $FINCH_DIR/cred-helpers directory.\")) && \\\n"+ + " ([ -L /usr/local/bin/docker-credential-ecr-login ] "+ "|| sudo ln -s \"$FINCH_DIR\"/cred-helpers/docker-credential-ecr-login /usr/local/bin)\n"+ - "([ -e \"$FINCH_DIR\"/cred-helpers/docker-credential-secretservice ] \n"+ - "|| (echo \"error: docker-credential-secretservice not found in $FINCH_DIR/cred-helpers directory.\")) && \n"+ - "([ -L /usr/local/bin/docker-credential-secretservice ] "+ + "([ -e \"$FINCH_DIR\"/cred-helpers/docker-credential-secretservice ] || \\\n"+ + " (echo \"error: docker-credential-secretservice not found in $FINCH_DIR/cred-helpers directory.\")) && \\\n"+ + " ([ -L /usr/local/bin/docker-credential-secretservice ] "+ "|| sudo ln -s \"$FINCH_DIR\"/cred-helpers/docker-credential-secretservice /usr/local/bin)\n"+ "[ -L /home/mock_user.linux/.finch ] || ln -s $FINCH_DIR /home/mock_user.linux/.finch"), string(fileBytes),