diff --git a/EC-Delete-LandingZone.py b/EC-Delete-LandingZone.py index b7e3134..609f036 100644 --- a/EC-Delete-LandingZone.py +++ b/EC-Delete-LandingZone.py @@ -152,12 +152,17 @@ def main(argv): delete_ssm_parameter('/org/member/KMSCloudtrailKey_arn', account_session) delete_ssm_parameter('/org/member/SLZVersion', account_session) delete_ssm_parameter('/org/member/SecLog_cloudtrail-groupname', account_session) + delete_ssm_parameter('/org/member/SecLog_cloudtrail-group-subscription-filter-name', account_session) delete_ssm_parameter('/org/member/SecLog_insight-groupname', account_session) + delete_ssm_parameter('/org/member/SecLog_insight-group-subscription-filter-name', account_session) delete_ssm_parameter('/org/member/SecLog_securityhub-groupname', account_session) + delete_ssm_parameter('/org/member/SecLog_securityhub-group-subscription-filter-name', account_session) delete_ssm_parameter('/org/member/SecLog_config-groupname', account_session) + delete_ssm_parameter('/org/member/SecLog_config-group-subscription-filter-name', account_session) delete_ssm_parameter('/org/member/SecLog_alarms-groupname', account_session) for region in regions: delete_ssm_parameter('/org/member/SecLog_guardduty-groupname', account_session, region=region) + delete_ssm_parameter('/org/member/SecLog_guardduty-group-subscription-filter-name', account_session, region=region) print("") print(f"####### AWS Landing Zone deletion script finished. Executed in {time.time() - start_time} seconds") diff --git a/EC-SLZ-Version.txt b/EC-SLZ-Version.txt index df80819..41336a1 100644 --- a/EC-SLZ-Version.txt +++ b/EC-SLZ-Version.txt @@ -1 +1 @@ -1.5.11 +1.5.12 diff --git a/SH/EC-Configure-Client-Account.sh b/SH/EC-Configure-Client-Account.sh index d11f5ee..92f57cb 100755 --- a/SH/EC-Configure-Client-Account.sh +++ b/SH/EC-Configure-Client-Account.sh @@ -85,6 +85,7 @@ configure_client() { securityhubgroupname=`aws --profile $SECLOG ssm get-parameter --name "/org/member/SecLog_securityhub-groupname" --output text --query 'Parameter.Value'` configgroupname=`aws --profile $SECLOG ssm get-parameter --name "/org/member/SecLog_config-groupname" --output text --query 'Parameter.Value'` alarmsgroupname=`aws --profile $SECLOG ssm get-parameter --name "/org/member/SecLog_alarms-groupname" --output text --query 'Parameter.Value'` + alarmsgroupname=`aws --profile $SECLOG ssm get-parameter --name "/org/member/SecLog_alarms-groupname" --output text --query 'Parameter.Value'` echo "" @@ -162,6 +163,9 @@ configure_client() { fi aws --profile $CLIENT --region $region ssm add-tags-to-resource --resource-type "Parameter" --resource-id /org/member/SecLog_guardduty-groupname --tags file://$CFN_TAGS_FILE + aws --profile $CLIENT --region $region ssm put-parameter --name /org/member/SecLog_guardduty-group-subscription-filter-name --type String --value "DEFAULT" --overwrite + aws --profile $CLIENT --region $region ssm add-tags-to-resource --resource-type "Parameter" --resource-id /org/member/SecLog_guardduty-group-subscription-filter-name --tags file://$CFN_TAGS_FILE + done if [ ! -z "$securityhubgroupname" ] ; then diff --git a/Updates/1.5.12/manifest.json b/Updates/1.5.12/manifest.json new file mode 100644 index 0000000..8a262ff --- /dev/null +++ b/Updates/1.5.12/manifest.json @@ -0,0 +1,20 @@ +{ "version" : "1.5.12", + "regions" : ["ap-northeast-1","ap-northeast-2","ap-northeast-3","ap-south-1","ap-southeast-1","ap-southeast-2","ca-central-1","eu-central-1","eu-north-1","eu-west-1", "eu-west-2","eu-west-3","sa-east-1","us-east-1","us-east-2","us-west-1","us-west-2"], + "tags" : [ + { "Key": "Organization","Value": "EC" }, + { "Key": "Owner","Value": "DIGIT.C.1" }, + { "Key": "Environment","Value": "prod" }, + { "Key": "Criticity","Value": "high" }, + { "Key": "Project","Value": "secLZ" }, + { "Key": "Confidentiality","Value": "confidential" }, + { "Key": "ApplicationRole","Value": "security" } + ], + "accounts" : { + "exclude" : [], + "include" : [] + }, + "stacks" : { + + } + +}