prowler: Set default region by aws config, fall back to us-east-1

This commit is contained in:
Jason Chen
2018-04-19 14:00:28 +08:00
parent e1559b263c
commit 2f166e2ba3

16
prowler
View File

@@ -23,7 +23,7 @@ OPTRED=""
OPTNORMAL=""
# Set the defaults for these getopts variables
REGION="us-east-1"
REGION=""
FILTERREGION=""
MAXITEMS=100
MONOCHROME=0
@@ -76,7 +76,7 @@ while getopts ":hlkp:r:c:f:m:M:en" OPTION; do
PROFILE=$OPTARG
;;
r )
REGION=$OPTARG
REGION_OPT=$OPTARG
;;
c )
CHECKNUMBER=$OPTARG
@@ -274,6 +274,16 @@ if [ -z "${AWSCLI}" ]; then
exit $EXITCODE
fi
# Set default region by aws config, fall back to us-east-1
REGION_CONFIG=$(aws configure get region)
if [[ $REGION_OPT ]]; then
REGION="$REGION_OPT"
elif [[ $REGION_CONFIG ]]; then
REGION="$REGION_CONFIG"
else
REGION="us-east-1"
fi
TITLE_ID=""
TITLE_TEXT="CALLER ERROR - UNSET TITLE"
## Output formatting functions
@@ -1697,7 +1707,7 @@ extra73(){
for bucket in $ALL_BUCKETS_LIST; do
extra73Thread $bucket &
done
wait
wait
}
extra73Thread(){