Merge pull request #12 from mhlias/secondary_account_fixes

Fix secondary account feature bugs.
mhlias · Aug 17, 2017 · 209b6eb · 209b6eb
2 parents 6624be1 + 70ff925
commit 209b6eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/aws_helper/conn.go b/aws_helper/conn.go
@@ -29,7 +29,7 @@ type Config struct {
 	Use_sts       bool
 	Mfa_device_id string
 	Mfa_token     string
-	Secondary     *Account
+	Secondary     Account
 }
 
 type Account struct {
@@ -105,7 +105,7 @@ func (c *Config) Connect() interface{} {
 		os.Setenv("AWS_SESSION_TOKEN", *sts_resp.Credentials.SessionToken)
 		os.Setenv("AWS_DEFAULT_REGION", c.Region)
 
-		if len(c.Secondary.Account_id) > 0 && len(c.Secondary.Role) > 0 && len(c.Secondary.Region) > 0 {
+		if c.Secondary != (Account{}) {
 
 			params2 := &sts.AssumeRoleInput{
 				RoleArn:         aws.String(fmt.Sprintf("arn:aws:iam::%s:role/%s", c.Secondary.Account_id, c.Secondary.Role)),

diff --git a/main.go b/main.go
@@ -32,7 +32,7 @@ type conf struct {
 	Parallelism      int16             `yaml:"parallelism"`
 	environment      string
 	account          string
-	Secondary        map[string]*aws_helper.Account `yaml:"secondary_accounts"`
+	Secondary        map[string]aws_helper.Account `yaml:"secondary_accounts"`
 }
 
 type multiflag []string