From 94a90599bd29f8895c9227f3dd296a157df4bf09 Mon Sep 17 00:00:00 2001 From: zfLQ2qx2 <31103058+zfLQ2qx2@users.noreply.github.com> Date: Thu, 21 Nov 2019 15:17:03 -0500 Subject: [PATCH] Handle Trusted Advisor entitlement issue gracefully --- checks/check_extra726 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/checks/check_extra726 b/checks/check_extra726 index e58d8884..388d01a1 100644 --- a/checks/check_extra726 +++ b/checks/check_extra726 @@ -20,7 +20,12 @@ CHECK_ALTERNATE_check726="extra726" extra726(){ trap "exit" INT # forcing us-east-1 region only since support only works in that region - TA_CHECKS_ID=$($AWSCLI support describe-trusted-advisor-checks --language en $PROFILE_OPT --region us-east-1 --query checks[*].id --output text) + TA_CHECKS_ID=$($AWSCLI support describe-trusted-advisor-checks --language en $PROFILE_OPT --region us-east-1 --query checks[*].id --output text 2>&1) + if [[ $(echo "$TA_CHECKS_ID" | grep SubscriptionRequiredException) ]]; then + textInfo "Trusted Advisor requires AWS Premium Support Subscription" + return + fi + 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)