go/golang-saas-starter-kit
1
0
Fork 0
mirror of https://github.com/raseels-repos/golang-saas-starter-kit.git synced 2025-06-29 00:52:03 +02:00
Code Issues Releases Activity

deploy aws region empty for role

Browse Source
This commit is contained in:
Lee Brown
2019-07-14 01:19:50 -08:00
parent 5276254db5
commit a672b56d5d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/devops/cmd/deploy/aws.go
View File

@ -29,6 +29,8 @@ const (
func GetAwsCredentials(targetEnv string) (awsCredentials, error) { func GetAwsCredentials(targetEnv string) (awsCredentials, error) {
var creds awsCredentials var creds awsCredentials
creds.Region = strings.TrimSpace(getTargetEnv(targetEnv, "AWS_REGION"))
if v := getTargetEnv(targetEnv, "AWS_USE_ROLE"); v != "" { if v := getTargetEnv(targetEnv, "AWS_USE_ROLE"); v != "" {
creds.UseRole, _ = strconv.ParseBool(v) creds.UseRole, _ = strconv.ParseBool(v)
@ -37,7 +39,7 @@ func GetAwsCredentials(targetEnv string) (awsCredentials, error) {
return creds, errors.Wrap(err, "Failed to load AWS credentials from instance") return creds, errors.Wrap(err, "Failed to load AWS credentials from instance")
} }
if sess.Config != nil && sess.Config.Region != nil { if sess.Config != nil && sess.Config.Region != nil && *sess.Config.Region != "" {
creds.Region = *sess.Config.Region creds.Region = *sess.Config.Region
} else { } else {
sm := ec2metadata.New(sess) sm := ec2metadata.New(sess)
@ -52,7 +54,6 @@ func GetAwsCredentials(targetEnv string) (awsCredentials, error) {
creds.AccessKeyID = strings.TrimSpace(getTargetEnv(targetEnv, "AWS_ACCESS_KEY_ID")) creds.AccessKeyID = strings.TrimSpace(getTargetEnv(targetEnv, "AWS_ACCESS_KEY_ID"))
creds.SecretAccessKey = strings.TrimSpace(getTargetEnv(targetEnv, "AWS_SECRET_ACCESS_KEY")) creds.SecretAccessKey = strings.TrimSpace(getTargetEnv(targetEnv, "AWS_SECRET_ACCESS_KEY"))
creds.Region = strings.TrimSpace(getTargetEnv(targetEnv, "AWS_REGION"))
errs := validator.New().Struct(creds) errs := validator.New().Struct(creds)
if errs != nil { if errs != nil {