From 9dfa4d2c22d9ea226e021ac4505f62abc58f7bef Mon Sep 17 00:00:00 2001
From: Mike Mondragon <mikemondragon@gmail.com>
Date: Tue, 14 Mar 2023 21:23:52 -0700
Subject: [PATCH] Promote AWS_REGION from .env if it exists for proper AWS API
 behavior. Closes #45

---
 README.md        |  7 +++++++
 cmd/root/root.go | 10 ++++++++++
 2 files changed, 17 insertions(+)

diff --git a/README.md b/README.md
index 4830dc4..be5fcdb 100644
--- a/README.md
+++ b/README.md
@@ -169,6 +169,13 @@ Also see the CLI's online help `$ okta-aws-cli --help`
 | Emit deprecated AWS variable `aws_security_token` with duplicated value from `aws_session_token` | `LEGACY_AWS_VARIABLES=true` | `--legacy-aws-variables` | `true` if flag is present  |
 | Verbosely print all API calls/responses to the screen | `DEBUG_API_CALLS=true` | `--debug-api-calls` | `true` if flag is present  |
 
+NOTE: If
+[`AWS_REGION`](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-envvars.html)
+is set in the `.env` file it will be promoted into the okta-aws-cli runtime if
+it isn't also already set as an ENV VAR. This will allow operators making use of
+an `.env` file have to have proper AWS API behavior in spefific regions, for
+instance in US govcloud and other non-North America regions.
+
 ### Allowed Web SSO Client
 
 This is the "Allowed Web SSO Client" value from the "Sign On" settings of an
diff --git a/cmd/root/root.go b/cmd/root/root.go
index 57e104e..dbe65b3 100644
--- a/cmd/root/root.go
+++ b/cmd/root/root.go
@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -185,6 +186,15 @@ to collect a proper IAM role for the AWS CLI operator.`,
 		viper.SetConfigType("dotenv")
 
 		_ = viper.ReadInConfig()
+
+		// After viper reads in the dotenv file check if AWS_REGION is set
+		// there. The value will be keyed by lower case name. If it is, set
+		// AWS_REGION as an ENV VAR if it hasn't already been.
+		awsRegionEnvVar := "AWS_REGION"
+		vipAwsRegion := viper.GetString(strings.ToLower(awsRegionEnvVar))
+		if vipAwsRegion != "" && os.Getenv(awsRegionEnvVar) == "" {
+			_ = os.Setenv(awsRegionEnvVar, vipAwsRegion)
+		}
 	}
 	viper.AutomaticEnv()