From 4adc7f5864d745fd2de2de4d53a117b706659824 Mon Sep 17 00:00:00 2001 From: njgibbon Date: Thu, 24 Dec 2020 00:00:06 +0000 Subject: [PATCH] feat - fix - taking out eks check condition because california region --- checks/check_extra794 | 11 ++--------- checks/check_extra795 | 11 ++--------- checks/check_extra796 | 11 ++--------- checks/check_extra797 | 11 ++--------- 4 files changed, 8 insertions(+), 36 deletions(-) diff --git a/checks/check_extra794 b/checks/check_extra794 index 281dca35..9c276106 100644 --- a/checks/check_extra794 +++ b/checks/check_extra794 @@ -21,12 +21,7 @@ CHECK_ALTERNATE_check794="extra794" extra794(){ textInfo "Looking for control plane logging enabled for EKS clusters across all regions... " for regx in $REGIONS; do - # Get a list of EKS clusters (Unless us-west-1 which doesn't support EKS): - if [[ $regx == "us-west-1" ]]; then - textInfo "$regx: EKS not supported in this region" "$regx" - else - CLUSTERS=$($AWSCLI eks list-clusters $PROFILE_OPT --region $regx --query 'clusters[]' --output text) - fi + CLUSTERS=$($AWSCLI eks list-clusters $PROFILE_OPT --region $regx --query 'clusters[]' --output text) if [[ $CLUSTERS ]]; then for CLUSTER in $CLUSTERS;do CLUSTERDEF=$($AWSCLI eks describe-cluster $PROFILE_OPT --region $regx --name $CLUSTER --query 'cluster.logging.clusterLogging[0]') @@ -43,9 +38,7 @@ extra794(){ fi done else - if [[ $regx != "us-west-1" ]]; then - textInfo "$regx: No EKS clusters found" "$regx" - fi + textInfo "$regx: No EKS clusters found" "$regx" fi done } diff --git a/checks/check_extra795 b/checks/check_extra795 index fbfa3059..3a385c4b 100644 --- a/checks/check_extra795 +++ b/checks/check_extra795 @@ -21,12 +21,7 @@ CHECK_ALTERNATE_check795="extra795" extra795(){ textInfo "Looking for public access enabled for EKS clusters across all regions... " for regx in $REGIONS; do - # Get a list of EKS clusters (Unless us-west-1 which doesn't support EKS): - if [[ $regx == "us-west-1" ]]; then - textInfo "$regx: EKS not supported in this region" "$regx" - else - CLUSTERS=$($AWSCLI eks list-clusters $PROFILE_OPT --region $regx --query 'clusters[]' --output text) - fi + CLUSTERS=$($AWSCLI eks list-clusters $PROFILE_OPT --region $regx --query 'clusters[]' --output text) if [[ $CLUSTERS ]]; then for CLUSTER in $CLUSTERS;do CLUSTERDEF=$($AWSCLI eks describe-cluster $PROFILE_OPT --region $regx --name $CLUSTER --query 'cluster.resourcesVpcConfig') @@ -40,9 +35,7 @@ extra795(){ fi done else - if [[ $regx != "us-west-1" ]]; then - textInfo "$regx: No EKS clusters found" "$regx" - fi + textInfo "$regx: No EKS clusters found" "$regx" fi done } diff --git a/checks/check_extra796 b/checks/check_extra796 index 601712e0..be24a340 100644 --- a/checks/check_extra796 +++ b/checks/check_extra796 @@ -21,12 +21,7 @@ CHECK_ALTERNATE_check796="extra796" extra796(){ textInfo "Looking for public access CIDRs for EKS clusters across all regions... " for regx in $REGIONS; do - # Get a list of EKS clusters (Unless us-west-1 which doesn't support EKS): - if [[ $regx == "us-west-1" ]]; then - textInfo "$regx: EKS not supported in this region" "$regx" - else - CLUSTERS=$($AWSCLI eks list-clusters $PROFILE_OPT --region $regx --query 'clusters[]' --output text) - fi + CLUSTERS=$($AWSCLI eks list-clusters $PROFILE_OPT --region $regx --query 'clusters[]' --output text) if [[ $CLUSTERS ]]; then for CLUSTER in $CLUSTERS;do CLUSTERDEF=$($AWSCLI eks describe-cluster $PROFILE_OPT --region $regx --name $CLUSTER --query 'cluster.resourcesVpcConfig') @@ -45,9 +40,7 @@ extra796(){ fi done else - if [[ $regx != "us-west-1" ]]; then - textInfo "$regx: No EKS clusters found" "$regx" - fi + textInfo "$regx: No EKS clusters found" "$regx" fi done } diff --git a/checks/check_extra797 b/checks/check_extra797 index 1eca9888..6a1f696e 100644 --- a/checks/check_extra797 +++ b/checks/check_extra797 @@ -21,12 +21,7 @@ CHECK_ALTERNATE_check797="extra797" extra797(){ textInfo "Looking for encryption config for EKS clusters across all regions... " for regx in $REGIONS; do - # Get a list of EKS clusters (Unless us-west-1 which doesn't support EKS): - if [[ $regx == "us-west-1" ]]; then - textInfo "$regx: EKS not supported in this region" "$regx" - else - CLUSTERS=$($AWSCLI eks list-clusters $PROFILE_OPT --region $regx --query 'clusters[]' --output text) - fi + CLUSTERS=$($AWSCLI eks list-clusters $PROFILE_OPT --region $regx --query 'clusters[]' --output text) if [[ $CLUSTERS ]]; then for CLUSTER in $CLUSTERS;do ENC_CONFIG=$($AWSCLI eks describe-cluster $PROFILE_OPT --region $regx --name $CLUSTER --query 'cluster.encryptionConfig') @@ -38,9 +33,7 @@ extra797(){ fi done else - if [[ $regx != "us-west-1" ]]; then - textInfo "$regx: No EKS clusters found" "$regx" - fi + textInfo "$regx: No EKS clusters found" "$regx" fi done }