Merge pull request #5562 from hashicorp/fix5558

don't set region from metadata if profile is set.

builder/amazon/chroot/builder_test.go

@@ -10,6 +10,7 @@ func testConfig() map[string]interface{} {
 	return map[string]interface{}{
 		"ami_name":   "foo",
 		"source_ami": "foo",
+		"region":     "us-east-1",
 	}
 }
 

builder/amazon/common/access_config.go

@@ -34,15 +34,15 @@ func (c *AccessConfig) Session() (*session.Session, error) {
 		return c.session, nil
 	}
 
+	config := aws.NewConfig().WithMaxRetries(11).WithCredentialsChainVerboseErrors(true)
+
 	if c.ProfileName != "" {
 		if err := os.Setenv("AWS_PROFILE", c.ProfileName); err != nil {
 			return nil, fmt.Errorf("Set env error: %s", err)
 		}
-	}
-
-	config := aws.NewConfig().WithMaxRetries(11).WithCredentialsChainVerboseErrors(true)
-
-	if region := c.region(); region != "" {
+	} else if c.RawRegion != "" {
+		config = config.WithRegion(c.RawRegion)
+	} else if region := c.metadataRegion(); region != "" {
 		config = config.WithRegion(region)
 	}
 
@@ -68,25 +68,27 @@ func (c *AccessConfig) Session() (*session.Session, error) {
 		SharedConfigState: session.SharedConfigEnable,
 		Config:            *config,
 	}
+
 	if c.MFACode != "" {
 		opts.AssumeRoleTokenProvider = func() (string, error) {
 			return c.MFACode, nil
 		}
 	}
-	var err error
-	c.session, err = session.NewSessionWithOptions(opts)
-	if err != nil {
+
+	if sess, err := session.NewSessionWithOptions(opts); err != nil {
 		return nil, err
+	} else if *sess.Config.Region == "" {
+		return nil, fmt.Errorf("Could not find AWS region, make sure it's set.")
+	} else {
+		log.Printf("Found region %s", *sess.Config.Region)
+		c.session = sess
 	}
 
 	return c.session, nil
 }
 
-// region returns either the region from config or region from metadata service
-func (c *AccessConfig) region() string {
-	if c.RawRegion != "" {
-		return c.RawRegion
-	}
+// metadataRegion returns the region from the metadata service
+func (c *AccessConfig) metadataRegion() string {
 
 	client := cleanhttp.DefaultClient()
 
@@ -112,9 +114,5 @@ func (c *AccessConfig) Prepare(ctx *interpolate.Context) []error {
 		}
 	}
 
-	if len(errs) > 0 {
-		return errs
-	}
-
-	return nil
+	return errs
 }

builder/amazon/common/ami_config.go

@@ -45,10 +45,11 @@ func (c *AMIConfig) Prepare(accessConfig *AccessConfig, ctx *interpolate.Context
 		session, err := accessConfig.Session()
 		if err != nil {
 			errs = append(errs, err)
-		}
-		region := *session.Config.Region
-		if stringInSlice(c.AMIRegions, region) {
-			errs = append(errs, fmt.Errorf("Cannot copy AMI to AWS session region '%s', please remove it from `ami_regions`.", region))
+		} else {
+			region := *session.Config.Region
+			if stringInSlice(c.AMIRegions, region) {
+				errs = append(errs, fmt.Errorf("Cannot copy AMI to AWS session region '%s', please remove it from `ami_regions`.", region))
+			}
 		}
 	}