aws-sdk-core 2.9.36 → 2.11.632

data/apis/waf/2015-08-24/api-2.json

@@ -7,6 +7,7 @@
     "protocol":"json",
     "serviceAbbreviation":"WAF",
     "serviceFullName":"AWS WAF",
+    "serviceId":"WAF",
     "signatureVersion":"v4",
     "targetPrefix":"AWSWAF_20150824",
     "uid":"waf-2015-08-24"
@@ -29,6 +30,23 @@
         {"shape":"WAFLimitsExceededException"}
       ]
     },
+    "CreateGeoMatchSet":{
+      "name":"CreateGeoMatchSet",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateGeoMatchSetRequest"},
+      "output":{"shape":"CreateGeoMatchSetResponse"},
+      "errors":[
+        {"shape":"WAFStaleDataException"},
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidAccountException"},
+        {"shape":"WAFDisallowedNameException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFLimitsExceededException"}
+      ]
+    },
     "CreateIPSet":{
       "name":"CreateIPSet",
       "http":{
@@ -46,6 +64,55 @@
         {"shape":"WAFLimitsExceededException"}
       ]
     },
+    "CreateRateBasedRule":{
+      "name":"CreateRateBasedRule",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateRateBasedRuleRequest"},
+      "output":{"shape":"CreateRateBasedRuleResponse"},
+      "errors":[
+        {"shape":"WAFStaleDataException"},
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFDisallowedNameException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFLimitsExceededException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"},
+        {"shape":"WAFBadRequestException"}
+      ]
+    },
+    "CreateRegexMatchSet":{
+      "name":"CreateRegexMatchSet",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateRegexMatchSetRequest"},
+      "output":{"shape":"CreateRegexMatchSetResponse"},
+      "errors":[
+        {"shape":"WAFStaleDataException"},
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFDisallowedNameException"},
+        {"shape":"WAFLimitsExceededException"}
+      ]
+    },
+    "CreateRegexPatternSet":{
+      "name":"CreateRegexPatternSet",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateRegexPatternSetRequest"},
+      "output":{"shape":"CreateRegexPatternSetResponse"},
+      "errors":[
+        {"shape":"WAFStaleDataException"},
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFDisallowedNameException"},
+        {"shape":"WAFLimitsExceededException"}
+      ]
+    },
     "CreateRule":{
       "name":"CreateRule",
       "http":{
@@ -59,7 +126,28 @@
         {"shape":"WAFInternalErrorException"},
         {"shape":"WAFDisallowedNameException"},
         {"shape":"WAFInvalidParameterException"},
-        {"shape":"WAFLimitsExceededException"}
+        {"shape":"WAFLimitsExceededException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"},
+        {"shape":"WAFBadRequestException"}
+      ]
+    },
+    "CreateRuleGroup":{
+      "name":"CreateRuleGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateRuleGroupRequest"},
+      "output":{"shape":"CreateRuleGroupResponse"},
+      "errors":[
+        {"shape":"WAFStaleDataException"},
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFDisallowedNameException"},
+        {"shape":"WAFLimitsExceededException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"},
+        {"shape":"WAFBadRequestException"}
       ]
     },
     "CreateSizeConstraintSet":{
@@ -110,7 +198,26 @@
         {"shape":"WAFInvalidAccountException"},
         {"shape":"WAFDisallowedNameException"},
         {"shape":"WAFInvalidParameterException"},
-        {"shape":"WAFLimitsExceededException"}
+        {"shape":"WAFLimitsExceededException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"},
+        {"shape":"WAFBadRequestException"}
+      ]
+    },
+    "CreateWebACLMigrationStack":{
+      "name":"CreateWebACLMigrationStack",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"CreateWebACLMigrationStackRequest"},
+      "output":{"shape":"CreateWebACLMigrationStackResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFInvalidOperationException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFEntityMigrationException"}
       ]
     },
     "CreateXssMatchSet":{
@@ -147,6 +254,23 @@
         {"shape":"WAFNonEmptyEntityException"}
       ]
     },
+    "DeleteGeoMatchSet":{
+      "name":"DeleteGeoMatchSet",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteGeoMatchSetRequest"},
+      "output":{"shape":"DeleteGeoMatchSetResponse"},
+      "errors":[
+        {"shape":"WAFStaleDataException"},
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidAccountException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFReferencedItemException"},
+        {"shape":"WAFNonEmptyEntityException"}
+      ]
+    },
     "DeleteIPSet":{
       "name":"DeleteIPSet",
       "http":{
@@ -164,6 +288,87 @@
         {"shape":"WAFNonEmptyEntityException"}
       ]
     },
+    "DeleteLoggingConfiguration":{
+      "name":"DeleteLoggingConfiguration",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteLoggingConfigurationRequest"},
+      "output":{"shape":"DeleteLoggingConfigurationResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFStaleDataException"}
+      ]
+    },
+    "DeletePermissionPolicy":{
+      "name":"DeletePermissionPolicy",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeletePermissionPolicyRequest"},
+      "output":{"shape":"DeletePermissionPolicyResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFStaleDataException"},
+        {"shape":"WAFNonexistentItemException"}
+      ]
+    },
+    "DeleteRateBasedRule":{
+      "name":"DeleteRateBasedRule",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteRateBasedRuleRequest"},
+      "output":{"shape":"DeleteRateBasedRuleResponse"},
+      "errors":[
+        {"shape":"WAFStaleDataException"},
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidAccountException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFReferencedItemException"},
+        {"shape":"WAFNonEmptyEntityException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"}
+      ]
+    },
+    "DeleteRegexMatchSet":{
+      "name":"DeleteRegexMatchSet",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteRegexMatchSetRequest"},
+      "output":{"shape":"DeleteRegexMatchSetResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidAccountException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFReferencedItemException"},
+        {"shape":"WAFStaleDataException"},
+        {"shape":"WAFNonEmptyEntityException"}
+      ]
+    },
+    "DeleteRegexPatternSet":{
+      "name":"DeleteRegexPatternSet",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteRegexPatternSetRequest"},
+      "output":{"shape":"DeleteRegexPatternSetResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidAccountException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFReferencedItemException"},
+        {"shape":"WAFStaleDataException"},
+        {"shape":"WAFNonEmptyEntityException"}
+      ]
+    },
     "DeleteRule":{
       "name":"DeleteRule",
       "http":{
@@ -178,7 +383,28 @@
         {"shape":"WAFInvalidAccountException"},
         {"shape":"WAFNonexistentItemException"},
         {"shape":"WAFReferencedItemException"},
-        {"shape":"WAFNonEmptyEntityException"}
+        {"shape":"WAFNonEmptyEntityException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"}
+      ]
+    },
+    "DeleteRuleGroup":{
+      "name":"DeleteRuleGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteRuleGroupRequest"},
+      "output":{"shape":"DeleteRuleGroupResponse"},
+      "errors":[
+        {"shape":"WAFStaleDataException"},
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFReferencedItemException"},
+        {"shape":"WAFNonEmptyEntityException"},
+        {"shape":"WAFInvalidOperationException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"}
       ]
     },
     "DeleteSizeConstraintSet":{
@@ -229,7 +455,9 @@
         {"shape":"WAFInvalidAccountException"},
         {"shape":"WAFNonexistentItemException"},
         {"shape":"WAFReferencedItemException"},
-        {"shape":"WAFNonEmptyEntityException"}
+        {"shape":"WAFNonEmptyEntityException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"}
       ]
     },
     "DeleteXssMatchSet":{
@@ -288,6 +516,20 @@
         {"shape":"WAFInternalErrorException"}
       ]
     },
+    "GetGeoMatchSet":{
+      "name":"GetGeoMatchSet",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetGeoMatchSetRequest"},
+      "output":{"shape":"GetGeoMatchSetResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidAccountException"},
+        {"shape":"WAFNonexistentItemException"}
+      ]
+    },
     "GetIPSet":{
       "name":"GetIPSet",
       "http":{
@@ -302,6 +544,89 @@
         {"shape":"WAFNonexistentItemException"}
       ]
     },
+    "GetLoggingConfiguration":{
+      "name":"GetLoggingConfiguration",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetLoggingConfigurationRequest"},
+      "output":{"shape":"GetLoggingConfigurationResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFNonexistentItemException"}
+      ]
+    },
+    "GetPermissionPolicy":{
+      "name":"GetPermissionPolicy",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetPermissionPolicyRequest"},
+      "output":{"shape":"GetPermissionPolicyResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFNonexistentItemException"}
+      ]
+    },
+    "GetRateBasedRule":{
+      "name":"GetRateBasedRule",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetRateBasedRuleRequest"},
+      "output":{"shape":"GetRateBasedRuleResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidAccountException"},
+        {"shape":"WAFNonexistentItemException"}
+      ]
+    },
+    "GetRateBasedRuleManagedKeys":{
+      "name":"GetRateBasedRuleManagedKeys",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetRateBasedRuleManagedKeysRequest"},
+      "output":{"shape":"GetRateBasedRuleManagedKeysResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidAccountException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFInvalidParameterException"}
+      ]
+    },
+    "GetRegexMatchSet":{
+      "name":"GetRegexMatchSet",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetRegexMatchSetRequest"},
+      "output":{"shape":"GetRegexMatchSetResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidAccountException"},
+        {"shape":"WAFNonexistentItemException"}
+      ]
+    },
+    "GetRegexPatternSet":{
+      "name":"GetRegexPatternSet",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetRegexPatternSetRequest"},
+      "output":{"shape":"GetRegexPatternSetResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidAccountException"},
+        {"shape":"WAFNonexistentItemException"}
+      ]
+    },
     "GetRule":{
       "name":"GetRule",
       "http":{
@@ -316,6 +641,19 @@
         {"shape":"WAFNonexistentItemException"}
       ]
     },
+    "GetRuleGroup":{
+      "name":"GetRuleGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetRuleGroupRequest"},
+      "output":{"shape":"GetRuleGroupResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFNonexistentItemException"}
+      ]
+    },
     "GetSampledRequests":{
       "name":"GetSampledRequests",
       "http":{
@@ -385,6 +723,20 @@
         {"shape":"WAFNonexistentItemException"}
       ]
     },
+    "ListActivatedRulesInRuleGroup":{
+      "name":"ListActivatedRulesInRuleGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListActivatedRulesInRuleGroupRequest"},
+      "output":{"shape":"ListActivatedRulesInRuleGroupResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFInvalidParameterException"}
+      ]
+    },
     "ListByteMatchSets":{
       "name":"ListByteMatchSets",
       "http":{
@@ -398,6 +750,19 @@
         {"shape":"WAFInvalidAccountException"}
       ]
     },
+    "ListGeoMatchSets":{
+      "name":"ListGeoMatchSets",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListGeoMatchSetsRequest"},
+      "output":{"shape":"ListGeoMatchSetsResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidAccountException"}
+      ]
+    },
     "ListIPSets":{
       "name":"ListIPSets",
       "http":{
@@ -411,21 +776,86 @@
         {"shape":"WAFInvalidAccountException"}
       ]
     },
-    "ListRules":{
-      "name":"ListRules",
+    "ListLoggingConfigurations":{
+      "name":"ListLoggingConfigurations",
       "http":{
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{"shape":"ListRulesRequest"},
-      "output":{"shape":"ListRulesResponse"},
+      "input":{"shape":"ListLoggingConfigurationsRequest"},
+      "output":{"shape":"ListLoggingConfigurationsResponse"},
       "errors":[
         {"shape":"WAFInternalErrorException"},
-        {"shape":"WAFInvalidAccountException"}
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFInvalidParameterException"}
       ]
     },
-    "ListSizeConstraintSets":{
-      "name":"ListSizeConstraintSets",
+    "ListRateBasedRules":{
+      "name":"ListRateBasedRules",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListRateBasedRulesRequest"},
+      "output":{"shape":"ListRateBasedRulesResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidAccountException"}
+      ]
+    },
+    "ListRegexMatchSets":{
+      "name":"ListRegexMatchSets",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListRegexMatchSetsRequest"},
+      "output":{"shape":"ListRegexMatchSetsResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidAccountException"}
+      ]
+    },
+    "ListRegexPatternSets":{
+      "name":"ListRegexPatternSets",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListRegexPatternSetsRequest"},
+      "output":{"shape":"ListRegexPatternSetsResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidAccountException"}
+      ]
+    },
+    "ListRuleGroups":{
+      "name":"ListRuleGroups",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListRuleGroupsRequest"},
+      "output":{"shape":"ListRuleGroupsResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"}
+      ]
+    },
+    "ListRules":{
+      "name":"ListRules",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListRulesRequest"},
+      "output":{"shape":"ListRulesResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidAccountException"}
+      ]
+    },
+    "ListSizeConstraintSets":{
+      "name":"ListSizeConstraintSets",
       "http":{
         "method":"POST",
         "requestUri":"/"
@@ -450,6 +880,36 @@
         {"shape":"WAFInvalidAccountException"}
       ]
     },
+    "ListSubscribedRuleGroups":{
+      "name":"ListSubscribedRuleGroups",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListSubscribedRuleGroupsRequest"},
+      "output":{"shape":"ListSubscribedRuleGroupsResponse"},
+      "errors":[
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFInternalErrorException"}
+      ]
+    },
+    "ListTagsForResource":{
+      "name":"ListTagsForResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListTagsForResourceRequest"},
+      "output":{"shape":"ListTagsForResourceResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFBadRequestException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"}
+      ]
+    },
     "ListWebACLs":{
       "name":"ListWebACLs",
       "http":{
@@ -476,6 +936,71 @@
         {"shape":"WAFInvalidAccountException"}
       ]
     },
+    "PutLoggingConfiguration":{
+      "name":"PutLoggingConfiguration",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"PutLoggingConfigurationRequest"},
+      "output":{"shape":"PutLoggingConfigurationResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFStaleDataException"},
+        {"shape":"WAFServiceLinkedRoleErrorException"}
+      ]
+    },
+    "PutPermissionPolicy":{
+      "name":"PutPermissionPolicy",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"PutPermissionPolicyRequest"},
+      "output":{"shape":"PutPermissionPolicyResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFStaleDataException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFInvalidPermissionPolicyException"}
+      ]
+    },
+    "TagResource":{
+      "name":"TagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"TagResourceRequest"},
+      "output":{"shape":"TagResourceResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFLimitsExceededException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFBadRequestException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"}
+      ]
+    },
+    "UntagResource":{
+      "name":"UntagResource",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UntagResourceRequest"},
+      "output":{"shape":"UntagResourceResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFBadRequestException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"}
+      ]
+    },
     "UpdateByteMatchSet":{
       "name":"UpdateByteMatchSet",
       "http":{
@@ -495,6 +1020,26 @@
         {"shape":"WAFLimitsExceededException"}
       ]
     },
+    "UpdateGeoMatchSet":{
+      "name":"UpdateGeoMatchSet",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateGeoMatchSetRequest"},
+      "output":{"shape":"UpdateGeoMatchSetResponse"},
+      "errors":[
+        {"shape":"WAFStaleDataException"},
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidAccountException"},
+        {"shape":"WAFInvalidOperationException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFNonexistentContainerException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFReferencedItemException"},
+        {"shape":"WAFLimitsExceededException"}
+      ]
+    },
     "UpdateIPSet":{
       "name":"UpdateIPSet",
       "http":{
@@ -515,6 +1060,64 @@
         {"shape":"WAFLimitsExceededException"}
       ]
     },
+    "UpdateRateBasedRule":{
+      "name":"UpdateRateBasedRule",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateRateBasedRuleRequest"},
+      "output":{"shape":"UpdateRateBasedRuleResponse"},
+      "errors":[
+        {"shape":"WAFStaleDataException"},
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFInvalidAccountException"},
+        {"shape":"WAFInvalidOperationException"},
+        {"shape":"WAFInvalidParameterException"},
+        {"shape":"WAFNonexistentContainerException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFReferencedItemException"},
+        {"shape":"WAFLimitsExceededException"}
+      ]
+    },
+    "UpdateRegexMatchSet":{
+      "name":"UpdateRegexMatchSet",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateRegexMatchSetRequest"},
+      "output":{"shape":"UpdateRegexMatchSetResponse"},
+      "errors":[
+        {"shape":"WAFStaleDataException"},
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFDisallowedNameException"},
+        {"shape":"WAFLimitsExceededException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFNonexistentContainerException"},
+        {"shape":"WAFInvalidOperationException"},
+        {"shape":"WAFInvalidAccountException"}
+      ]
+    },
+    "UpdateRegexPatternSet":{
+      "name":"UpdateRegexPatternSet",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateRegexPatternSetRequest"},
+      "output":{"shape":"UpdateRegexPatternSetResponse"},
+      "errors":[
+        {"shape":"WAFStaleDataException"},
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFLimitsExceededException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFNonexistentContainerException"},
+        {"shape":"WAFInvalidOperationException"},
+        {"shape":"WAFInvalidAccountException"},
+        {"shape":"WAFInvalidRegexPatternException"}
+      ]
+    },
     "UpdateRule":{
       "name":"UpdateRule",
       "http":{
@@ -535,6 +1138,24 @@
         {"shape":"WAFLimitsExceededException"}
       ]
     },
+    "UpdateRuleGroup":{
+      "name":"UpdateRuleGroup",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateRuleGroupRequest"},
+      "output":{"shape":"UpdateRuleGroupResponse"},
+      "errors":[
+        {"shape":"WAFStaleDataException"},
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFNonexistentContainerException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFInvalidOperationException"},
+        {"shape":"WAFLimitsExceededException"},
+        {"shape":"WAFInvalidParameterException"}
+      ]
+    },
     "UpdateSizeConstraintSet":{
       "name":"UpdateSizeConstraintSet",
       "http":{
@@ -591,7 +1212,8 @@
         {"shape":"WAFNonexistentContainerException"},
         {"shape":"WAFNonexistentItemException"},
         {"shape":"WAFReferencedItemException"},
-        {"shape":"WAFLimitsExceededException"}
+        {"shape":"WAFLimitsExceededException"},
+        {"shape":"WAFSubscriptionNotFoundException"}
       ]
     },
     "UpdateXssMatchSet":{
@@ -620,13 +1242,15 @@
       "type":"structure",
       "required":[
         "Priority",
-        "RuleId",
-        "Action"
+        "RuleId"
       ],
       "members":{
         "Priority":{"shape":"RulePriority"},
         "RuleId":{"shape":"ResourceId"},
-        "Action":{"shape":"WafAction"}
+        "Action":{"shape":"WafAction"},
+        "OverrideAction":{"shape":"WafOverrideAction"},
+        "Type":{"shape":"WafRuleType"},
+        "ExcludedRules":{"shape":"ExcludedRules"}
       }
     },
     "ActivatedRules":{
@@ -673,7 +1297,8 @@
     },
     "ByteMatchSetUpdates":{
       "type":"list",
-      "member":{"shape":"ByteMatchSetUpdate"}
+      "member":{"shape":"ByteMatchSetUpdate"},
+      "min":1
     },
     "ByteMatchTargetString":{"type":"blob"},
     "ByteMatchTuple":{
@@ -704,7 +1329,9 @@
     },
     "ChangeToken":{
       "type":"string",
-      "min":1
+      "max":128,
+      "min":1,
+      "pattern":".*\\S.*"
     },
     "ChangeTokenStatus":{
       "type":"string",
@@ -744,7 +1371,7 @@
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
-    "CreateIPSetRequest":{
+    "CreateGeoMatchSetRequest":{
       "type":"structure",
       "required":[
         "Name",
@@ -755,52 +1382,57 @@
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
-    "CreateIPSetResponse":{
+    "CreateGeoMatchSetResponse":{
       "type":"structure",
       "members":{
-        "IPSet":{"shape":"IPSet"},
+        "GeoMatchSet":{"shape":"GeoMatchSet"},
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
-    "CreateRuleRequest":{
+    "CreateIPSetRequest":{
       "type":"structure",
       "required":[
         "Name",
-        "MetricName",
         "ChangeToken"
       ],
       "members":{
         "Name":{"shape":"ResourceName"},
-        "MetricName":{"shape":"MetricName"},
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
-    "CreateRuleResponse":{
+    "CreateIPSetResponse":{
       "type":"structure",
       "members":{
-        "Rule":{"shape":"Rule"},
+        "IPSet":{"shape":"IPSet"},
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
-    "CreateSizeConstraintSetRequest":{
+    "CreateRateBasedRuleRequest":{
       "type":"structure",
       "required":[
         "Name",
+        "MetricName",
+        "RateKey",
+        "RateLimit",
         "ChangeToken"
       ],
       "members":{
         "Name":{"shape":"ResourceName"},
-        "ChangeToken":{"shape":"ChangeToken"}
+        "MetricName":{"shape":"MetricName"},
+        "RateKey":{"shape":"RateKey"},
+        "RateLimit":{"shape":"RateLimit"},
+        "ChangeToken":{"shape":"ChangeToken"},
+        "Tags":{"shape":"TagList"}
       }
     },
-    "CreateSizeConstraintSetResponse":{
+    "CreateRateBasedRuleResponse":{
       "type":"structure",
       "members":{
-        "SizeConstraintSet":{"shape":"SizeConstraintSet"},
+        "Rule":{"shape":"RateBasedRule"},
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
-    "CreateSqlInjectionMatchSetRequest":{
+    "CreateRegexMatchSetRequest":{
       "type":"structure",
       "required":[
         "Name",
@@ -811,112 +1443,338 @@
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
-    "CreateSqlInjectionMatchSetResponse":{
+    "CreateRegexMatchSetResponse":{
       "type":"structure",
       "members":{
-        "SqlInjectionMatchSet":{"shape":"SqlInjectionMatchSet"},
+        "RegexMatchSet":{"shape":"RegexMatchSet"},
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
-    "CreateWebACLRequest":{
+    "CreateRegexPatternSetRequest":{
       "type":"structure",
       "required":[
         "Name",
-        "MetricName",
-        "DefaultAction",
         "ChangeToken"
       ],
       "members":{
         "Name":{"shape":"ResourceName"},
-        "MetricName":{"shape":"MetricName"},
-        "DefaultAction":{"shape":"WafAction"},
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
-    "CreateWebACLResponse":{
+    "CreateRegexPatternSetResponse":{
       "type":"structure",
       "members":{
-        "WebACL":{"shape":"WebACL"},
+        "RegexPatternSet":{"shape":"RegexPatternSet"},
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
-    "CreateXssMatchSetRequest":{
+    "CreateRuleGroupRequest":{
       "type":"structure",
       "required":[
         "Name",
+        "MetricName",
         "ChangeToken"
       ],
       "members":{
         "Name":{"shape":"ResourceName"},
-        "ChangeToken":{"shape":"ChangeToken"}
+        "MetricName":{"shape":"MetricName"},
+        "ChangeToken":{"shape":"ChangeToken"},
+        "Tags":{"shape":"TagList"}
       }
     },
-    "CreateXssMatchSetResponse":{
+    "CreateRuleGroupResponse":{
       "type":"structure",
       "members":{
-        "XssMatchSet":{"shape":"XssMatchSet"},
+        "RuleGroup":{"shape":"RuleGroup"},
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
-    "DeleteByteMatchSetRequest":{
+    "CreateRuleRequest":{
       "type":"structure",
       "required":[
-        "ByteMatchSetId",
+        "Name",
+        "MetricName",
         "ChangeToken"
       ],
       "members":{
-        "ByteMatchSetId":{"shape":"ResourceId"},
-        "ChangeToken":{"shape":"ChangeToken"}
+        "Name":{"shape":"ResourceName"},
+        "MetricName":{"shape":"MetricName"},
+        "ChangeToken":{"shape":"ChangeToken"},
+        "Tags":{"shape":"TagList"}
       }
     },
-    "DeleteByteMatchSetResponse":{
+    "CreateRuleResponse":{
       "type":"structure",
       "members":{
+        "Rule":{"shape":"Rule"},
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
-    "DeleteIPSetRequest":{
+    "CreateSizeConstraintSetRequest":{
       "type":"structure",
       "required":[
-        "IPSetId",
+        "Name",
         "ChangeToken"
       ],
       "members":{
-        "IPSetId":{"shape":"ResourceId"},
+        "Name":{"shape":"ResourceName"},
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
-    "DeleteIPSetResponse":{
+    "CreateSizeConstraintSetResponse":{
       "type":"structure",
       "members":{
+        "SizeConstraintSet":{"shape":"SizeConstraintSet"},
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
-    "DeleteRuleRequest":{
+    "CreateSqlInjectionMatchSetRequest":{
       "type":"structure",
       "required":[
-        "RuleId",
+        "Name",
         "ChangeToken"
       ],
       "members":{
-        "RuleId":{"shape":"ResourceId"},
+        "Name":{"shape":"ResourceName"},
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
-    "DeleteRuleResponse":{
+    "CreateSqlInjectionMatchSetResponse":{
       "type":"structure",
       "members":{
+        "SqlInjectionMatchSet":{"shape":"SqlInjectionMatchSet"},
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
-    "DeleteSizeConstraintSetRequest":{
+    "CreateWebACLMigrationStackRequest":{
       "type":"structure",
       "required":[
-        "SizeConstraintSetId",
-        "ChangeToken"
+        "WebACLId",
+        "S3BucketName",
+        "IgnoreUnsupportedType"
       ],
       "members":{
-        "SizeConstraintSetId":{"shape":"ResourceId"},
+        "WebACLId":{"shape":"ResourceId"},
+        "S3BucketName":{"shape":"S3BucketName"},
+        "IgnoreUnsupportedType":{"shape":"IgnoreUnsupportedType"}
+      }
+    },
+    "CreateWebACLMigrationStackResponse":{
+      "type":"structure",
+      "required":["S3ObjectUrl"],
+      "members":{
+        "S3ObjectUrl":{"shape":"S3ObjectUrl"}
+      }
+    },
+    "CreateWebACLRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "MetricName",
+        "DefaultAction",
+        "ChangeToken"
+      ],
+      "members":{
+        "Name":{"shape":"ResourceName"},
+        "MetricName":{"shape":"MetricName"},
+        "DefaultAction":{"shape":"WafAction"},
+        "ChangeToken":{"shape":"ChangeToken"},
+        "Tags":{"shape":"TagList"}
+      }
+    },
+    "CreateWebACLResponse":{
+      "type":"structure",
+      "members":{
+        "WebACL":{"shape":"WebACL"},
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "CreateXssMatchSetRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "ChangeToken"
+      ],
+      "members":{
+        "Name":{"shape":"ResourceName"},
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "CreateXssMatchSetResponse":{
+      "type":"structure",
+      "members":{
+        "XssMatchSet":{"shape":"XssMatchSet"},
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "DeleteByteMatchSetRequest":{
+      "type":"structure",
+      "required":[
+        "ByteMatchSetId",
+        "ChangeToken"
+      ],
+      "members":{
+        "ByteMatchSetId":{"shape":"ResourceId"},
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "DeleteByteMatchSetResponse":{
+      "type":"structure",
+      "members":{
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "DeleteGeoMatchSetRequest":{
+      "type":"structure",
+      "required":[
+        "GeoMatchSetId",
+        "ChangeToken"
+      ],
+      "members":{
+        "GeoMatchSetId":{"shape":"ResourceId"},
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "DeleteGeoMatchSetResponse":{
+      "type":"structure",
+      "members":{
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "DeleteIPSetRequest":{
+      "type":"structure",
+      "required":[
+        "IPSetId",
+        "ChangeToken"
+      ],
+      "members":{
+        "IPSetId":{"shape":"ResourceId"},
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "DeleteIPSetResponse":{
+      "type":"structure",
+      "members":{
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "DeleteLoggingConfigurationRequest":{
+      "type":"structure",
+      "required":["ResourceArn"],
+      "members":{
+        "ResourceArn":{"shape":"ResourceArn"}
+      }
+    },
+    "DeleteLoggingConfigurationResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DeletePermissionPolicyRequest":{
+      "type":"structure",
+      "required":["ResourceArn"],
+      "members":{
+        "ResourceArn":{"shape":"ResourceArn"}
+      }
+    },
+    "DeletePermissionPolicyResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "DeleteRateBasedRuleRequest":{
+      "type":"structure",
+      "required":[
+        "RuleId",
+        "ChangeToken"
+      ],
+      "members":{
+        "RuleId":{"shape":"ResourceId"},
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "DeleteRateBasedRuleResponse":{
+      "type":"structure",
+      "members":{
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "DeleteRegexMatchSetRequest":{
+      "type":"structure",
+      "required":[
+        "RegexMatchSetId",
+        "ChangeToken"
+      ],
+      "members":{
+        "RegexMatchSetId":{"shape":"ResourceId"},
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "DeleteRegexMatchSetResponse":{
+      "type":"structure",
+      "members":{
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "DeleteRegexPatternSetRequest":{
+      "type":"structure",
+      "required":[
+        "RegexPatternSetId",
+        "ChangeToken"
+      ],
+      "members":{
+        "RegexPatternSetId":{"shape":"ResourceId"},
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "DeleteRegexPatternSetResponse":{
+      "type":"structure",
+      "members":{
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "DeleteRuleGroupRequest":{
+      "type":"structure",
+      "required":[
+        "RuleGroupId",
+        "ChangeToken"
+      ],
+      "members":{
+        "RuleGroupId":{"shape":"ResourceId"},
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "DeleteRuleGroupResponse":{
+      "type":"structure",
+      "members":{
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "DeleteRuleRequest":{
+      "type":"structure",
+      "required":[
+        "RuleId",
+        "ChangeToken"
+      ],
+      "members":{
+        "RuleId":{"shape":"ResourceId"},
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "DeleteRuleResponse":{
+      "type":"structure",
+      "members":{
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "DeleteSizeConstraintSetRequest":{
+      "type":"structure",
+      "required":[
+        "SizeConstraintSetId",
+        "ChangeToken"
+      ],
+      "members":{
+        "SizeConstraintSetId":{"shape":"ResourceId"},
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
@@ -974,65 +1832,499 @@
     "DeleteXssMatchSetResponse":{
       "type":"structure",
       "members":{
-        "ChangeToken":{"shape":"ChangeToken"}
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "ErrorReason":{"type":"string"},
+    "ExcludedRule":{
+      "type":"structure",
+      "required":["RuleId"],
+      "members":{
+        "RuleId":{"shape":"ResourceId"}
+      }
+    },
+    "ExcludedRules":{
+      "type":"list",
+      "member":{"shape":"ExcludedRule"}
+    },
+    "FieldToMatch":{
+      "type":"structure",
+      "required":["Type"],
+      "members":{
+        "Type":{"shape":"MatchFieldType"},
+        "Data":{"shape":"MatchFieldData"}
+      }
+    },
+    "GeoMatchConstraint":{
+      "type":"structure",
+      "required":[
+        "Type",
+        "Value"
+      ],
+      "members":{
+        "Type":{"shape":"GeoMatchConstraintType"},
+        "Value":{"shape":"GeoMatchConstraintValue"}
+      }
+    },
+    "GeoMatchConstraintType":{
+      "type":"string",
+      "enum":["Country"]
+    },
+    "GeoMatchConstraintValue":{
+      "type":"string",
+      "enum":[
+        "AF",
+        "AX",
+        "AL",
+        "DZ",
+        "AS",
+        "AD",
+        "AO",
+        "AI",
+        "AQ",
+        "AG",
+        "AR",
+        "AM",
+        "AW",
+        "AU",
+        "AT",
+        "AZ",
+        "BS",
+        "BH",
+        "BD",
+        "BB",
+        "BY",
+        "BE",
+        "BZ",
+        "BJ",
+        "BM",
+        "BT",
+        "BO",
+        "BQ",
+        "BA",
+        "BW",
+        "BV",
+        "BR",
+        "IO",
+        "BN",
+        "BG",
+        "BF",
+        "BI",
+        "KH",
+        "CM",
+        "CA",
+        "CV",
+        "KY",
+        "CF",
+        "TD",
+        "CL",
+        "CN",
+        "CX",
+        "CC",
+        "CO",
+        "KM",
+        "CG",
+        "CD",
+        "CK",
+        "CR",
+        "CI",
+        "HR",
+        "CU",
+        "CW",
+        "CY",
+        "CZ",
+        "DK",
+        "DJ",
+        "DM",
+        "DO",
+        "EC",
+        "EG",
+        "SV",
+        "GQ",
+        "ER",
+        "EE",
+        "ET",
+        "FK",
+        "FO",
+        "FJ",
+        "FI",
+        "FR",
+        "GF",
+        "PF",
+        "TF",
+        "GA",
+        "GM",
+        "GE",
+        "DE",
+        "GH",
+        "GI",
+        "GR",
+        "GL",
+        "GD",
+        "GP",
+        "GU",
+        "GT",
+        "GG",
+        "GN",
+        "GW",
+        "GY",
+        "HT",
+        "HM",
+        "VA",
+        "HN",
+        "HK",
+        "HU",
+        "IS",
+        "IN",
+        "ID",
+        "IR",
+        "IQ",
+        "IE",
+        "IM",
+        "IL",
+        "IT",
+        "JM",
+        "JP",
+        "JE",
+        "JO",
+        "KZ",
+        "KE",
+        "KI",
+        "KP",
+        "KR",
+        "KW",
+        "KG",
+        "LA",
+        "LV",
+        "LB",
+        "LS",
+        "LR",
+        "LY",
+        "LI",
+        "LT",
+        "LU",
+        "MO",
+        "MK",
+        "MG",
+        "MW",
+        "MY",
+        "MV",
+        "ML",
+        "MT",
+        "MH",
+        "MQ",
+        "MR",
+        "MU",
+        "YT",
+        "MX",
+        "FM",
+        "MD",
+        "MC",
+        "MN",
+        "ME",
+        "MS",
+        "MA",
+        "MZ",
+        "MM",
+        "NA",
+        "NR",
+        "NP",
+        "NL",
+        "NC",
+        "NZ",
+        "NI",
+        "NE",
+        "NG",
+        "NU",
+        "NF",
+        "MP",
+        "NO",
+        "OM",
+        "PK",
+        "PW",
+        "PS",
+        "PA",
+        "PG",
+        "PY",
+        "PE",
+        "PH",
+        "PN",
+        "PL",
+        "PT",
+        "PR",
+        "QA",
+        "RE",
+        "RO",
+        "RU",
+        "RW",
+        "BL",
+        "SH",
+        "KN",
+        "LC",
+        "MF",
+        "PM",
+        "VC",
+        "WS",
+        "SM",
+        "ST",
+        "SA",
+        "SN",
+        "RS",
+        "SC",
+        "SL",
+        "SG",
+        "SX",
+        "SK",
+        "SI",
+        "SB",
+        "SO",
+        "ZA",
+        "GS",
+        "SS",
+        "ES",
+        "LK",
+        "SD",
+        "SR",
+        "SJ",
+        "SZ",
+        "SE",
+        "CH",
+        "SY",
+        "TW",
+        "TJ",
+        "TZ",
+        "TH",
+        "TL",
+        "TG",
+        "TK",
+        "TO",
+        "TT",
+        "TN",
+        "TR",
+        "TM",
+        "TC",
+        "TV",
+        "UG",
+        "UA",
+        "AE",
+        "GB",
+        "US",
+        "UM",
+        "UY",
+        "UZ",
+        "VU",
+        "VE",
+        "VN",
+        "VG",
+        "VI",
+        "WF",
+        "EH",
+        "YE",
+        "ZM",
+        "ZW"
+      ]
+    },
+    "GeoMatchConstraints":{
+      "type":"list",
+      "member":{"shape":"GeoMatchConstraint"}
+    },
+    "GeoMatchSet":{
+      "type":"structure",
+      "required":[
+        "GeoMatchSetId",
+        "GeoMatchConstraints"
+      ],
+      "members":{
+        "GeoMatchSetId":{"shape":"ResourceId"},
+        "Name":{"shape":"ResourceName"},
+        "GeoMatchConstraints":{"shape":"GeoMatchConstraints"}
+      }
+    },
+    "GeoMatchSetSummaries":{
+      "type":"list",
+      "member":{"shape":"GeoMatchSetSummary"}
+    },
+    "GeoMatchSetSummary":{
+      "type":"structure",
+      "required":[
+        "GeoMatchSetId",
+        "Name"
+      ],
+      "members":{
+        "GeoMatchSetId":{"shape":"ResourceId"},
+        "Name":{"shape":"ResourceName"}
+      }
+    },
+    "GeoMatchSetUpdate":{
+      "type":"structure",
+      "required":[
+        "Action",
+        "GeoMatchConstraint"
+      ],
+      "members":{
+        "Action":{"shape":"ChangeAction"},
+        "GeoMatchConstraint":{"shape":"GeoMatchConstraint"}
+      }
+    },
+    "GeoMatchSetUpdates":{
+      "type":"list",
+      "member":{"shape":"GeoMatchSetUpdate"},
+      "min":1
+    },
+    "GetByteMatchSetRequest":{
+      "type":"structure",
+      "required":["ByteMatchSetId"],
+      "members":{
+        "ByteMatchSetId":{"shape":"ResourceId"}
+      }
+    },
+    "GetByteMatchSetResponse":{
+      "type":"structure",
+      "members":{
+        "ByteMatchSet":{"shape":"ByteMatchSet"}
+      }
+    },
+    "GetChangeTokenRequest":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "GetChangeTokenResponse":{
+      "type":"structure",
+      "members":{
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "GetChangeTokenStatusRequest":{
+      "type":"structure",
+      "required":["ChangeToken"],
+      "members":{
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "GetChangeTokenStatusResponse":{
+      "type":"structure",
+      "members":{
+        "ChangeTokenStatus":{"shape":"ChangeTokenStatus"}
+      }
+    },
+    "GetGeoMatchSetRequest":{
+      "type":"structure",
+      "required":["GeoMatchSetId"],
+      "members":{
+        "GeoMatchSetId":{"shape":"ResourceId"}
+      }
+    },
+    "GetGeoMatchSetResponse":{
+      "type":"structure",
+      "members":{
+        "GeoMatchSet":{"shape":"GeoMatchSet"}
+      }
+    },
+    "GetIPSetRequest":{
+      "type":"structure",
+      "required":["IPSetId"],
+      "members":{
+        "IPSetId":{"shape":"ResourceId"}
+      }
+    },
+    "GetIPSetResponse":{
+      "type":"structure",
+      "members":{
+        "IPSet":{"shape":"IPSet"}
+      }
+    },
+    "GetLoggingConfigurationRequest":{
+      "type":"structure",
+      "required":["ResourceArn"],
+      "members":{
+        "ResourceArn":{"shape":"ResourceArn"}
+      }
+    },
+    "GetLoggingConfigurationResponse":{
+      "type":"structure",
+      "members":{
+        "LoggingConfiguration":{"shape":"LoggingConfiguration"}
+      }
+    },
+    "GetPermissionPolicyRequest":{
+      "type":"structure",
+      "required":["ResourceArn"],
+      "members":{
+        "ResourceArn":{"shape":"ResourceArn"}
+      }
+    },
+    "GetPermissionPolicyResponse":{
+      "type":"structure",
+      "members":{
+        "Policy":{"shape":"PolicyString"}
+      }
+    },
+    "GetRateBasedRuleManagedKeysRequest":{
+      "type":"structure",
+      "required":["RuleId"],
+      "members":{
+        "RuleId":{"shape":"ResourceId"},
+        "NextMarker":{"shape":"NextMarker"}
       }
     },
-    "FieldToMatch":{
+    "GetRateBasedRuleManagedKeysResponse":{
       "type":"structure",
-      "required":["Type"],
       "members":{
-        "Type":{"shape":"MatchFieldType"},
-        "Data":{"shape":"MatchFieldData"}
+        "ManagedKeys":{"shape":"ManagedKeys"},
+        "NextMarker":{"shape":"NextMarker"}
       }
     },
-    "GetByteMatchSetRequest":{
+    "GetRateBasedRuleRequest":{
       "type":"structure",
-      "required":["ByteMatchSetId"],
+      "required":["RuleId"],
       "members":{
-        "ByteMatchSetId":{"shape":"ResourceId"}
+        "RuleId":{"shape":"ResourceId"}
       }
     },
-    "GetByteMatchSetResponse":{
+    "GetRateBasedRuleResponse":{
       "type":"structure",
       "members":{
-        "ByteMatchSet":{"shape":"ByteMatchSet"}
+        "Rule":{"shape":"RateBasedRule"}
       }
     },
-    "GetChangeTokenRequest":{
+    "GetRegexMatchSetRequest":{
       "type":"structure",
+      "required":["RegexMatchSetId"],
       "members":{
+        "RegexMatchSetId":{"shape":"ResourceId"}
       }
     },
-    "GetChangeTokenResponse":{
+    "GetRegexMatchSetResponse":{
       "type":"structure",
       "members":{
-        "ChangeToken":{"shape":"ChangeToken"}
+        "RegexMatchSet":{"shape":"RegexMatchSet"}
       }
     },
-    "GetChangeTokenStatusRequest":{
+    "GetRegexPatternSetRequest":{
       "type":"structure",
-      "required":["ChangeToken"],
+      "required":["RegexPatternSetId"],
       "members":{
-        "ChangeToken":{"shape":"ChangeToken"}
+        "RegexPatternSetId":{"shape":"ResourceId"}
       }
     },
-    "GetChangeTokenStatusResponse":{
+    "GetRegexPatternSetResponse":{
       "type":"structure",
       "members":{
-        "ChangeTokenStatus":{"shape":"ChangeTokenStatus"}
+        "RegexPatternSet":{"shape":"RegexPatternSet"}
       }
     },
-    "GetIPSetRequest":{
+    "GetRuleGroupRequest":{
       "type":"structure",
-      "required":["IPSetId"],
+      "required":["RuleGroupId"],
       "members":{
-        "IPSetId":{"shape":"ResourceId"}
+        "RuleGroupId":{"shape":"ResourceId"}
       }
     },
-    "GetIPSetResponse":{
+    "GetRuleGroupResponse":{
       "type":"structure",
       "members":{
-        "IPSet":{"shape":"IPSet"}
+        "RuleGroup":{"shape":"RuleGroup"}
       }
     },
     "GetRuleRequest":{
@@ -1184,7 +2476,12 @@
         "IPV6"
       ]
     },
-    "IPSetDescriptorValue":{"type":"string"},
+    "IPSetDescriptorValue":{
+      "type":"string",
+      "max":50,
+      "min":1,
+      "pattern":".*\\S.*"
+    },
     "IPSetDescriptors":{
       "type":"list",
       "member":{"shape":"IPSetDescriptor"}
@@ -1217,9 +2514,26 @@
     },
     "IPSetUpdates":{
       "type":"list",
-      "member":{"shape":"IPSetUpdate"}
+      "member":{"shape":"IPSetUpdate"},
+      "min":1
     },
     "IPString":{"type":"string"},
+    "IgnoreUnsupportedType":{"type":"boolean"},
+    "ListActivatedRulesInRuleGroupRequest":{
+      "type":"structure",
+      "members":{
+        "RuleGroupId":{"shape":"ResourceId"},
+        "NextMarker":{"shape":"NextMarker"},
+        "Limit":{"shape":"PaginationLimit"}
+      }
+    },
+    "ListActivatedRulesInRuleGroupResponse":{
+      "type":"structure",
+      "members":{
+        "NextMarker":{"shape":"NextMarker"},
+        "ActivatedRules":{"shape":"ActivatedRules"}
+      }
+    },
     "ListByteMatchSetsRequest":{
       "type":"structure",
       "members":{
@@ -1234,6 +2548,20 @@
         "ByteMatchSets":{"shape":"ByteMatchSetSummaries"}
       }
     },
+    "ListGeoMatchSetsRequest":{
+      "type":"structure",
+      "members":{
+        "NextMarker":{"shape":"NextMarker"},
+        "Limit":{"shape":"PaginationLimit"}
+      }
+    },
+    "ListGeoMatchSetsResponse":{
+      "type":"structure",
+      "members":{
+        "NextMarker":{"shape":"NextMarker"},
+        "GeoMatchSets":{"shape":"GeoMatchSetSummaries"}
+      }
+    },
     "ListIPSetsRequest":{
       "type":"structure",
       "members":{
@@ -1248,6 +2576,76 @@
         "IPSets":{"shape":"IPSetSummaries"}
       }
     },
+    "ListLoggingConfigurationsRequest":{
+      "type":"structure",
+      "members":{
+        "NextMarker":{"shape":"NextMarker"},
+        "Limit":{"shape":"PaginationLimit"}
+      }
+    },
+    "ListLoggingConfigurationsResponse":{
+      "type":"structure",
+      "members":{
+        "LoggingConfigurations":{"shape":"LoggingConfigurations"},
+        "NextMarker":{"shape":"NextMarker"}
+      }
+    },
+    "ListRateBasedRulesRequest":{
+      "type":"structure",
+      "members":{
+        "NextMarker":{"shape":"NextMarker"},
+        "Limit":{"shape":"PaginationLimit"}
+      }
+    },
+    "ListRateBasedRulesResponse":{
+      "type":"structure",
+      "members":{
+        "NextMarker":{"shape":"NextMarker"},
+        "Rules":{"shape":"RuleSummaries"}
+      }
+    },
+    "ListRegexMatchSetsRequest":{
+      "type":"structure",
+      "members":{
+        "NextMarker":{"shape":"NextMarker"},
+        "Limit":{"shape":"PaginationLimit"}
+      }
+    },
+    "ListRegexMatchSetsResponse":{
+      "type":"structure",
+      "members":{
+        "NextMarker":{"shape":"NextMarker"},
+        "RegexMatchSets":{"shape":"RegexMatchSetSummaries"}
+      }
+    },
+    "ListRegexPatternSetsRequest":{
+      "type":"structure",
+      "members":{
+        "NextMarker":{"shape":"NextMarker"},
+        "Limit":{"shape":"PaginationLimit"}
+      }
+    },
+    "ListRegexPatternSetsResponse":{
+      "type":"structure",
+      "members":{
+        "NextMarker":{"shape":"NextMarker"},
+        "RegexPatternSets":{"shape":"RegexPatternSetSummaries"}
+      }
+    },
+    "ListRuleGroupsRequest":{
+      "type":"structure",
+      "members":{
+        "NextMarker":{"shape":"NextMarker"},
+        "Limit":{"shape":"PaginationLimit"}
+      }
+    },
+    "ListRuleGroupsResponse":{
+      "type":"structure",
+      "members":{
+        "NextMarker":{"shape":"NextMarker"},
+        "RuleGroups":{"shape":"RuleGroupSummaries"}
+      }
+    },
     "ListRulesRequest":{
       "type":"structure",
       "members":{
@@ -1290,6 +2688,36 @@
         "SqlInjectionMatchSets":{"shape":"SqlInjectionMatchSetSummaries"}
       }
     },
+    "ListSubscribedRuleGroupsRequest":{
+      "type":"structure",
+      "members":{
+        "NextMarker":{"shape":"NextMarker"},
+        "Limit":{"shape":"PaginationLimit"}
+      }
+    },
+    "ListSubscribedRuleGroupsResponse":{
+      "type":"structure",
+      "members":{
+        "NextMarker":{"shape":"NextMarker"},
+        "RuleGroups":{"shape":"SubscribedRuleGroupSummaries"}
+      }
+    },
+    "ListTagsForResourceRequest":{
+      "type":"structure",
+      "required":["ResourceARN"],
+      "members":{
+        "NextMarker":{"shape":"NextMarker"},
+        "Limit":{"shape":"PaginationLimit"},
+        "ResourceARN":{"shape":"ResourceArn"}
+      }
+    },
+    "ListTagsForResourceResponse":{
+      "type":"structure",
+      "members":{
+        "NextMarker":{"shape":"NextMarker"},
+        "TagInfoForResource":{"shape":"TagInfoForResource"}
+      }
+    },
     "ListWebACLsRequest":{
       "type":"structure",
       "members":{
@@ -1318,7 +2746,39 @@
         "XssMatchSets":{"shape":"XssMatchSetSummaries"}
       }
     },
-    "MatchFieldData":{"type":"string"},
+    "LogDestinationConfigs":{
+      "type":"list",
+      "member":{"shape":"ResourceArn"},
+      "max":1,
+      "min":1
+    },
+    "LoggingConfiguration":{
+      "type":"structure",
+      "required":[
+        "ResourceArn",
+        "LogDestinationConfigs"
+      ],
+      "members":{
+        "ResourceArn":{"shape":"ResourceArn"},
+        "LogDestinationConfigs":{"shape":"LogDestinationConfigs"},
+        "RedactedFields":{"shape":"RedactedFields"}
+      }
+    },
+    "LoggingConfigurations":{
+      "type":"list",
+      "member":{"shape":"LoggingConfiguration"}
+    },
+    "ManagedKey":{"type":"string"},
+    "ManagedKeys":{
+      "type":"list",
+      "member":{"shape":"ManagedKey"}
+    },
+    "MatchFieldData":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":".*\\S.*"
+    },
     "MatchFieldType":{
       "type":"string",
       "enum":[
@@ -1326,14 +2786,35 @@
         "QUERY_STRING",
         "HEADER",
         "METHOD",
-        "BODY"
+        "BODY",
+        "SINGLE_QUERY_ARG",
+        "ALL_QUERY_ARGS"
+      ]
+    },
+    "MetricName":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":".*\\S.*"
+    },
+    "MigrationErrorType":{
+      "type":"string",
+      "enum":[
+        "ENTITY_NOT_SUPPORTED",
+        "ENTITY_NOT_FOUND",
+        "S3_BUCKET_NO_PERMISSION",
+        "S3_BUCKET_NOT_ACCESSIBLE",
+        "S3_BUCKET_NOT_FOUND",
+        "S3_BUCKET_INVALID_REGION",
+        "S3_INTERNAL_ERROR"
       ]
     },
-    "MetricName":{"type":"string"},
     "Negated":{"type":"boolean"},
     "NextMarker":{
       "type":"string",
-      "min":1
+      "max":1224,
+      "min":1,
+      "pattern":".*\\S.*"
     },
     "PaginationLimit":{
       "type":"integer",
@@ -1345,13 +2826,22 @@
       "enum":[
         "CHANGE_ACTION",
         "WAF_ACTION",
+        "WAF_OVERRIDE_ACTION",
         "PREDICATE_TYPE",
         "IPSET_TYPE",
         "BYTE_MATCH_FIELD_TYPE",
         "SQL_INJECTION_MATCH_FIELD_TYPE",
         "BYTE_MATCH_TEXT_TRANSFORMATION",
         "BYTE_MATCH_POSITIONAL_CONSTRAINT",
-        "SIZE_CONSTRAINT_COMPARISON_OPERATOR"
+        "SIZE_CONSTRAINT_COMPARISON_OPERATOR",
+        "GEO_MATCH_LOCATION_TYPE",
+        "GEO_MATCH_LOCATION_VALUE",
+        "RATE_KEY",
+        "RULE_TYPE",
+        "NEXT_MARKER",
+        "RESOURCE_ARN",
+        "TAGS",
+        "TAG_KEYS"
       ]
     },
     "ParameterExceptionParameter":{
@@ -1362,9 +2852,17 @@
       "type":"string",
       "enum":[
         "INVALID_OPTION",
-        "ILLEGAL_COMBINATION"
+        "ILLEGAL_COMBINATION",
+        "ILLEGAL_ARGUMENT",
+        "INVALID_TAG_KEY"
       ]
     },
+    "PolicyString":{
+      "type":"string",
+      "max":395000,
+      "min":1,
+      "pattern":".*\\S.*"
+    },
     "PopulationSize":{"type":"long"},
     "PositionalConstraint":{
       "type":"string",
@@ -1376,42 +2874,221 @@
         "CONTAINS_WORD"
       ]
     },
-    "Predicate":{
+    "Predicate":{
+      "type":"structure",
+      "required":[
+        "Negated",
+        "Type",
+        "DataId"
+      ],
+      "members":{
+        "Negated":{"shape":"Negated"},
+        "Type":{"shape":"PredicateType"},
+        "DataId":{"shape":"ResourceId"}
+      }
+    },
+    "PredicateType":{
+      "type":"string",
+      "enum":[
+        "IPMatch",
+        "ByteMatch",
+        "SqlInjectionMatch",
+        "GeoMatch",
+        "SizeConstraint",
+        "XssMatch",
+        "RegexMatch"
+      ]
+    },
+    "Predicates":{
+      "type":"list",
+      "member":{"shape":"Predicate"}
+    },
+    "PutLoggingConfigurationRequest":{
+      "type":"structure",
+      "required":["LoggingConfiguration"],
+      "members":{
+        "LoggingConfiguration":{"shape":"LoggingConfiguration"}
+      }
+    },
+    "PutLoggingConfigurationResponse":{
+      "type":"structure",
+      "members":{
+        "LoggingConfiguration":{"shape":"LoggingConfiguration"}
+      }
+    },
+    "PutPermissionPolicyRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceArn",
+        "Policy"
+      ],
+      "members":{
+        "ResourceArn":{"shape":"ResourceArn"},
+        "Policy":{"shape":"PolicyString"}
+      }
+    },
+    "PutPermissionPolicyResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "RateBasedRule":{
+      "type":"structure",
+      "required":[
+        "RuleId",
+        "MatchPredicates",
+        "RateKey",
+        "RateLimit"
+      ],
+      "members":{
+        "RuleId":{"shape":"ResourceId"},
+        "Name":{"shape":"ResourceName"},
+        "MetricName":{"shape":"MetricName"},
+        "MatchPredicates":{"shape":"Predicates"},
+        "RateKey":{"shape":"RateKey"},
+        "RateLimit":{"shape":"RateLimit"}
+      }
+    },
+    "RateKey":{
+      "type":"string",
+      "enum":["IP"]
+    },
+    "RateLimit":{
+      "type":"long",
+      "max":2000000000,
+      "min":100
+    },
+    "RedactedFields":{
+      "type":"list",
+      "member":{"shape":"FieldToMatch"}
+    },
+    "RegexMatchSet":{
+      "type":"structure",
+      "members":{
+        "RegexMatchSetId":{"shape":"ResourceId"},
+        "Name":{"shape":"ResourceName"},
+        "RegexMatchTuples":{"shape":"RegexMatchTuples"}
+      }
+    },
+    "RegexMatchSetSummaries":{
+      "type":"list",
+      "member":{"shape":"RegexMatchSetSummary"}
+    },
+    "RegexMatchSetSummary":{
+      "type":"structure",
+      "required":[
+        "RegexMatchSetId",
+        "Name"
+      ],
+      "members":{
+        "RegexMatchSetId":{"shape":"ResourceId"},
+        "Name":{"shape":"ResourceName"}
+      }
+    },
+    "RegexMatchSetUpdate":{
+      "type":"structure",
+      "required":[
+        "Action",
+        "RegexMatchTuple"
+      ],
+      "members":{
+        "Action":{"shape":"ChangeAction"},
+        "RegexMatchTuple":{"shape":"RegexMatchTuple"}
+      }
+    },
+    "RegexMatchSetUpdates":{
+      "type":"list",
+      "member":{"shape":"RegexMatchSetUpdate"},
+      "min":1
+    },
+    "RegexMatchTuple":{
+      "type":"structure",
+      "required":[
+        "FieldToMatch",
+        "TextTransformation",
+        "RegexPatternSetId"
+      ],
+      "members":{
+        "FieldToMatch":{"shape":"FieldToMatch"},
+        "TextTransformation":{"shape":"TextTransformation"},
+        "RegexPatternSetId":{"shape":"ResourceId"}
+      }
+    },
+    "RegexMatchTuples":{
+      "type":"list",
+      "member":{"shape":"RegexMatchTuple"}
+    },
+    "RegexPatternSet":{
+      "type":"structure",
+      "required":[
+        "RegexPatternSetId",
+        "RegexPatternStrings"
+      ],
+      "members":{
+        "RegexPatternSetId":{"shape":"ResourceId"},
+        "Name":{"shape":"ResourceName"},
+        "RegexPatternStrings":{"shape":"RegexPatternStrings"}
+      }
+    },
+    "RegexPatternSetSummaries":{
+      "type":"list",
+      "member":{"shape":"RegexPatternSetSummary"}
+    },
+    "RegexPatternSetSummary":{
       "type":"structure",
       "required":[
-        "Negated",
-        "Type",
-        "DataId"
+        "RegexPatternSetId",
+        "Name"
       ],
       "members":{
-        "Negated":{"shape":"Negated"},
-        "Type":{"shape":"PredicateType"},
-        "DataId":{"shape":"ResourceId"}
+        "RegexPatternSetId":{"shape":"ResourceId"},
+        "Name":{"shape":"ResourceName"}
       }
     },
-    "PredicateType":{
+    "RegexPatternSetUpdate":{
+      "type":"structure",
+      "required":[
+        "Action",
+        "RegexPatternString"
+      ],
+      "members":{
+        "Action":{"shape":"ChangeAction"},
+        "RegexPatternString":{"shape":"RegexPatternString"}
+      }
+    },
+    "RegexPatternSetUpdates":{
+      "type":"list",
+      "member":{"shape":"RegexPatternSetUpdate"},
+      "min":1
+    },
+    "RegexPatternString":{
       "type":"string",
-      "enum":[
-        "IPMatch",
-        "ByteMatch",
-        "SqlInjectionMatch",
-        "SizeConstraint",
-        "XssMatch"
-      ]
+      "max":512,
+      "min":1,
+      "pattern":".*"
     },
-    "Predicates":{
+    "RegexPatternStrings":{
       "type":"list",
-      "member":{"shape":"Predicate"}
+      "member":{"shape":"RegexPatternString"},
+      "max":10
+    },
+    "ResourceArn":{
+      "type":"string",
+      "max":1224,
+      "min":1,
+      "pattern":".*\\S.*"
     },
     "ResourceId":{
       "type":"string",
       "max":128,
-      "min":1
+      "min":1,
+      "pattern":".*\\S.*"
     },
     "ResourceName":{
       "type":"string",
       "max":128,
-      "min":1
+      "min":1,
+      "pattern":".*\\S.*"
     },
     "Rule":{
       "type":"structure",
@@ -1426,6 +3103,46 @@
         "Predicates":{"shape":"Predicates"}
       }
     },
+    "RuleGroup":{
+      "type":"structure",
+      "required":["RuleGroupId"],
+      "members":{
+        "RuleGroupId":{"shape":"ResourceId"},
+        "Name":{"shape":"ResourceName"},
+        "MetricName":{"shape":"MetricName"}
+      }
+    },
+    "RuleGroupSummaries":{
+      "type":"list",
+      "member":{"shape":"RuleGroupSummary"}
+    },
+    "RuleGroupSummary":{
+      "type":"structure",
+      "required":[
+        "RuleGroupId",
+        "Name"
+      ],
+      "members":{
+        "RuleGroupId":{"shape":"ResourceId"},
+        "Name":{"shape":"ResourceName"}
+      }
+    },
+    "RuleGroupUpdate":{
+      "type":"structure",
+      "required":[
+        "Action",
+        "ActivatedRule"
+      ],
+      "members":{
+        "Action":{"shape":"ChangeAction"},
+        "ActivatedRule":{"shape":"ActivatedRule"}
+      }
+    },
+    "RuleGroupUpdates":{
+      "type":"list",
+      "member":{"shape":"RuleGroupUpdate"},
+      "min":1
+    },
     "RulePriority":{"type":"integer"},
     "RuleSummaries":{
       "type":"list",
@@ -1457,6 +3174,16 @@
       "type":"list",
       "member":{"shape":"RuleUpdate"}
     },
+    "S3BucketName":{
+      "type":"string",
+      "max":63,
+      "min":3,
+      "pattern":"^aws-waf-migration-[0-9A-Za-z\\.\\-_]*"
+    },
+    "S3ObjectUrl":{
+      "type":"string",
+      "min":1
+    },
     "SampleWeight":{
       "type":"long",
       "min":0
@@ -1471,7 +3198,8 @@
         "Request":{"shape":"HTTPRequest"},
         "Weight":{"shape":"SampleWeight"},
         "Timestamp":{"shape":"Timestamp"},
-        "Action":{"shape":"Action"}
+        "Action":{"shape":"Action"},
+        "RuleWithinRuleGroup":{"shape":"ResourceId"}
       }
     },
     "SampledHTTPRequests":{
@@ -1538,7 +3266,8 @@
     },
     "SizeConstraintSetUpdates":{
       "type":"list",
-      "member":{"shape":"SizeConstraintSetUpdate"}
+      "member":{"shape":"SizeConstraintSetUpdate"},
+      "min":1
     },
     "SizeConstraints":{
       "type":"list",
@@ -1584,7 +3313,8 @@
     },
     "SqlInjectionMatchSetUpdates":{
       "type":"list",
-      "member":{"shape":"SqlInjectionMatchSetUpdate"}
+      "member":{"shape":"SqlInjectionMatchSetUpdate"},
+      "min":1
     },
     "SqlInjectionMatchTuple":{
       "type":"structure",
@@ -1601,6 +3331,79 @@
       "type":"list",
       "member":{"shape":"SqlInjectionMatchTuple"}
     },
+    "SubscribedRuleGroupSummaries":{
+      "type":"list",
+      "member":{"shape":"SubscribedRuleGroupSummary"}
+    },
+    "SubscribedRuleGroupSummary":{
+      "type":"structure",
+      "required":[
+        "RuleGroupId",
+        "Name",
+        "MetricName"
+      ],
+      "members":{
+        "RuleGroupId":{"shape":"ResourceId"},
+        "Name":{"shape":"ResourceName"},
+        "MetricName":{"shape":"MetricName"}
+      }
+    },
+    "Tag":{
+      "type":"structure",
+      "required":[
+        "Key",
+        "Value"
+      ],
+      "members":{
+        "Key":{"shape":"TagKey"},
+        "Value":{"shape":"TagValue"}
+      }
+    },
+    "TagInfoForResource":{
+      "type":"structure",
+      "members":{
+        "ResourceARN":{"shape":"ResourceArn"},
+        "TagList":{"shape":"TagList"}
+      }
+    },
+    "TagKey":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":".*\\S.*"
+    },
+    "TagKeyList":{
+      "type":"list",
+      "member":{"shape":"TagKey"},
+      "min":1
+    },
+    "TagList":{
+      "type":"list",
+      "member":{"shape":"Tag"},
+      "min":1
+    },
+    "TagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceARN",
+        "Tags"
+      ],
+      "members":{
+        "ResourceARN":{"shape":"ResourceArn"},
+        "Tags":{"shape":"TagList"}
+      }
+    },
+    "TagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
+    "TagValue":{
+      "type":"string",
+      "max":256,
+      "min":0,
+      "pattern":".*"
+    },
     "TextTransformation":{
       "type":"string",
       "enum":[
@@ -1625,6 +3428,22 @@
     },
     "Timestamp":{"type":"timestamp"},
     "URIString":{"type":"string"},
+    "UntagResourceRequest":{
+      "type":"structure",
+      "required":[
+        "ResourceARN",
+        "TagKeys"
+      ],
+      "members":{
+        "ResourceARN":{"shape":"ResourceArn"},
+        "TagKeys":{"shape":"TagKeyList"}
+      }
+    },
+    "UntagResourceResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "UpdateByteMatchSetRequest":{
       "type":"structure",
       "required":[
@@ -1644,6 +3463,25 @@
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
+    "UpdateGeoMatchSetRequest":{
+      "type":"structure",
+      "required":[
+        "GeoMatchSetId",
+        "ChangeToken",
+        "Updates"
+      ],
+      "members":{
+        "GeoMatchSetId":{"shape":"ResourceId"},
+        "ChangeToken":{"shape":"ChangeToken"},
+        "Updates":{"shape":"GeoMatchSetUpdates"}
+      }
+    },
+    "UpdateGeoMatchSetResponse":{
+      "type":"structure",
+      "members":{
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
     "UpdateIPSetRequest":{
       "type":"structure",
       "required":[
@@ -1663,6 +3501,84 @@
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
+    "UpdateRateBasedRuleRequest":{
+      "type":"structure",
+      "required":[
+        "RuleId",
+        "ChangeToken",
+        "Updates",
+        "RateLimit"
+      ],
+      "members":{
+        "RuleId":{"shape":"ResourceId"},
+        "ChangeToken":{"shape":"ChangeToken"},
+        "Updates":{"shape":"RuleUpdates"},
+        "RateLimit":{"shape":"RateLimit"}
+      }
+    },
+    "UpdateRateBasedRuleResponse":{
+      "type":"structure",
+      "members":{
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "UpdateRegexMatchSetRequest":{
+      "type":"structure",
+      "required":[
+        "RegexMatchSetId",
+        "Updates",
+        "ChangeToken"
+      ],
+      "members":{
+        "RegexMatchSetId":{"shape":"ResourceId"},
+        "Updates":{"shape":"RegexMatchSetUpdates"},
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "UpdateRegexMatchSetResponse":{
+      "type":"structure",
+      "members":{
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "UpdateRegexPatternSetRequest":{
+      "type":"structure",
+      "required":[
+        "RegexPatternSetId",
+        "Updates",
+        "ChangeToken"
+      ],
+      "members":{
+        "RegexPatternSetId":{"shape":"ResourceId"},
+        "Updates":{"shape":"RegexPatternSetUpdates"},
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "UpdateRegexPatternSetResponse":{
+      "type":"structure",
+      "members":{
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "UpdateRuleGroupRequest":{
+      "type":"structure",
+      "required":[
+        "RuleGroupId",
+        "Updates",
+        "ChangeToken"
+      ],
+      "members":{
+        "RuleGroupId":{"shape":"ResourceId"},
+        "Updates":{"shape":"RuleGroupUpdates"},
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "UpdateRuleGroupResponse":{
+      "type":"structure",
+      "members":{
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
     "UpdateRuleRequest":{
       "type":"structure",
       "required":[
@@ -1758,6 +3674,13 @@
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
+    "WAFBadRequestException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"errorMessage"}
+      },
+      "exception":true
+    },
     "WAFDisallowedNameException":{
       "type":"structure",
       "members":{
@@ -1765,6 +3688,15 @@
       },
       "exception":true
     },
+    "WAFEntityMigrationException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"errorMessage"},
+        "MigrationErrorType":{"shape":"MigrationErrorType"},
+        "MigrationErrorReason":{"shape":"ErrorReason"}
+      },
+      "exception":true
+    },
     "WAFInternalErrorException":{
       "type":"structure",
       "members":{
@@ -1795,6 +3727,20 @@
       },
       "exception":true
     },
+    "WAFInvalidPermissionPolicyException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"errorMessage"}
+      },
+      "exception":true
+    },
+    "WAFInvalidRegexPatternException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"errorMessage"}
+      },
+      "exception":true
+    },
     "WAFLimitsExceededException":{
       "type":"structure",
       "members":{
@@ -1830,6 +3776,13 @@
       },
       "exception":true
     },
+    "WAFServiceLinkedRoleErrorException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"errorMessage"}
+      },
+      "exception":true
+    },
     "WAFStaleDataException":{
       "type":"structure",
       "members":{
@@ -1837,6 +3790,28 @@
       },
       "exception":true
     },
+    "WAFSubscriptionNotFoundException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"errorMessage"}
+      },
+      "exception":true
+    },
+    "WAFTagOperationException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"errorMessage"}
+      },
+      "exception":true
+    },
+    "WAFTagOperationInternalErrorException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"errorMessage"}
+      },
+      "exception":true,
+      "fault":true
+    },
     "WafAction":{
       "type":"structure",
       "required":["Type"],
@@ -1852,6 +3827,28 @@
         "COUNT"
       ]
     },
+    "WafOverrideAction":{
+      "type":"structure",
+      "required":["Type"],
+      "members":{
+        "Type":{"shape":"WafOverrideActionType"}
+      }
+    },
+    "WafOverrideActionType":{
+      "type":"string",
+      "enum":[
+        "NONE",
+        "COUNT"
+      ]
+    },
+    "WafRuleType":{
+      "type":"string",
+      "enum":[
+        "REGULAR",
+        "RATE_BASED",
+        "GROUP"
+      ]
+    },
     "WebACL":{
       "type":"structure",
       "required":[
@@ -1864,7 +3861,8 @@
         "Name":{"shape":"ResourceName"},
         "MetricName":{"shape":"MetricName"},
         "DefaultAction":{"shape":"WafAction"},
-        "Rules":{"shape":"ActivatedRules"}
+        "Rules":{"shape":"ActivatedRules"},
+        "WebACLArn":{"shape":"ResourceArn"}
       }
     },
     "WebACLSummaries":{
@@ -1937,7 +3935,8 @@
     },
     "XssMatchSetUpdates":{
       "type":"list",
-      "member":{"shape":"XssMatchSetUpdate"}
+      "member":{"shape":"XssMatchSetUpdate"},
+      "min":1
     },
     "XssMatchTuple":{
       "type":"structure",