Added the URI path to the custom aggregation keys that you can specify for a rate-based rule.

Author: aws-sdk-dotnet-automation

generator/ServiceModels/wafv2/wafv2-2019-07-29.api.json

@@ -3190,7 +3190,8 @@
         "HTTPMethod":{"shape":"RateLimitHTTPMethod"},
         "ForwardedIP":{"shape":"RateLimitForwardedIP"},
         "IP":{"shape":"RateLimitIP"},
-        "LabelNamespace":{"shape":"RateLimitLabelNamespace"}
+        "LabelNamespace":{"shape":"RateLimitLabelNamespace"},
+        "UriPath":{"shape":"RateLimitUriPath"}
       }
     },
     "RateBasedStatementCustomKeys":{
@@ -3273,6 +3274,13 @@
         "TextTransformations":{"shape":"TextTransformations"}
       }
     },
+    "RateLimitUriPath":{
+      "type":"structure",
+      "required":["TextTransformations"],
+      "members":{
+        "TextTransformations":{"shape":"TextTransformations"}
+      }
+    },
     "RedactedFields":{
       "type":"list",
       "member":{"shape":"FieldToMatch"},

generator/ServiceModels/wafv2/wafv2-2019-07-29.docs.json

@@ -315,9 +315,9 @@
       }
     },
     "CookieMatchPattern": {
-      "base": "<p>The filter to use to identify the subset of cookies to inspect in a web request. </p> <p>You must specify exactly one setting: either <code>All</code>, <code>IncludedCookies</code>, or <code>ExcludedCookies</code>.</p> <p>Example JSON: <code>\"MatchPattern\": { \"IncludedCookies\": {\"KeyToInclude1\", \"KeyToInclude2\", \"KeyToInclude3\"} }</code> </p>",
+      "base": "<p>The filter to use to identify the subset of cookies to inspect in a web request. </p> <p>You must specify exactly one setting: either <code>All</code>, <code>IncludedCookies</code>, or <code>ExcludedCookies</code>.</p> <p>Example JSON: <code>\"MatchPattern\": { \"IncludedCookies\": [ \"session-id-time\", \"session-id\" ] }</code> </p>",
       "refs": {
-        "Cookies$MatchPattern": "<p>The filter to use to identify the subset of cookies to inspect in a web request. </p> <p>You must specify exactly one setting: either <code>All</code>, <code>IncludedCookies</code>, or <code>ExcludedCookies</code>.</p> <p>Example JSON: <code>\"MatchPattern\": { \"IncludedCookies\": {\"KeyToInclude1\", \"KeyToInclude2\", \"KeyToInclude3\"} }</code> </p>"
+        "Cookies$MatchPattern": "<p>The filter to use to identify the subset of cookies to inspect in a web request. </p> <p>You must specify exactly one setting: either <code>All</code>, <code>IncludedCookies</code>, or <code>ExcludedCookies</code>.</p> <p>Example JSON: <code>\"MatchPattern\": { \"IncludedCookies\": [ \"session-id-time\", \"session-id\" ] }</code> </p>"
       }
     },
     "CookieNames": {
@@ -1043,9 +1043,9 @@
       }
     },
     "HeaderMatchPattern": {
-      "base": "<p>The filter to use to identify the subset of headers to inspect in a web request. </p> <p>You must specify exactly one setting: either <code>All</code>, <code>IncludedHeaders</code>, or <code>ExcludedHeaders</code>.</p> <p>Example JSON: <code>\"MatchPattern\": { \"ExcludedHeaders\": {\"KeyToExclude1\", \"KeyToExclude2\"} }</code> </p>",
+      "base": "<p>The filter to use to identify the subset of headers to inspect in a web request. </p> <p>You must specify exactly one setting: either <code>All</code>, <code>IncludedHeaders</code>, or <code>ExcludedHeaders</code>.</p> <p>Example JSON: <code>\"MatchPattern\": { \"ExcludedHeaders\": [ \"KeyToExclude1\", \"KeyToExclude2\" ] }</code> </p>",
       "refs": {
-        "Headers$MatchPattern": "<p>The filter to use to identify the subset of headers to inspect in a web request. </p> <p>You must specify exactly one setting: either <code>All</code>, <code>IncludedHeaders</code>, or <code>ExcludedHeaders</code>.</p> <p>Example JSON: <code>\"MatchPattern\": { \"ExcludedHeaders\": {\"KeyToExclude1\", \"KeyToExclude2\"} }</code> </p>"
+        "Headers$MatchPattern": "<p>The filter to use to identify the subset of headers to inspect in a web request. </p> <p>You must specify exactly one setting: either <code>All</code>, <code>IncludedHeaders</code>, or <code>ExcludedHeaders</code>.</p> <p>Example JSON: <code>\"MatchPattern\": { \"ExcludedHeaders\": [ \"KeyToExclude1\", \"KeyToExclude2\" ] }</code> </p>"
       }
     },
     "HeaderName": {
@@ -1854,6 +1854,12 @@
         "RateBasedStatementCustomKey$QueryString": "<p>Use the request's query string as an aggregate key. Each distinct string contributes to the aggregation instance. If you use just the query string as your custom key, then each string fully defines an aggregation instance. </p>"
       }
     },
+    "RateLimitUriPath": {
+      "base": "<p>Specifies the request's URI path as an aggregate key for a rate-based rule. Each distinct URI path contributes to the aggregation instance. If you use just the URI path as your custom key, then each URI path fully defines an aggregation instance. </p>",
+      "refs": {
+        "RateBasedStatementCustomKey$UriPath": "<p>Use the request's URI path as an aggregate key. Each distinct URI path contributes to the aggregation instance. If you use just the URI path as your custom key, then each URI path fully defines an aggregation instance. </p>"
+      }
+    },
     "RedactedFields": {
       "base": null,
       "refs": {
@@ -2445,6 +2451,7 @@
         "RateLimitHeader$TextTransformations": "<p>Text transformations eliminate some of the unusual formatting that attackers use in web requests in an effort to bypass detection. Text transformations are used in rule match statements, to transform the <code>FieldToMatch</code> request component before inspecting it, and they're used in rate-based rule statements, to transform request components before using them as custom aggregation keys. If you specify one or more transformations to apply, WAF performs all transformations on the specified content, starting from the lowest priority setting, and then uses the component contents. </p>",
         "RateLimitQueryArgument$TextTransformations": "<p>Text transformations eliminate some of the unusual formatting that attackers use in web requests in an effort to bypass detection. Text transformations are used in rule match statements, to transform the <code>FieldToMatch</code> request component before inspecting it, and they're used in rate-based rule statements, to transform request components before using them as custom aggregation keys. If you specify one or more transformations to apply, WAF performs all transformations on the specified content, starting from the lowest priority setting, and then uses the component contents. </p>",
         "RateLimitQueryString$TextTransformations": "<p>Text transformations eliminate some of the unusual formatting that attackers use in web requests in an effort to bypass detection. Text transformations are used in rule match statements, to transform the <code>FieldToMatch</code> request component before inspecting it, and they're used in rate-based rule statements, to transform request components before using them as custom aggregation keys. If you specify one or more transformations to apply, WAF performs all transformations on the specified content, starting from the lowest priority setting, and then uses the component contents. </p>",
+        "RateLimitUriPath$TextTransformations": "<p>Text transformations eliminate some of the unusual formatting that attackers use in web requests in an effort to bypass detection. Text transformations are used in rule match statements, to transform the <code>FieldToMatch</code> request component before inspecting it, and they're used in rate-based rule statements, to transform request components before using them as custom aggregation keys. If you specify one or more transformations to apply, WAF performs all transformations on the specified content, starting from the lowest priority setting, and then uses the component contents. </p>",
         "RegexMatchStatement$TextTransformations": "<p>Text transformations eliminate some of the unusual formatting that attackers use in web requests in an effort to bypass detection. Text transformations are used in rule match statements, to transform the <code>FieldToMatch</code> request component before inspecting it, and they're used in rate-based rule statements, to transform request components before using them as custom aggregation keys. If you specify one or more transformations to apply, WAF performs all transformations on the specified content, starting from the lowest priority setting, and then uses the component contents. </p>",
         "RegexPatternSetReferenceStatement$TextTransformations": "<p>Text transformations eliminate some of the unusual formatting that attackers use in web requests in an effort to bypass detection. Text transformations are used in rule match statements, to transform the <code>FieldToMatch</code> request component before inspecting it, and they're used in rate-based rule statements, to transform request components before using them as custom aggregation keys. If you specify one or more transformations to apply, WAF performs all transformations on the specified content, starting from the lowest priority setting, and then uses the component contents. </p>",
         "SizeConstraintStatement$TextTransformations": "<p>Text transformations eliminate some of the unusual formatting that attackers use in web requests in an effort to bypass detection. Text transformations are used in rule match statements, to transform the <code>FieldToMatch</code> request component before inspecting it, and they're used in rate-based rule statements, to transform request components before using them as custom aggregation keys. If you specify one or more transformations to apply, WAF performs all transformations on the specified content, starting from the lowest priority setting, and then uses the component contents. </p>",

generator/ServiceModels/wafv2/wafv2-2019-07-29.normal.json

@@ -1361,7 +1361,7 @@
           "documentation":"<p>Inspect only the cookies whose keys don't match any of the strings specified here. </p>"
         }
       },
-      "documentation":"<p>The filter to use to identify the subset of cookies to inspect in a web request. </p> <p>You must specify exactly one setting: either <code>All</code>, <code>IncludedCookies</code>, or <code>ExcludedCookies</code>.</p> <p>Example JSON: <code>\"MatchPattern\": { \"IncludedCookies\": {\"KeyToInclude1\", \"KeyToInclude2\", \"KeyToInclude3\"} }</code> </p>"
+      "documentation":"<p>The filter to use to identify the subset of cookies to inspect in a web request. </p> <p>You must specify exactly one setting: either <code>All</code>, <code>IncludedCookies</code>, or <code>ExcludedCookies</code>.</p> <p>Example JSON: <code>\"MatchPattern\": { \"IncludedCookies\": [ \"session-id-time\", \"session-id\" ] }</code> </p>"
     },
     "CookieNames":{
       "type":"list",
@@ -1379,7 +1379,7 @@
       "members":{
         "MatchPattern":{
           "shape":"CookieMatchPattern",
-          "documentation":"<p>The filter to use to identify the subset of cookies to inspect in a web request. </p> <p>You must specify exactly one setting: either <code>All</code>, <code>IncludedCookies</code>, or <code>ExcludedCookies</code>.</p> <p>Example JSON: <code>\"MatchPattern\": { \"IncludedCookies\": {\"KeyToInclude1\", \"KeyToInclude2\", \"KeyToInclude3\"} }</code> </p>"
+          "documentation":"<p>The filter to use to identify the subset of cookies to inspect in a web request. </p> <p>You must specify exactly one setting: either <code>All</code>, <code>IncludedCookies</code>, or <code>ExcludedCookies</code>.</p> <p>Example JSON: <code>\"MatchPattern\": { \"IncludedCookies\": [ \"session-id-time\", \"session-id\" ] }</code> </p>"
         },
         "MatchScope":{
           "shape":"MapMatchScope",
@@ -3056,7 +3056,7 @@
           "documentation":"<p>Inspect only the headers whose keys don't match any of the strings specified here. </p>"
         }
       },
-      "documentation":"<p>The filter to use to identify the subset of headers to inspect in a web request. </p> <p>You must specify exactly one setting: either <code>All</code>, <code>IncludedHeaders</code>, or <code>ExcludedHeaders</code>.</p> <p>Example JSON: <code>\"MatchPattern\": { \"ExcludedHeaders\": {\"KeyToExclude1\", \"KeyToExclude2\"} }</code> </p>"
+      "documentation":"<p>The filter to use to identify the subset of headers to inspect in a web request. </p> <p>You must specify exactly one setting: either <code>All</code>, <code>IncludedHeaders</code>, or <code>ExcludedHeaders</code>.</p> <p>Example JSON: <code>\"MatchPattern\": { \"ExcludedHeaders\": [ \"KeyToExclude1\", \"KeyToExclude2\" ] }</code> </p>"
     },
     "HeaderName":{"type":"string"},
     "HeaderNames":{
@@ -3087,7 +3087,7 @@
       "members":{
         "MatchPattern":{
           "shape":"HeaderMatchPattern",
-          "documentation":"<p>The filter to use to identify the subset of headers to inspect in a web request. </p> <p>You must specify exactly one setting: either <code>All</code>, <code>IncludedHeaders</code>, or <code>ExcludedHeaders</code>.</p> <p>Example JSON: <code>\"MatchPattern\": { \"ExcludedHeaders\": {\"KeyToExclude1\", \"KeyToExclude2\"} }</code> </p>"
+          "documentation":"<p>The filter to use to identify the subset of headers to inspect in a web request. </p> <p>You must specify exactly one setting: either <code>All</code>, <code>IncludedHeaders</code>, or <code>ExcludedHeaders</code>.</p> <p>Example JSON: <code>\"MatchPattern\": { \"ExcludedHeaders\": [ \"KeyToExclude1\", \"KeyToExclude2\" ] }</code> </p>"
         },
         "MatchScope":{
           "shape":"MapMatchScope",
@@ -4550,6 +4550,10 @@
         "LabelNamespace":{
           "shape":"RateLimitLabelNamespace",
           "documentation":"<p>Use the specified label namespace as an aggregate key. Each distinct fully qualified label name that has the specified label namespace contributes to the aggregation instance. If you use just one label namespace as your custom key, then each label name fully defines an aggregation instance. </p> <p>This uses only labels that have been added to the request by rules that are evaluated before this rate-based rule in the web ACL. </p> <p>For information about label namespaces and names, see <a href=\"https://docs.aws.amazon.com/waf/latest/developerguide/waf-rule-label-requirements.html\">Label syntax and naming requirements</a> in the <i>WAF Developer Guide</i>.</p>"
+        },
+        "UriPath":{
+          "shape":"RateLimitUriPath",
+          "documentation":"<p>Use the request's URI path as an aggregate key. Each distinct URI path contributes to the aggregation instance. If you use just the URI path as your custom key, then each URI path fully defines an aggregation instance. </p>"
         }
       },
       "documentation":"<p>Specifies a single custom aggregate key for a rate-base rule. </p> <note> <p>Web requests that are missing any of the components specified in the aggregation keys are omitted from the rate-based rule evaluation and handling. </p> </note>"
@@ -4673,6 +4677,17 @@
       },
       "documentation":"<p>Specifies the request's query string as an aggregate key for a rate-based rule. Each distinct string contributes to the aggregation instance. If you use just the query string as your custom key, then each string fully defines an aggregation instance. </p>"
     },
+    "RateLimitUriPath":{
+      "type":"structure",
+      "required":["TextTransformations"],
+      "members":{
+        "TextTransformations":{
+          "shape":"TextTransformations",
+          "documentation":"<p>Text transformations eliminate some of the unusual formatting that attackers use in web requests in an effort to bypass detection. Text transformations are used in rule match statements, to transform the <code>FieldToMatch</code> request component before inspecting it, and they're used in rate-based rule statements, to transform request components before using them as custom aggregation keys. If you specify one or more transformations to apply, WAF performs all transformations on the specified content, starting from the lowest priority setting, and then uses the component contents. </p>"
+        }
+      },
+      "documentation":"<p>Specifies the request's URI path as an aggregate key for a rate-based rule. Each distinct URI path contributes to the aggregation instance. If you use just the URI path as your custom key, then each URI path fully defines an aggregation instance. </p>"
+    },
     "RedactedFields":{
       "type":"list",
       "member":{"shape":"FieldToMatch"},

sdk/src/Services/WAFV2/Generated/Model/CookieMatchPattern.cs

@@ -38,8 +38,8 @@ namespace Amazon.WAFV2.Model
     /// </para>
     ///  
     /// <para>
-    /// Example JSON: <code>"MatchPattern": { "IncludedCookies": {"KeyToInclude1", "KeyToInclude2",
-    /// "KeyToInclude3"} }</code> 
+    /// Example JSON: <code>"MatchPattern": { "IncludedCookies": [ "session-id-time", "session-id"
+    /// ] }</code> 
     /// </para>
     /// </summary>
     public partial class CookieMatchPattern

sdk/src/Services/WAFV2/Generated/Model/Cookies.cs

@@ -62,8 +62,8 @@ public partial class Cookies
         /// </para>
         ///  
         /// <para>
-        /// Example JSON: <code>"MatchPattern": { "IncludedCookies": {"KeyToInclude1", "KeyToInclude2",
-        /// "KeyToInclude3"} }</code> 
+        /// Example JSON: <code>"MatchPattern": { "IncludedCookies": [ "session-id-time", "session-id"
+        /// ] }</code> 
         /// </para>
         /// </summary>
         [AWSProperty(Required=true)]

sdk/src/Services/WAFV2/Generated/Model/HeaderMatchPattern.cs

@@ -38,8 +38,8 @@ namespace Amazon.WAFV2.Model
     /// </para>
     ///  
     /// <para>
-    /// Example JSON: <code>"MatchPattern": { "ExcludedHeaders": {"KeyToExclude1", "KeyToExclude2"}
-    /// }</code> 
+    /// Example JSON: <code>"MatchPattern": { "ExcludedHeaders": [ "KeyToExclude1", "KeyToExclude2"
+    /// ] }</code> 
     /// </para>
     /// </summary>
     public partial class HeaderMatchPattern

sdk/src/Services/WAFV2/Generated/Model/Headers.cs

@@ -67,8 +67,8 @@ public partial class Headers
         /// </para>
         ///  
         /// <para>
-        /// Example JSON: <code>"MatchPattern": { "ExcludedHeaders": {"KeyToExclude1", "KeyToExclude2"}
-        /// }</code> 
+        /// Example JSON: <code>"MatchPattern": { "ExcludedHeaders": [ "KeyToExclude1", "KeyToExclude2"
+        /// ] }</code> 
         /// </para>
         /// </summary>
         [AWSProperty(Required=true)]

sdk/src/Services/WAFV2/Generated/Model/Internal/MarshallTransformations/RateBasedStatementCustomKeyMarshaller.cs

@@ -133,6 +133,17 @@ public void Marshall(RateBasedStatementCustomKey requestObject, JsonMarshallerCo
                 context.Writer.WriteObjectEnd();
             }
 
+            if(requestObject.IsSetUriPath())
+            {
+                context.Writer.WritePropertyName("UriPath");
+                context.Writer.WriteObjectStart();
+
+                var marshaller = RateLimitUriPathMarshaller.Instance;
+                marshaller.Marshall(requestObject.UriPath, context);
+
+                context.Writer.WriteObjectEnd();
+            }
+
         }
 
         /// <summary>

sdk/src/Services/WAFV2/Generated/Model/Internal/MarshallTransformations/RateBasedStatementCustomKeyUnmarshaller.cs

@@ -112,6 +112,12 @@ public RateBasedStatementCustomKey Unmarshall(JsonUnmarshallerContext context)
                     unmarshalledObject.QueryString = unmarshaller.Unmarshall(context);
                     continue;
                 }
+                if (context.TestExpression("UriPath", targetDepth))
+                {
+                    var unmarshaller = RateLimitUriPathUnmarshaller.Instance;
+                    unmarshalledObject.UriPath = unmarshaller.Unmarshall(context);
+                    continue;
+                }
             }
 
             return unmarshalledObject;