diff --git a/checks/check_extra7114 b/checks/check_extra7114 index a6f08e20..93c7906a 100644 --- a/checks/check_extra7114 +++ b/checks/check_extra7114 @@ -36,7 +36,7 @@ extra7114(){ if [[ "$ENDPOINT_SC_ENCRYPTION" == "DISABLED" ]]; then textFail "$regx: Glue development endpoint $ENDPOINT_NAME does not have S3 encryption enabled!" "$regx" "$ENDPOINT_NAME" else - textPass "$regx: Glue development endpoint $ENDPOINT_NAME has S3 encryption enabled" "$regx" + textPass "$regx: Glue development endpoint $ENDPOINT_NAME has S3 encryption enabled" "$regx" "$ENDPOINT_NAME" fi else textFail "$regx: Glue development endpoint $ENDPOINT_NAME does not have security configuration" "$regx" "$ENDPOINT_NAME" diff --git a/checks/check_extra7118 b/checks/check_extra7118 index da129972..12cc7b08 100644 --- a/checks/check_extra7118 +++ b/checks/check_extra7118 @@ -40,10 +40,10 @@ extra7118(){ textFail "$regx: Glue job $JOB_NAME does not have S3 encryption enabled" "$regx" "$JOB_NAME" fi else - textPass "$regx: Glue job $JOB_NAME does have $S3_ENCRYPTION for S3 encryption enabled" "$regx" + textPass "$regx: Glue job $JOB_NAME does have $S3_ENCRYPTION for S3 encryption enabled" "$regx" "$JOB_NAME" fi elif [[ ! -z "$JOB_ENCRYPTION" ]]; then - textPass "$regx: Glue job $JOB_NAME does have $JOB_ENCRYPTION for S3 encryption enabled" "$regx" + textPass "$regx: Glue job $JOB_NAME does have $JOB_ENCRYPTION for S3 encryption enabled" "$regx" "$JOB_NAME" else textFail "$regx: Glue job $JOB_NAME does not have S3 encryption enabled" "$regx" "$JOB_NAME" fi diff --git a/checks/check_extra7119 b/checks/check_extra7119 index 954908a1..4f6e904b 100644 --- a/checks/check_extra7119 +++ b/checks/check_extra7119 @@ -36,7 +36,7 @@ extra7119(){ if [[ $ENDPOINT_SC_ENCRYPTION == "DISABLED" ]]; then textFail "$regx: Glue development endpoint $ENDPOINT_NAME does not have CloudWatch logs encryption enabled!" "$regx" "$ENDPOINT_NAME" else - textPass "$regx: Glue development endpoint $ENDPOINT_NAME has CloudWatch logs encryption enabled" "$regx" + textPass "$regx: Glue development endpoint $ENDPOINT_NAME has CloudWatch logs encryption enabled" "$regx" "$ENDPOINT_NAME" fi else textFail "$regx: Glue development endpoint $ENDPOINT_NAME does not have security configuration" "$regx" "$ENDPOINT_NAME" diff --git a/checks/check_extra7122 b/checks/check_extra7122 index 738efc2d..1b4f8d27 100644 --- a/checks/check_extra7122 +++ b/checks/check_extra7122 @@ -35,7 +35,7 @@ extra7122(){ if [[ "$JOB_BOOKMARK_ENCRYPTION" == "DISABLED" ]]; then textFail "$regx: Glue job $JOB_NAME does not have Job bookmark encryption enabled" "$regx" "$JOB_NAME" else - textPass "$regx: Glue job $JOB_NAME does have $JOB_BOOKMARK_ENCRYPTION for Job bookmark encryption enabled" "$regx" + textPass "$regx: Glue job $JOB_NAME does have $JOB_BOOKMARK_ENCRYPTION for Job bookmark encryption enabled" "$regx" "$JOB_NAME" fi else textFail "$regx: Glue job $JOB_NAME does not have Job bookmark encryption enabled" "$regx" "$JOB_NAME" diff --git a/checks/check_extra7123 b/checks/check_extra7123 index 02a83000..c462f749 100644 --- a/checks/check_extra7123 +++ b/checks/check_extra7123 @@ -30,7 +30,7 @@ extra7123(){ if [[ $LIST_OF_USERS_WITH_2ACCESS_KEYS ]]; then # textFail "Users with access key 1 older than 90 days:" for user in $LIST_OF_USERS_WITH_2ACCESS_KEYS; do - textFail "User $user has 2 active access keys" "us-east-1" "$user" + textFail "User $user has 2 active access keys" "$REGION" "$user" done else textPass "No users with 2 active access keys" diff --git a/checks/check_extra7125 b/checks/check_extra7125 index 7e7cd722..545d6d8b 100644 --- a/checks/check_extra7125 +++ b/checks/check_extra7125 @@ -34,9 +34,9 @@ extra7125(){ if [[ $MFA_TYPE == "mfa" || $MFA_TYPE == "sms-mfa" ]]; then textInfo "User $user has virtual MFA enabled" elif [[ $MFA_TYPE == "" ]]; then - textFail "User $user has not hardware MFA enabled" "us-east-1" "$user" + textFail "User $user has not hardware MFA enabled" "$REGION" "$user" else - textPass "User $user has hardware MFA enabled" "us-east-1" "$user" + textPass "User $user has hardware MFA enabled" "$REGION" "$user" fi done else diff --git a/checks/check_extra7126 b/checks/check_extra7126 index 7b91e0e2..6017afa4 100644 --- a/checks/check_extra7126 +++ b/checks/check_extra7126 @@ -33,9 +33,9 @@ extra7126(){ if [[ $CHECK_STATUS == "PendingDeletion" ]]; then textInfo "$regx: KMS key $key is pending deletion" "$regx" elif [[ $CHECK_STATUS == "Disabled" ]]; then - textInfo "$regx: KMS key $key is disabled" "$regx" + textInfo "$regx: KMS key $key is disabled" "$regx" "$key" else - textPass "$regx: KMS key $key is not disabled or pending deletion" "$regx" + textPass "$regx: KMS key $key is not disabled or pending deletion" "$regx" "$key" fi done else diff --git a/checks/check_extra7128 b/checks/check_extra7128 index 27be1f66..20182e8c 100644 --- a/checks/check_extra7128 +++ b/checks/check_extra7128 @@ -31,9 +31,9 @@ extra7128(){ for table in $DDB_TABLES_LIST; do DDB_TABLE_WITH_KMS=$($AWSCLI dynamodb describe-table --table-name $table $PROFILE_OPT --region $regx --query Table.SSEDescription.SSEType --output text) if [[ $DDB_TABLE_WITH_KMS == "KMS" ]]; then - textPass "$regx: DynamoDB table $table does have KMS encryption enabled" "$regx" + textPass "$regx: DynamoDB table $table does have KMS encryption enabled" "$regx" "$table" else - textInfo "$regx: DynamoDB table $table does have DEFAULT encryption enabled" "$regx" + textInfo "$regx: DynamoDB table $table does have DEFAULT encryption enabled" "$regx" "$table" fi done else diff --git a/checks/check_extra7129 b/checks/check_extra7129 index 44ef5f60..ddeb1c77 100644 --- a/checks/check_extra7129 +++ b/checks/check_extra7129 @@ -50,12 +50,12 @@ extra7129(){ if [[ ${#WAF_PROTECTED_ALBS[@]} -gt 0 ]]; then for wafaclarn in "${WAF_PROTECTED_ALBS[@]}"; do WAFV2_WEBACL_ARN_SHORT=$(echo $wafaclarn | awk -F'/' '{ print $3 }') - textPass "$regx: Application Load Balancer $alb is protected by WAFv2 ACL $WAFV2_WEBACL_ARN_SHORT" "$regx" + textPass "$regx: Application Load Balancer $alb is protected by WAFv2 ACL $WAFV2_WEBACL_ARN_SHORT" "$regx" "$alb" done fi if [[ ${#WAFv1_PROTECTED_ALBS[@]} -gt 0 ]]; then for wafv1aclid in "${WAFv1_PROTECTED_ALBS[@]}"; do - textPass "$regx: Application Load Balancer $alb is protected by WAFv1 ACL $wafv1aclid" "$regx" + textPass "$regx: Application Load Balancer $alb is protected by WAFv1 ACL $wafv1aclid" "$regx" "$alb" done fi else