From ef952ce9cc61d730fe436bf0bdefe9604bfd0c64 Mon Sep 17 00:00:00 2001
From: Toni de la Fuente <toni@blyx.com>
Date: Wed, 22 Apr 2020 12:07:20 +0200
Subject: [PATCH] Simplified caller id info on outputs

---
 include/whoami | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/include/whoami b/include/whoami
index abe59cc5..c54385f2 100644
--- a/include/whoami
+++ b/include/whoami
@@ -14,9 +14,11 @@
 
 # Get whoami in AWS, who is the user running this shell script
 getWhoami(){
-  ACCOUNT_NUM=$($AWSCLI sts get-caller-identity --output json $PROFILE_OPT --region $REGION --query "Account" | tr -d '"')
+  ACCOUNT_NUM=$($AWSCLI sts get-caller-identity --output text $PROFILE_OPT --region $REGION --query "Account")
+  CALLER_ARN=$($AWSCLI sts get-caller-identity --output text $PROFILE_OPT --region $REGION --query "Arn")
+  USER_ID=$($AWSCLI sts get-caller-identity --output text $PROFILE_OPT --region $REGION --query "UserId")
+
   if [[ "$MODE" == "csv" ]]; then
-    CALLER_ARN_RAW=$($AWSCLI sts get-caller-identity --output json $PROFILE_OPT --region $REGION --query "Arn")
     if [[ 255 -eq $? ]]; then
       # Failed to get own identity ... exit
       echo "ERROR WITH $PROFILE CREDENTIALS - EXITING!"
@@ -24,7 +26,6 @@ getWhoami(){
       EXITCODE=2
       exit $EXITCODE
     fi
-    CALLER_ARN=$(echo $CALLER_ARN_RAW | tr -d '"')
     printCsvHeader
     textTitle "0.0" "Show report generation info" "NOT_SCORED" "SUPPORT"
     textInfo "ARN: $CALLER_ARN  TIMESTAMP: $SCRIPT_START_TIME"
@@ -33,10 +34,10 @@ getWhoami(){
   else
     echo ""
     echo -e " This report is being generated using credentials below:\n"
-    echo -e " AWS-CLI Profile: $NOTICE[$PROFILE]$NORMAL AWS API Region: $NOTICE[$REGION]$NORMAL AWS Filter Region: $NOTICE[${FILTERREGION:-all}]$NORMAL\n"
+    echo -e " AWS-CLI Profile: $NOTICE[$PROFILE]$NORMAL AWS API Region: $NOTICE[$REGION]$NORMAL AWS Filter Region: $NOTICE[${FILTERREGION:-all}]$NORMAL"
     if [[ $MONOCHROME -eq 1 ]]; then
-      echo -e " Caller Identity:"
-      $AWSCLI sts get-caller-identity --output text $PROFILE_OPT --region $REGION --query "Arn"
+      echo -e " AWS Account: $NOTICE[$ACCOUNT_NUM]$NORMAL UserId: $NOTICE[$USER_ID]$NORMAL"
+      echo -e " Caller Identity ARN: $NOTICE[$CALLER_ARN]$NORMAL"
       if [[ 255 -eq $? ]]; then
         # Failed to get own identity ... exit
         echo "ERROR WITH $PROFILE CREDENTIALS - EXITING!"
@@ -44,8 +45,8 @@ getWhoami(){
         exit 2
       fi
     else
-      echo -e " Caller Identity:"
-      $AWSCLI sts get-caller-identity --output table $PROFILE_OPT --region $REGION
+      echo -e " AWS Account: $NOTICE[$ACCOUNT_NUM]$NORMAL UserId: $NOTICE[$USER_ID]$NORMAL"
+      echo -e " Caller Identity ARN: $NOTICE[$CALLER_ARN]$NORMAL"
       if [[ 255 -eq $? ]]; then
         # Failed to get own identity ... exit
         echo variable $PROFILE_OPT