c8d/pull: Don't wrap no basic auth error
#46662
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
vvoland
added
area/api
area/distribution
kind/bugfix
thaJeztah
reviewed
Oct 17, 2023
vvoland
changed the title
no basic auth error
vvoland
force-pushed
the
c8d-pull-access-denied-msg-2
branch
from
06a9323 to
5b85d12
Compare
rumpl
approved these changes
Oct 27, 2023
thaJeztah
reviewed
Oct 27, 2023
| @@ -124,6 +125,9 @@ func (i *ImageService) PullImage(ctx context.Context, ref reference.Named, platf | |||
| img, err := i.client.Pull(ctx, ref.String(), opts...) | |||
| if err != nil { | |||
| if errors.Is(err, docker.ErrInvalidAuthorization) { | |||
| if strings.Contains(err.Error(), "no basic auth credentials") { | |||
There was a problem hiding this comment.
one last nit; can you add a comment with a link to the containerd code, so that we have some reference what we're trying to match (to give it some context)?
can probably use a permalink to the tag;
https://github.com/containerd/containerd/blob/v1.7.8/remotes/docker/authorizer.go#L189-L191
Don't wrap the `no basic auth credentials` error from containerd and return it as-is. The error will look like: ``` failed to resolve reference "docker.io/library/aodkoakds:latest": pull access denied, repository does not exist or may require authorization: server message: insufficient_scope: authorization failed ``` Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
vvoland
force-pushed
the
c8d-pull-access-denied-msg-2
branch
from
5b85d12 to
df34db1
Compare
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.
Don't wrap the
no basic auth credentialserror from containerd and return it as-is.The error will look like:
- How to verify it
Cherry-pick: containerd/containerd#9234
make TEST_FILTER='TestLogoutWithExternalAuth' TEST_IGNORE_CGROUP_CHECK=1 DOCKER_GRAPHDRIVER=overlayfs TEST_INTEGRATION_USE_SNAPSHOTTER=1 test-integration- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)