Skip to content
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

Correct evaluation of "profile" command argument #124

Merged
merged 1 commit into from
Aug 16, 2023
Merged

Correct evaluation of "profile" command argument #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,11 +208,9 @@ that can be used for the AWS CLI configuration. Output can also be expressed as
values](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html)
for AWS CLI configuration.

Configuration can be done with command line flags, an `.env` file, environment
variables, or a combination of the three. Configuration is evaluated in that
order. For example if the CLI flag `--profile [value]` and the env var
`OKTA_AWSCLI_PROFILE` are both present then the environment variable value takes
precedent.
Configuration can be done with command line flags, environment variables, an
`.env` file, or a combination of the three. The first value found in that
evaluation order takes precedent.

Also see the CLI's online help `$ okta-aws-cli --help`

Expand Down
6 changes: 3 additions & 3 deletions cmd/root/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,21 +90,21 @@ func init() {
{
name: config.SessionDurationFlag,
short: "s",
value: "3600",
value: "",
usage: "Session duration for role.",
envVar: config.AWSSessionDurationEnvVar,
},
{
name: config.ProfileFlag,
short: "p",
value: "default",
value: "",
usage: "AWS Profile",
envVar: config.ProfileEnvVar,
},
{
name: config.FormatFlag,
short: "f",
value: "env-var",
value: "",
usage: "Output format. [env-var|aws-credentials]",
envVar: config.FormatEnvVar,
},
Expand Down
21 changes: 12 additions & 9 deletions internal/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,9 @@ func readConfig() (Attributes, error) {
attrs.Format = EnvVarFormat
}

// if profile is set by env var defer to it, otherwise the default "default"
// will be used
if viper.GetString(downCase(ProfileEnvVar)) != "" {
// mimic AWS CLI behavior, if profile value is not set by flag check
// the ENV VAR, else set to "default"
if attrs.Profile == "" {
attrs.Profile = viper.GetString(downCase(ProfileEnvVar))
}
if attrs.Profile == "" {
Expand All @@ -285,16 +285,19 @@ func readConfig() (Attributes, error) {
if attrs.AWSIAMRole == "" {
attrs.AWSIAMRole = viper.GetString(downCase(AWSIAMRoleEnvVar))
}
// duration has a default of 3600 from CLI flags, but if the env var version
// is not 0 then prefer it
duration := viper.GetInt64(downCase(AWSSessionDurationEnvVar))
if duration != 0 {
attrs.AWSSessionDuration = duration
}
if !attrs.QRCode {
attrs.QRCode = viper.GetBool(downCase(QRCodeEnvVar))
}

// if session duration is 0, inspect the ENV VAR for a value, else set
// a default of 3600
if attrs.AWSSessionDuration == 0 {
attrs.AWSSessionDuration = viper.GetInt64(downCase(AWSSessionDurationEnvVar))
}
if attrs.AWSSessionDuration == 0 {
attrs.AWSSessionDuration = 3600
}

// correct org domain if it's in admin form
orgDomain := strings.Replace(attrs.OrgDomain, "-admin", "", -1)
if orgDomain != attrs.OrgDomain {
Expand Down