Fix IAM Role ARN if trying to run against GovCloud #48
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
added 2 commits
May 12, 2020 17:45
cblkwell
reviewed
May 13, 2020
cmd/main.go
Outdated
Comment on lines
457
to
461
| if partition, ok := endpoints.PartitionForRegion(endpoints.DefaultPartitions(), region); ok { | ||
| return partition.ID() | ||
| } | ||
| return "aws" | ||
| } |
There was a problem hiding this comment.
Why not always return partition.ID? Won't this always be either "aws" or "aws-gov"? If it errors out, isn't that a bad sign? I suspect this is a "Chas doesn't understand Go" problem, but I'm curious nevertheless.
mdawn
reviewed
May 13, 2020
cmd/main.go
Outdated
Comment on lines
456
to
461
| func getPartition(region string) string { | ||
| if partition, ok := endpoints.PartitionForRegion(endpoints.DefaultPartitions(), region); ok { | ||
| return partition.ID() | ||
| } | ||
| return "aws" | ||
| } |
There was a problem hiding this comment.
Suggested change
| func getPartition(region string) string { | |
| if partition, ok := endpoints.PartitionForRegion(endpoints.DefaultPartitions(), region); ok { | |
| return partition.ID() | |
| } | |
| return "aws" | |
| } | |
| func getPartition(region string) (string, error) { | |
| partition, ok := endpoints.PartitionForRegion(endpoints.DefaultPartitions(), region) | |
| if !ok { | |
| return "", fmt.Errorf("Error finding partition for region: %s", region) | |
| } | |
| return partition.ID(), nil | |
| } |
cmd/main.go
Outdated
| RoleARN: fmt.Sprintf("arn:aws:iam::%v:role/%v", | ||
| options.AwsAccountID, options.Role), | ||
| RoleARN: fmt.Sprintf("arn:%s:iam::%d:role/%s", | ||
| getPartition(options.AwsRegion), |
There was a problem hiding this comment.
Suggested change
| getPartition(options.AwsRegion), | |
| partition, |
Then add above something to call getPartition like:
partition, err := getPartition(options.AwsRegion)
if err != nil {
fmt.Println(err)
fmt.Println("Using aws as partition")
partition = "aws"
}
If you want to avoid noping out of the process
mdawn
approved these changes
May 14, 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.
Up til now we've been hardcoding the AWS partition, which breaks when trying to run against GovCloud. This PR looks up the AWS partition based on the region you're passing in.
Tested by running