From 0f2e351716474c879e3cc3b3f03ab8e601ea7ed4 Mon Sep 17 00:00:00 2001
From: Andrea Di Fabio <39841198+sectoramen@users.noreply.github.com>
Date: Wed, 22 Dec 2021 10:13:06 -0500
Subject: [PATCH] When performing a restoreInitialAWSCredentials, unset the
 credentials ENV variables if they were never set

---
 include/assume_role | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/include/assume_role b/include/assume_role
index 91a3444403..3282324e68 100644
--- a/include/assume_role
+++ b/include/assume_role
@@ -88,23 +88,22 @@ cleanSTSAssumeFile() {
 }
 
 backupInitialAWSCredentials() {
-#    echo Backing up current AWS ENV Credentials
-    if [[ $(printenv AWS_ACCESS_KEY_ID) ]]; then 
-#        echo Current AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID      
+
+    if [[ $(printenv AWS_ACCESS_KEY_ID) && $(printenv AWS_SECRET_ACCESS_KEY) && $(printenv AWS_SESSION_TOKEN) ]]; then 
         INITIAL_AWS_ACCESS_KEY_ID=$(printenv AWS_ACCESS_KEY_ID)
-    fi
-    if [[ $(printenv AWS_SECRET_ACCESS_KEY) ]]; then 
-#        echo AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY      
         INITIAL_AWS_SECRET_ACCESS_KEY=$(printenv AWS_SECRET_ACCESS_KEY)
-    fi
-    if [[ $(printenv AWS_SESSION_TOKEN) ]]; then 
-#        echo AWS_SESSION_TOKEN=$AWS_SESSION_TOKEN      
         INITIAL_AWS_SESSION_TOKEN=$(printenv AWS_SESSION_TOKEN)
     fi    
 }
 
 restoreInitialAWSCredentials() {
-    export AWS_ACCESS_KEY_ID=$INITIAL_AWS_ACCESS_KEY_ID
-    export AWS_SECRET_ACCESS_KEY=$INITIAL_AWS_SECRET_ACCESS_KEY
-    export AWS_SESSION_TOKEN=$INITIAL_AWS_SESSION_TOKEN
+    if [[ $INITIAL_AWS_ACCESS_KEY_ID && $INITIAL_AWS_SECRET_ACCESS_KEY && $INITIAL_AWS_SESSION_TOKEN ]]; then
+        export AWS_ACCESS_KEY_ID=$INITIAL_AWS_ACCESS_KEY_ID
+        export AWS_SECRET_ACCESS_KEY=$INITIAL_AWS_SECRET_ACCESS_KEY
+        export AWS_SESSION_TOKEN=$INITIAL_AWS_SESSION_TOKEN
+    else
+        unset AWS_ACCESS_KEY_ID
+        unset AWS_SECRET_ACCESS_KEY
+        unset AWS_SESSION_TOKEN
+    fi
 }