From 335f442b51371f17b07008b3d9b2e6f4996af48e Mon Sep 17 00:00:00 2001 From: Adrien Delorme Date: Fri, 25 Jan 2019 13:02:42 +0100 Subject: [PATCH] aws: unwrap AccessConfig.region func * it was used only in the Session() call. * default region guessing from metadata should happen in the SDK, not 'manually' --- builder/amazon/common/access_config.go | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/builder/amazon/common/access_config.go b/builder/amazon/common/access_config.go index 3270ed0d4..707b7a5ba 100644 --- a/builder/amazon/common/access_config.go +++ b/builder/amazon/common/access_config.go @@ -54,8 +54,9 @@ func (c *AccessConfig) Session() (*session.Session, error) { // retries are exponentially backed off. config = config.WithMaxRetries(8) - region, _ := c.region() - config = config.WithRegion(region) + if c.RawRegion != "" { + config = config.WithRegion(c.RawRegion) + } if c.CustomEndpointEc2 != "" { config = config.WithEndpoint(c.CustomEndpointEc2) @@ -139,13 +140,6 @@ func (c *AccessConfig) metadataRegion() (string, error) { return ec2meta.Region() } -func (c *AccessConfig) region() (string, error) { - if c.RawRegion != "" { - return c.RawRegion, nil - } - return c.metadataRegion() -} - func (c *AccessConfig) Prepare(ctx *interpolate.Context) []error { var errs []error