From 7d324bed6568789213b99f6b96a7904fa5eeff3c Mon Sep 17 00:00:00 2001 From: root Date: Mon, 30 Dec 2019 14:43:51 -0500 Subject: [PATCH] Resolve issue with not_available state in results --- checks/check_extra726 | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/checks/check_extra726 b/checks/check_extra726 index 388d01a1..b2eee1a4 100644 --- a/checks/check_extra726 +++ b/checks/check_extra726 @@ -29,12 +29,23 @@ extra726(){ for checkid in $TA_CHECKS_ID; do TA_CHECKS_NAME=$($AWSCLI support describe-trusted-advisor-checks --language en $PROFILE_OPT --region us-east-1 --query "checks[?id==\`$checkid\`].{name:name}[*]" --output text) QUERY_TA_CHECK_RESULT=$($AWSCLI support describe-trusted-advisor-check-result --check-id $checkid --language en $PROFILE_OPT --region us-east-1 --query 'result.status' --output text) - if [[ $(echo $QUERY_TA_CHECK_RESULT | grep ok) ]]; then - textPass "Trusted Advisor check $TA_CHECKS_NAME is in state $QUERY_TA_CHECK_RESULT" - elif [[ $(echo $QUERY_TA_CHECK_RESULT | grep warning) ]]; then - textInfo "Trusted Advisor check $TA_CHECKS_NAME is in state $QUERY_TA_CHECK_RESULT" - else - textFail "Trusted Advisor check $TA_CHECKS_NAME is in state $QUERY_TA_CHECK_RESULT" - fi + # Possible results - https://docs.aws.amazon.com/cli/latest/reference/support/describe-trusted-advisor-check-result.html + case "$QUERY_TA_CHECK_RESULT" in + "ok") + textPass "Trusted Advisor check $TA_CHECKS_NAME is in ok state $QUERY_TA_CHECK_RESULT" + ;; + "error") + textFail "Trusted Advisor check $TA_CHECKS_NAME is in error state $QUERY_TA_CHECK_RESULT" + ;; + "warning") + textInfo "Trusted Advisor check $TA_CHECKS_NAME is in warning state $QUERY_TA_CHECK_RESULT" + ;; + "not_available") + textInfo "Trusted Advisor check $TA_CHECKS_NAME is in not_available state $QUERY_TA_CHECK_RESULT" + ;; + "*") + textFail "Trusted Advisor check $TA_CHECKS_NAME is in unknown state $QUERY_TA_CHECK_RESULT" + ;; + esac done }