intermediate changes

ref:182c3b80fff8bdde3ca2d2697d1ad403b6da8608

10 files changed, 922 insertions, 23 deletions

diff --git a/contrib/python/boto3/py3/.dist-info/METADATA b/contrib/python/boto3/py3/.dist-info/METADATA
index 98413b0391a..2551a23c29b 100644
--- a/contrib/python/boto3/py3/.dist-info/METADATA
+++ b/contrib/python/boto3/py3/.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: boto3
-Version: 1.24.0
+Version: 1.24.1
 Summary: The AWS SDK for Python
 Home-page: https://github.com/boto/boto3
 Author: Amazon Web Services
@@ -21,7 +21,7 @@ Classifier: Programming Language :: Python :: 3.10
 Requires-Python: >= 3.7
 License-File: LICENSE
 License-File: NOTICE
-Requires-Dist: botocore (<1.28.0,>=1.27.0)
+Requires-Dist: botocore (<1.28.0,>=1.27.1)
 Requires-Dist: jmespath (<2.0.0,>=0.7.1)
 Requires-Dist: s3transfer (<0.7.0,>=0.6.0)
 Provides-Extra: crt
diff --git a/contrib/python/boto3/py3/boto3/__init__.py b/contrib/python/boto3/py3/boto3/__init__.py
index dedac575eca..f52adf165e3 100644
--- a/contrib/python/boto3/py3/boto3/__init__.py
+++ b/contrib/python/boto3/py3/boto3/__init__.py
@@ -17,7 +17,7 @@ from boto3.compat import _warn_deprecated_python
 from boto3.session import Session
 
 __author__ = 'Amazon Web Services'
-__version__ = '1.24.0'
+__version__ = '1.24.1'
 
 
 # The default Boto3 session; autoloaded when needed.
diff --git a/contrib/python/botocore/py3/.dist-info/METADATA b/contrib/python/botocore/py3/.dist-info/METADATA
index 567d44556fb..54a4148914d 100644
--- a/contrib/python/botocore/py3/.dist-info/METADATA
+++ b/contrib/python/botocore/py3/.dist-info/METADATA
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: botocore
-Version: 1.27.0
+Version: 1.27.1
 Summary: Low-level, data-driven core of boto 3.
 Home-page: https://github.com/boto/botocore
 Author: Amazon Web Services
diff --git a/contrib/python/botocore/py3/botocore/__init__.py b/contrib/python/botocore/py3/botocore/__init__.py
index 094f4ae500d..eafe824699c 100644
--- a/contrib/python/botocore/py3/botocore/__init__.py
+++ b/contrib/python/botocore/py3/botocore/__init__.py
@@ -16,7 +16,7 @@ import logging
 import os
 import re
 
-__version__ = '1.27.0'
+__version__ = '1.27.1'
 
 
 class NullHandler(logging.Handler):
diff --git a/contrib/python/botocore/py3/botocore/data/backup-gateway/2021-01-01/service-2.json b/contrib/python/botocore/py3/botocore/data/backup-gateway/2021-01-01/service-2.json
index f67c9233af3..c7b3d86979b 100644
--- a/contrib/python/botocore/py3/botocore/data/backup-gateway/2021-01-01/service-2.json
+++ b/contrib/python/botocore/py3/botocore/data/backup-gateway/2021-01-01/service-2.json
@@ -91,6 +91,21 @@
       ],
       "documentation":"<p>Disassociates a backup gateway from the specified server. After the disassociation process finishes, the gateway can no longer access the virtual machines on the server.</p>"
     },
+    "GetGateway":{
+      "name":"GetGateway",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetGatewayInput"},
+      "output":{"shape":"GetGatewayOutput"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>By providing the ARN (Amazon Resource Name), this API returns the gateway.</p>"
+    },
     "ImportHypervisorConfiguration":{
       "name":"ImportHypervisorConfiguration",
       "http":{
@@ -241,6 +256,21 @@
       ],
       "documentation":"<p>Updates a gateway's name. Specify which gateway to update using the Amazon Resource Name (ARN) of the gateway in your request.</p>"
     },
+    "UpdateGatewaySoftwareNow":{
+      "name":"UpdateGatewaySoftwareNow",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"UpdateGatewaySoftwareNowInput"},
+      "output":{"shape":"UpdateGatewaySoftwareNowOutput"},
+      "errors":[
+        {"shape":"ValidationException"},
+        {"shape":"InternalServerException"},
+        {"shape":"ResourceNotFoundException"}
+      ],
+      "documentation":"<p>Updates the gateway virtual machine (VM) software. The request immediately triggers the software update.</p> <note> <p>When you make this request, you get a <code>200 OK</code> success response immediately. However, it might take some time for the update to complete.</p> </note>"
+    },
     "UpdateHypervisor":{
       "name":"UpdateHypervisor",
       "http":{
@@ -453,6 +483,40 @@
       "min":50,
       "pattern":"^arn:(aws|aws-cn|aws-us-gov):backup-gateway(:[a-zA-Z-0-9]+){3}\\/[a-zA-Z-0-9]+$"
     },
+    "GatewayDetails":{
+      "type":"structure",
+      "members":{
+        "GatewayArn":{
+          "shape":"GatewayArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the gateway. Use the <code>ListGateways</code> operation to return a list of gateways for your account and Amazon Web Services Region.</p>"
+        },
+        "GatewayDisplayName":{
+          "shape":"Name",
+          "documentation":"<p>The display name of the gateway.</p>"
+        },
+        "GatewayType":{
+          "shape":"GatewayType",
+          "documentation":"<p>The type of the gateway type.</p>"
+        },
+        "HypervisorId":{
+          "shape":"HypervisorId",
+          "documentation":"<p>The hypervisor ID of the gateway.</p>"
+        },
+        "LastSeenTime":{
+          "shape":"Time",
+          "documentation":"<p>Details showing the last time Backup gateway communicated with the cloud, in Unix format and UTC time.</p>"
+        },
+        "NextUpdateAvailabilityTime":{
+          "shape":"Time",
+          "documentation":"<p>Details showing the next update availability time of the gateway.</p>"
+        },
+        "VpcEndpoint":{
+          "shape":"VpcEndpoint",
+          "documentation":"<p>The DNS name for the virtual private cloud (VPC) endpoint the gateway uses to connect to the cloud for backup gateway.</p>"
+        }
+      },
+      "documentation":"<p>The details of gateway.</p>"
+    },
     "GatewayType":{
       "type":"string",
       "enum":["BACKUP_VM"]
@@ -461,6 +525,25 @@
       "type":"list",
       "member":{"shape":"Gateway"}
     },
+    "GetGatewayInput":{
+      "type":"structure",
+      "required":["GatewayArn"],
+      "members":{
+        "GatewayArn":{
+          "shape":"GatewayArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the gateway.</p>"
+        }
+      }
+    },
+    "GetGatewayOutput":{
+      "type":"structure",
+      "members":{
+        "Gateway":{
+          "shape":"GatewayDetails",
+          "documentation":"<p>By providing the ARN (Amazon Resource Name), this API returns the gateway.</p>"
+        }
+      }
+    },
     "Host":{
       "type":"string",
       "max":128,
@@ -791,7 +874,7 @@
         },
         "Value":{
           "shape":"TagValue",
-          "documentation":"<p>The key part of a value's key-value pair.</p>"
+          "documentation":"<p>The value part of a tag's key-value pair.</p>"
         }
       },
       "documentation":"<p>A key-value pair you can use to manage, filter, and search for your resources. Allowed characters include UTF-8 letters, numbers, spaces, and the following characters: + - = . _ : /.</p>"
@@ -922,6 +1005,25 @@
         }
       }
     },
+    "UpdateGatewaySoftwareNowInput":{
+      "type":"structure",
+      "required":["GatewayArn"],
+      "members":{
+        "GatewayArn":{
+          "shape":"GatewayArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the gateway to be updated.</p>"
+        }
+      }
+    },
+    "UpdateGatewaySoftwareNowOutput":{
+      "type":"structure",
+      "members":{
+        "GatewayArn":{
+          "shape":"GatewayArn",
+          "documentation":"<p>The Amazon Resource Name (ARN) of the gateway you updated.</p>"
+        }
+      }
+    },
     "UpdateHypervisorInput":{
       "type":"structure",
       "required":["HypervisorArn"],
@@ -934,6 +1036,10 @@
           "shape":"ServerArn",
           "documentation":"<p>The Amazon Resource Name (ARN) of the hypervisor to update.</p>"
         },
+        "Name":{
+          "shape":"Name",
+          "documentation":"<p>The updated name for the hypervisor</p>"
+        },
         "Password":{
           "shape":"Password",
           "documentation":"<p>The updated password for the hypervisor.</p>"
@@ -997,7 +1103,7 @@
         },
         "ResourceArn":{
           "shape":"ResourceArn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the virtual machine.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the virtual machine. For example, <code>arn:aws:backup-gateway:us-west-1:0000000000000:vm/vm-0000ABCDEFGIJKL</code>.</p>"
         }
       },
       "documentation":"<p>A virtual machine that is on a hypervisor.</p>"
@@ -1006,6 +1112,11 @@
       "type":"list",
       "member":{"shape":"VirtualMachine"}
     },
+    "VpcEndpoint":{
+      "type":"string",
+      "max":255,
+      "min":1
+    },
     "string":{"type":"string"}
   },
   "documentation":"<p><fullname>Backup gateway</fullname> <p>Backup gateway connects Backup to your hypervisor, so you can create, store, and restore backups of your virtual machines (VMs) anywhere, whether on-premises or in the VMware Cloud (VMC) on Amazon Web Services.</p> <p>Add on-premises resources by connecting to a hypervisor through a gateway. Backup will automatically discover the resources in your hypervisor.</p> <p>Use Backup to assign virtual or on-premises resources to a backup plan, or run on-demand backups. Once you have backed up your resources, you can view them and restore them like any resource supported by Backup.</p> <p>To download the Amazon Web Services software to get started, navigate to the Backup console, choose <b>Gateways</b>, then choose <b>Create gateway</b>.</p></p>"
diff --git a/contrib/python/botocore/py3/botocore/data/chime-sdk-meetings/2021-07-15/service-2.json b/contrib/python/botocore/py3/botocore/data/chime-sdk-meetings/2021-07-15/service-2.json
index cfa79357113..c390411af01 100644
--- a/contrib/python/botocore/py3/botocore/data/chime-sdk-meetings/2021-07-15/service-2.json
+++ b/contrib/python/botocore/py3/botocore/data/chime-sdk-meetings/2021-07-15/service-2.json
@@ -32,6 +32,24 @@
       ],
       "documentation":"<p>Creates up to 100 attendees for an active Amazon Chime SDK meeting. For more information about the Amazon Chime SDK, see <a href=\"https://docs.aws.amazon.com/chime/latest/dg/meetings-sdk.html\">Using the Amazon Chime SDK</a> in the <i>Amazon Chime Developer Guide</i>.</p>"
     },
+    "BatchUpdateAttendeeCapabilitiesExcept":{
+      "name":"BatchUpdateAttendeeCapabilitiesExcept",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/meetings/{MeetingId}/attendees/capabilities?operation=batch-update-except",
+        "responseCode":200
+      },
+      "input":{"shape":"BatchUpdateAttendeeCapabilitiesExceptRequest"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ConflictException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"NotFoundException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"ServiceUnavailableException"}
+      ],
+      "documentation":"<p>Updates <code>AttendeeCapabilities</code> except the capabilities listed in an <code>ExcludedAttendeeIds</code> table.</p>"
+    },
     "CreateAttendee":{
       "name":"CreateAttendee",
       "http":{
@@ -227,6 +245,24 @@
         {"shape":"ServiceFailureException"}
       ],
       "documentation":"<p>Stops transcription for the specified <code>meetingId</code>.</p>"
+    },
+    "UpdateAttendeeCapabilities":{
+      "name":"UpdateAttendeeCapabilities",
+      "http":{
+        "method":"PUT",
+        "requestUri":"/meetings/{MeetingId}/attendees/{AttendeeId}/capabilities"
+      },
+      "input":{"shape":"UpdateAttendeeCapabilitiesRequest"},
+      "output":{"shape":"UpdateAttendeeCapabilitiesResponse"},
+      "errors":[
+        {"shape":"BadRequestException"},
+        {"shape":"ConflictException"},
+        {"shape":"UnauthorizedException"},
+        {"shape":"NotFoundException"},
+        {"shape":"ForbiddenException"},
+        {"shape":"ServiceUnavailableException"}
+      ],
+      "documentation":"<p>The capabilties that you want to update.</p>"
     }
   },
   "shapes":{
@@ -251,10 +287,54 @@
         "JoinToken":{
           "shape":"JoinTokenString",
           "documentation":"<p>The join token used by the Amazon Chime SDK attendee.</p>"
+        },
+        "Capabilities":{
+          "shape":"AttendeeCapabilities",
+          "documentation":"<p>The capabilities (audio, video, or content) assigned to an attendee.</p>"
         }
       },
       "documentation":"<p>An Amazon Chime SDK meeting attendee. Includes a unique <code>AttendeeId</code> and <code>JoinToken</code>. The <code>JoinToken</code> allows a client to authenticate and join as the specified attendee. The <code>JoinToken</code> expires when the meeting ends, or when <a>DeleteAttendee</a> is called. After that, the attendee is unable to join the meeting. </p> <p>We recommend securely transferring each <code>JoinToken</code> from your server application to the client so that no other client has access to the token except for the one authorized to represent the attendee.</p>"
     },
+    "AttendeeCapabilities":{
+      "type":"structure",
+      "required":[
+        "Audio",
+        "Video",
+        "Content"
+      ],
+      "members":{
+        "Audio":{
+          "shape":"MediaCapabilities",
+          "documentation":"<p>The audio capability assigned to an attendee.</p>"
+        },
+        "Video":{
+          "shape":"MediaCapabilities",
+          "documentation":"<p>The video capability assigned to an attendee.</p>"
+        },
+        "Content":{
+          "shape":"MediaCapabilities",
+          "documentation":"<p>The content capability assigned to an attendee.</p>"
+        }
+      },
+      "documentation":"<p>The media capabilities of an attendee, including audio, video and content. </p>"
+    },
+    "AttendeeIdItem":{
+      "type":"structure",
+      "required":["AttendeeId"],
+      "members":{
+        "AttendeeId":{
+          "shape":"GuidString",
+          "documentation":"<p>A list of one or more attendee IDs.</p>"
+        }
+      },
+      "documentation":"<p>A structure that contains one or more attendee IDs.</p>"
+    },
+    "AttendeeIdsList":{
+      "type":"list",
+      "member":{"shape":"AttendeeIdItem"},
+      "max":250,
+      "min":1
+    },
     "AttendeeList":{
       "type":"list",
       "member":{"shape":"Attendee"}
@@ -319,6 +399,30 @@
         }
       }
     },
+    "BatchUpdateAttendeeCapabilitiesExceptRequest":{
+      "type":"structure",
+      "required":[
+        "MeetingId",
+        "ExcludedAttendeeIds",
+        "Capabilities"
+      ],
+      "members":{
+        "MeetingId":{
+          "shape":"GuidString",
+          "documentation":"<p>The ID of the meeting associated with the update request.</p>",
+          "location":"uri",
+          "locationName":"MeetingId"
+        },
+        "ExcludedAttendeeIds":{
+          "shape":"AttendeeIdsList",
+          "documentation":"<p>The <code>AttendeeIDs</code> that you want to exclude from one or more capabilities.</p>"
+        },
+        "Capabilities":{
+          "shape":"AttendeeCapabilities",
+          "documentation":"<p>The capabilities (<code>audio</code>, <code>video</code>, or <code>content</code>) that you want to update.</p>"
+        }
+      }
+    },
     "Boolean":{"type":"boolean"},
     "ClientRequestToken":{
       "type":"string",
@@ -327,6 +431,17 @@
       "pattern":"[-_a-zA-Z0-9]*",
       "sensitive":true
     },
+    "ConflictException":{
+      "type":"structure",
+      "members":{
+        "Code":{"shape":"String"},
+        "Message":{"shape":"String"},
+        "RequestId":{"shape":"String"}
+      },
+      "documentation":"<p>Multiple instances of the same request have been made simultaneously.</p>",
+      "error":{"httpStatusCode":409},
+      "exception":true
+    },
     "CreateAttendeeError":{
       "type":"structure",
       "members":{
@@ -361,6 +476,10 @@
         "ExternalUserId":{
           "shape":"ExternalUserId",
           "documentation":"<p>The Amazon Chime SDK external user ID. An idempotency token. Links the attendee to an identity managed by a builder application.</p>"
+        },
+        "Capabilities":{
+          "shape":"AttendeeCapabilities",
+          "documentation":"<p>The capabilities (<code>audio</code>, <code>video</code>, or <code>content</code>) that you want to grant an attendee. If you don't specify capabilities, all users have send and receive capabilities on all media channels by default.</p>"
         }
       }
     },
@@ -371,6 +490,10 @@
         "ExternalUserId":{
           "shape":"ExternalUserId",
           "documentation":"<p>The Amazon Chime SDK external user ID. An idempotency token. Links the attendee to an identity managed by a builder application.</p>"
+        },
+        "Capabilities":{
+          "shape":"AttendeeCapabilities",
+          "documentation":"<p>A list of one or more capabilities.</p>"
         }
       },
       "documentation":"<p>The Amazon Chime SDK attendee fields to create, used with the BatchCreateAttendee action.</p>"
@@ -773,6 +896,15 @@
         }
       }
     },
+    "MediaCapabilities":{
+      "type":"string",
+      "enum":[
+        "SendReceive",
+        "Send",
+        "Receive",
+        "None"
+      ]
+    },
     "MediaPlacement":{
       "type":"structure",
       "members":{
@@ -874,7 +1006,7 @@
         "Message":{"shape":"String"},
         "RequestId":{
           "shape":"String",
-          "documentation":"<p>The request id associated with the call responsible for the exception.</p>"
+          "documentation":"<p>The request ID associated with the call responsible for the exception.</p>"
         }
       },
       "documentation":"<p>One or more of the resources in the request does not exist in the system.</p>",
@@ -917,7 +1049,7 @@
         "Message":{"shape":"String"},
         "RequestId":{"shape":"String"}
       },
-      "documentation":"<p>The service encountered an unexpected error.</p>",
+      "documentation":"<p>The service is currently unavailable.</p>",
       "error":{"httpStatusCode":500},
       "exception":true,
       "fault":true
@@ -985,7 +1117,7 @@
         "Message":{"shape":"String"},
         "RequestId":{"shape":"String"}
       },
-      "documentation":"<p>The number of customer requests exceeds the request rate limit.</p>",
+      "documentation":"<p>The number of requests exceeds the limit.</p>",
       "error":{"httpStatusCode":429},
       "exception":true
     },
@@ -1144,6 +1276,38 @@
       "documentation":"<p>The request was well-formed but was unable to be followed due to semantic errors.</p>",
       "error":{"httpStatusCode":422},
       "exception":true
+    },
+    "UpdateAttendeeCapabilitiesRequest":{
+      "type":"structure",
+      "required":[
+        "MeetingId",
+        "AttendeeId",
+        "Capabilities"
+      ],
+      "members":{
+        "MeetingId":{
+          "shape":"GuidString",
+          "documentation":"<p>The ID of the meeting associated with the update request.</p>",
+          "location":"uri",
+          "locationName":"MeetingId"
+        },
+        "AttendeeId":{
+          "shape":"GuidString",
+          "documentation":"<p>The ID of the attendee associated with the update request.</p>",
+          "location":"uri",
+          "locationName":"AttendeeId"
+        },
+        "Capabilities":{
+          "shape":"AttendeeCapabilities",
+          "documentation":"<p>The capabilties that you want to update.</p>"
+        }
+      }
+    },
+    "UpdateAttendeeCapabilitiesResponse":{
+      "type":"structure",
+      "members":{
+        "Attendee":{"shape":"Attendee"}
+      }
     }
   },
   "documentation":"<p>The Amazon Chime SDK meetings APIs in this section allow software developers to create Amazon Chime SDK meetings, set the AWS Regions for meetings, create and manage users, and send and receive meeting notifications. For more information about the meeting APIs, see <a href=\"https://docs.aws.amazon.com/chime/latest/APIReference/API_Operations_Amazon_Chime_SDK_Meetings.html\">Amazon Chime SDK meetings</a>.</p>"
diff --git a/contrib/python/botocore/py3/botocore/data/forecast/2018-06-26/service-2.json b/contrib/python/botocore/py3/botocore/data/forecast/2018-06-26/service-2.json
index 713f21afb78..c3bb3329724 100644
--- a/contrib/python/botocore/py3/botocore/data/forecast/2018-06-26/service-2.json
+++ b/contrib/python/botocore/py3/botocore/data/forecast/2018-06-26/service-2.json
@@ -77,7 +77,7 @@
         {"shape":"ResourceInUseException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Imports your training data to an Amazon Forecast dataset. You provide the location of your training data in an Amazon Simple Storage Service (Amazon S3) bucket and the Amazon Resource Name (ARN) of the dataset that you want to import the data to.</p> <p>You must specify a <a href=\"https://docs.aws.amazon.com/forecast/latest/dg/API_DataSource.html\">DataSource</a> object that includes an AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the data, as Amazon Forecast makes a copy of your data and processes it in an internal AWS system. For more information, see <a href=\"https://docs.aws.amazon.com/forecast/latest/dg/aws-forecast-iam-roles.html\">Set up permissions</a>.</p> <p>The training data must be in CSV format. The delimiter must be a comma (,).</p> <p>You can specify the path to a specific CSV file, the S3 bucket, or to a folder in the S3 bucket. For the latter two cases, Amazon Forecast imports all files up to the limit of 10,000 files.</p> <p>Because dataset imports are not aggregated, your most recent dataset import is the one that is used when training a predictor or generating a forecast. Make sure that your most recent dataset import contains all of the data you want to model off of, and not just the new data collected since the previous import.</p> <p>To get a list of all your dataset import jobs, filtered by specified criteria, use the <a href=\"https://docs.aws.amazon.com/forecast/latest/dg/API_ListDatasetImportJobs.html\">ListDatasetImportJobs</a> operation.</p>"
+      "documentation":"<p>Imports your training data to an Amazon Forecast dataset. You provide the location of your training data in an Amazon Simple Storage Service (Amazon S3) bucket and the Amazon Resource Name (ARN) of the dataset that you want to import the data to.</p> <p>You must specify a <a href=\"https://docs.aws.amazon.com/forecast/latest/dg/API_DataSource.html\">DataSource</a> object that includes an AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the data, as Amazon Forecast makes a copy of your data and processes it in an internal AWS system. For more information, see <a href=\"https://docs.aws.amazon.com/forecast/latest/dg/aws-forecast-iam-roles.html\">Set up permissions</a>.</p> <p>The training data must be in CSV or Parquet format. The delimiter must be a comma (,).</p> <p>You can specify the path to a specific file, the S3 bucket, or to a folder in the S3 bucket. For the latter two cases, Amazon Forecast imports all files up to the limit of 10,000 files.</p> <p>Because dataset imports are not aggregated, your most recent dataset import is the one that is used when training a predictor or generating a forecast. Make sure that your most recent dataset import contains all of the data you want to model off of, and not just the new data collected since the previous import.</p> <p>To get a list of all your dataset import jobs, filtered by specified criteria, use the <a href=\"https://docs.aws.amazon.com/forecast/latest/dg/API_ListDatasetImportJobs.html\">ListDatasetImportJobs</a> operation.</p>"
     },
     "CreateExplainability":{
       "name":"CreateExplainability",
@@ -128,7 +128,7 @@
         {"shape":"ResourceInUseException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Creates a forecast for each item in the <code>TARGET_TIME_SERIES</code> dataset that was used to train the predictor. This is known as inference. To retrieve the forecast for a single item at low latency, use the operation. To export the complete forecast into your Amazon Simple Storage Service (Amazon S3) bucket, use the <a>CreateForecastExportJob</a> operation.</p> <p>The range of the forecast is determined by the <code>ForecastHorizon</code> value, which you specify in the <a>CreatePredictor</a> request. When you query a forecast, you can request a specific date range within the forecast.</p> <p>To get a list of all your forecasts, use the <a>ListForecasts</a> operation.</p> <note> <p>The forecasts generated by Amazon Forecast are in the same time zone as the dataset that was used to create the predictor.</p> </note> <p>For more information, see <a>howitworks-forecast</a>.</p> <note> <p>The <code>Status</code> of the forecast must be <code>ACTIVE</code> before you can query or export the forecast. Use the <a>DescribeForecast</a> operation to get the status.</p> </note>"
+      "documentation":"<p>Creates a forecast for each item in the <code>TARGET_TIME_SERIES</code> dataset that was used to train the predictor. This is known as inference. To retrieve the forecast for a single item at low latency, use the operation. To export the complete forecast into your Amazon Simple Storage Service (Amazon S3) bucket, use the <a>CreateForecastExportJob</a> operation.</p> <p>The range of the forecast is determined by the <code>ForecastHorizon</code> value, which you specify in the <a>CreatePredictor</a> request. When you query a forecast, you can request a specific date range within the forecast.</p> <p>To get a list of all your forecasts, use the <a>ListForecasts</a> operation.</p> <note> <p>The forecasts generated by Amazon Forecast are in the same time zone as the dataset that was used to create the predictor.</p> </note> <p>For more information, see <a>howitworks-forecast</a>.</p> <note> <p>The <code>Status</code> of the forecast must be <code>ACTIVE</code> before you can query or export the forecast. Use the <a>DescribeForecast</a> operation to get the status.</p> </note> <p>By default, a forecast includes predictions for every item (<code>item_id</code>) in the dataset group that was used to train the predictor. However, you can use the <code>TimeSeriesSelector</code> object to generate a forecast on a subset of time series. Forecast creation is skipped for any time series that you specify that are not in the input dataset. The forecast export file will not contain these time series or their forecasted values.</p>"
     },
     "CreateForecastExportJob":{
       "name":"CreateForecastExportJob",
@@ -196,7 +196,7 @@
         {"shape":"ResourceInUseException"},
         {"shape":"LimitExceededException"}
       ],
-      "documentation":"<p>Exports backtest forecasts and accuracy metrics generated by the <a>CreateAutoPredictor</a> or <a>CreatePredictor</a> operations. Two folders containing CSV files are exported to your specified S3 bucket.</p> <p> The export file names will match the following conventions:</p> <p> <code>&lt;ExportJobName&gt;_&lt;ExportTimestamp&gt;_&lt;PartNumber&gt;.csv</code> </p> <p>The &lt;ExportTimestamp&gt; component is in Java SimpleDate format (yyyy-MM-ddTHH-mm-ssZ).</p> <p>You must specify a <a>DataDestination</a> object that includes an Amazon S3 bucket and an AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the Amazon S3 bucket. For more information, see <a>aws-forecast-iam-roles</a>.</p> <note> <p>The <code>Status</code> of the export job must be <code>ACTIVE</code> before you can access the export in your Amazon S3 bucket. To get the status, use the <a>DescribePredictorBacktestExportJob</a> operation.</p> </note>"
+      "documentation":"<p>Exports backtest forecasts and accuracy metrics generated by the <a>CreateAutoPredictor</a> or <a>CreatePredictor</a> operations. Two folders containing CSV or Parquet files are exported to your specified S3 bucket.</p> <p> The export file names will match the following conventions:</p> <p> <code>&lt;ExportJobName&gt;_&lt;ExportTimestamp&gt;_&lt;PartNumber&gt;.csv</code> </p> <p>The &lt;ExportTimestamp&gt; component is in Java SimpleDate format (yyyy-MM-ddTHH-mm-ssZ).</p> <p>You must specify a <a>DataDestination</a> object that includes an Amazon S3 bucket and an AWS Identity and Access Management (IAM) role that Amazon Forecast can assume to access the Amazon S3 bucket. For more information, see <a>aws-forecast-iam-roles</a>.</p> <note> <p>The <code>Status</code> of the export job must be <code>ACTIVE</code> before you can access the export in your Amazon S3 bucket. To get the status, use the <a>DescribePredictorBacktestExportJob</a> operation.</p> </note>"
     },
     "DeleteDataset":{
       "name":"DeleteDataset",
@@ -1099,6 +1099,10 @@
         "Tags":{
           "shape":"Tags",
           "documentation":"<p>The optional metadata that you apply to the dataset import job to help you categorize and organize them. Each tag consists of a key and an optional value, both of which you define.</p> <p>The following basic restrictions apply to tags:</p> <ul> <li> <p>Maximum number of tags per resource - 50.</p> </li> <li> <p>For each resource, each tag key must be unique, and each tag key can have only one value.</p> </li> <li> <p>Maximum key length - 128 Unicode characters in UTF-8.</p> </li> <li> <p>Maximum value length - 256 Unicode characters in UTF-8.</p> </li> <li> <p>If your tagging schema is used across multiple services and resources, remember that other services may have restrictions on allowed characters. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following characters: + - = . _ : / @.</p> </li> <li> <p>Tag keys and values are case sensitive.</p> </li> <li> <p>Do not use <code>aws:</code>, <code>AWS:</code>, or any upper or lowercase combination of such as a prefix for keys as it is reserved for AWS use. You cannot edit or delete tag keys with this prefix. Values can have this prefix. If a tag value has <code>aws</code> as its prefix but the key does not, then Forecast considers it to be a user tag and will count against the limit of 50 tags. Tags with only the key prefix of <code>aws</code> do not count against your tags per resource limit.</p> </li> </ul>"
+        },
+        "Format":{
+          "shape":"Format",
+          "documentation":"<p>The format of the imported data, CSV or PARQUET. The default value is CSV.</p>"
         }
       }
     },
@@ -1179,6 +1183,10 @@
         "Tags":{
           "shape":"Tags",
           "documentation":"<p>Optional metadata to help you categorize and organize your resources. Each tag consists of a key and an optional value, both of which you define. Tag keys and values are case sensitive.</p> <p>The following restrictions apply to tags:</p> <ul> <li> <p>For each resource, each tag key must be unique and each tag key must have one value.</p> </li> <li> <p>Maximum number of tags per resource: 50.</p> </li> <li> <p>Maximum key length: 128 Unicode characters in UTF-8.</p> </li> <li> <p>Maximum value length: 256 Unicode characters in UTF-8.</p> </li> <li> <p>Accepted characters: all letters and numbers, spaces representable in UTF-8, and + - = . _ : / @. If your tagging schema is used across other services and resources, the character restrictions of those services also apply. </p> </li> <li> <p>Key prefixes cannot include any upper or lowercase combination of <code>aws:</code> or <code>AWS:</code>. Values can have this prefix. If a tag value has <code>aws</code> as its prefix but the key does not, Forecast considers it to be a user tag and will count against the limit of 50 tags. Tags with only the key prefix of <code>aws</code> do not count against your tags per resource limit. You cannot edit or delete tag keys with this prefix.</p> </li> </ul>"
+        },
+        "Format":{
+          "shape":"Format",
+          "documentation":"<p>The format of the exported data, CSV or PARQUET.</p>"
         }
       }
     },
@@ -1263,6 +1271,10 @@
         "Tags":{
           "shape":"Tags",
           "documentation":"<p>The optional metadata that you apply to the forecast export job to help you categorize and organize them. Each tag consists of a key and an optional value, both of which you define.</p> <p>The following basic restrictions apply to tags:</p> <ul> <li> <p>Maximum number of tags per resource - 50.</p> </li> <li> <p>For each resource, each tag key must be unique, and each tag key can have only one value.</p> </li> <li> <p>Maximum key length - 128 Unicode characters in UTF-8.</p> </li> <li> <p>Maximum value length - 256 Unicode characters in UTF-8.</p> </li> <li> <p>If your tagging schema is used across multiple services and resources, remember that other services may have restrictions on allowed characters. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following characters: + - = . _ : / @.</p> </li> <li> <p>Tag keys and values are case sensitive.</p> </li> <li> <p>Do not use <code>aws:</code>, <code>AWS:</code>, or any upper or lowercase combination of such as a prefix for keys as it is reserved for AWS use. You cannot edit or delete tag keys with this prefix. Values can have this prefix. If a tag value has <code>aws</code> as its prefix but the key does not, then Forecast considers it to be a user tag and will count against the limit of 50 tags. Tags with only the key prefix of <code>aws</code> do not count against your tags per resource limit.</p> </li> </ul>"
+        },
+        "Format":{
+          "shape":"Format",
+          "documentation":"<p>The format of the exported data, CSV or PARQUET. The default value is CSV.</p>"
         }
       }
     },
@@ -1297,6 +1309,10 @@
         "Tags":{
           "shape":"Tags",
           "documentation":"<p>The optional metadata that you apply to the forecast to help you categorize and organize them. Each tag consists of a key and an optional value, both of which you define.</p> <p>The following basic restrictions apply to tags:</p> <ul> <li> <p>Maximum number of tags per resource - 50.</p> </li> <li> <p>For each resource, each tag key must be unique, and each tag key can have only one value.</p> </li> <li> <p>Maximum key length - 128 Unicode characters in UTF-8.</p> </li> <li> <p>Maximum value length - 256 Unicode characters in UTF-8.</p> </li> <li> <p>If your tagging schema is used across multiple services and resources, remember that other services may have restrictions on allowed characters. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following characters: + - = . _ : / @.</p> </li> <li> <p>Tag keys and values are case sensitive.</p> </li> <li> <p>Do not use <code>aws:</code>, <code>AWS:</code>, or any upper or lowercase combination of such as a prefix for keys as it is reserved for AWS use. You cannot edit or delete tag keys with this prefix. Values can have this prefix. If a tag value has <code>aws</code> as its prefix but the key does not, then Forecast considers it to be a user tag and will count against the limit of 50 tags. Tags with only the key prefix of <code>aws</code> do not count against your tags per resource limit.</p> </li> </ul>"
+        },
+        "TimeSeriesSelector":{
+          "shape":"TimeSeriesSelector",
+          "documentation":"<p>Defines the set of time series that are used to create the forecasts in a <code>TimeSeriesIdentifiers</code> object.</p> <p>The <code>TimeSeriesIdentifiers</code> object needs the following information:</p> <ul> <li> <p> <code>DataSource</code> </p> </li> <li> <p> <code>Format</code> </p> </li> <li> <p> <code>Schema</code> </p> </li> </ul>"
         }
       }
     },
@@ -1359,6 +1375,10 @@
         "Tags":{
           "shape":"Tags",
           "documentation":"<p>Optional metadata to help you categorize and organize your backtests. Each tag consists of a key and an optional value, both of which you define. Tag keys and values are case sensitive.</p> <p>The following restrictions apply to tags:</p> <ul> <li> <p>For each resource, each tag key must be unique and each tag key must have one value.</p> </li> <li> <p>Maximum number of tags per resource: 50.</p> </li> <li> <p>Maximum key length: 128 Unicode characters in UTF-8.</p> </li> <li> <p>Maximum value length: 256 Unicode characters in UTF-8.</p> </li> <li> <p>Accepted characters: all letters and numbers, spaces representable in UTF-8, and + - = . _ : / @. If your tagging schema is used across other services and resources, the character restrictions of those services also apply. </p> </li> <li> <p>Key prefixes cannot include any upper or lowercase combination of <code>aws:</code> or <code>AWS:</code>. Values can have this prefix. If a tag value has <code>aws</code> as its prefix but the key does not, Forecast considers it to be a user tag and will count against the limit of 50 tags. Tags with only the key prefix of <code>aws</code> do not count against your tags per resource limit. You cannot edit or delete tag keys with this prefix.</p> </li> </ul>"
+        },
+        "Format":{
+          "shape":"Format",
+          "documentation":"<p>The format of the exported data, CSV or PARQUET. The default value is CSV.</p>"
         }
       }
     },
@@ -1928,6 +1948,10 @@
         "LastModificationTime":{
           "shape":"Timestamp",
           "documentation":"<p>The last time the resource was modified. The timestamp depends on the status of the job:</p> <ul> <li> <p> <code>CREATE_PENDING</code> - The <code>CreationTime</code>.</p> </li> <li> <p> <code>CREATE_IN_PROGRESS</code> - The current timestamp.</p> </li> <li> <p> <code>CREATE_STOPPING</code> - The current timestamp.</p> </li> <li> <p> <code>CREATE_STOPPED</code> - When the job stopped.</p> </li> <li> <p> <code>ACTIVE</code> or <code>CREATE_FAILED</code> - When the job finished or failed.</p> </li> </ul>"
+        },
+        "Format":{
+          "shape":"Format",
+          "documentation":"<p>The format of the imported data, CSV or PARQUET.</p>"
         }
       }
     },
@@ -2009,7 +2033,7 @@
         },
         "ExplainabilityArn":{
           "shape":"Arn",
-          "documentation":"<p>The Amazon Resource Name (ARN) of the Explainability.</p>"
+          "documentation":"<p>The Amazon Resource Name (ARN) of the Explainability export.</p>"
         },
         "Destination":{"shape":"DataDestination"},
         "Message":{
@@ -2027,6 +2051,10 @@
         "LastModificationTime":{
           "shape":"Timestamp",
           "documentation":"<p>The last time the resource was modified. The timestamp depends on the status of the job:</p> <ul> <li> <p> <code>CREATE_PENDING</code> - The <code>CreationTime</code>.</p> </li> <li> <p> <code>CREATE_IN_PROGRESS</code> - The current timestamp.</p> </li> <li> <p> <code>CREATE_STOPPING</code> - The current timestamp.</p> </li> <li> <p> <code>CREATE_STOPPED</code> - When the job stopped.</p> </li> <li> <p> <code>ACTIVE</code> or <code>CREATE_FAILED</code> - When the job finished or failed.</p> </li> </ul>"
+        },
+        "Format":{
+          "shape":"Format",
+          "documentation":"<p>The format of the exported data, CSV or PARQUET.</p>"
         }
       }
     },
@@ -2139,6 +2167,10 @@
         "LastModificationTime":{
           "shape":"Timestamp",
           "documentation":"<p>The last time the resource was modified. The timestamp depends on the status of the job:</p> <ul> <li> <p> <code>CREATE_PENDING</code> - The <code>CreationTime</code>.</p> </li> <li> <p> <code>CREATE_IN_PROGRESS</code> - The current timestamp.</p> </li> <li> <p> <code>CREATE_STOPPING</code> - The current timestamp.</p> </li> <li> <p> <code>CREATE_STOPPED</code> - When the job stopped.</p> </li> <li> <p> <code>ACTIVE</code> or <code>CREATE_FAILED</code> - When the job finished or failed.</p> </li> </ul>"
+        },
+        "Format":{
+          "shape":"Format",
+          "documentation":"<p>The format of the exported data, CSV or PARQUET.</p>"
         }
       }
     },
@@ -2194,6 +2226,10 @@
         "LastModificationTime":{
           "shape":"Timestamp",
           "documentation":"<p>The last time the resource was modified. The timestamp depends on the status of the job:</p> <ul> <li> <p> <code>CREATE_PENDING</code> - The <code>CreationTime</code>.</p> </li> <li> <p> <code>CREATE_IN_PROGRESS</code> - The current timestamp.</p> </li> <li> <p> <code>CREATE_STOPPING</code> - The current timestamp.</p> </li> <li> <p> <code>CREATE_STOPPED</code> - When the job stopped.</p> </li> <li> <p> <code>ACTIVE</code> or <code>CREATE_FAILED</code> - When the job finished or failed.</p> </li> </ul>"
+        },
+        "TimeSeriesSelector":{
+          "shape":"TimeSeriesSelector",
+          "documentation":"<p>The time series to include in the forecast.</p>"
         }
       }
     },
@@ -2297,6 +2333,10 @@
         "LastModificationTime":{
           "shape":"Timestamp",
           "documentation":"<p>The last time the resource was modified. The timestamp depends on the status of the job:</p> <ul> <li> <p> <code>CREATE_PENDING</code> - The <code>CreationTime</code>.</p> </li> <li> <p> <code>CREATE_IN_PROGRESS</code> - The current timestamp.</p> </li> <li> <p> <code>CREATE_STOPPING</code> - The current timestamp.</p> </li> <li> <p> <code>CREATE_STOPPED</code> - When the job stopped.</p> </li> <li> <p> <code>ACTIVE</code> or <code>CREATE_FAILED</code> - When the job finished or failed.</p> </li> </ul>"
+        },
+        "Format":{
+          "shape":"Format",
+          "documentation":"<p>The format of the exported data, CSV or PARQUET.</p>"
         }
       }
     },
@@ -2529,7 +2569,7 @@
       "members":{
         "TimeSeriesGranularity":{
           "shape":"TimeSeriesGranularity",
-          "documentation":"<p>To create an Explainability for all time series in your datasets, use <code>ALL</code>. To create an Explainability for specific time series in your datasets, use <code>SPECIFIC</code>.</p> <p>Specify time series by uploading a CSV file to an Amazon S3 bucket and set the location within the <a>DataDestination</a> data type.</p>"
+          "documentation":"<p>To create an Explainability for all time series in your datasets, use <code>ALL</code>. To create an Explainability for specific time series in your datasets, use <code>SPECIFIC</code>.</p> <p>Specify time series by uploading a CSV or Parquet file to an Amazon S3 bucket and set the location within the <a>DataDestination</a> data type.</p>"
         },
         "TimePointGranularity":{
           "shape":"TimePointGranularity",
@@ -2838,6 +2878,11 @@
       "type":"list",
       "member":{"shape":"ForecastSummary"}
     },
+    "Format":{
+      "type":"string",
+      "max":7,
+      "pattern":"^CSV|PARQUET$"
+    },
     "Frequency":{
       "type":"string",
       "max":5,
@@ -4065,6 +4110,28 @@
         "SPECIFIC"
       ]
     },
+    "TimeSeriesIdentifiers":{
+      "type":"structure",
+      "members":{
+        "DataSource":{"shape":"DataSource"},
+        "Schema":{"shape":"Schema"},
+        "Format":{
+          "shape":"Format",
+          "documentation":"<p>The format of the data, either CSV or PARQUET.</p>"
+        }
+      },
+      "documentation":"<p>Details about the import file that contains the time series for which you want to create forecasts.</p>"
+    },
+    "TimeSeriesSelector":{
+      "type":"structure",
+      "members":{
+        "TimeSeriesIdentifiers":{
+          "shape":"TimeSeriesIdentifiers",
+          "documentation":"<p>Details about the import file that contains the time series for which you want to create forecasts.</p>"
+        }
+      },
+      "documentation":"<p>Defines the set of time series that are used to create the forecasts in a <code>TimeSeriesIdentifiers</code> object.</p> <p>The <code>TimeSeriesIdentifiers</code> object needs the following information:</p> <ul> <li> <p> <code>DataSource</code> </p> </li> <li> <p> <code>Format</code> </p> </li> <li> <p> <code>Schema</code> </p> </li> </ul>"
+    },
     "TimeZone":{
       "type":"string",
       "max":256,
diff --git a/contrib/python/botocore/py3/botocore/data/route53/2013-04-01/paginators-1.json b/contrib/python/botocore/py3/botocore/data/route53/2013-04-01/paginators-1.json
index 8d8e433dd8d..2c370965ff5 100644
--- a/contrib/python/botocore/py3/botocore/data/route53/2013-04-01/paginators-1.json
+++ b/contrib/python/botocore/py3/botocore/data/route53/2013-04-01/paginators-1.json
@@ -44,6 +44,24 @@
       "limit_key": "MaxResults",
       "output_token": "NextToken",
       "result_key": "QueryLoggingConfigs"
+    },
+    "ListCidrBlocks": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "CidrBlocks"
+    },
+    "ListCidrCollections": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "CidrCollections"
+    },
+    "ListCidrLocations": {
+      "input_token": "NextToken",
+      "limit_key": "MaxResults",
+      "output_token": "NextToken",
+      "result_key": "CidrLocations"
     }
   }
 }
diff --git a/contrib/python/botocore/py3/botocore/data/route53/2013-04-01/service-2.json b/contrib/python/botocore/py3/botocore/data/route53/2013-04-01/service-2.json
index 37747203ef2..9e70d99bbe7 100644
--- a/contrib/python/botocore/py3/botocore/data/route53/2013-04-01/service-2.json
+++ b/contrib/python/botocore/py3/botocore/data/route53/2013-04-01/service-2.json
@@ -54,6 +54,28 @@
       ],
       "documentation":"<p>Associates an Amazon VPC with a private hosted zone. </p> <important> <p>To perform the association, the VPC and the private hosted zone must already exist. You can't convert a public hosted zone into a private hosted zone.</p> </important> <note> <p>If you want to associate a VPC that was created by using one Amazon Web Services account with a private hosted zone that was created by using a different account, the Amazon Web Services account that created the private hosted zone must first submit a <code>CreateVPCAssociationAuthorization</code> request. Then the account that created the VPC must submit an <code>AssociateVPCWithHostedZone</code> request.</p> </note> <note> <p>When granting access, the hosted zone and the Amazon VPC must belong to the same partition. A partition is a group of Amazon Web Services Regions. Each Amazon Web Services account is scoped to one partition.</p> <p>The following are the supported partitions:</p> <ul> <li> <p> <code>aws</code> - Amazon Web Services Regions</p> </li> <li> <p> <code>aws-cn</code> - China Regions</p> </li> <li> <p> <code>aws-us-gov</code> - Amazon Web Services GovCloud (US) Region</p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Access Management</a> in the <i>Amazon Web Services General Reference</i>.</p> </note>"
     },
+    "ChangeCidrCollection":{
+      "name":"ChangeCidrCollection",
+      "http":{
+        "method":"POST",
+        "requestUri":"/2013-04-01/cidrcollection/{CidrCollectionId}"
+      },
+      "input":{
+        "shape":"ChangeCidrCollectionRequest",
+        "locationName":"ChangeCidrCollectionRequest",
+        "xmlNamespace":{"uri":"https://route53.amazonaws.com/doc/2013-04-01/"}
+      },
+      "output":{"shape":"ChangeCidrCollectionResponse"},
+      "errors":[
+        {"shape":"NoSuchCidrCollectionException"},
+        {"shape":"CidrCollectionVersionMismatchException"},
+        {"shape":"InvalidInput"},
+        {"shape":"CidrBlockInUseException"},
+        {"shape":"LimitsExceeded"},
+        {"shape":"ConcurrentModification"}
+      ],
+      "documentation":"<p>Creates, changes, or deletes CIDR blocks within a collection. Contains authoritative IP information mapping blocks to one or multiple locations.</p> <p>A change request can update multiple locations in a collection at a time, which is helpful if you want to move one or more CIDR blocks from one location to another in one transaction, without downtime. </p> <p> <b>Limits</b> </p> <p>The max number of CIDR blocks included in the request is 1000. As a result, big updates require multiple API calls.</p> <p> <b> PUT and DELETE_IF_EXISTS</b> </p> <p>Use <code>ChangeCidrCollection</code> to perform the following actions:</p> <ul> <li> <p> <code>PUT</code>: Create a CIDR block within the specified collection.</p> </li> <li> <p> <code> DELETE_IF_EXISTS</code>: Delete an existing CIDR block from the collection.</p> </li> </ul>"
+    },
     "ChangeResourceRecordSets":{
       "name":"ChangeResourceRecordSets",
       "http":{
@@ -96,6 +118,27 @@
       ],
       "documentation":"<p>Adds, edits, or deletes tags for a health check or a hosted zone.</p> <p>For information about using tags for cost allocation, see <a href=\"https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/cost-alloc-tags.html\">Using Cost Allocation Tags</a> in the <i>Billing and Cost Management User Guide</i>.</p>"
     },
+    "CreateCidrCollection":{
+      "name":"CreateCidrCollection",
+      "http":{
+        "method":"POST",
+        "requestUri":"/2013-04-01/cidrcollection",
+        "responseCode":201
+      },
+      "input":{
+        "shape":"CreateCidrCollectionRequest",
+        "locationName":"CreateCidrCollectionRequest",
+        "xmlNamespace":{"uri":"https://route53.amazonaws.com/doc/2013-04-01/"}
+      },
+      "output":{"shape":"CreateCidrCollectionResponse"},
+      "errors":[
+        {"shape":"LimitsExceeded"},
+        {"shape":"InvalidInput"},
+        {"shape":"CidrCollectionAlreadyExistsException"},
+        {"shape":"ConcurrentModification"}
+      ],
+      "documentation":"<p>Creates a CIDR collection in the current Amazon Web Services account.</p>"
+    },
     "CreateHealthCheck":{
       "name":"CreateHealthCheck",
       "http":{
@@ -140,7 +183,7 @@
         {"shape":"NoSuchDelegationSet"},
         {"shape":"DelegationSetNotReusable"}
       ],
-      "documentation":"<p>Creates a new public or private hosted zone. You create records in a public hosted zone to define how you want to route traffic on the internet for a domain, such as example.com, and its subdomains (apex.example.com, acme.example.com). You create records in a private hosted zone to define how you want to route traffic for a domain and its subdomains within one or more Amazon Virtual Private Clouds (Amazon VPCs). </p> <important> <p>You can't convert a public hosted zone to a private hosted zone or vice versa. Instead, you must create a new hosted zone with the same name and create new resource record sets.</p> </important> <p>For more information about charges for hosted zones, see <a href=\"http://aws.amazon.com/route53/pricing/\">Amazon Route 53 Pricing</a>.</p> <p>Note the following:</p> <ul> <li> <p>You can't create a hosted zone for a top-level domain (TLD) such as .com.</p> </li> <li> <p>For public hosted zones, Route 53 automatically creates a default SOA record and four NS records for the zone. For more information about SOA and NS records, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/SOA-NSrecords.html\">NS and SOA Records that Route 53 Creates for a Hosted Zone</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> <p>If you want to use the same name servers for multiple public hosted zones, you can optionally associate a reusable delegation set with the hosted zone. See the <code>DelegationSetId</code> element.</p> </li> <li> <p>If your domain is registered with a registrar other than Route 53, you must update the name servers with your registrar to make Route 53 the DNS service for the domain. For more information, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/MigratingDNS.html\">Migrating DNS Service for an Existing Domain to Amazon Route 53</a> in the <i>Amazon Route 53 Developer Guide</i>. </p> </li> </ul> <p>When you submit a <code>CreateHostedZone</code> request, the initial status of the hosted zone is <code>PENDING</code>. For public hosted zones, this means that the NS and SOA records are not yet available on all Route 53 DNS servers. When the NS and SOA records are available, the status of the zone changes to <code>INSYNC</code>.</p> <p>The <code>CreateHostedZone</code> request requires the caller to have an <code>ec2:DescribeVpcs</code> permission.</p> <note> <p>When creating private hosted zones, the Amazon VPC must belong to the same partition where the hosted zone is created. A partition is a group of Amazon Web Services Regions. Each Amazon Web Services account is scoped to one partition.</p> <p>The following are the supported partitions:</p> <ul> <li> <p> <code>aws</code> - Amazon Web Services Regions</p> </li> <li> <p> <code>aws-cn</code> - China Regions</p> </li> <li> <p> <code>aws-us-gov</code> - Amazon Web Services GovCloud (US) Region</p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Access Management</a> in the <i>Amazon Web Services General Reference</i>.</p> </note>"
+      "documentation":"<p>Creates a new public or private hosted zone. You create records in a public hosted zone to define how you want to route traffic on the internet for a domain, such as example.com, and its subdomains (apex.example.com, acme.example.com). You create records in a private hosted zone to define how you want to route traffic for a domain and its subdomains within one or more Amazon Virtual Private Clouds (Amazon VPCs). </p> <important> <p>You can't convert a public hosted zone to a private hosted zone or vice versa. Instead, you must create a new hosted zone with the same name and create new resource record sets.</p> </important> <p>For more information about charges for hosted zones, see <a href=\"http://aws.amazon.com/route53/pricing/\">Amazon Route 53 Pricing</a>.</p> <p>Note the following:</p> <ul> <li> <p>You can't create a hosted zone for a top-level domain (TLD) such as .com.</p> </li> <li> <p>For public hosted zones, Route 53 automatically creates a default SOA record and four NS records for the zone. For more information about SOA and NS records, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/SOA-NSrecords.html\">NS and SOA Records that Route 53 Creates for a Hosted Zone</a> in the <i>Amazon Route 53 Developer Guide</i>.</p> <p>If you want to use the same name servers for multiple public hosted zones, you can optionally associate a reusable delegation set with the hosted zone. See the <code>DelegationSetId</code> element.</p> </li> <li> <p>If your domain is registered with a registrar other than Route 53, you must update the name servers with your registrar to make Route 53 the DNS service for the domain. For more information, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/MigratingDNS.html\">Migrating DNS Service for an Existing Domain to Amazon Route 53</a> in the <i>Amazon Route 53 Developer Guide</i>. </p> </li> </ul> <p>When you submit a <code>CreateHostedZone</code> request, the initial status of the hosted zone is <code>PENDING</code>. For public hosted zones, this means that the NS and SOA records are not yet available on all Route 53 DNS servers. When the NS and SOA records are available, the status of the zone changes to <code>INSYNC</code>.</p> <p>The <code>CreateHostedZone</code> request requires the caller to have an <code>ec2:DescribeVpcs</code> permission.</p> <note> <p>When creating private hosted zones, the Amazon VPC must belong to the same partition where the hosted zone is created. A partition is a group of Amazon Web Services Regions. Each Amazon Web Services account is scoped to one partition.</p> <p>The following are the supported partitions:</p> <ul> <li> <p> <code>aws</code> - Amazon Web Services Regions</p> </li> <li> <p> <code>aws-cn</code> - China Regions</p> </li> <li> <p> <code>aws-us-gov</code> - Amazon Web Services GovCloud (US) Region</p> </li> </ul> <p>For more information, see <a href=\"https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html\">Access Management</a> in the <i>Amazon Web Services General Reference</i>.</p> </note>"
     },
     "CreateKeySigningKey":{
       "name":"CreateKeySigningKey",
@@ -321,6 +364,22 @@
       ],
       "documentation":"<p>Deactivates a key-signing key (KSK) so that it will not be used for signing by DNSSEC. This operation changes the KSK status to <code>INACTIVE</code>.</p>"
     },
+    "DeleteCidrCollection":{
+      "name":"DeleteCidrCollection",
+      "http":{
+        "method":"DELETE",
+        "requestUri":"/2013-04-01/cidrcollection/{CidrCollectionId}"
+      },
+      "input":{"shape":"DeleteCidrCollectionRequest"},
+      "output":{"shape":"DeleteCidrCollectionResponse"},
+      "errors":[
+        {"shape":"NoSuchCidrCollectionException"},
+        {"shape":"CidrCollectionInUseException"},
+        {"shape":"InvalidInput"},
+        {"shape":"ConcurrentModification"}
+      ],
+      "documentation":"<p>Deletes a CIDR collection in the current Amazon Web Services account. The collection must be empty before it can be deleted.</p>"
+    },
     "DeleteHealthCheck":{
       "name":"DeleteHealthCheck",
       "http":{
@@ -351,7 +410,7 @@
         {"shape":"InvalidInput"},
         {"shape":"InvalidDomainName"}
       ],
-      "documentation":"<p>Deletes a hosted zone.</p> <p>If the hosted zone was created by another service, such as Cloud Map, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DeleteHostedZone.html#delete-public-hosted-zone-created-by-another-service\">Deleting Public Hosted Zones That Were Created by Another Service</a> in the <i>Amazon Route 53 Developer Guide</i> for information about how to delete it. (The process is the same for public and private hosted zones that were created by another service.)</p> <p>If you want to keep your domain registration but you want to stop routing internet traffic to your website or web application, we recommend that you delete resource record sets in the hosted zone instead of deleting the hosted zone.</p> <important> <p>If you delete a hosted zone, you can't undelete it. You must create a new hosted zone and update the name servers for your domain registration, which can require up to 48 hours to take effect. (If you delegated responsibility for a subdomain to a hosted zone and you delete the child hosted zone, you must update the name servers in the parent hosted zone.) In addition, if you delete a hosted zone, someone could hijack the domain and route traffic to their own resources using your domain name.</p> </important> <p>If you want to avoid the monthly charge for the hosted zone, you can transfer DNS service for the domain to a free DNS service. When you transfer DNS service, you have to update the name servers for the domain registration. If the domain is registered with Route 53, see <a href=\"https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_UpdateDomainNameservers.html\">UpdateDomainNameservers</a> for information about how to replace Route 53 name servers with name servers for the new DNS service. If the domain is registered with another registrar, use the method provided by the registrar to update name servers for the domain registration. For more information, perform an internet search on \"free DNS service.\"</p> <p>You can delete a hosted zone only if it contains only the default SOA record and NS resource record sets. If the hosted zone contains other resource record sets, you must delete them before you can delete the hosted zone. If you try to delete a hosted zone that contains other resource record sets, the request fails, and Route 53 returns a <code>HostedZoneNotEmpty</code> error. For information about deleting records from your hosted zone, see <a href=\"https://docs.aws.amazon.com/Route53/latest/APIReference/API_ChangeResourceRecordSets.html\">ChangeResourceRecordSets</a>.</p> <p>To verify that the hosted zone has been deleted, do one of the following:</p> <ul> <li> <p>Use the <code>GetHostedZone</code> action to request information about the hosted zone.</p> </li> <li> <p>Use the <code>ListHostedZones</code> action to get a list of the hosted zones associated with the current Amazon Web Services account.</p> </li> </ul>"
+      "documentation":"<p>Deletes a hosted zone.</p> <p>If the hosted zone was created by another service, such as Cloud Map, see <a href=\"https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/DeleteHostedZone.html#delete-public-hosted-zone-created-by-another-service\">Deleting Public Hosted Zones That Were Created by Another Service</a> in the <i>Amazon Route 53 Developer Guide</i> for information about how to delete it. (The process is the same for public and private hosted zones that were created by another service.)</p> <p>If you want to keep your domain registration but you want to stop routing internet traffic to your website or web application, we recommend that you delete resource record sets in the hosted zone instead of deleting the hosted zone.</p> <important> <p>If you delete a hosted zone, you can't undelete it. You must create a new hosted zone and update the name servers for your domain registration, which can require up to 48 hours to take effect. (If you delegated responsibility for a subdomain to a hosted zone and you delete the child hosted zone, you must update the name servers in the parent hosted zone.) In addition, if you delete a hosted zone, someone could hijack the domain and route traffic to their own resources using your domain name.</p> </important> <p>If you want to avoid the monthly charge for the hosted zone, you can transfer DNS service for the domain to a free DNS service. When you transfer DNS service, you have to update the name servers for the domain registration. If the domain is registered with Route 53, see <a href=\"https://docs.aws.amazon.com/Route53/latest/APIReference/API_domains_UpdateDomainNameservers.html\">UpdateDomainNameservers</a> for information about how to replace Route 53 name servers with name servers for the new DNS service. If the domain is registered with another registrar, use the method provided by the registrar to update name servers for the domain registration. For more information, perform an internet search on \"free DNS service.\"</p> <p>You can delete a hosted zone only if it contains only the default SOA record and NS resource record sets. If the hosted zone contains other resource record sets, you must delete them before you can delete the hosted zone. If you try to delete a hosted zone that contains other resource record sets, the request fails, and Route 53 returns a <code>HostedZoneNotEmpty</code> error. For information about deleting records from your hosted zone, see <a href=\"https://docs.aws.amazon.com/Route53/latest/APIReference/API_ChangeResourceRecordSets.html\">ChangeResourceRecordSets</a>.</p> <p>To verify that the hosted zone has been deleted, do one of the following:</p> <ul> <li> <p>Use the <code>GetHostedZone</code> action to request information about the hosted zone.</p> </li> <li> <p>Use the <code>ListHostedZones</code> action to get a list of the hosted zones associated with the current Amazon Web Services account.</p> </li> </ul>"
     },
     "DeleteKeySigningKey":{
       "name":"DeleteKeySigningKey",
@@ -758,6 +817,48 @@
       "output":{"shape":"GetTrafficPolicyInstanceCountResponse"},
       "documentation":"<p>Gets the number of traffic policy instances that are associated with the current Amazon Web Services account.</p>"
     },
+    "ListCidrBlocks":{
+      "name":"ListCidrBlocks",
+      "http":{
+        "method":"GET",
+        "requestUri":"/2013-04-01/cidrcollection/{CidrCollectionId}/cidrblocks"
+      },
+      "input":{"shape":"ListCidrBlocksRequest"},
+      "output":{"shape":"ListCidrBlocksResponse"},
+      "errors":[
+        {"shape":"NoSuchCidrCollectionException"},
+        {"shape":"NoSuchCidrLocationException"},
+        {"shape":"InvalidInput"}
+      ],
+      "documentation":"<p>Returns a paginated list of location objects and their CIDR blocks.</p>"
+    },
+    "ListCidrCollections":{
+      "name":"ListCidrCollections",
+      "http":{
+        "method":"GET",
+        "requestUri":"/2013-04-01/cidrcollection"
+      },
+      "input":{"shape":"ListCidrCollectionsRequest"},
+      "output":{"shape":"ListCidrCollectionsResponse"},
+      "errors":[
+        {"shape":"InvalidInput"}
+      ],
+      "documentation":"<p>Returns a paginated list of CIDR collections in the Amazon Web Services account (metadata only).</p>"
+    },
+    "ListCidrLocations":{
+      "name":"ListCidrLocations",
+      "http":{
+        "method":"GET",
+        "requestUri":"/2013-04-01/cidrcollection/{CidrCollectionId}"
+      },
+      "input":{"shape":"ListCidrLocationsRequest"},
+      "output":{"shape":"ListCidrLocationsResponse"},
+      "errors":[
+        {"shape":"NoSuchCidrCollectionException"},
+        {"shape":"InvalidInput"}
+      ],
+      "documentation":"<p>Returns a paginated list of CIDR locations for the given collection (metadata only, does not include CIDR blocks).</p>"
+    },
     "ListGeoLocations":{
       "name":"ListGeoLocations",
       "http":{
@@ -1088,6 +1189,12 @@
     }
   },
   "shapes":{
+    "ARN":{
+      "type":"string",
+      "max":2048,
+      "min":20,
+      "pattern":".*\\S.*"
+    },
     "AWSAccountID":{"type":"string"},
     "AccountLimit":{
       "type":"structure",
@@ -1269,6 +1376,44 @@
       },
       "documentation":"<p>The information for a change request.</p>"
     },
+    "ChangeCidrCollectionRequest":{
+      "type":"structure",
+      "required":[
+        "Id",
+        "Changes"
+      ],
+      "members":{
+        "Id":{
+          "shape":"UUID",
+          "documentation":"<p>The UUID of the CIDR collection to update.</p>",
+          "location":"uri",
+          "locationName":"CidrCollectionId"
+        },
+        "CollectionVersion":{
+          "shape":"CollectionVersion",
+          "documentation":"<p>A sequential counter that Amazon Route 53 sets to 1 when you create a collection and increments it by 1 each time you update the collection.</p> <p>We recommend that you use <code>ListCidrCollection</code> to get the current value of <code>CollectionVersion</code> for the collection that you want to update, and then include that value with the change request. This prevents Route 53 from overwriting an intervening update: </p> <ul> <li> <p>If the value in the request matches the value of <code>CollectionVersion</code> in the collection, Route 53 updates the collection.</p> </li> <li> <p>If the value of <code>CollectionVersion</code> in the collection is greater than the value in the request, the collection was changed after you got the version number. Route 53 does not update the collection, and it returns a <code>CidrCollectionVersionMismatch</code> error. </p> </li> </ul>"
+        },
+        "Changes":{
+          "shape":"CidrCollectionChanges",
+          "documentation":"<p> Information about changes to a CIDR collection.</p>"
+        }
+      }
+    },
+    "ChangeCidrCollectionResponse":{
+      "type":"structure",
+      "required":["Id"],
+      "members":{
+        "Id":{
+          "shape":"ChangeId",
+          "documentation":"<p>The ID that is returned by <code>ChangeCidrCollection</code>. You can use it as input to <code>GetChange</code> to see if a CIDR collection change has propagated or not.</p>"
+        }
+      }
+    },
+    "ChangeId":{
+      "type":"string",
+      "max":6500,
+      "min":1
+    },
     "ChangeInfo":{
       "type":"structure",
       "required":[
@@ -1390,6 +1535,168 @@
       },
       "max":256
     },
+    "Cidr":{
+      "type":"string",
+      "max":50,
+      "min":1,
+      "pattern":".*\\S.*"
+    },
+    "CidrBlockInUseException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>This CIDR block is already in use.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "CidrBlockSummaries":{
+      "type":"list",
+      "member":{"shape":"CidrBlockSummary"}
+    },
+    "CidrBlockSummary":{
+      "type":"structure",
+      "members":{
+        "CidrBlock":{
+          "shape":"Cidr",
+          "documentation":"<p>Value for the CIDR block.</p>"
+        },
+        "LocationName":{
+          "shape":"CidrLocationNameDefaultNotAllowed",
+          "documentation":"<p>The location name of the CIDR block.</p>"
+        }
+      },
+      "documentation":"<p>A complex type that lists the CIDR blocks.</p>"
+    },
+    "CidrCollection":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"ARN",
+          "documentation":"<p>The ARN of the collection. Can be used to reference the collection in IAM policy or in another Amazon Web Services account.</p>"
+        },
+        "Id":{
+          "shape":"UUID",
+          "documentation":"<p>The unique ID of the CIDR collection.</p>"
+        },
+        "Name":{
+          "shape":"CollectionName",
+          "documentation":"<p>The name of a CIDR collection.</p>"
+        },
+        "Version":{
+          "shape":"CollectionVersion",
+          "documentation":"<p>A sequential counter that Route 53 sets to 1 when you create a CIDR collection and increments by 1 each time you update settings for the CIDR collection.</p>"
+        }
+      },
+      "documentation":"<p>A complex type that identifies a CIDR collection.</p>"
+    },
+    "CidrCollectionAlreadyExistsException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>A CIDR collection with this name and a different caller reference already exists in this account.</p>",
+      "exception":true
+    },
+    "CidrCollectionChange":{
+      "type":"structure",
+      "required":[
+        "LocationName",
+        "Action",
+        "CidrList"
+      ],
+      "members":{
+        "LocationName":{
+          "shape":"CidrLocationNameDefaultNotAllowed",
+          "documentation":"<p>Name of the location that is associated with the CIDR collection.</p>"
+        },
+        "Action":{
+          "shape":"CidrCollectionChangeAction",
+          "documentation":"<p>CIDR collection change action. </p>"
+        },
+        "CidrList":{
+          "shape":"CidrList",
+          "documentation":"<p>List of CIDR blocks.</p>"
+        }
+      },
+      "documentation":"<p>A complex type that contains information about the CIDR collection change.</p>"
+    },
+    "CidrCollectionChangeAction":{
+      "type":"string",
+      "enum":[
+        "PUT",
+        "DELETE_IF_EXISTS"
+      ]
+    },
+    "CidrCollectionChanges":{
+      "type":"list",
+      "member":{"shape":"CidrCollectionChange"},
+      "max":1000,
+      "min":1
+    },
+    "CidrCollectionInUseException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>This CIDR collection is in use, and isn't empty.</p>",
+      "error":{"httpStatusCode":400},
+      "exception":true
+    },
+    "CidrCollectionVersionMismatchException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The CIDR collection version you provided, doesn't match the one in the <code>ListCidrCollections</code> operation.</p>",
+      "error":{"httpStatusCode":409},
+      "exception":true
+    },
+    "CidrList":{
+      "type":"list",
+      "member":{
+        "shape":"Cidr",
+        "locationName":"Cidr"
+      },
+      "max":1000,
+      "min":1
+    },
+    "CidrLocationNameDefaultAllowed":{
+      "type":"string",
+      "max":16,
+      "min":1,
+      "pattern":"[0-9A-Za-z_\\-\\*]+"
+    },
+    "CidrLocationNameDefaultNotAllowed":{
+      "type":"string",
+      "max":16,
+      "min":1,
+      "pattern":"[0-9A-Za-z_\\-]+"
+    },
+    "CidrNonce":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"\\p{ASCII}+"
+    },
+    "CidrRoutingConfig":{
+      "type":"structure",
+      "required":[
+        "CollectionId",
+        "LocationName"
+      ],
+      "members":{
+        "CollectionId":{
+          "shape":"UUID",
+          "documentation":"<p>The CIDR collection ID.</p>"
+        },
+        "LocationName":{
+          "shape":"CidrLocationNameDefaultAllowed",
+          "documentation":"<p>The CIDR collection location name.</p>"
+        }
+      },
+      "documentation":"<p>The object that is specified in resource record set object when you are linking a resource record set to a CIDR location.</p> <p>A <code>LocationName</code> with an asterisk “*” can be used to create a default CIDR record. <code>CollectionId</code> is still required for default record.</p>"
+    },
     "CloudWatchAlarmConfiguration":{
       "type":"structure",
       "required":[
@@ -1474,6 +1781,42 @@
       "max":64,
       "min":1
     },
+    "CollectionName":{
+      "type":"string",
+      "max":64,
+      "min":1,
+      "pattern":"[0-9A-Za-z_\\-]+"
+    },
+    "CollectionSummaries":{
+      "type":"list",
+      "member":{"shape":"CollectionSummary"}
+    },
+    "CollectionSummary":{
+      "type":"structure",
+      "members":{
+        "Arn":{
+          "shape":"ARN",
+          "documentation":"<p>The ARN of the collection summary. Can be used to reference the collection in IAM policy or cross-account.</p>"
+        },
+        "Id":{
+          "shape":"UUID",
+          "documentation":"<p>Unique ID for the CIDR collection.</p>"
+        },
+        "Name":{
+          "shape":"CollectionName",
+          "documentation":"<p>The name of a CIDR collection.</p>"
+        },
+        "Version":{
+          "shape":"CollectionVersion",
+          "documentation":"<p>A sequential counter that Route 53 sets to 1 when you create a CIDR collection and increments by 1 each time you update settings for the CIDR collection.</p>"
+        }
+      },
+      "documentation":"<p>A complex type that is an entry in an <a href=\"https://docs.aws.amazon.com/Route53/latest/APIReference/API_CidrCollection.html\">CidrCollection</a> array.</p>"
+    },
+    "CollectionVersion":{
+      "type":"long",
+      "min":1
+    },
     "ComparisonOperator":{
       "type":"string",
       "enum":[
@@ -1515,6 +1858,38 @@
       "error":{"httpStatusCode":400},
       "exception":true
     },
+    "CreateCidrCollectionRequest":{
+      "type":"structure",
+      "required":[
+        "Name",
+        "CallerReference"
+      ],
+      "members":{
+        "Name":{
+          "shape":"CollectionName",
+          "documentation":"<p>A unique identifier for the account that can be used to reference the collection from other API calls.</p>"
+        },
+        "CallerReference":{
+          "shape":"CidrNonce",
+          "documentation":"<p>A client-specific token that allows requests to be securely retried so that the intended outcome will only occur once, retries receive a similar response, and there are no additional edge cases to handle.</p>"
+        }
+      }
+    },
+    "CreateCidrCollectionResponse":{
+      "type":"structure",
+      "members":{
+        "Collection":{
+          "shape":"CidrCollection",
+          "documentation":"<p>A complex type that contains information about the CIDR collection.</p>"
+        },
+        "Location":{
+          "shape":"ResourceURI",
+          "documentation":"<p>A unique URL that represents the location for the CIDR collection.</p>",
+          "location":"header",
+          "locationName":"Location"
+        }
+      }
+    },
     "CreateHealthCheckRequest":{
       "type":"structure",
       "required":[
@@ -1562,7 +1937,7 @@
       "members":{
         "Name":{
           "shape":"DNSName",
-          "documentation":"<p>The name of the domain. Specify a fully qualified domain name, for example, <i>www.example.com</i>. The trailing dot is optional; Amazon Route 53 assumes that the domain name is fully qualified. This means that Route 53 treats <i>www.example.com</i> (without a trailing dot) and <i>www.example.com.</i> (with a trailing dot) as identical.</p> <p>If you're creating a public hosted zone, this is the name you have registered with your DNS registrar. If your domain name is registered with a registrar other than Route 53, change the name servers for your domain to the set of <code>NameServers</code> that <code>CreateHostedZone</code> returns in <code>DelegationSet</code>.</p>"
+          "documentation":"<p>The name of the domain. Specify a fully qualified domain name, for example, <i>www.example.com</i>. The trailing dot is optional; Amazon Route 53 assumes that the domain name is fully qualified. This means that Route 53 treats <i>www.example.com</i> (without a trailing dot) and <i>www.example.com.</i> (with a trailing dot) as identical.</p> <p>If you're creating a public hosted zone, this is the name you have registered with your DNS registrar. If your domain name is registered with a registrar other than Route 53, change the name servers for your domain to the set of <code>NameServers</code> that <code>CreateHostedZone</code> returns in <code>DelegationSet</code>.</p>"
         },
         "VPC":{
           "shape":"VPC",
@@ -1578,7 +1953,7 @@
         },
         "DelegationSetId":{
           "shape":"ResourceId",
-          "documentation":"<p>If you want to associate a reusable delegation set with this hosted zone, the ID that Amazon Route 53 assigned to the reusable delegation set when you created it. For more information about reusable delegation sets, see <a href=\"https://docs.aws.amazon.com/Route53/latest/APIReference/API_CreateReusableDelegationSet.html\">CreateReusableDelegationSet</a>.</p>"
+          "documentation":"<p>If you want to associate a reusable delegation set with this hosted zone, the ID that Amazon Route 53 assigned to the reusable delegation set when you created it. For more information about reusable delegation sets, see <a href=\"https://docs.aws.amazon.com/Route53/latest/APIReference/API_CreateReusableDelegationSet.html\">CreateReusableDelegationSet</a>.</p>"
         }
       },
       "documentation":"<p>A complex type that contains information about the request to create a public or private hosted zone.</p>"
@@ -2061,6 +2436,23 @@
         "locationName":"DelegationSet"
       }
     },
+    "DeleteCidrCollectionRequest":{
+      "type":"structure",
+      "required":["Id"],
+      "members":{
+        "Id":{
+          "shape":"UUID",
+          "documentation":"<p>The UUID of the collection to delete.</p>",
+          "location":"uri",
+          "locationName":"CidrCollectionId"
+        }
+      }
+    },
+    "DeleteCidrCollectionResponse":{
+      "type":"structure",
+      "members":{
+      }
+    },
     "DeleteHealthCheckRequest":{
       "type":"structure",
       "required":["HealthCheckId"],
@@ -2490,7 +2882,7 @@
       "required":["Id"],
       "members":{
         "Id":{
-          "shape":"ResourceId",
+          "shape":"ChangeId",
           "documentation":"<p>The ID of the change batch request. The value that you specify here is the value that <code>ChangeResourceRecordSets</code> returned in the <code>Id</code> element when you submitted the request.</p>",
           "location":"uri",
           "locationName":"Id"
@@ -3630,7 +4022,7 @@
           "documentation":"<p/>"
         }
       },
-      "documentation":"<p>This operation can't be completed either because the current account has reached the limit on reusable delegation sets that it can create or because you've reached the limit on the number of Amazon VPCs that you can associate with a private hosted zone. To get the current limit on the number of reusable delegation sets, see <a href=\"https://docs.aws.amazon.com/Route53/latest/APIReference/API_GetAccountLimit.html\">GetAccountLimit</a>. To get the current limit on the number of Amazon VPCs that you can associate with a private hosted zone, see <a href=\"https://docs.aws.amazon.com/Route53/latest/APIReference/API_GetHostedZoneLimit.html\">GetHostedZoneLimit</a>. To request a higher limit, <a href=\"http://aws.amazon.com/route53-request\">create a case</a> with the Amazon Web Services Support Center.</p>",
+      "documentation":"<p>This operation can't be completed because the current account has reached the limit on the resource you are trying to create. To request a higher limit, <a href=\"http://aws.amazon.com/route53-request\">create a case</a> with the Amazon Web Services Support Center.</p>",
       "exception":true
     },
     "LinkedService":{
@@ -3647,6 +4039,116 @@
       },
       "documentation":"<p>If a health check or hosted zone was created by another service, <code>LinkedService</code> is a complex type that describes the service that created the resource. When a resource is created by another service, you can't edit or delete it using Amazon Route 53. </p>"
     },
+    "ListCidrBlocksRequest":{
+      "type":"structure",
+      "required":["CollectionId"],
+      "members":{
+        "CollectionId":{
+          "shape":"UUID",
+          "documentation":"<p>The UUID of the CIDR collection.</p>",
+          "location":"uri",
+          "locationName":"CidrCollectionId"
+        },
+        "LocationName":{
+          "shape":"CidrLocationNameDefaultNotAllowed",
+          "documentation":"<p>The name of the CIDR collection location.</p>",
+          "location":"querystring",
+          "locationName":"location"
+        },
+        "NextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>An opaque pagination token to indicate where the service is to begin enumerating results.</p>",
+          "location":"querystring",
+          "locationName":"nexttoken"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>Maximum number of results you want returned.</p>",
+          "location":"querystring",
+          "locationName":"maxresults"
+        }
+      }
+    },
+    "ListCidrBlocksResponse":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>An opaque pagination token to indicate where the service is to begin enumerating results. </p> <p>If no value is provided, the listing of results starts from the beginning.</p>"
+        },
+        "CidrBlocks":{
+          "shape":"CidrBlockSummaries",
+          "documentation":"<p>A complex type that contains information about the CIDR blocks.</p>"
+        }
+      }
+    },
+    "ListCidrCollectionsRequest":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>An opaque pagination token to indicate where the service is to begin enumerating results.</p> <p>If no value is provided, the listing of results starts from the beginning.</p>",
+          "location":"querystring",
+          "locationName":"nexttoken"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of CIDR collections to return in the response.</p>",
+          "location":"querystring",
+          "locationName":"maxresults"
+        }
+      }
+    },
+    "ListCidrCollectionsResponse":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>An opaque pagination token to indicate where the service is to begin enumerating results.</p> <p>If no value is provided, the listing of results starts from the beginning.</p>"
+        },
+        "CidrCollections":{
+          "shape":"CollectionSummaries",
+          "documentation":"<p>A complex type with information about the CIDR collection.</p>"
+        }
+      }
+    },
+    "ListCidrLocationsRequest":{
+      "type":"structure",
+      "required":["CollectionId"],
+      "members":{
+        "CollectionId":{
+          "shape":"UUID",
+          "documentation":"<p>The CIDR collection ID.</p>",
+          "location":"uri",
+          "locationName":"CidrCollectionId"
+        },
+        "NextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>An opaque pagination token to indicate where the service is to begin enumerating results.</p> <p>If no value is provided, the listing of results starts from the beginning.</p>",
+          "location":"querystring",
+          "locationName":"nexttoken"
+        },
+        "MaxResults":{
+          "shape":"MaxResults",
+          "documentation":"<p>The maximum number of CIDR collection locations to return in the response.</p>",
+          "location":"querystring",
+          "locationName":"maxresults"
+        }
+      }
+    },
+    "ListCidrLocationsResponse":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"PaginationToken",
+          "documentation":"<p>An opaque pagination token to indicate where the service is to begin enumerating results.</p> <p>If no value is provided, the listing of results starts from the beginning.</p>"
+        },
+        "CidrLocations":{
+          "shape":"LocationSummaries",
+          "documentation":"<p>A complex type that contains information about the list of CIDR locations.</p>"
+        }
+      }
+    },
     "ListGeoLocationsRequest":{
       "type":"structure",
       "members":{
@@ -4512,6 +5014,20 @@
       },
       "documentation":"<p>A complex type that contains the response information for the request.</p>"
     },
+    "LocationSummaries":{
+      "type":"list",
+      "member":{"shape":"LocationSummary"}
+    },
+    "LocationSummary":{
+      "type":"structure",
+      "members":{
+        "LocationName":{
+          "shape":"CidrLocationNameDefaultAllowed",
+          "documentation":"<p>A string that specifies a location name.</p>"
+        }
+      },
+      "documentation":"<p>A complex type that contains information about the CIDR location.</p>"
+    },
     "MaxResults":{"type":"string"},
     "MeasureLatency":{"type":"boolean"},
     "Message":{
@@ -4542,6 +5058,24 @@
       "error":{"httpStatusCode":404},
       "exception":true
     },
+    "NoSuchCidrCollectionException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The CIDR collection you specified, doesn't exist.</p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
+    "NoSuchCidrLocationException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"ErrorMessage"}
+      },
+      "documentation":"<p>The CIDR collection location doesn't match any locations in your account.</p>",
+      "error":{"httpStatusCode":404},
+      "exception":true
+    },
     "NoSuchCloudWatchLogsLogGroup":{
       "type":"structure",
       "members":{
@@ -4881,7 +5415,8 @@
         "TrafficPolicyInstanceId":{
           "shape":"TrafficPolicyInstanceId",
           "documentation":"<p>When you create a traffic policy instance, Amazon Route 53 automatically creates a resource record set. <code>TrafficPolicyInstanceId</code> is the ID of the traffic policy instance that Route 53 created this resource record set for.</p> <important> <p>To delete the resource record set that is associated with a traffic policy instance, use <code>DeleteTrafficPolicyInstance</code>. Route 53 will delete the resource record set automatically. If you delete the resource record set by using <code>ChangeResourceRecordSets</code>, Route 53 doesn't automatically delete the traffic policy instance, and you'll continue to be charged for it even though it's no longer in use. </p> </important>"
-        }
+        },
+        "CidrRoutingConfig":{"shape":"CidrRoutingConfig"}
       },
       "documentation":"<p>Information about the resource record set to create or delete.</p>"
     },
@@ -5521,6 +6056,10 @@
       "max":4
     },
     "TransportProtocol":{"type":"string"},
+    "UUID":{
+      "type":"string",
+      "pattern":"[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}"
+    },
     "UpdateHealthCheckRequest":{
       "type":"structure",
       "required":["HealthCheckId"],
diff --git a/contrib/python/botocore/py3/botocore/handlers.py b/contrib/python/botocore/py3/botocore/handlers.py
index 1337d6a323c..b94ae299fda 100644
--- a/contrib/python/botocore/py3/botocore/handlers.py
+++ b/contrib/python/botocore/py3/botocore/handlers.py
@@ -632,7 +632,7 @@ def fix_route53_ids(params, model, **kwargs):
     members = [
         name
         for (name, shape) in input_shape.members.items()
-        if shape.name in ['ResourceId', 'DelegationSetId']
+        if shape.name in ['ResourceId', 'DelegationSetId', 'ChangeId']
     ]
 
     for name in members: