c8d/pull: Return same access denied error as graphdrivers #46656
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
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
vvoland
added
area/distribution
status/2-code-review
kind/bugfix
rumpl
reviewed
Oct 16, 2023
| @@ -120,6 +123,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) { | |||
There was a problem hiding this comment.
This will clash with containerd/containerd#9234
maybe we should wrap the returned error?
There was a problem hiding this comment.
doh! forgot about that one; I guess we need to revert this one when we bump to a containerd vendor with that patch
There was a problem hiding this comment.
I guess the check will be even uglier, we'll have to check the error message itself and return the right error
There was a problem hiding this comment.
Wouldn't we still be able to match the ErrInvalidAuthorization that it wraps?
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.
- What I did
- How I did it
- How to verify it
Fixes
ContainerCollectionTest.test_run_with_image_that_does_not_existfrom docker-pyPartially fixes TestImagePullNonExisting
$ make TEST_FILTER='TestImagePullNonExisting' TEST_IGNORE_CGROUP_CHECK=1 DOCKER_BUILDKIT=0 DOCKER_GRAPHDRIVER=overlayfs TEST_INTEGRATION_USE_SNAPSHOTTER=1 test-integration (...) --- FAIL: TestImagePullNonExisting/library/asdfasdf:foobar (0.02s) --- FAIL: TestImagePullNonExisting/library/asdfasdf:latest (0.02s) --- FAIL: TestImagePullNonExisting/asdfasdf:latest (0.02s) --- FAIL: TestImagePullNonExisting/asdfasdf:foobar (0.03s) - --- FAIL: TestImagePullNonExisting/library/asdfasdf (0.02s) - --- FAIL: TestImagePullNonExisting/asdfasdf (0.02s) + --- PASS: TestImagePullNonExisting/library/asdfasdf (1.00s) + --- PASS: TestImagePullNonExisting/asdfasdf (1.01s) FAIL- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)