iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5676 from hashicorp/fix5669 

Correctly set aws region if given in template along with a profile.
This commit is contained in:
Matthew Hooker 2017-12-07 11:13:44 -08:00 committed by GitHub
parent ca26ab5d5a 7b5c0900ef
commit da4d6f76be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builder/amazon/common/access_config.go
View File

@ -40,7 +40,9 @@ func (c *AccessConfig) Session() (*session.Session, error) {
if err := os.Setenv("AWS_PROFILE", c.ProfileName); err != nil { if err := os.Setenv("AWS_PROFILE", c.ProfileName); err != nil {
return nil, fmt.Errorf("Set env error: %s", err) return nil, fmt.Errorf("Set env error: %s", err)
} }
} else if c.RawRegion != "" { }
if c.RawRegion != "" {
config = config.WithRegion(c.RawRegion) config = config.WithRegion(c.RawRegion)
} else if region := c.metadataRegion(); region != "" { } else if region := c.metadataRegion(); region != "" {
config = config.WithRegion(region) config = config.WithRegion(region)