Prioritize Role over environment variables (#161)

* Update aws.go * add also to subscriber
nytimes · Nov 5, 2018 · 19b29a0 · 19b29a0
1 parent ca1565f
commit 19b29a0
Showing 1 changed file with 7 additions and 10 deletions.
diff --git a/pubsub/aws/aws.go b/pubsub/aws/aws.go
@@ -46,16 +46,14 @@ func NewPublisher(cfg SNSConfig) (pubsub.Publisher, error) {
 	var creds *credentials.Credentials
 	if cfg.AccessKey != "" {
 		creds = credentials.NewStaticCredentials(cfg.AccessKey, cfg.SecretKey, cfg.SessionToken)
-	} else {
-		creds = credentials.NewEnvCredentials()
-	}
-
-	if cfg.RoleARN != "" {
+	} else if cfg.RoleARN != "" {
 		var err error
 		creds, err = requestRoleCredentials(creds, cfg.RoleARN, cfg.MFASerialNumber)
 		if err != nil {
 			return p, err
 		}
+	} else {
+		creds = credentials.NewEnvCredentials()
 	}
 
 	sess, err := session.NewSession()
@@ -204,15 +202,14 @@ func NewSubscriber(cfg SQSConfig) (pubsub.Subscriber, error) {
 	var creds *credentials.Credentials
 	if cfg.AccessKey != "" {
 		creds = credentials.NewStaticCredentials(cfg.AccessKey, cfg.SecretKey, cfg.SessionToken)
-	} else {
-		creds = credentials.NewEnvCredentials()
-	}
-
-	if cfg.RoleARN != "" {
+	} else if cfg.RoleARN != "" {
+		var err error
 		creds, err = requestRoleCredentials(creds, cfg.RoleARN, cfg.MFASerialNumber)
 		if err != nil {
 			return s, err
 		}
+	} else {
+		creds = credentials.NewEnvCredentials()
 	}
 
 	sess, err := session.NewSession()