From 783ed32e7e7bc3f82cbbf1b19f7fea2ff00c6573 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Wed, 16 Jan 2019 11:02:13 -0800 Subject: [PATCH 1/2] fix region stuff --- builder/amazon/common/access_config.go | 10 +++++----- builder/amazon/common/regions.go | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/builder/amazon/common/access_config.go b/builder/amazon/common/access_config.go index d7a8ec9dc..e1fd8049f 100644 --- a/builder/amazon/common/access_config.go +++ b/builder/amazon/common/access_config.go @@ -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 != "" { diff --git a/builder/amazon/common/regions.go b/builder/amazon/common/regions.go index 3bdda86da..773e8ad33 100644 --- a/builder/amazon/common/regions.go +++ b/builder/amazon/common/regions.go @@ -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 { From e0543246fa71d8bf714c94b8e6ec64ba8ad86c96 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Wed, 16 Jan 2019 11:05:11 -0800 Subject: [PATCH 2/2] remove commented code --- builder/amazon/common/access_config.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/builder/amazon/common/access_config.go b/builder/amazon/common/access_config.go index e1fd8049f..7f45a543e 100644 --- a/builder/amazon/common/access_config.go +++ b/builder/amazon/common/access_config.go @@ -55,10 +55,6 @@ func (c *AccessConfig) Session() (*session.Session, error) { config = config.WithMaxRetries(8) 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 != "" {