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

Merge pull request #6931 from hashicorp/fix_6919 

aws: better error handling of region/credential guessing from metadata
This commit is contained in:
Megan Marsh 2018-11-05 11:24:09 -08:00 committed by GitHub
parent b88b5c9aaa 3f288fc6ca
commit 79862f1bbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,13 +51,15 @@ func (c *AccessConfig) Session() (*session.Session, error) {
}
// default is 3, and when it was causing failures for users being throttled
config = config.WithMaxRetries(20)
// retries are exponentially backed off.
config = config.WithMaxRetries(8)
if c.RawRegion != "" {
config = config.WithRegion(c.RawRegion)
} else if region := c.metadataRegion(); region != "" {
config = config.WithRegion(region)
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)
}
config = config.WithRegion(region)
if c.CustomEndpointEc2 != "" {
config = config.WithEndpoint(c.CustomEndpointEc2)
@ -88,8 +90,6 @@ func (c *AccessConfig) Session() (*session.Session, error) {
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
@ -130,7 +130,7 @@ func (c *AccessConfig) IsChinaCloud() bool {
}
// metadataRegion returns the region from the metadata service
func (c *AccessConfig) metadataRegion() string {
func (c *AccessConfig) metadataRegion() (string, error) {
client := cleanhttp.DefaultClient()
@ -139,13 +139,14 @@ func (c *AccessConfig) metadataRegion() string {
ec2meta := ec2metadata.New(session.New(), &aws.Config{
HTTPClient: client,
})
region, err := ec2meta.Region()
if err != nil {
log.Println("Error getting region from metadata service, "+
"probably because we're not running on AWS.", err)
return ""
return ec2meta.Region()
}
func (c *AccessConfig) region() (string, error) {
if c.RawRegion != "" {
return c.RawRegion, nil
}
return region
return c.metadataRegion()
}
func (c *AccessConfig) Prepare(ctx *interpolate.Context) []error {