Refactor EC2 Metadata (IMDS) code into new typed accessor library #1225
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
mogren
approved these changes
Sep 22, 2020
pkg/awsutils/imds.go
Outdated
Comment on lines
59
to
60
| // GetMacs returns the interface addresses attached to the instance. | ||
| func (imds TypedIMDS) GetMacs(ctx context.Context) ([]string, error) { |
|
e2e tests all pass: https://github.com/aws/amazon-vpc-cni-k8s/runs/1150477131?check_suite_focus=true |
mogren
reviewed
Sep 22, 2020
pkg/awsutils/awsutils.go
Outdated
Comment on lines
45
to
56
| metadataAZ = "placement/availability-zone" | ||
| metadataLocalIP = "local-ipv4" | ||
| metadataInstanceID = "instance-id" | ||
| metadataInstanceType = "instance-type" | ||
| metadataMAC = "mac" | ||
| metadataSGs = "/security-group-ids/" | ||
| metadataSubnetID = "/subnet-id/" | ||
| metadataVPCcidrs = "/vpc-ipv4-cidr-blocks/" | ||
| metadataDeviceNum = "/device-number/" | ||
| metadataInterface = "/interface-id/" | ||
| metadataSGs = "/security-group-ids" | ||
| metadataSubnetID = "/subnet-id" | ||
| metadataVPCcidrs = "/vpc-ipv4-cidr-blocks" | ||
| metadataDeviceNum = "/device-number" | ||
| metadataInterface = "/interface-id" | ||
| metadataSubnetCIDR = "/subnet-ipv4-cidr-block" | ||
| metadataIPv4s = "/local-ipv4s" |
There was a problem hiding this comment.
Btw, seems like these ones are only used in the tests now, maybe we should move them out?
There was a problem hiding this comment.
Oops, yes meant to include that patch too. Done.
Goal: Make it clearer what is cached, and not cached.
mogren
approved these changes
Sep 23, 2020
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.
Refactor EC2 Metadata code into a typed wrapper. The idea is to split out the low-level mechanism (imds.go) from clever caching or other logic (awsutils.go).
Reviewer: This is intended to be a no-op "obviously safe" refactor of metadata lookup code. If there's something that looks surprising or unclear, I'm happy to simplify it further.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.