Use correct env var (#7)

As per https://docs.aws.amazon.com/cli/latest/userguide/cli-environment.html Fixes #6
palantir · Nov 21, 2017 · eb4b48b · eb4b48b
1 parent c43f236
commit eb4b48b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/aws/asg.go b/aws/asg.go
@@ -73,7 +73,7 @@ func (c *Clients) GetASG(asgName *string) (*autoscaling.Group, error) {
 	}
 
 	if len(asgs) != 1 {
-		return nil, errors.Errorf("ASG Name '%s' matched '%v' ASGs, expecting it to match 1 (looking in region %s, have you set AWS_REGION?)", *asgName, len(asgs), c.ASGClient.SigningRegion)
+		return nil, errors.Errorf("ASG Name '%s' matched '%v' ASGs, expecting it to match 1 (looking in region %s, have you set AWS_DEFAULT_REGION?)", *asgName, len(asgs), c.ASGClient.SigningRegion)
 	}
 
 	return asgs[0], nil

diff --git a/aws/aws.go b/aws/aws.go
@@ -47,12 +47,9 @@ func GetAWSClients() (*Clients, error) {
 		return nil, errors.Errorf("Your AWS Credentials are expired")
 	}
 
-	region := os.Getenv("AWS_REGION")
+	region := os.Getenv("AWS_DEFAULT_REGION")
 	if region == "" {
-		region = os.Getenv("AWS_DEFAULT_REGION")
-		if region == "" {
-			region = "us-east-1"
-		}
+		region = "us-east-1"
 	}
 
 	awsConf := aws.Config{