Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

fix: formatting for byo credential helper bashrc #1278

Merged
merged 1 commit into from
Feb 6, 2025
Merged

fix: formatting for byo credential helper bashrc #1278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/config/nerdctl_config_applier.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
18 changes: 9 additions & 9 deletions pkg/config/nerdctl_config_applier_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down Expand Up @@ -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),
Expand Down
Loading