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.
Description of changes:
Currently
err
in arg of the seconderrors.Wrapf()
in getENIaddresses() will neverreceive error except for nil value.
err != nil
and return, hence L#595 will never get err except for nil.amazon-vpc-cni-k8s/ipamd/ipamd.go
Lines 583 to 595 in 0736312
When
errors.Wrapf()
is called with nil in first arg, the new messageis not wrapped. To make matters worse,
getENIaddresses()
returnserror as
nil
so the logic of code after the method could be collapsed.Hence, this patch uses
errors.Errorf()
insteaderrors.Wrapf()
.Also, current unit tests for ipamd use two primary IPs for one
ENI. This patch fixes it as well.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.