From e6992e87ee10198c762a890809496afc43454097 Mon Sep 17 00:00:00 2001
From: gabrielsoltz <thegaby@gmail.com>
Date: Tue, 18 Jun 2019 12:59:58 +0200
Subject: [PATCH] ignore None when user data is empty

---
 checks/check_extra741 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/checks/check_extra741 b/checks/check_extra741
index 2bf05f1a..ca845f3d 100644
--- a/checks/check_extra741
+++ b/checks/check_extra741
@@ -23,8 +23,9 @@ extra741(){
     if [[ $LIST_OF_EC2_INSTANCES ]];then
       for instance in $LIST_OF_EC2_INSTANCES; do
         USERDATA_FILE=$instance-userdata.decoded
-        USERDATA=$($AWSCLI ec2 describe-instance-attribute --attribute userData --query UserData.Value $PROFILE_OPT --region $regx --instance-id $instance --output text | decode_report > $USERDATA_FILE)
-        if [ -s $USERDATA_FILE ];then
+        USERDATA=$($AWSCLI ec2 describe-instance-attribute --attribute userData --query UserData.Value $PROFILE_OPT --region $regx --instance-id $instance --output text | grep -v None)
+        if [[ $USERDATA ]];then
+          echo "$USERDATA" | decode_report > $USERDATA_FILE
           FILE_FORMAT_ASCII=$(file -b $USERDATA_FILE|grep ASCII)
           #FINDINGS=$(grep '[A-Za-z0-9]\{20,40\}' $USERDATA_FILE | grep -i -e key -e secret -e token -e pass - |wc -l|tr -d '\ ')
           #FINDINGS=$(grep -i -e key -e secret -e token -e pass $USERDATA_FILE |wc -l|tr -d '\ ')