Merge pull request #1089 from TimeInc/fix-broken-token

Bugfix: Save token that came from goamz + use it in go-sdk-aws
This commit is contained in:
Paul Hinze 2015-03-02 09:29:13 -06:00
commit cd47f00b91
1 changed files with 3 additions and 1 deletions

View File

@ -21,6 +21,7 @@ import (
type Config struct {
AccessKey string
SecretKey string
Token string
Region string
}
@ -58,7 +59,7 @@ func (c *Config) Client() (interface{}, error) {
// bucket storage in S3
client.region = c.Region
creds := awsGo.Creds(c.AccessKey, c.SecretKey, "")
creds := awsGo.Creds(c.AccessKey, c.SecretKey, c.Token)
log.Println("[INFO] Initializing EC2 connection")
client.ec2conn = ec2.New(auth, region)
@ -95,6 +96,7 @@ func (c *Config) AWSAuth() (aws.Auth, error) {
// Store the accesskey and secret that we got...
c.AccessKey = auth.AccessKey
c.SecretKey = auth.SecretKey
c.Token = auth.Token
}
return auth, err