Skip to content

Search all environments for AWS credential defaults #1044

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 9, 2020
Merged

Search all environments for AWS credential defaults #1044

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
48bb28b
Search all environments for AWS credential defaults
deliahu May 8, 2020
c18dd21
Merge branch 'master' into env-aws-defaults
vishalbollu May 8, 2020
92c1f73
Merge branch 'master' into env-aws-defaults
deliahu May 9, 2020
4054013
Merge branch 'master' into env-aws-defaults
deliahu May 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions cli/cmd/lib_cli_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,6 +651,25 @@ func getEnvConfigDefaults(envName string) cliconfig.Environment {
if defaults.AWSRegion == nil && os.Getenv("AWS_REGION") != "" {
defaults.AWSRegion = pointer.String(os.Getenv("AWS_REGION"))
}

if defaults.AWSAccessKeyID == nil && defaults.AWSSecretAccessKey == nil {
// search other envs for credentials (favoring the env named "aws", or the last entry in the list)
regionWasNil := defaults.AWSRegion == nil
cliConfig, _ := readCLIConfig()
for _, env := range cliConfig.Environments {
if env.AWSAccessKeyID != nil && env.AWSSecretAccessKey != nil {
defaults.AWSAccessKeyID = env.AWSAccessKeyID
defaults.AWSSecretAccessKey = env.AWSSecretAccessKey
}
if regionWasNil && env.AWSRegion != nil {
defaults.AWSRegion = env.AWSRegion
}
if env.Name == "aws" {
break // favor the env named "aws"
}
}
}

if defaults.AWSRegion == nil {
defaults.AWSRegion = pointer.String("us-east-1")
}
Expand Down Expand Up @@ -695,6 +714,7 @@ func configureEnv(envName string, fieldsToSkipPrompt cliconfig.Environment) (cli
}

defaults := getEnvConfigDefaults(env.Name)

switch env.Provider {
case types.LocalProviderType:
err := promptLocalEnv(&env, defaults)
Expand Down