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

make sure region validation catches authentication errors

This commit is contained in:
Megan Marsh 2018-10-16 14:15:55 -07:00
parent ce30ed9444
commit 7c3f0aa3b2
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,7 +149,10 @@ func (c *AccessConfig) Prepare(ctx *interpolate.Context) []error {
if c.RawRegion != "" && !c.SkipValidation { if c.RawRegion != "" && !c.SkipValidation {
ec2conn := getValidationSession() ec2conn := getValidationSession()
if valid := ValidateRegion(c.RawRegion, ec2conn); !valid { valid, err := ValidateRegion(c.RawRegion, ec2conn)
if err != nil {
errs = append(errs, fmt.Errorf("error validating region: %s", err.Error()))
} else if !valid {
errs = append(errs, fmt.Errorf("Unknown region: %s", c.RawRegion)) errs = append(errs, fmt.Errorf("Unknown region: %s", c.RawRegion))
} }
} }

6
builder/amazon/common/ami_config.go
View File

@ -112,7 +112,11 @@ func (c *AMIConfig) prepareRegions(ec2conn ec2iface.EC2API, accessConfig *Access
if !c.AMISkipRegionValidation { if !c.AMISkipRegionValidation {
// Verify the region is real // Verify the region is real
if valid := ValidateRegion(region, ec2conn); !valid { ec2conn := getValidationSession()
valid, err := ValidateRegion(region, ec2conn)
if err != nil {
errs = append(errs, fmt.Errorf("error validating region: %s", err.Error()))
} else if !valid {
errs = append(errs, fmt.Errorf("Unknown region: %s", region)) errs = append(errs, fmt.Errorf("Unknown region: %s", region))
} }
} }

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

@ -15,23 +15,31 @@ func getValidationSession() *ec2.EC2 {
return ec2conn return ec2conn
} }
func listEC2Regions(ec2conn ec2iface.EC2API) []string { func listEC2Regions(ec2conn ec2iface.EC2API) ([]string, error) {
var regions []string var regions []string
resultRegions, _ := ec2conn.DescribeRegions(nil) resultRegions, err := ec2conn.DescribeRegions(nil)
if err != nil {
return []string{}, err
}
for _, region := range resultRegions.Regions { for _, region := range resultRegions.Regions {
regions = append(regions, *region.RegionName) regions = append(regions, *region.RegionName)
} }
return regions return regions, nil
} }
// ValidateRegion returns true if the supplied region is a valid AWS // ValidateRegion returns true if the supplied region is a valid AWS
// region and false if it's not. // region and false if it's not.
func ValidateRegion(region string, ec2conn ec2iface.EC2API) bool { func ValidateRegion(region string, ec2conn ec2iface.EC2API) (bool, error) {
for _, valid := range listEC2Regions(ec2conn) { regions, err := listEC2Regions(ec2conn)
if err != nil {
return false, err
}
for _, valid := range regions {
if region == valid { if region == valid {
return true return true, nil
} }
} }
return false return false, nil
} }