fix preserving existing aws credentials

ivanfoo · Jun 28, 2016 · 2d5038b · 2d5038b
1 parent f759249
commit 2d5038b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/commands/assume.go b/commands/assume.go
@@ -89,13 +89,18 @@ func (c *CmdAssume) getArnOfAliasFromFile(rolesFile string) string {
 }
 
 func (c *CmdAssume) saveAWSCredentials(credentialsFile string) error {
-	cfg := ini.Empty()
+	cfg, err := ini.LooseLoad(awsCredentialsFile)
+
+	if err != nil {
+		fmt.Println("Creating new credentials file...")
+	}
+
 	cfg.NewSection(c.awsSession)
 	cfg.Section(c.awsSession).NewKey("aws_access_key_id", c.credentials.AccessKey)
 	cfg.Section(c.awsSession).NewKey("aws_secret_access_key", c.credentials.SecretKey)
 	cfg.Section(c.awsSession).NewKey("aws_security_token", c.credentials.Token)
 
-	err := cfg.SaveTo(awsCredentialsFile)
+	err = cfg.SaveTo(awsCredentialsFile)
 
 	if err != nil {
 		return err

diff --git a/commands/configure.go b/commands/configure.go
@@ -1,6 +1,10 @@
 package commands
 
-import "gopkg.in/ini.v1"
+import (
+	"fmt"
+
+	"gopkg.in/ini.v1"
+)
 
 type CmdConfigure struct {
 	Alias     string `short:"a" long:"alias" description:"role alias" default:"default"`
@@ -9,11 +13,16 @@ type CmdConfigure struct {
 }
 
 func (c *CmdConfigure) Execute(args []string) error {
-	cfg := ini.Empty()
+	cfg, err := ini.LooseLoad(c.RolesFile)
+
+	if err != nil {
+		fmt.Println("Creating new roles file...")
+	}
+
 	cfg.NewSection(c.Alias)
 	cfg.Section(c.Alias).NewKey("arn", c.Arn)
 
-	err := cfg.SaveTo(c.RolesFile)
+	err = cfg.SaveTo(c.RolesFile)
 
 	if err != nil {
 		return err