From 2f166e2ba3b6b32c3a7beccb684de55ad1e1c418 Mon Sep 17 00:00:00 2001 From: Jason Chen Date: Thu, 19 Apr 2018 14:00:28 +0800 Subject: [PATCH] prowler: Set default region by aws config, fall back to us-east-1 --- prowler | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/prowler b/prowler index ada565ed..c0ccb372 100755 --- a/prowler +++ b/prowler @@ -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(){