Skip to content

fixed and improved region detection within queue url #403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 12, 2021
Merged

fixed and improved region detection within queue url #403

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39e1348
fixed and improved region detection within queue url
bwagner5 Apr 9, 2021
1c7db39
add debug log for queue-url region detectio n
bwagner5 Apr 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"strconv"
"strings"

"github.com/aws/aws-sdk-go/aws/endpoints"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/rs/zerolog/log"
)
Expand Down Expand Up @@ -189,7 +190,8 @@ func ParseCliArgs() (config Config, err error) {
if config.AWSRegion != "" {
sess.Config.Region = &config.AWSRegion
} else if *sess.Config.Region == "" && config.QueueURL != "" {
config.AWSRegion = strings.Split(config.QueueURL, ".")[1]
config.AWSRegion = getRegionFromQueueURL(config.QueueURL)
log.Debug().Str("Retrieved AWS region from queue-url: \"%s\"", config.AWSRegion)
sess.Config.Region = &config.AWSRegion
} else {
config.AWSRegion = *sess.Config.Region
Expand Down Expand Up @@ -390,3 +392,14 @@ func isConfigProvided(cliArgName string, envVarName string) bool {
})
return cliArgProvided
}

func getRegionFromQueueURL(queueURL string) string {
for _, partition := range endpoints.DefaultPartitions() {
for regionID := range partition.Regions() {
if strings.Contains(queueURL, regionID) {
Copy link
Contributor

@james-callahan james-callahan Apr 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's not likely; but if someone named their queue us-west-2 when it was actually in e.g. ap-southeast-1 then this could have a false positive.

return regionID
}
}
}
return ""
Copy link
Contributor

@haugenj haugenj Apr 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will this lead to an error?

Copy link
Contributor

@haugenj haugenj Apr 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if they do end up changing the queue urls or something, maybe we should at least log here

Copy link
Contributor Author

@bwagner5 bwagner5 Apr 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added a debug log

Copy link
Contributor Author

@bwagner5 bwagner5 Apr 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh and to answer the first question, yes it will lead to an aws sdk error that the region is undefined

}