aws-sdk-core 2.10.64 → 2.10.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1643db41b5645ff0033af3935d81006e3bf8377
-  data.tar.gz: fb57872fa3c96008ba5c5974ead8752a212344f7
+  metadata.gz: 1ce27e24bc4d74ff25a09b212fcea884544d4a64
+  data.tar.gz: fea77df738210e4ab11b797aa2a0ed6ccea71b4f
 SHA512:
-  metadata.gz: 6ab7afdec3abd76ca88e7076cfaa5d5c557a5d562ea3f73af94a506c944f36c55f3814b180abc9bfc4a3b053169e228670d865607cd4d0e675815eba825a5cba
-  data.tar.gz: 4258b84192af3de69316fd0968983cbb4634afc1d8a2d1493c30c900853be2c926fe9a7ed71b3ab903da90a0d7dd494ef322458bac29303589a2360256c40d38
+  metadata.gz: a8d7d60b254929c7a77c3b217da537c4b64bd094742a9312f47746b485c27ed1e4f63820cf4f3a6e849268d88f21ffa2664861ff7d149836f0bac0dcd2fe9a23
+  data.tar.gz: 96a962afa0ee7e8fb33e3a66b852def6b03baaab8e4c3e9fbd06046d747505f0b29fa62b5c6bf6b49d9d6680b05faf90cc1730e9597d7712884723f8cda09a88

data/apis/cloudhsm/2014-05-30/api-2.json

@@ -7,6 +7,7 @@
     "protocol":"json",
     "serviceAbbreviation":"CloudHSM",
     "serviceFullName":"Amazon CloudHSM",
+    "serviceId":"CloudHSM",
     "signatureVersion":"v4",
     "targetPrefix":"CloudHsmFrontendService",
     "uid":"cloudhsm-2014-05-30"

data/apis/ec2/2016-11-15/api-2.json

@@ -1807,6 +1807,15 @@
       "input":{"shape":"ModifyVpcPeeringConnectionOptionsRequest"},
       "output":{"shape":"ModifyVpcPeeringConnectionOptionsResult"}
     },
+    "ModifyVpcTenancy":{
+      "name":"ModifyVpcTenancy",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ModifyVpcTenancyRequest"},
+      "output":{"shape":"ModifyVpcTenancyResult"}
+    },
     "MonitorInstances":{
       "name":"MonitorInstances",
       "http":{
@@ -10912,6 +10921,27 @@
         }
       }
     },
+    "ModifyVpcTenancyRequest":{
+      "type":"structure",
+      "required":[
+        "VpcId",
+        "InstanceTenancy"
+      ],
+      "members":{
+        "VpcId":{"shape":"String"},
+        "InstanceTenancy":{"shape":"VpcTenancy"},
+        "DryRun":{"shape":"Boolean"}
+      }
+    },
+    "ModifyVpcTenancyResult":{
+      "type":"structure",
+      "members":{
+        "ReturnValue":{
+          "shape":"Boolean",
+          "locationName":"return"
+        }
+      }
+    },
     "MonitorInstancesRequest":{
       "type":"structure",
       "required":["InstanceIds"],
@@ -16193,6 +16223,10 @@
         "available"
       ]
     },
+    "VpcTenancy":{
+      "type":"string",
+      "enum":["default"]
+    },
     "VpnConnection":{
       "type":"structure",
       "members":{

data/apis/es/2015-01-01/api-2.json

@@ -264,6 +264,7 @@
       "exception":true
     },
     "Boolean":{"type":"boolean"},
+    "CloudWatchLogsLogGroupArn":{"type":"string"},
     "CreateElasticsearchDomainRequest":{
       "type":"structure",
       "required":["DomainName"],
@@ -274,7 +275,8 @@
         "EBSOptions":{"shape":"EBSOptions"},
         "AccessPolicies":{"shape":"PolicyDocument"},
         "SnapshotOptions":{"shape":"SnapshotOptions"},
-        "AdvancedOptions":{"shape":"AdvancedOptions"}
+        "AdvancedOptions":{"shape":"AdvancedOptions"},
+        "LogPublishingOptions":{"shape":"LogPublishingOptions"}
       }
     },
     "CreateElasticsearchDomainResponse":{
@@ -501,7 +503,8 @@
         "EBSOptions":{"shape":"EBSOptionsStatus"},
         "AccessPolicies":{"shape":"AccessPoliciesStatus"},
         "SnapshotOptions":{"shape":"SnapshotOptionsStatus"},
-        "AdvancedOptions":{"shape":"AdvancedOptionsStatus"}
+        "AdvancedOptions":{"shape":"AdvancedOptionsStatus"},
+        "LogPublishingOptions":{"shape":"LogPublishingOptionsStatus"}
       }
     },
     "ElasticsearchDomainStatus":{
@@ -525,7 +528,8 @@
         "EBSOptions":{"shape":"EBSOptions"},
         "AccessPolicies":{"shape":"PolicyDocument"},
         "SnapshotOptions":{"shape":"SnapshotOptions"},
-        "AdvancedOptions":{"shape":"AdvancedOptions"}
+        "AdvancedOptions":{"shape":"AdvancedOptions"},
+        "LogPublishingOptions":{"shape":"LogPublishingOptions"}
       }
     },
     "ElasticsearchDomainStatusList":{
@@ -686,6 +690,32 @@
         "TagList":{"shape":"TagList"}
       }
     },
+    "LogPublishingOption":{
+      "type":"structure",
+      "members":{
+        "CloudWatchLogsLogGroupArn":{"shape":"CloudWatchLogsLogGroupArn"},
+        "Enabled":{"shape":"Boolean"}
+      }
+    },
+    "LogPublishingOptions":{
+      "type":"map",
+      "key":{"shape":"LogType"},
+      "value":{"shape":"LogPublishingOption"}
+    },
+    "LogPublishingOptionsStatus":{
+      "type":"structure",
+      "members":{
+        "Options":{"shape":"LogPublishingOptions"},
+        "Status":{"shape":"OptionStatus"}
+      }
+    },
+    "LogType":{
+      "type":"string",
+      "enum":[
+        "INDEX_SLOW_LOGS",
+        "SEARCH_SLOW_LOGS"
+      ]
+    },
     "MaxResults":{
       "type":"integer",
       "max":100
@@ -832,7 +862,8 @@
         "EBSOptions":{"shape":"EBSOptions"},
         "SnapshotOptions":{"shape":"SnapshotOptions"},
         "AdvancedOptions":{"shape":"AdvancedOptions"},
-        "AccessPolicies":{"shape":"PolicyDocument"}
+        "AccessPolicies":{"shape":"PolicyDocument"},
+        "LogPublishingOptions":{"shape":"LogPublishingOptions"}
       }
     },
     "UpdateElasticsearchDomainConfigResponse":{

data/apis/rds/2013-01-10/api-2.json

@@ -6,6 +6,7 @@
     "protocol":"query",
     "serviceAbbreviation":"Amazon RDS",
     "serviceFullName":"Amazon Relational Database Service",
+    "serviceId":"RDS",
     "signatureVersion":"v4",
     "uid":"rds-2013-01-10",
     "xmlNamespace":"http://rds.amazonaws.com/doc/2013-01-10/"

data/apis/rds/2013-02-12/api-2.json

@@ -6,6 +6,7 @@
     "protocol":"query",
     "serviceAbbreviation":"Amazon RDS",
     "serviceFullName":"Amazon Relational Database Service",
+    "serviceId":"RDS",
     "signatureVersion":"v4",
     "uid":"rds-2013-02-12",
     "xmlNamespace":"http://rds.amazonaws.com/doc/2013-02-12/"

data/apis/rds/2013-09-09/api-2.json

@@ -6,6 +6,7 @@
     "protocol":"query",
     "serviceAbbreviation":"Amazon RDS",
     "serviceFullName":"Amazon Relational Database Service",
+    "serviceId":"RDS",
     "signatureVersion":"v4",
     "uid":"rds-2013-09-09",
     "xmlNamespace":"http://rds.amazonaws.com/doc/2013-09-09/"

data/apis/rds/2014-09-01/api-2.json

@@ -6,6 +6,7 @@
     "protocol":"query",
     "serviceAbbreviation":"Amazon RDS",
     "serviceFullName":"Amazon Relational Database Service",
+    "serviceId":"RDS",
     "signatureVersion":"v4",
     "uid":"rds-2014-09-01",
     "xmlNamespace":"http://rds.amazonaws.com/doc/2014-09-01/"

data/apis/rds/2014-10-31/api-2.json

@@ -6,6 +6,7 @@
     "protocol":"query",
     "serviceAbbreviation":"Amazon RDS",
     "serviceFullName":"Amazon Relational Database Service",
+    "serviceId":"RDS",
     "signatureVersion":"v4",
     "uid":"rds-2014-10-31",
     "xmlNamespace":"http://rds.amazonaws.com/doc/2014-10-31/"

data/apis/rds/2014-10-31/waiters-2.json

@@ -85,6 +85,91 @@
           "argument": "DBInstances[].DBInstanceStatus"
         }
       ]
+    },
+    "DBSnapshotAvailable": {
+      "delay": 30,
+      "operation": "DescribeDBSnapshots",
+      "maxAttempts": 60,
+      "acceptors": [
+        {
+          "expected": "available",
+          "matcher": "pathAll",
+          "state": "success",
+          "argument": "DBSnapshots[].Status"
+        },
+        {
+          "expected": "deleted",
+          "matcher": "pathAny",
+          "state": "failure",
+          "argument": "DBSnapshots[].Status"
+        },
+        {
+          "expected": "deleting",
+          "matcher": "pathAny",
+          "state": "failure",
+          "argument": "DBSnapshots[].Status"
+        },
+        {
+          "expected": "failed",
+          "matcher": "pathAny",
+          "state": "failure",
+          "argument": "DBSnapshots[].Status"
+        },
+        {
+          "expected": "incompatible-restore",
+          "matcher": "pathAny",
+          "state": "failure",
+          "argument": "DBSnapshots[].Status"
+        },
+        {
+          "expected": "incompatible-parameters",
+          "matcher": "pathAny",
+          "state": "failure",
+          "argument": "DBSnapshots[].Status"
+        }
+      ]
+    },
+    "DBSnapshotDeleted": {
+      "delay": 30,
+      "operation": "DescribeDBSnapshots",
+      "maxAttempts": 60,
+      "acceptors": [
+        {
+          "expected": "deleted",
+          "matcher": "pathAll",
+          "state": "success",
+          "argument": "DBSnapshots[].Status"
+        },
+        {
+          "expected": "DBSnapshotNotFound",
+          "matcher": "error",
+          "state": "success"
+        },
+        {
+          "expected": "creating",
+          "matcher": "pathAny",
+          "state": "failure",
+          "argument": "DBSnapshots[].Status"
+        },
+        {
+          "expected": "modifying",
+          "matcher": "pathAny",
+          "state": "failure",
+          "argument": "DBSnapshots[].Status"
+        },
+        {
+          "expected": "rebooting",
+          "matcher": "pathAny",
+          "state": "failure",
+          "argument": "DBSnapshots[].Status"
+        },
+        {
+          "expected": "resetting-master-credentials",
+          "matcher": "pathAny",
+          "state": "failure",
+          "argument": "DBSnapshots[].Status"
+        }
+      ]
     }
   }
 }

data/apis/waf-regional/2016-11-28/api-2.json

@@ -45,6 +45,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":{
@@ -78,6 +95,36 @@
         {"shape":"WAFLimitsExceededException"}
       ]
     },
+    "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":{
@@ -179,6 +226,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":{
@@ -213,6 +277,40 @@
         {"shape":"WAFNonEmptyEntityException"}
       ]
     },
+    "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":{
@@ -352,6 +450,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":{
@@ -395,6 +507,34 @@
         {"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":{
@@ -507,6 +647,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":{
@@ -533,6 +686,32 @@
         {"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"}
+      ]
+    },
     "ListResourcesForWebACL":{
       "name":"ListResourcesForWebACL",
       "http":{
@@ -631,6 +810,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":{
@@ -671,6 +870,43 @@
         {"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":"WAFNonexistentContainerException"},
+        {"shape":"WAFInvalidOperationException"},
+        {"shape":"WAFInvalidAccountException"},
+        {"shape":"WAFInvalidRegexPatternException"}
+      ]
+    },
     "UpdateRule":{
       "name":"UpdateRule",
       "http":{
@@ -846,7 +1082,8 @@
     },
     "ByteMatchSetUpdates":{
       "type":"list",
-      "member":{"shape":"ByteMatchSetUpdate"}
+      "member":{"shape":"ByteMatchSetUpdate"},
+      "min":1
     },
     "ByteMatchTargetString":{"type":"blob"},
     "ByteMatchTuple":{
@@ -917,6 +1154,24 @@
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
+    "CreateGeoMatchSetRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "ChangeToken"
+      ],
+      "members":{
+        "Name":{"shape":"ResourceName"},
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "CreateGeoMatchSetResponse":{
+      "type":"structure",
+      "members":{
+        "GeoMatchSet":{"shape":"GeoMatchSet"},
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
     "CreateIPSetRequest":{
       "type":"structure",
       "required":[
@@ -959,6 +1214,42 @@
         "ChangeToken":{"shape":"ChangeToken"}
       }
     },
+    "CreateRegexMatchSetRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "ChangeToken"
+      ],
+      "members":{
+        "Name":{"shape":"ResourceName"},
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "CreateRegexMatchSetResponse":{
+      "type":"structure",
+      "members":{
+        "RegexMatchSet":{"shape":"RegexMatchSet"},
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "CreateRegexPatternSetRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "ChangeToken"
+      ],
+      "members":{
+        "Name":{"shape":"ResourceName"},
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
+    "CreateRegexPatternSetResponse":{
+      "type":"structure",
+      "members":{
+        "RegexPatternSet":{"shape":"RegexPatternSet"},
+        "ChangeToken":{"shape":"ChangeToken"}
+      }
+    },
     "CreateRuleRequest":{
       "type":"structure",
       "required":[
@@ -1072,6 +1363,23 @@
         "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":[
@@ -1106,6 +1414,40 @@
         "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"}
+      }
+    },
     "DeleteRuleRequest":{
       "type":"structure",
       "required":[
@@ -1211,6 +1553,322 @@
         "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"],
@@ -1248,6 +1906,19 @@
         "ChangeTokenStatus":{"shape":"ChangeTokenStatus"}
       }
     },
+    "GetGeoMatchSetRequest":{
+      "type":"structure",
+      "required":["GeoMatchSetId"],
+      "members":{
+        "GeoMatchSetId":{"shape":"ResourceId"}
+      }
+    },
+    "GetGeoMatchSetResponse":{
+      "type":"structure",
+      "members":{
+        "GeoMatchSet":{"shape":"GeoMatchSet"}
+      }
+    },
     "GetIPSetRequest":{
       "type":"structure",
       "required":["IPSetId"],
@@ -1289,6 +1960,32 @@
         "Rule":{"shape":"RateBasedRule"}
       }
     },
+    "GetRegexMatchSetRequest":{
+      "type":"structure",
+      "required":["RegexMatchSetId"],
+      "members":{
+        "RegexMatchSetId":{"shape":"ResourceId"}
+      }
+    },
+    "GetRegexMatchSetResponse":{
+      "type":"structure",
+      "members":{
+        "RegexMatchSet":{"shape":"RegexMatchSet"}
+      }
+    },
+    "GetRegexPatternSetRequest":{
+      "type":"structure",
+      "required":["RegexPatternSetId"],
+      "members":{
+        "RegexPatternSetId":{"shape":"ResourceId"}
+      }
+    },
+    "GetRegexPatternSetResponse":{
+      "type":"structure",
+      "members":{
+        "RegexPatternSet":{"shape":"RegexPatternSet"}
+      }
+    },
     "GetRuleRequest":{
       "type":"structure",
       "required":["RuleId"],
@@ -1484,7 +2181,8 @@
     },
     "IPSetUpdates":{
       "type":"list",
-      "member":{"shape":"IPSetUpdate"}
+      "member":{"shape":"IPSetUpdate"},
+      "min":1
     },
     "IPString":{"type":"string"},
     "ListByteMatchSetsRequest":{
@@ -1501,6 +2199,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":{
@@ -1529,6 +2241,34 @@
         "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"}
+      }
+    },
     "ListResourcesForWebACLRequest":{
       "type":"structure",
       "required":["WebACLId"],
@@ -1651,6 +2391,8 @@
         "BYTE_MATCH_TEXT_TRANSFORMATION",
         "BYTE_MATCH_POSITIONAL_CONSTRAINT",
         "SIZE_CONSTRAINT_COMPARISON_OPERATOR",
+        "GEO_MATCH_LOCATION_TYPE",
+        "GEO_MATCH_LOCATION_VALUE",
         "RATE_KEY",
         "RULE_TYPE",
         "NEXT_MARKER"
@@ -1697,8 +2439,10 @@
         "IPMatch",
         "ByteMatch",
         "SqlInjectionMatch",
+        "GeoMatch",
         "SizeConstraint",
-        "XssMatch"
+        "XssMatch",
+        "RegexMatch"
       ]
     },
     "Predicates":{
@@ -1730,6 +2474,114 @@
       "type":"long",
       "min":2000
     },
+    "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":[
+        "RegexPatternSetId",
+        "Name"
+      ],
+      "members":{
+        "RegexPatternSetId":{"shape":"ResourceId"},
+        "Name":{"shape":"ResourceName"}
+      }
+    },
+    "RegexPatternSetUpdate":{
+      "type":"structure",
+      "required":[
+        "Action",
+        "RegexPatternString"
+      ],
+      "members":{
+        "Action":{"shape":"ChangeAction"},
+        "RegexPatternString":{"shape":"RegexPatternString"}
+      }
+    },
+    "RegexPatternSetUpdates":{
+      "type":"list",
+      "member":{"shape":"RegexPatternSetUpdate"},
+      "min":1
+    },
+    "RegexPatternString":{
+      "type":"string",
+      "min":1
+    },
+    "RegexPatternStrings":{
+      "type":"list",
+      "member":{"shape":"RegexPatternString"},
+      "max":10
+    },
     "ResourceArn":{
       "type":"string",
       "max":1224,
@@ -1874,7 +2726,8 @@
     },
     "SizeConstraintSetUpdates":{
       "type":"list",
-      "member":{"shape":"SizeConstraintSetUpdate"}
+      "member":{"shape":"SizeConstraintSetUpdate"},
+      "min":1
     },
     "SizeConstraints":{
       "type":"list",
@@ -1920,7 +2773,8 @@
     },
     "SqlInjectionMatchSetUpdates":{
       "type":"list",
-      "member":{"shape":"SqlInjectionMatchSetUpdate"}
+      "member":{"shape":"SqlInjectionMatchSetUpdate"},
+      "min":1
     },
     "SqlInjectionMatchTuple":{
       "type":"structure",
@@ -1980,6 +2834,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":[
@@ -2020,6 +2893,44 @@
         "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"}
+      }
+    },
     "UpdateRuleRequest":{
       "type":"structure",
       "required":[
@@ -2152,6 +3063,13 @@
       },
       "exception":true
     },
+    "WAFInvalidRegexPatternException":{
+      "type":"structure",
+      "members":{
+        "message":{"shape":"errorMessage"}
+      },
+      "exception":true
+    },
     "WAFLimitsExceededException":{
       "type":"structure",
       "members":{
@@ -2308,7 +3226,8 @@
     },
     "XssMatchSetUpdates":{
       "type":"list",
-      "member":{"shape":"XssMatchSetUpdate"}
+      "member":{"shape":"XssMatchSetUpdate"},
+      "min":1
     },
     "XssMatchTuple":{
       "type":"structure",