Firewall Management Service Update: AWS Firewall Manager now lets you combine multiple resource tags using the logical AND operator or the logical OR operator.

Author: AWS

.changes/next-release/feature-FirewallManagementService-9714f8a.json

@@ -0,0 +1,6 @@
+{
+    "type": "feature",
+    "category": "Firewall Management Service",
+    "contributor": "",
+    "description": "AWS Firewall Manager now lets you combine multiple resource tags using the logical AND operator or the logical OR operator."
+}

services/fms/src/main/resources/codegen-resources/service-2.json

@@ -3211,6 +3211,10 @@
         "PolicyStatus":{
           "shape":"CustomerPolicyStatus",
           "documentation":"<p>Indicates whether the policy is in or out of an admin's policy or Region scope.</p> <ul> <li> <p> <code>ACTIVE</code> - The administrator can manage and delete the policy.</p> </li> <li> <p> <code>OUT_OF_ADMIN_SCOPE</code> - The administrator can view the policy, but they can't edit or delete the policy. Existing policy protections stay in place. Any new resources that come into scope of the policy won't be protected.</p> </li> </ul>"
+        },
+        "ResourceTagLogicalOperator":{
+          "shape":"ResourceTagLogicalOperator",
+          "documentation":"<p>Specifies whether to combine multiple resource tags with AND, so that a resource must have all tags to be included or excluded, or OR, so that a resource must have at least one tag.</p> <p>Default: <code>AND</code> </p>"
         }
       },
       "documentation":"<p>An Firewall Manager policy.</p>"
@@ -3925,18 +3929,25 @@
           "documentation":"<p>The resource tag value. To specify an empty string value, either don't provide this or specify it as \"\". </p>"
         }
       },
-      "documentation":"<p>The resource tags that Firewall Manager uses to determine if a particular resource should be included or excluded from the Firewall Manager policy. Tags enable you to categorize your Amazon Web Services resources in different ways, for example, by purpose, owner, or environment. Each tag consists of a key and an optional value. Firewall Manager combines the tags with \"AND\" so that, if you add more than one tag to a policy scope, a resource must have all the specified tags to be included or excluded. For more information, see <a href=\"https://docs.aws.amazon.com/awsconsolehelpdocs/latest/gsg/tag-editor.html\">Working with Tag Editor</a>.</p> <p>Every resource tag must have a string value, either a non-empty string or an empty string. If you don't provide a value for a resource tag, Firewall Manager saves the value as an empty string: \"\". When Firewall Manager compares tags, it only matches two tags if they have the same key and the same value. A tag with an empty string value only matches with tags that also have an empty string value. </p>"
+      "documentation":"<p>The resource tags that Firewall Manager uses to determine if a particular resource should be included or excluded from the Firewall Manager policy. Tags enable you to categorize your Amazon Web Services resources in different ways, for example, by purpose, owner, or environment. Each tag consists of a key and an optional value. If you add more than one tag to a policy, you can specify whether to combine them using the logical AND operator or the logical OR operator. For more information, see <a href=\"https://docs.aws.amazon.com/awsconsolehelpdocs/latest/gsg/tag-editor.html\">Working with Tag Editor</a>.</p> <p>Every resource tag must have a string value, either a non-empty string or an empty string. If you don't provide a value for a resource tag, Firewall Manager saves the value as an empty string: \"\". When Firewall Manager compares tags, it only matches two tags if they have the same key and the same value. A tag with an empty string value only matches with tags that also have an empty string value. </p>"
     },
     "ResourceTagKey":{
       "type":"string",
       "max":128,
       "min":1,
-      "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"
+      "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:\\/=+\\-@*\\\\]*)$"
+    },
+    "ResourceTagLogicalOperator":{
+      "type":"string",
+      "enum":[
+        "AND",
+        "OR"
+      ]
     },
     "ResourceTagValue":{
       "type":"string",
       "max":256,
-      "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:/=+\\-@]*)$"
+      "pattern":"^([\\p{L}\\p{Z}\\p{N}_.:\\/=+\\-@*\\\\]*)$"
     },
     "ResourceTags":{
       "type":"list",