From 0878511abff485a0a7b6282b5211605dd4feed80 Mon Sep 17 00:00:00 2001
From: Geert Smelt <anthirian@users.noreply.github.com>
Date: Fri, 26 Jun 2020 11:16:59 +0200
Subject: [PATCH 1/4] Fix listing EC2 instances if default output format is not
 JSON

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

diff --git a/checks/check119 b/checks/check119
index 5a0a90d7..bc97c801 100644
--- a/checks/check119
+++ b/checks/check119
@@ -18,7 +18,7 @@ CHECK_ALTERNATE_check119="check119"
 
 check119(){
   for regx in $REGIONS; do
-    EC2_DATA=$($AWSCLI ec2 describe-instances $PROFILE_OPT --region $regx --query 'Reservations[].Instances[].[InstanceId, IamInstanceProfile.Arn, State.Name]')
+    EC2_DATA=$($AWSCLI ec2 describe-instances $PROFILE_OPT --region $regx --query 'Reservations[].Instances[].[InstanceId, IamInstanceProfile.Arn, State.Name]' --output json)
     EC2_DATA=$(echo $EC2_DATA | jq '.[]|{InstanceId: .[0], ProfileArn: .[1], StateName: .[2]}')
     INSTANCE_LIST=$(echo $EC2_DATA | jq -r '.InstanceId')
     if [[ $INSTANCE_LIST ]]; then

From a0c58e1cb2249c7b839a1ebc6ecd99765bbfc146 Mon Sep 17 00:00:00 2001
From: Geert Smelt <anthirian@users.noreply.github.com>
Date: Fri, 26 Jun 2020 11:25:16 +0200
Subject: [PATCH 2/4] Fix listing EC2 Security Groups if default output format
 is not JSON

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

diff --git a/checks/check_extra75 b/checks/check_extra75
index 91a34df3..11179a61 100644
--- a/checks/check_extra75
+++ b/checks/check_extra75
@@ -24,7 +24,7 @@ extra75(){
   textInfo "Looking for Security Groups in all regions...  "
 
   for regx in $REGIONS; do
-    SECURITYGROUPS=$($AWSCLI ec2 describe-security-groups $PROFILE_OPT --region $regx --max-items $MAXITEMS | jq '.SecurityGroups|map({(.GroupId): (.GroupName)})|add')
+    SECURITYGROUPS=$($AWSCLI ec2 describe-security-groups $PROFILE_OPT --region $regx --max-items $MAXITEMS --output json | jq '.SecurityGroups|map({(.GroupId): (.GroupName)})|add')
     if [[ $SECURITYGROUPS == "null" ]];
     then
       continue

From 63d06212db3216644b61b83e662ccb7b40781b91 Mon Sep 17 00:00:00 2001
From: Geert Smelt <anthirian@users.noreply.github.com>
Date: Fri, 26 Jun 2020 11:55:12 +0200
Subject: [PATCH 3/4] Fix listing CloudFormation stacks if default output
 format is not JSON

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

diff --git a/checks/check_extra742 b/checks/check_extra742
index 309f75d5..745c09c0 100644
--- a/checks/check_extra742
+++ b/checks/check_extra742
@@ -26,7 +26,7 @@ extra742(){
 
   textInfo "Looking for secrets in CloudFormation output across all regions... "
   for regx in $REGIONS; do
-    CFN_STACKS=$($AWSCLI cloudformation describe-stacks $PROFILE_OPT --region $regx)
+    CFN_STACKS=$($AWSCLI cloudformation describe-stacks $PROFILE_OPT --region $regx --output json)
     LIST_OF_CFN_STACKS=$(echo $CFN_STACKS | jq -r '.Stacks[].StackName')
     if [[ $LIST_OF_CFN_STACKS ]];then
       for stack in $LIST_OF_CFN_STACKS; do

From d3553b642e289fbbaeae3b2bb90997b08e0a8e7d Mon Sep 17 00:00:00 2001
From: Geert Smelt <anthirian@users.noreply.github.com>
Date: Fri, 26 Jun 2020 12:50:09 +0200
Subject: [PATCH 4/4] Fix listing Elastic IPs if default output format is not
 JSON

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

diff --git a/checks/check_extra772 b/checks/check_extra772
index 088be100..bb0e5e39 100644
--- a/checks/check_extra772
+++ b/checks/check_extra772
@@ -19,7 +19,7 @@ CHECK_ALTERNATE_check772="extra772"
 
 extra772(){
   for region in $REGIONS; do
-    EIP_DUMP=$($AWSCLI ec2 describe-addresses ${PROFILE_OPT} --region $region)
+    EIP_DUMP=$($AWSCLI ec2 describe-addresses ${PROFILE_OPT} --region $region --output json)
     EIP_LIST=$(echo $EIP_DUMP | jq -r '.Addresses[].AllocationId')
     if [[ $EIP_LIST ]]; then
       for eip in $EIP_LIST; do