Merge pull request 99designs#257 from frezbo/feature/rotate-region-fix

Updating session creator to always use the region specified
ChrisSchreiber · May 16, 2018 · ae56f73 · ae56f73
2 parents e18d4e6 + 86a7b6c
commit ae56f73
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/vault/provider.go b/vault/provider.go
@@ -344,6 +344,7 @@ func (p *VaultProvider) assumeRole(creds credentials.Value, roleArn string) (sts
 type KeyringProvider struct {
 	Keyring keyring.Keyring
 	Profile string
+	Region  string
 }
 
 func (p *KeyringProvider) IsExpired() bool {

diff --git a/vault/rotator.go b/vault/rotator.go
@@ -34,14 +34,15 @@ func (r *Rotator) Rotate(profile string) error {
 	provider := &KeyringProvider{
 		Keyring: r.Keyring,
 		Profile: source.Name,
+		Region:  source.Region,
 	}
 
 	oldMasterCreds, err := provider.Retrieve()
 	if err != nil {
 		return err
 	}
 
-	oldSess := session.New(&aws.Config{
+	oldSess := session.New(&aws.Config{Region: aws.String(provider.Region),
 		Credentials: credentials.NewCredentials(&credentials.StaticProvider{Value: oldMasterCreds}),
 	})
 
@@ -84,7 +85,7 @@ func (r *Rotator) Rotate(profile string) error {
 		iamUserName = aws.String(currentUserName)
 	}
 
-	oldSessionClient := iam.New(session.New(&aws.Config{
+	oldSessionClient := iam.New(session.New(&aws.Config{Region: aws.String(provider.Region),
 		Credentials: credentials.NewCredentials(&credentials.StaticProvider{Value: oldSessionVal}),
 	}))
 
@@ -131,7 +132,7 @@ func (r *Rotator) Rotate(profile string) error {
 			return err
 		}
 
-		newClient := iam.New(session.New(&aws.Config{
+		newClient := iam.New(session.New(&aws.Config{Region: aws.String(provider.Region),
 			Credentials: credentials.NewCredentials(&credentials.StaticProvider{Value: newVal}),
 		}))