fix registry auth regression #97
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
introduced with commit: c30d664 Signed-off-by: Jonas Galvão Xavier <jonas.agx@gmail.com>
|
validated against: |
spiffcs
reviewed
Feb 1, 2022
| @@ -98,6 +91,10 @@ func prepareRemoteOptions(ref name.Reference, registryOptions *image.RegistryOpt | |||
| authenticator := registryOptions.Authenticator(ref.Context().RegistryStr()) | |||
| if authenticator != nil { | |||
| opts = append(opts, remote.WithAuth(authenticator)) | |||
| } else { | |||
There was a problem hiding this comment.
Are we putting this here now because we still want InsecureSkipTLSVerify to be respected from the config?
There was a problem hiding this comment.
Thanks for adding this back!
There was a problem hiding this comment.
It was removed mistakenly, I expanded the PR description to avoid confusion.
kzantow
approved these changes
Feb 1, 2022
| @@ -98,6 +91,10 @@ func prepareRemoteOptions(ref name.Reference, registryOptions *image.RegistryOpt | |||
| authenticator := registryOptions.Authenticator(ref.Context().RegistryStr()) | |||
| if authenticator != nil { | |||
| opts = append(opts, remote.WithAuth(authenticator)) | |||
| } else { | |||
| // use the Keychain specified from a docker config file. | |||
| log.Debugf("no registry credentials configured, using the default keychain") | |||
There was a problem hiding this comment.
my vote would be to keep it as debug. (my mental model: info = let me know big-picture execution stages, debug = tell me more about decision points)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
While adding Podman I mistakenly removed a registry condition[1]. The problem was spotted by tests in Syft and Grype.
Question: should that behavior be enforced by tests in Stereoscope?
Also added extra unit tests around Podman.
[1] commit: c30d664
Signed-off-by: Jonas Galvão Xavier jonas.agx@gmail.com