aws-sdk-core 2.10.71 → 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"
@@ -76,7 +77,10 @@
         {"shape":"WAFInternalErrorException"},
         {"shape":"WAFDisallowedNameException"},
         {"shape":"WAFInvalidParameterException"},
-        {"shape":"WAFLimitsExceededException"}
+        {"shape":"WAFLimitsExceededException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"},
+        {"shape":"WAFBadRequestException"}
       ]
     },
     "CreateRegexMatchSet":{
@@ -122,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":{
@@ -173,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":{
@@ -244,6 +288,34 @@
         {"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":{
@@ -258,7 +330,9 @@
         {"shape":"WAFInvalidAccountException"},
         {"shape":"WAFNonexistentItemException"},
         {"shape":"WAFReferencedItemException"},
-        {"shape":"WAFNonEmptyEntityException"}
+        {"shape":"WAFNonEmptyEntityException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"}
       ]
     },
     "DeleteRegexMatchSet":{
@@ -309,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":{
@@ -360,7 +455,9 @@
         {"shape":"WAFInvalidAccountException"},
         {"shape":"WAFNonexistentItemException"},
         {"shape":"WAFReferencedItemException"},
-        {"shape":"WAFNonEmptyEntityException"}
+        {"shape":"WAFNonEmptyEntityException"},
+        {"shape":"WAFTagOperationException"},
+        {"shape":"WAFTagOperationInternalErrorException"}
       ]
     },
     "DeleteXssMatchSet":{
@@ -447,6 +544,32 @@
         {"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":{
@@ -518,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":{
@@ -587,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":{
@@ -626,6 +776,20 @@
         {"shape":"WAFInvalidAccountException"}
       ]
     },
+    "ListLoggingConfigurations":{
+      "name":"ListLoggingConfigurations",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListLoggingConfigurationsRequest"},
+      "output":{"shape":"ListLoggingConfigurationsResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"},
+        {"shape":"WAFNonexistentItemException"},
+        {"shape":"WAFInvalidParameterException"}
+      ]
+    },
     "ListRateBasedRules":{
       "name":"ListRateBasedRules",
       "http":{
@@ -665,6 +829,18 @@
         {"shape":"WAFInvalidAccountException"}
       ]
     },
+    "ListRuleGroups":{
+      "name":"ListRuleGroups",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ListRuleGroupsRequest"},
+      "output":{"shape":"ListRuleGroupsResponse"},
+      "errors":[
+        {"shape":"WAFInternalErrorException"}
+      ]
+    },
     "ListRules":{
       "name":"ListRules",
       "http":{
@@ -704,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":{
@@ -730,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":{
@@ -840,6 +1111,7 @@
         {"shape":"WAFStaleDataException"},
         {"shape":"WAFInternalErrorException"},
         {"shape":"WAFLimitsExceededException"},
+        {"shape":"WAFNonexistentItemException"},
         {"shape":"WAFNonexistentContainerException"},
         {"shape":"WAFInvalidOperationException"},
         {"shape":"WAFInvalidAccountException"},
@@ -866,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":{
@@ -922,7 +1212,8 @@
         {"shape":"WAFNonexistentContainerException"},
         {"shape":"WAFNonexistentItemException"},
         {"shape":"WAFReferencedItemException"},
-        {"shape":"WAFLimitsExceededException"}
+        {"shape":"WAFLimitsExceededException"},
+        {"shape":"WAFSubscriptionNotFoundException"}
       ]
     },
     "UpdateXssMatchSet":{
@@ -951,14 +1242,15 @@
       "type":"structure",
       "required":[
         "Priority",
-        "RuleId",
-        "Action"
+        "RuleId"
       ],
       "members":{
         "Priority":{"shape":"RulePriority"},
         "RuleId":{"shape":"ResourceId"},
         "Action":{"shape":"WafAction"},
-        "Type":{"shape":"WafRuleType"}
+        "OverrideAction":{"shape":"WafOverrideAction"},
+        "Type":{"shape":"WafRuleType"},
+        "ExcludedRules":{"shape":"ExcludedRules"}
       }
     },
     "ActivatedRules":{
@@ -1037,7 +1329,9 @@
     },
     "ChangeToken":{
       "type":"string",
-      "min":1
+      "max":128,
+      "min":1,
+      "pattern":".*\\S.*"
     },
     "ChangeTokenStatus":{
       "type":"string",
@@ -1127,7 +1421,8 @@
         "MetricName":{"shape":"MetricName"},
         "RateKey":{"shape":"RateKey"},
         "RateLimit":{"shape":"RateLimit"},
-        "ChangeToken":{"shape":"ChangeToken"}
+        "ChangeToken":{"shape":"ChangeToken"},
+        "Tags":{"shape":"TagList"}
       }
     },
     "CreateRateBasedRuleResponse":{
@@ -1173,7 +1468,7 @@
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
-    "CreateRuleRequest":{
+    "CreateRuleGroupRequest":{
       "type":"structure",
       "required":[
         "Name",
@@ -1183,9 +1478,31 @@
       "members":{
         "Name":{"shape":"ResourceName"},
         "MetricName":{"shape":"MetricName"},
+        "ChangeToken":{"shape":"ChangeToken"},
+        "Tags":{"shape":"TagList"}
+      }
+    },
+    "CreateRuleGroupResponse":{
+      "type":"structure",
+      "members":{
+        "RuleGroup":{"shape":"RuleGroup"},
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
+    "CreateRuleRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "MetricName",
+        "ChangeToken"
+      ],
+      "members":{
+        "Name":{"shape":"ResourceName"},
+        "MetricName":{"shape":"MetricName"},
+        "ChangeToken":{"shape":"ChangeToken"},
+        "Tags":{"shape":"TagList"}
+      }
+    },
     "CreateRuleResponse":{
       "type":"structure",
       "members":{
@@ -1229,6 +1546,26 @@
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
+    "CreateWebACLMigrationStackRequest":{
+      "type":"structure",
+      "required":[
+        "WebACLId",
+        "S3BucketName",
+        "IgnoreUnsupportedType"
+      ],
+      "members":{
+        "WebACLId":{"shape":"ResourceId"},
+        "S3BucketName":{"shape":"S3BucketName"},
+        "IgnoreUnsupportedType":{"shape":"IgnoreUnsupportedType"}
+      }
+    },
+    "CreateWebACLMigrationStackResponse":{
+      "type":"structure",
+      "required":["S3ObjectUrl"],
+      "members":{
+        "S3ObjectUrl":{"shape":"S3ObjectUrl"}
+      }
+    },
     "CreateWebACLRequest":{
       "type":"structure",
       "required":[
@@ -1241,7 +1578,8 @@
         "Name":{"shape":"ResourceName"},
         "MetricName":{"shape":"MetricName"},
         "DefaultAction":{"shape":"WafAction"},
-        "ChangeToken":{"shape":"ChangeToken"}
+        "ChangeToken":{"shape":"ChangeToken"},
+        "Tags":{"shape":"TagList"}
       }
     },
     "CreateWebACLResponse":{
@@ -1320,6 +1658,30 @@
         "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":[
@@ -1371,27 +1733,44 @@
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
-    "DeleteRuleRequest":{
+    "DeleteRuleGroupRequest":{
       "type":"structure",
       "required":[
-        "RuleId",
+        "RuleGroupId",
         "ChangeToken"
       ],
       "members":{
-        "RuleId":{"shape":"ResourceId"},
+        "RuleGroupId":{"shape":"ResourceId"},
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
-    "DeleteRuleResponse":{
+    "DeleteRuleGroupResponse":{
       "type":"structure",
       "members":{
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
-    "DeleteSizeConstraintSetRequest":{
+    "DeleteRuleRequest":{
       "type":"structure",
       "required":[
-        "SizeConstraintSetId",
+        "RuleId",
+        "ChangeToken"
+      ],
+      "members":{
+        "RuleId":{"shape":"ResourceId"},
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "DeleteRuleResponse":{
+      "type":"structure",
+      "members":{
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "DeleteSizeConstraintSetRequest":{
+      "type":"structure",
+      "required":[
+        "SizeConstraintSetId",
         "ChangeToken"
       ],
       "members":{
@@ -1456,6 +1835,18 @@
         "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"],
@@ -1843,6 +2234,32 @@
         "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"],
@@ -1897,6 +2314,19 @@
         "RegexPatternSet":{"shape":"RegexPatternSet"}
       }
     },
+    "GetRuleGroupRequest":{
+      "type":"structure",
+      "required":["RuleGroupId"],
+      "members":{
+        "RuleGroupId":{"shape":"ResourceId"}
+      }
+    },
+    "GetRuleGroupResponse":{
+      "type":"structure",
+      "members":{
+        "RuleGroup":{"shape":"RuleGroup"}
+      }
+    },
     "GetRuleRequest":{
       "type":"structure",
       "required":["RuleId"],
@@ -2046,7 +2476,12 @@
         "IPV6"
       ]
     },
-    "IPSetDescriptorValue":{"type":"string"},
+    "IPSetDescriptorValue":{
+      "type":"string",
+      "max":50,
+      "min":1,
+      "pattern":".*\\S.*"
+    },
     "IPSetDescriptors":{
       "type":"list",
       "member":{"shape":"IPSetDescriptor"}
@@ -2083,6 +2518,22 @@
       "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":{
@@ -2125,6 +2576,20 @@
         "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":{
@@ -2167,6 +2632,20 @@
         "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":{
@@ -2209,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":{
@@ -2237,12 +2746,39 @@
         "XssMatchSets":{"shape":"XssMatchSetSummaries"}
       }
     },
+    "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"},
+    "MatchFieldData":{
+      "type":"string",
+      "max":128,
+      "min":1,
+      "pattern":".*\\S.*"
+    },
     "MatchFieldType":{
       "type":"string",
       "enum":[
@@ -2250,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",
@@ -2269,6 +2826,7 @@
       "enum":[
         "CHANGE_ACTION",
         "WAF_ACTION",
+        "WAF_OVERRIDE_ACTION",
         "PREDICATE_TYPE",
         "IPSET_TYPE",
         "BYTE_MATCH_FIELD_TYPE",
@@ -2280,7 +2838,10 @@
         "GEO_MATCH_LOCATION_VALUE",
         "RATE_KEY",
         "RULE_TYPE",
-        "NEXT_MARKER"
+        "NEXT_MARKER",
+        "RESOURCE_ARN",
+        "TAGS",
+        "TAG_KEYS"
       ]
     },
     "ParameterExceptionParameter":{
@@ -2291,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",
@@ -2334,6 +2903,35 @@
       "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":[
@@ -2357,7 +2955,12 @@
     },
     "RateLimit":{
       "type":"long",
-      "min":2000
+      "max":2000000000,
+      "min":100
+    },
+    "RedactedFields":{
+      "type":"list",
+      "member":{"shape":"FieldToMatch"}
     },
     "RegexMatchSet":{
       "type":"structure",
@@ -2460,22 +3063,32 @@
     },
     "RegexPatternString":{
       "type":"string",
-      "min":1
+      "max":512,
+      "min":1,
+      "pattern":".*"
     },
     "RegexPatternStrings":{
       "type":"list",
       "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",
@@ -2490,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",
@@ -2521,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
@@ -2535,7 +3198,8 @@
         "Request":{"shape":"HTTPRequest"},
         "Weight":{"shape":"SampleWeight"},
         "Timestamp":{"shape":"Timestamp"},
-        "Action":{"shape":"Action"}
+        "Action":{"shape":"Action"},
+        "RuleWithinRuleGroup":{"shape":"ResourceId"}
       }
     },
     "SampledHTTPRequests":{
@@ -2667,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":[
@@ -2691,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":[
@@ -2807,6 +3560,25 @@
         "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":[
@@ -2902,6 +3674,13 @@
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
+    "WAFBadRequestException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"errorMessage"}
+      },
+      "exception":true
+    },
     "WAFDisallowedNameException":{
       "type":"structure",
       "members":{
@@ -2909,6 +3688,15 @@
       },
       "exception":true
     },
+    "WAFEntityMigrationException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"errorMessage"},
+        "MigrationErrorType":{"shape":"MigrationErrorType"},
+        "MigrationErrorReason":{"shape":"ErrorReason"}
+      },
+      "exception":true
+    },
     "WAFInternalErrorException":{
       "type":"structure",
       "members":{
@@ -2939,6 +3727,13 @@
       },
       "exception":true
     },
+    "WAFInvalidPermissionPolicyException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"errorMessage"}
+      },
+      "exception":true
+    },
     "WAFInvalidRegexPatternException":{
       "type":"structure",
       "members":{
@@ -2981,6 +3776,13 @@
       },
       "exception":true
     },
+    "WAFServiceLinkedRoleErrorException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"errorMessage"}
+      },
+      "exception":true
+    },
     "WAFStaleDataException":{
       "type":"structure",
       "members":{
@@ -2988,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"],
@@ -3003,11 +3827,26 @@
         "COUNT"
       ]
     },
+    "WafOverrideAction":{
+      "type":"structure",
+      "required":["Type"],
+      "members":{
+        "Type":{"shape":"WafOverrideActionType"}
+      }
+    },
+    "WafOverrideActionType":{
+      "type":"string",
+      "enum":[
+        "NONE",
+        "COUNT"
+      ]
+    },
     "WafRuleType":{
       "type":"string",
       "enum":[
         "REGULAR",
-        "RATE_BASED"
+        "RATE_BASED",
+        "GROUP"
       ]
     },
     "WebACL":{
@@ -3022,7 +3861,8 @@
         "Name":{"shape":"ResourceName"},
         "MetricName":{"shape":"MetricName"},
         "DefaultAction":{"shape":"WafAction"},
-        "Rules":{"shape":"ActivatedRules"}
+        "Rules":{"shape":"ActivatedRules"},
+        "WebACLArn":{"shape":"ResourceArn"}
       }
     },
     "WebACLSummaries":{