scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 03:27:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Default to us-east-1 for CLI logins (#7622)

Browse Source
This commit is contained in:
Jim Kalafut
2019-10-14 11:55:10 -07:00
committed by GitHub
parent a35b2905bb
commit 5241c317cb
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/credential/aws/cli.go
View File

@@ -13,7 +13,7 @@ import (
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/sts"
"github.com/hashicorp/errwrap"
hclog "github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-hclog"
"github.com/hashicorp/vault/api"
"github.com/hashicorp/vault/helper/awsutil"
)
@@ -99,7 +99,11 @@ func (h *CLIHandler) Auth(c *api.Client, m map[string]string) (*api.Secret, erro
return nil, err
}
loginData, err := GenerateLoginData(creds, headerValue, m["region"])
region := m["region"]
if region == "" {
region = awsutil.DefaultRegion
}
loginData, err := GenerateLoginData(creds, headerValue, region)
if err != nil {
return nil, err
}