From 56cc74887f4290ff2160f430f05ca704e6ca5c4c Mon Sep 17 00:00:00 2001 From: Jeff Mitchell Date: Tue, 3 May 2016 15:25:11 -0400 Subject: [PATCH] Region is required so error in awsutil if not set and set if empty in client code in logical/aws --- builtin/logical/aws/client.go | 4 ++++ helper/awsutil/generate_providers.go | 3 +++ 2 files changed, 7 insertions(+) diff --git a/builtin/logical/aws/client.go b/builtin/logical/aws/client.go index 4ec18f806a..75059b0acb 100644 --- a/builtin/logical/aws/client.go +++ b/builtin/logical/aws/client.go @@ -30,6 +30,10 @@ func getRootConfig(s logical.Storage) (*aws.Config, error) { credConfig.Region = config.Region } + if credConfig.Region == "" { + credConfig.Region = "us-east-1" + } + creds, err := awsutil.GenerateCredentialChain(credConfig) if err != nil { return nil, err diff --git a/helper/awsutil/generate_providers.go b/helper/awsutil/generate_providers.go index 37c9051009..3e1d13a521 100644 --- a/helper/awsutil/generate_providers.go +++ b/helper/awsutil/generate_providers.go @@ -21,6 +21,9 @@ func GenerateCredentialChain(config *AWSCredentialsConfig) (*credentials.Credent if config == nil { return nil, fmt.Errorf("nil configuration provided") } + if config.Region == "" { + return nil, fmt.Errorf("region must be provided in credentials configuration") + } var providers []credentials.Provider