Merge pull request #1334 from buildpacks/fix/keychain

Fix auth by wrapping keychain in a ResolvedKeychain
buildpacks · Apr 10, 2024 · 85f22a0 · 85f22a0
2 parents 137225b + 2670257
commit 85f22a0
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/auth/keychain.go b/auth/keychain.go
@@ -38,13 +38,15 @@ func DefaultKeychain(images ...string) (authn.Keychain, error) {
 		return nil, err
 	}
 
-	keychains := []authn.Keychain{envKeychain, authn.DefaultKeychain}
-
+	keychains := []authn.Keychain{
+		envKeychain,
+		NewResolvedKeychain(authn.DefaultKeychain, images...),
+	}
 	if vendorKeychainEnabled("amazon") {
-		keychains = append(keychains, amazonKeychain)
+		keychains = append(keychains, NewResolvedKeychain(amazonKeychain, images...))
 	}
 	if vendorKeychainEnabled("azure") {
-		keychains = append(keychains, azureKeychain)
+		keychains = append(keychains, NewResolvedKeychain(azureKeychain, images...))
 	}
 
 	return authn.NewMultiKeychain(