Use AWS SDK to retrieve ec2 instance identity doc #1369
Conversation
mcpherrinm
requested review from
amartinezfayo,
APTy,
azdagron,
evan2645 and
marcosy
as code owners
| IdentityDocumentURL string `hcl:"identity_document_url"` | ||
| IdentitySignatureURL string `hcl:"identity_signature_url"` | ||
| EC2MetadataEndpoint string `hcl:"ec2_metadata_endpoint"` | ||
| IdentityDocumentURL string `hcl:"identity_document_url"` // Deprecated |
There was a problem hiding this comment.
nit: prefix vars with Deprecated (but keep hcl tag as-is) as a visual indicator that new code shouldn't rely on them
| config.IdentityDocumentURL = defaultIdentityDocumentURL | ||
| } | ||
| // If we have a legacy config, ensure both have a value | ||
| if config.EC2MetadataEndpoint == "" && (config.IdentitySignatureURL != "" || config.IdentityDocumentURL != "") { |
There was a problem hiding this comment.
We should log here if deprecated configurables are set and the new endpoint configurable is:
- set (e.g. "deprecated configurable foo is ignored because...")
- not set (.e.g. "deprecated configurable foo will be deprecated in a future release. please use ec2_metadata_endpoint instead")
|
Addressed feedback (warning logs, use Deprecated prefix on variable names) I rebased on master and force-pushed the updated commit since there was some merge conflicts with my other cleanup PR in #1368 |
| "fmt" | ||
| "github.com/hashicorp/go-hclog" |
There was a problem hiding this comment.
nit: this import belongs down with the other group...
There was a problem hiding this comment.
fixed. Blame my IDE upgrading losing my save-actions auto-goimports :)
| "io/ioutil" | ||
| "net/http" | ||
| "sync" | ||
|
|
||
| awsSdk "github.com/aws/aws-sdk-go/aws" |
There was a problem hiding this comment.
nit: we aren't consistent in the codebase but named imports should follow package naming conventions (i.e. awssdk)
There was a problem hiding this comment.
Changed to awssdk
This keeps the old code, and if either the doc or sig URL is set, it uses the old codepath. After a deprecation period, we can delete it. Signed-off-by: Matthew McPherrin <mmc@squareup.com>
This is an alternative design to #1360
Rather than trying to always use the SDK, the fallback path here uses the old code.
This is thus more compatible, at the expense of being a bit branchier.
Which issue this PR fixes
fixes #1359