Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

fix: handle no docker auth and log only a warning when getting auth credentials fails #2579

Merged
merged 6 commits into from
Oct 31, 2024
Merged

fix: handle no docker auth and log only a warning when getting auth credentials fails #2579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3c3100b
fix: handle no docker auth
skylenet Oct 30, 2024
4e9bad9
docker auth: add no auth test
skylenet Oct 30, 2024
2c28749
docker auth: only log and don't fail if some auth creds were not able…
skylenet Oct 30, 2024
ffe0bc2
rename test
tedim52 Oct 31, 2024
c643435
trigger CI
skylenet Oct 31, 2024
55607e6
trigger ci
tedim52 Oct 31, 2024
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
7 changes: 5 additions & 2 deletions ...s_backend/engine_functions/docker_config_storage_creator/docker_config_storage_creator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,12 @@ func storeConfigInVolume(
for _, registry := range registries {
creds, err := docker_manager.GetAuthFromDockerConfig(registry)
if err != nil {
return stacktrace.NewError("An error occurred getting auth for registry '%v' from Docker config: %v", registry, err)
logrus.Warnf("An error occurred getting auth for registry '%v' from Docker config: %v", registry, err)
}
// creds can be nil if the registry doesn't have auth
if err != nil && creds != nil {
cfg.Auths[registry] = *creds
}
cfg.Auths[registry] = *creds
}

cfgJsonStr, err := json.Marshal(cfg)
Expand Down
6 changes: 6 additions & 0 deletions container-engine-lib/lib/backend_impls/docker/docker_manager/docker_auth_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ func writeStaticConfig(t *testing.T, configContent string) string {
return tmpDir
}

func TestGetAuthWithNoAuthSetReturnsNilAndNoError(t *testing.T) {
authConfig, err := GetAuthFromDockerConfig("my-repo/my-image:latest")
assert.NoError(t, err)
assert.Nil(t, authConfig, "Auth config should be nil")
}

func TestGetAuthConfigForRepoPlain(t *testing.T) {
expectedUser := "user"
expectedPassword := "password"
Expand Down
Loading