From 8a04f40a80e305a9f65c60f537b933056c01e0c4 Mon Sep 17 00:00:00 2001
From: Toni de la Fuente <toni@blyx.com>
Date: Mon, 12 Apr 2021 20:20:04 +0200
Subject: [PATCH 1/4] Fixed issue #774

---
 checks/check_extra747 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/checks/check_extra747 b/checks/check_extra747
index ae8c0a72..f2473563 100644
--- a/checks/check_extra747
+++ b/checks/check_extra747
@@ -33,7 +33,7 @@ extra747(){
         if [[ $ENABLED_CLOUDWATCHLOGS_EXPORTS ]]; then
           textPass "$regx: RDS instance $rdsinstance is shipping $ENABLED_CLOUDWATCHLOGS_EXPORTS to CloudWatch Logs" "$regx"
         else
-          textFail "$regx: RDS instance $rdsinstance has not CloudWatch Logs enabled!" "$regx"
+          textFail "$regx: RDS instance $rdsinstance has no CloudWatch Logs enabled!" "$regx"
         fi
       done
     else

From 2552f2977d7210c3a0b0a2b892ad843e95006f5b Mon Sep 17 00:00:00 2001
From: Toni de la Fuente <toni@blyx.com>
Date: Mon, 12 Apr 2021 21:23:28 +0200
Subject: [PATCH 2/4] Fixed issue #775

---
 include/assume_role | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/assume_role b/include/assume_role
index fd4e779d..2ef94a92 100644
--- a/include/assume_role
+++ b/include/assume_role
@@ -70,7 +70,7 @@ assume_role(){
     export AWS_ACCESS_KEY_ID=$(cat $TEMP_STS_ASSUMED_FILE | jq -r '.Credentials.AccessKeyId')
     export AWS_SECRET_ACCESS_KEY=$(cat $TEMP_STS_ASSUMED_FILE | jq -r '.Credentials.SecretAccessKey')
     export AWS_SESSION_TOKEN=$(cat $TEMP_STS_ASSUMED_FILE | jq -r '.Credentials.SessionToken')
-    export AWS_SESSION_EXPIRATION=$(convert_date_to_timestamp "$(cat $TEMP_STS_ASSUMED_FILE | jq -r '.Credentials.Expiration'| sed 's/+00:00//g')")
+    export AWS_SESSION_EXPIRATION=$(convert_date_to_timestamp "$(cat $TEMP_STS_ASSUMED_FILE | jq -r '.Credentials.Expiration'| sed 's/+00:00//g;s/Z//g')")
     rm -fr $TEMP_STS_ASSUMED_FILE
 }
 

From 53117819fc74a3e3534e5171468e6c3248094aaa Mon Sep 17 00:00:00 2001
From: Toni de la Fuente <toni@blyx.com>
Date: Wed, 14 Apr 2021 11:47:38 +0200
Subject: [PATCH 3/4] Fixed credentials renew issue #775

---
 include/assume_role | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/assume_role b/include/assume_role
index 2ef94a92..173e44f5 100644
--- a/include/assume_role
+++ b/include/assume_role
@@ -70,7 +70,7 @@ assume_role(){
     export AWS_ACCESS_KEY_ID=$(cat $TEMP_STS_ASSUMED_FILE | jq -r '.Credentials.AccessKeyId')
     export AWS_SECRET_ACCESS_KEY=$(cat $TEMP_STS_ASSUMED_FILE | jq -r '.Credentials.SecretAccessKey')
     export AWS_SESSION_TOKEN=$(cat $TEMP_STS_ASSUMED_FILE | jq -r '.Credentials.SessionToken')
-    export AWS_SESSION_EXPIRATION=$(convert_date_to_timestamp "$(cat $TEMP_STS_ASSUMED_FILE | jq -r '.Credentials.Expiration'| sed 's/+00:00//g;s/Z//g')")
+    export AWS_SESSION_EXPIRATION=$(cat $TEMP_STS_ASSUMED_FILE | jq -r '.Credentials.Expiration | sub("\\+00:00";"Z") | fromdateiso8601')
     rm -fr $TEMP_STS_ASSUMED_FILE
 }
 

From 721b15d10524c8877c51600090f6748cc1de73ae Mon Sep 17 00:00:00 2001
From: Toni de la Fuente <toni@blyx.com>
Date: Thu, 15 Apr 2021 09:30:31 +0200
Subject: [PATCH 4/4] Fixed issue #776

---
 include/outputs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/outputs b/include/outputs
index d9d4fb1c..9d51f823 100644
--- a/include/outputs
+++ b/include/outputs
@@ -22,7 +22,6 @@ OUTPUT_DATE=$(date -u +"%Y%m%d%H%M%S")
 OUTPUT_DIR="${PROWLER_DIR}/output" # default output if none 
 OUTPUT_FILE_NAME="${OUTPUT_DIR}/prowler-output-${ACCOUNT_NUM}-${OUTPUT_DATE}"
 HTML_LOGO_URL="https://github.com/toniblyx/prowler/"
-#HTML_LOGO_IMG="https://raw.githubusercontent.com/toniblyx/prowler/master/util/html/prowler-logo.png"
 HTML_LOGO_IMG="https://github.com/toniblyx/prowler/raw/2.4/util/html/prowler-logo-new.png"
 TIMESTAMP=$(get_iso8601_timestamp)
 PROWLER_PARAMETERS=$@
@@ -303,7 +302,7 @@ generateJsonAsffOutput(){
   --arg CHECK_ID "$CHECK_ID" \
   --arg TYPE "$CHECK_ASFF_COMPLIANCE_TYPE" \
   --arg COMPLIANCE_RELATED_REQUIREMENTS "$CHECK_ASFF_COMPLIANCE_TYPE" \
-  --arg RESOURCE_TYPE "$ASFF_RESOURCE_TYPE" \
+  --arg RESOURCE_TYPE "$CHECK_ASFF_RESOURCE_TYPE" \
   --arg REPREGION "$REPREGION" \
   --arg TIMESTAMP "$(get_iso8601_timestamp)" \
   --arg PROWLER_VERSION "$PROWLER_VERSION" \