Skip to content

Commit

Permalink
Allow to specify custom AWS region (#15)
Browse files Browse the repository at this point in the history
* Use AWS_DEFAULT_REGION env (necessary when assuming roles in AWS China)

* Add an option for specifying a region
  • Loading branch information
kevwargo authored Mar 29, 2020
1 parent e45c0bc commit ca37610
Showing 1 changed file with 23 additions and 4 deletions.
27 changes: 23 additions & 4 deletions cmd/assume-role-arn/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,14 @@ import (
"github.com/sirupsen/logrus"
)

const (
envAWSDefaultRegion = "AWS_DEFAULT_REGION"
defaultRegion = "us-east-1"
)

var (
roleARN, roleName, externalID, mfa, mfaToken, awsProfileName string
verbose, ignoreCache, skipCache, version bool
roleARN, roleName, externalID, mfa, mfaToken, region, awsProfileName string
verbose, ignoreCache, skipCache, version bool
)

func init() {
Expand All @@ -40,6 +45,7 @@ func init() {
flag.StringVar(&mfa, "m", "", "MFA serial (shorthand)")

flag.StringVar(&mfaToken, "mfatoken", "", "MFA token")
flag.StringVar(&region, "region", "", "AWS region")

flag.BoolVar(&verbose, "verbose", false, "verbose mode")
flag.BoolVar(&verbose, "v", false, "verbose mode (shorthand)")
Expand Down Expand Up @@ -83,14 +89,27 @@ func askForMFAToken(roleARN string) string {
return strings.TrimRight(mfaToken, "\n")
}

func getRegion() string {
if region != "" {
return region
}

if region := os.Getenv(envAWSDefaultRegion); region != "" {
return region
}

return defaultRegion
}

func getSession(awsCreds *AWSCreds) *session.Session {
region := "us-east-1"
region := getRegion()
sessionOptions := session.Options{
SharedConfigState: session.SharedConfigEnable,
Config: aws.Config{
Region: aws.String(region),
},
}

if awsProfileName != "" {
awsProfile, _ := readAWSProfile(awsProfileName)
logrus.WithFields(logrus.Fields{"awsProfile": awsProfile, "profileName": awsProfileName}).Debug("aws profile")
Expand Down Expand Up @@ -233,7 +252,7 @@ func main() {
}

sessionHash := getSessionHash(roleARN, awsProfileName)

var credsCache CredentialsCacher = &FileCredentialsCache{}
if skipCache {
credsCache = &DummyCredentialsCache{}
Expand Down

0 comments on commit ca37610

Please sign in to comment.