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

fix region stuff

This commit is contained in:
Megan Marsh 2019-01-16 11:02:13 -08:00
parent d344675660
commit 783ed32e7e
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,11 +54,11 @@ func (c *AccessConfig) Session() (*session.Session, error) {
// retries are exponentially backed off.
config = config.WithMaxRetries(8)
region, err := c.region()
if err != nil {
return nil, fmt.Errorf("Could not get region, "+
"probably because it's not set or we're not running on AWS. %s", err)
}
region, _ := c.region()
// if err != nil {
// return nil, fmt.Errorf("Could not get region, "+
// "probably because it's not set or we're not running on AWS. %s", err)
// }
config = config.WithRegion(region)
if c.CustomEndpointEc2 != "" {

3
builder/amazon/common/regions.go
View File

@ -34,6 +34,9 @@ func (c *AccessConfig) ValidateRegion(regions ...string) error {
var invalidRegions []string
for _, region := range regions {
if region == "" {
continue
}
found := false
for _, validRegion := range validRegions {
if region == validRegion {