Add option to configure ec2_alias values #5846
Conversation
vishalnayak
force-pushed
the
aws-ec2-alias
branch
from
ac1ac8e
to
09ca161
Compare
| @@ -18,6 +18,11 @@ func pathConfigIdentity(b *backend) *framework.Path { | |||
| Default: identityAliasIAMUniqueID, | |||
| Description: fmt.Sprintf("Configure how the AWS auth method generates entity aliases when using IAM auth. Valid values are %q and %q", identityAliasIAMUniqueID, identityAliasIAMFullArn), | |||
| }, | |||
| "ec2_alias": { | |||
There was a problem hiding this comment.
Since the above parameter has the old style of declaring the parameter type (&framework.FieldSchema), could we run gofmt -s on this file since we're here anyway? That would clean up the above and any other places that need updating in the file.
| identityAlias := "" | ||
|
|
||
| switch identityConfigEntry.EC2Alias { | ||
| case identityAliasEC2InstanceID: |
There was a problem hiding this comment.
So am I right in thinking that this is the default path if neither have been set?
There was a problem hiding this comment.
Yes! The function identityConfigEntry above will return default values for both EC2Alias and IAMAlias.
| } | ||
|
|
||
| const identityAliasIAMUniqueID = "unique_id" | ||
| const identityAliasIAMFullArn = "full_arn" | ||
| const identityAliasEC2InstanceID = "instance-id" | ||
| const identityAliasEC2ImageID = "image-id" |
There was a problem hiding this comment.
Can we make these _ to match the IAM values?
| case entry.IAMAlias == "": | ||
| entry.IAMAlias = identityAliasIAMUniqueID | ||
| case entry.EC2Alias == "": | ||
| entry.EC2Alias = identityAliasEC2InstanceID |
There was a problem hiding this comment.
I think we should change this incase both end up being "" for some reason, probably break this into two if statements
Fixes #5709