Using correct error to construct CannotRemoveVolumeError #2059
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
sharanyad
reviewed
May 31, 2019
There was a problem hiding this comment.
Could you also add an assert here for err.Error() here https://github.com/aws/amazon-ecs-agent/blob/master/agent/dockerclient/dockerapi/docker_client_test.go#L1626?
| ok := client.VolumeRemove(ctx, name, false) | ||
| if ok != nil { | ||
| return &CannotRemoveVolumeError{err} | ||
| removeErr := client.VolumeRemove(ctx, name, false) |
There was a problem hiding this comment.
nit: this can just be err
There was a problem hiding this comment.
i wanted to make it very distinctively separate from the err above this, but I don't feel strongly about it, I'll update it to use err for consistency.
Added. |
yhlee-aws
force-pushed
the
volume_remove_err
branch
from
18dd6c8 to
e4422e0
Compare
sharanyad
approved these changes
May 31, 2019
ubhattacharjya
approved these changes
May 31, 2019
Merged
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.
Summary
We are constructing CannotRemoveVolumeError with wrong docker error, which can result in nullpointer
Implementation details
Using the correct docker error object
Testing
New tests cover the changes:
Description for the changelog
Licensing
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.