Skip to content

Commit b1c7d6e

Browse files
fix: formatting for byo credential helper bashrc (#1278)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
1 parent 77ed636 commit b1c7d6e

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

pkg/config/nerdctl_config_applier.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ func updateEnvironment(fs afero.Fs, fc *Finch, finchDir, homeDir, limaVMHomeDir
9595
}
9696

9797
//nolint:gosec // G101: Potential hardcoded credentials false positive
98-
const configureCredHelperTemplate = `([ -e "$FINCH_DIR"/cred-helpers/docker-credential-%s ]
99-
|| (echo "error: docker-credential-%s not found in $FINCH_DIR/cred-helpers directory.")) &&
100-
([ -L /usr/local/bin/docker-credential-%s ] || sudo ln -s "$FINCH_DIR"/cred-helpers/docker-credential-%s /usr/local/bin)`
98+
const configureCredHelperTemplate = `([ -e "$FINCH_DIR"/cred-helpers/docker-credential-%s ] || \
99+
(echo "error: docker-credential-%s not found in $FINCH_DIR/cred-helpers directory.")) && \
100+
([ -L /usr/local/bin/docker-credential-%s ] || sudo ln -s "$FINCH_DIR"/cred-helpers/docker-credential-%s /usr/local/bin)`
101101

102102
for _, credHelper := range fc.CredsHelpers {
103103
cmdArr = append(cmdArr, fmt.Sprintf(configureCredHelperTemplate, credHelper, credHelper, credHelper, credHelper))

pkg/config/nerdctl_config_applier_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,9 @@ export DOCKER_CONFIG="$FINCH_DIR"
163163
"AWS_DIR=/home/dir/.aws\n"+
164164
"export DOCKER_CONFIG=\"$FINCH_DIR\"\n"+
165165
"[ -L /root/.aws ] || sudo ln -fs \"$AWS_DIR\" /root/.aws\n"+
166-
"([ -e \"$FINCH_DIR\"/cred-helpers/docker-credential-ecr-login ] \n"+
167-
"|| (echo \"error: docker-credential-ecr-login not found in $FINCH_DIR/cred-helpers directory.\")) && \n"+
168-
"([ -L /usr/local/bin/docker-credential-ecr-login ] "+
166+
"([ -e \"$FINCH_DIR\"/cred-helpers/docker-credential-ecr-login ] || \\\n"+
167+
" (echo \"error: docker-credential-ecr-login not found in $FINCH_DIR/cred-helpers directory.\")) && \\\n"+
168+
" ([ -L /usr/local/bin/docker-credential-ecr-login ] "+
169169
"|| sudo ln -s \"$FINCH_DIR\"/cred-helpers/docker-credential-ecr-login /usr/local/bin)\n"+
170170
"[ -L /home/mock_user.linux/.finch ] || ln -s $FINCH_DIR /home/mock_user.linux/.finch"),
171171
string(fileBytes),
@@ -199,13 +199,13 @@ export DOCKER_CONFIG="$FINCH_DIR"
199199
"AWS_DIR=/home/dir/.aws\n"+
200200
"export DOCKER_CONFIG=\"$FINCH_DIR\"\n"+
201201
"[ -L /root/.aws ] || sudo ln -fs \"$AWS_DIR\" /root/.aws\n"+
202-
"([ -e \"$FINCH_DIR\"/cred-helpers/docker-credential-ecr-login ] \n"+
203-
"|| (echo \"error: docker-credential-ecr-login not found in $FINCH_DIR/cred-helpers directory.\")) && \n"+
204-
"([ -L /usr/local/bin/docker-credential-ecr-login ] "+
202+
"([ -e \"$FINCH_DIR\"/cred-helpers/docker-credential-ecr-login ] || \\\n"+
203+
" (echo \"error: docker-credential-ecr-login not found in $FINCH_DIR/cred-helpers directory.\")) && \\\n"+
204+
" ([ -L /usr/local/bin/docker-credential-ecr-login ] "+
205205
"|| sudo ln -s \"$FINCH_DIR\"/cred-helpers/docker-credential-ecr-login /usr/local/bin)\n"+
206-
"([ -e \"$FINCH_DIR\"/cred-helpers/docker-credential-secretservice ] \n"+
207-
"|| (echo \"error: docker-credential-secretservice not found in $FINCH_DIR/cred-helpers directory.\")) && \n"+
208-
"([ -L /usr/local/bin/docker-credential-secretservice ] "+
206+
"([ -e \"$FINCH_DIR\"/cred-helpers/docker-credential-secretservice ] || \\\n"+
207+
" (echo \"error: docker-credential-secretservice not found in $FINCH_DIR/cred-helpers directory.\")) && \\\n"+
208+
" ([ -L /usr/local/bin/docker-credential-secretservice ] "+
209209
"|| sudo ln -s \"$FINCH_DIR\"/cred-helpers/docker-credential-secretservice /usr/local/bin)\n"+
210210
"[ -L /home/mock_user.linux/.finch ] || ln -s $FINCH_DIR /home/mock_user.linux/.finch"),
211211
string(fileBytes),

0 commit comments

Comments
 (0)