fix region stuff

pull/7205/head
Megan Marsh 7 years ago
parent d344675660
commit 783ed32e7e

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

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

Loading…
Cancel
Save