Merge pull request #102 from thi-baut/main

Added AWS Core Ruleset in all AWF Policies (Firewall Manager)

Author: andywick-aws

aws_sra_examples/solutions/firewall_manager/firewall_manager_org/README.md

@@ -116,6 +116,7 @@ populated from the `SecurityAccountId` parameter within the `AWSControlTowerBP-B
       - ELBv2
       - API Gateway
     - AWS Managed Rule sets
+      - AWS Core Ruleset
       - AWS Windows Operating System Ruleset
     - Resource Tag
       - Key: workload-os
@@ -125,6 +126,7 @@ populated from the `SecurityAccountId` parameter within the `AWSControlTowerBP-B
       - ELBv2
       - API Gateway
     - AWS Managed Rule sets
+      - AWS Core Ruleset
       - AWS Linux Operating System Ruleset
     - Resource Tag
       - Key: workload-os
@@ -134,6 +136,7 @@ populated from the `SecurityAccountId` parameter within the `AWSControlTowerBP-B
       - ELBv2
       - API Gateway
     - AWS Managed Rule sets
+      - AWS Core Ruleset
       - AWS Posix Operating System Ruleset
     - Resource Tag
       - Key: workload-os

aws_sra_examples/solutions/firewall_manager/firewall_manager_org/templates/sra-firewall-manager-org-main-ssm.yaml

@@ -9,7 +9,7 @@ Description:
 
 Metadata:
   SRA:
-    Version: 1.2
+    Version: 1.3
     Entry: Parameters for deploying solution resolving SSM parameters
     Order: 1
   AWS::CloudFormation::Interface:
@@ -153,8 +153,8 @@ Parameters:
     Description: The SRA solution name. The default value is the folder name of the solution
     Type: String
   pSRASolutionVersion:
-    AllowedValues: [v1.2]
-    Default: v1.2
+    AllowedValues: [v1.3]
+    Default: v1.3
     Description: The SRA solution version. Used to trigger updates on the nested StackSets.
     Type: String
   pSRAStagingS3BucketName:

aws_sra_examples/solutions/firewall_manager/firewall_manager_org/templates/sra-firewall-manager-org-main.yaml

@@ -9,7 +9,7 @@ Description:
 
 Metadata:
   SRA:
-    Version: 1.2
+    Version: 1.3
     Entry: Parameters for deploying solution
     Order: 1
   AWS::CloudFormation::Interface:
@@ -151,8 +151,8 @@ Parameters:
     Description: The SRA solution name. The default value is the folder name of the solution
     Type: String
   pSRASolutionVersion:
-    AllowedValues: [v1.2]
-    Default: v1.2
+    AllowedValues: [v1.3]
+    Default: v1.3
     Description: The SRA solution version. Used to trigger updates on the nested StackSets.
     Type: String
   pSRAStagingS3BucketName:

aws_sra_examples/solutions/firewall_manager/firewall_manager_org/templates/sra-firewall-manager-org-waf-policy.yaml

@@ -9,7 +9,7 @@ Description:
 
 Metadata:
   SRA:
-    Version: 1.2
+    Version: 1.3
     Order: 5
   AWS::CloudFormation::Interface:
     ParameterGroups:
@@ -105,6 +105,8 @@ Resources:
         Type: WAFV2
         ManagedServiceData:
           '{ "type":"WAFV2", "defaultAction":{ "type":"ALLOW" }, "preProcessRuleGroups": [ { "managedRuleGroupIdentifier": { "vendorName": "AWS",
+          "managedRuleGroupName": "AWSManagedRulesCommonRuleSet", "version": null }, "overrideAction": { "type": "NONE" }, "ruleGroupArn": null,
+          "excludeRules": [], "ruleGroupType": "ManagedRuleGroup" }, { "managedRuleGroupIdentifier": { "vendorName": "AWS",
           "managedRuleGroupName": "AWSManagedRulesWindowsRuleSet", "version": null }, "overrideAction": { "type": "NONE" }, "ruleGroupArn": null,
           "excludeRules": [], "ruleGroupType": "ManagedRuleGroup" } ], "postProcessRuleGroups": [], "overrideCustomerWebACLAssociation":true }'
 
@@ -128,6 +130,8 @@ Resources:
         Type: WAFV2
         ManagedServiceData:
           '{ "type":"WAFV2", "defaultAction":{ "type":"ALLOW" }, "preProcessRuleGroups": [ { "managedRuleGroupIdentifier": { "vendorName": "AWS",
+          "managedRuleGroupName": "AWSManagedRulesCommonRuleSet", "version": null }, "overrideAction": { "type": "NONE" }, "ruleGroupArn": null,
+          "excludeRules": [], "ruleGroupType": "ManagedRuleGroup" }, { "managedRuleGroupIdentifier": { "vendorName": "AWS",
           "managedRuleGroupName": "AWSManagedRulesLinuxRuleSet", "version": null }, "overrideAction": { "type": "NONE" }, "ruleGroupArn": null,
           "excludeRules": [], "ruleGroupType": "ManagedRuleGroup" } ], "postProcessRuleGroups": [], "overrideCustomerWebACLAssociation":true }'
 
@@ -151,6 +155,8 @@ Resources:
         Type: WAFV2
         ManagedServiceData:
           '{ "type":"WAFV2", "defaultAction":{ "type":"ALLOW" }, "preProcessRuleGroups": [ { "managedRuleGroupIdentifier": { "vendorName": "AWS",
+          "managedRuleGroupName": "AWSManagedRulesCommonRuleSet", "version": null }, "overrideAction": { "type": "NONE" }, "ruleGroupArn": null,
+          "excludeRules": [], "ruleGroupType": "ManagedRuleGroup" }, { "managedRuleGroupIdentifier": { "vendorName": "AWS",
           "managedRuleGroupName": "AWSManagedRulesUnixRuleSet", "version": null }, "overrideAction": { "type": "NONE" }, "ruleGroupArn": null,
           "excludeRules": [], "ruleGroupType": "ManagedRuleGroup" } ], "postProcessRuleGroups": [], "overrideCustomerWebACLAssociation":true }'