CURRENT_ACCOUNT_ID is not needed

since ACCOUNT_ID is available
This commit is contained in:
Toni de la Fuente
2019-09-17 14:52:30 -04:00
committed by GitHub
parent 44cfa71358
commit 4401d4209c

View File

@@ -18,7 +18,6 @@ check26(){
# "Ensure S3 bucket access logging is enabled on the CloudTrail S3 bucket (Scored)"
CLOUDTRAILS=$($AWSCLI cloudtrail describe-trails $PROFILE_OPT --region "$REGION" --query 'trailList[*].Name' --output text| tr '\011' '\012' | awk -F: '{print $1}')
CURRENT_ACCOUNT_ID=$($AWSCLI sts $PROFILE_OPT get-caller-identity --region "$REGION" --query Account --output text)
if [[ $CLOUDTRAILS ]];then
for trail in $CLOUDTRAILS; do
@@ -28,12 +27,12 @@ check26(){
if [[ $CLOUDTRAILBUCKET ]];then
bucket=$CLOUDTRAILBUCKET
if [ "$CLOUDTRAIL_ACCOUNT_ID" == "$CURRENT_ACCOUNT_ID" ];then
if [ "$CLOUDTRAIL_ACCOUNT_ID" == "$ACCOUNT_ID" ];then
CLOUDTRAILBUCKET_LOGENABLED=$($AWSCLI s3api get-bucket-logging --bucket $bucket $PROFILE_OPT --region $REGION --query 'LoggingEnabled.TargetBucket' --output text|grep -v None)
fi
if [[ $CLOUDTRAILBUCKET_LOGENABLED ]];then
textPass "Bucket access logging enabled in CloudTrail S3 bucket $bucket for $trail"
elif [ "$CLOUDTRAIL_ACCOUNT_ID" == "$CURRENT_ACCOUNT_ID" ];then
elif [ "$CLOUDTRAIL_ACCOUNT_ID" == "$ACCOUNT_ID" ];then
textFail "Bucket access logging is not enabled in CloudTrail S3 bucket $bucket for $trail"
else
textInfo "CloudTrail S3 bucket $bucket for trail $trail is not in current account"