From bea5863204e58e439ca43edd1800f3569e902cb9 Mon Sep 17 00:00:00 2001
From: Inbar <5904674+InbarRose@users.noreply.github.com>
Date: Sun, 3 Apr 2022 09:32:06 +0300
Subject: [PATCH] support for AWS_ACCESS_KEY_ID

also cleanup the color changes when used
---
 check-ecs-exec.sh | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/check-ecs-exec.sh b/check-ecs-exec.sh
index faae64b..c1bd367 100755
--- a/check-ecs-exec.sh
+++ b/check-ecs-exec.sh
@@ -674,8 +674,8 @@ else
   fi
 fi
 
-# 11. Check task definition containers for environment variables AWS_ACCESS_KEY and AWS_SECRET_ACCESS_KEY
-# if AWS_ACCESS_KEY and AWS_SECRET_ACCESS_KEY are defined in a container, they will be used by the SSM service
+# 11. Check task definition containers for environment variables AWS_ACCESS_KEY, AWS_ACCESS_KEY_ID, and AWS_SECRET_ACCESS_KEY
+# if AWS_ACCESS_KEY, AWS_ACCESS_KEY_ID, and AWS_SECRET_ACCESS_KEY are defined in a container, they will be used by the SSM service
 # if the key defined does not have requirement permissions, the execute-command will not work.
 containerNameList=$(echo "${taskDefJson}" | jq -r ".taskDefinition.containerDefinitions[].name")
 idx=0
@@ -686,15 +686,22 @@ for containerName in $containerNameList; do
   printf "       ${COLOR_DEFAULT}- AWS_ACCESS_KEY"
   AWS_ACCESS_KEY_FOUND=$(echo "${taskDefJson}" | jq -r ".taskDefinition.containerDefinitions[${idx}].environment[] | select(.name==\"AWS_ACCESS_KEY\") | .name")
   case "${AWS_ACCESS_KEY_FOUND}" in
-    *AWS_ACCESS_KEY* ) printf ": ${COLOR_YELLOW}defined\n";;
-    * ) printf ": ${COLOR_GREEN}not defined\n";;
+    *AWS_ACCESS_KEY* ) printf ": ${COLOR_YELLOW}defined${COLOR_DEFAULT}\n";;
+    * ) printf ": ${COLOR_GREEN}not defined${COLOR_DEFAULT}\n";;
   esac
+  # find AWS_ACCESS_KEY_ID
+  printf "       ${COLOR_DEFAULT}- AWS_ACCESS_KEY_ID"
+  AAWS_ACCESS_KEY_ID_FOUND=$(echo "${taskDefJson}" | jq -r ".taskDefinition.containerDefinitions[${idx}].environment[] | select(.name==\"AWS_ACCESS_KEY_ID\") | .name")
+  case "${AWS_ACCESS_KEY_ID_FOUND}" in
+    *AWS_ACCESS_KEY_ID* ) printf ": ${COLOR_YELLOW}defined${COLOR_DEFAULT}\n";;
+    * ) printf ": ${COLOR_GREEN}not defined${COLOR_DEFAULT}\n";;
+  esac  
   # find AWS_SECRET_ACCESS_KEY
   printf "       ${COLOR_DEFAULT}- AWS_SECRET_ACCESS_KEY"
   AWS_SECRET_ACCESS_KEY_FOUND=$(echo "${taskDefJson}" | jq -r ".taskDefinition.containerDefinitions[${idx}].environment[] | select(.name==\"AWS_SECRET_ACCESS_KEY\") | .name")
   case "${AWS_SECRET_ACCESS_KEY_FOUND}" in
-    *AWS_SECRET_ACCESS_KEY* ) printf ": ${COLOR_YELLOW}defined\n";;
-    * ) printf ": ${COLOR_GREEN}not defined\n";;
+    *AWS_SECRET_ACCESS_KEY* ) printf ": ${COLOR_YELLOW}defined${COLOR_DEFAULT}\n";;
+    * ) printf ": ${COLOR_GREEN}not defined${COLOR_DEFAULT}\n";;
   esac
   idx=$((idx+1))
 done