Skip to content
This repository has been archived by the owner on Dec 19, 2017. It is now read-only.

Support MFA token from AWS config file #225

Closed
wants to merge 1 commit into from
Closed

Support MFA token from AWS config file #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions aws/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,7 @@ func SharedAuth() (auth Auth, err error) {

auth.AccessKey = profile["aws_access_key_id"]
auth.SecretKey = profile["aws_secret_access_key"]
auth.Token = profile["aws_session_token"]

if auth.AccessKey == "" {
err = errors.New("AWS_ACCESS_KEY_ID not found in environment in credentials file")
Expand Down
10 changes: 6 additions & 4 deletions aws/aws_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,13 @@ func (s *S) TestSharedAuthDefaultCredentials(c *C) {
panic(err)
}

ioutil.WriteFile(d+"/.aws/credentials", []byte("[default]\naws_access_key_id = access\naws_secret_access_key = secret\n"), 0644)
ioutil.WriteFile(d+"/.aws/credentials",
[]byte("[default]\naws_access_key_id = access\naws_secret_access_key = secret\naws_session_token = token"), 0644)
os.Setenv("HOME", d)

auth, err := aws.SharedAuth()
c.Assert(err, IsNil)
c.Assert(auth, Equals, aws.Auth{SecretKey: "secret", AccessKey: "access"})
c.Assert(auth, Equals, aws.Auth{SecretKey: "secret", AccessKey: "access", Token: "token"})
}

func (s *S) TestSharedAuth(c *C) {
Expand All @@ -127,12 +128,13 @@ func (s *S) TestSharedAuth(c *C) {
panic(err)
}

ioutil.WriteFile(d+"/.aws/credentials", []byte("[bar]\naws_access_key_id = access\naws_secret_access_key = secret\n"), 0644)
ioutil.WriteFile(d+"/.aws/credentials",
[]byte("[bar]\naws_access_key_id = access\naws_secret_access_key = secret\naws_session_token = token"), 0644)
os.Setenv("HOME", d)

auth, err := aws.SharedAuth()
c.Assert(err, IsNil)
c.Assert(auth, Equals, aws.Auth{SecretKey: "secret", AccessKey: "access"})
c.Assert(auth, Equals, aws.Auth{SecretKey: "secret", AccessKey: "access", Token: "token"})
}

func (s *S) TestEnvAuthNoSecret(c *C) {
Expand Down