aws-sdk-core 2.11.304 → 2.11.390

data/apis/ec2-instance-connect/2018-04-02/api-2.json

@@ -0,0 +1,119 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2018-04-02",
+    "endpointPrefix":"ec2-instance-connect",
+    "jsonVersion":"1.1",
+    "protocol":"json",
+    "serviceAbbreviation":"EC2 Instance Connect",
+    "serviceFullName":"AWS EC2 Instance Connect",
+    "serviceId":"EC2 Instance Connect",
+    "signatureVersion":"v4",
+    "targetPrefix":"AWSEC2InstanceConnectService",
+    "uid":"ec2-instance-connect-2018-04-02"
+  },
+  "operations":{
+    "SendSSHPublicKey":{
+      "name":"SendSSHPublicKey",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"SendSSHPublicKeyRequest"},
+      "output":{"shape":"SendSSHPublicKeyResponse"},
+      "errors":[
+        {"shape":"AuthException"},
+        {"shape":"InvalidArgsException"},
+        {"shape":"ServiceException"},
+        {"shape":"ThrottlingException"},
+        {"shape":"EC2InstanceNotFoundException"}
+      ]
+    }
+  },
+  "shapes":{
+    "AuthException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"}
+      },
+      "exception":true
+    },
+    "AvailabilityZone":{
+      "type":"string",
+      "max":32,
+      "min":6,
+      "pattern":"^(\\w+-){2,3}\\d+\\w+$"
+    },
+    "EC2InstanceNotFoundException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"}
+      },
+      "exception":true
+    },
+    "InstanceId":{
+      "type":"string",
+      "max":32,
+      "min":10,
+      "pattern":"^i-[a-f0-9]+$"
+    },
+    "InstanceOSUser":{
+      "type":"string",
+      "max":32,
+      "min":1,
+      "pattern":"^[A-Za-z_][A-Za-z0-9\\@\\._-]{0,30}[A-Za-z0-9\\$_-]?$"
+    },
+    "InvalidArgsException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"}
+      },
+      "exception":true
+    },
+    "RequestId":{"type":"string"},
+    "SSHPublicKey":{
+      "type":"string",
+      "max":4096,
+      "min":256
+    },
+    "SendSSHPublicKeyRequest":{
+      "type":"structure",
+      "required":[
+        "InstanceId",
+        "InstanceOSUser",
+        "SSHPublicKey",
+        "AvailabilityZone"
+      ],
+      "members":{
+        "InstanceId":{"shape":"InstanceId"},
+        "InstanceOSUser":{"shape":"InstanceOSUser"},
+        "SSHPublicKey":{"shape":"SSHPublicKey"},
+        "AvailabilityZone":{"shape":"AvailabilityZone"}
+      }
+    },
+    "SendSSHPublicKeyResponse":{
+      "type":"structure",
+      "members":{
+        "RequestId":{"shape":"RequestId"},
+        "Success":{"shape":"Success"}
+      }
+    },
+    "ServiceException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"}
+      },
+      "exception":true,
+      "fault":true
+    },
+    "String":{"type":"string"},
+    "Success":{"type":"boolean"},
+    "ThrottlingException":{
+      "type":"structure",
+      "members":{
+        "Message":{"shape":"String"}
+      },
+      "exception":true
+    }
+  }
+}

data/apis/ec2-instance-connect/2018-04-02/examples-1.json

@@ -0,0 +1,34 @@
+{
+  "version": "1.0",
+  "examples": {
+    "SendSSHPublicKey": [
+      {
+        "input": {
+          "AvailabilityZone": "us-west-2a",
+          "InstanceId": "i-abcd1234",
+          "InstanceOSUser": "ec2-user",
+          "SSHPublicKey": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC3FlHqj2eqCdrGHuA6dRjfZXQ4HX5lXEIRHaNbxEwE5Te7xNF7StwhrDtiV7IdT5fDqbRyGw/szPj3xGkNTVoElCZ2dDFb2qYZ1WLIpZwj/UhO9l2mgfjR56UojjQut5Jvn2KZ1OcyrNO0J83kCaJCV7JoVbXY79FBMUccYNY45zmv9+1FMCfY6i2jdIhwR6+yLk8oubL8lIPyq7X+6b9S0yKCkB7Peml1DvghlybpAIUrC9vofHt6XP4V1i0bImw1IlljQS+DUmULRFSccATDscCX9ajnj7Crhm0HAZC0tBPXpFdHkPwL3yzYo546SCS9LKEwz62ymxxbL9k7h09t"
+        },
+        "output": {
+          "RequestId": "abcd1234-abcd-1234-abcd-1234abcd1234",
+          "Success": true
+        },
+        "comments": {
+          "input": {
+            "AvailabilityZone": "The zone where the instance was launched",
+            "InstanceId": "The instance ID to publish the key to.",
+            "InstanceOSUser": "This should be the user you wish to be when ssh-ing to the instance (eg, ec2-user@[instance IP])",
+            "SSHPublicKey": "This should be in standard OpenSSH format (ssh-rsa [key body])"
+          },
+          "output": {
+            "RequestId": "This request ID should be provided when contacting AWS Support.",
+            "Success": "Should be true if the service does not return an error response."
+          }
+        },
+        "description": "The following example pushes a sample SSH public key to the EC2 instance i-abcd1234 in AZ us-west-2b for use by the instance OS user ec2-user.",
+        "id": "send-ssh-key-to-an-ec2-instance-1518124883100",
+        "title": "To push an SSH key to an EC2 instance"
+      }
+    ]
+  }
+}

data/apis/ec2-instance-connect/2018-04-02/paginators-1.json

@@ -0,0 +1,4 @@
+{
+  "pagination": {
+  }
+}

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

@@ -99,7 +99,8 @@
         "method":"POST",
         "requestUri":"/"
       },
-      "input":{"shape":"AssignPrivateIpAddressesRequest"}
+      "input":{"shape":"AssignPrivateIpAddressesRequest"},
+      "output":{"shape":"AssignPrivateIpAddressesResult"}
     },
     "AssociateAddress":{
       "name":"AssociateAddress",
@@ -947,6 +948,15 @@
       },
       "input":{"shape":"DeletePlacementGroupRequest"}
     },
+    "DeleteQueuedReservedInstances":{
+      "name":"DeleteQueuedReservedInstances",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DeleteQueuedReservedInstancesRequest"},
+      "output":{"shape":"DeleteQueuedReservedInstancesResult"}
+    },
     "DeleteRoute":{
       "name":"DeleteRoute",
       "http":{
@@ -1330,6 +1340,15 @@
       "input":{"shape":"DescribeElasticGpusRequest"},
       "output":{"shape":"DescribeElasticGpusResult"}
     },
+    "DescribeExportImageTasks":{
+      "name":"DescribeExportImageTasks",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"DescribeExportImageTasksRequest"},
+      "output":{"shape":"DescribeExportImageTasksResult"}
+    },
     "DescribeExportTasks":{
       "name":"DescribeExportTasks",
       "http":{
@@ -2267,6 +2286,15 @@
       "input":{"shape":"ExportClientVpnClientConfigurationRequest"},
       "output":{"shape":"ExportClientVpnClientConfigurationResult"}
     },
+    "ExportImage":{
+      "name":"ExportImage",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ExportImageRequest"},
+      "output":{"shape":"ExportImageResult"}
+    },
     "ExportTransitGatewayRoutes":{
       "name":"ExportTransitGatewayRoutes",
       "http":{
@@ -2276,6 +2304,15 @@
       "input":{"shape":"ExportTransitGatewayRoutesRequest"},
       "output":{"shape":"ExportTransitGatewayRoutesResult"}
     },
+    "GetCapacityReservationUsage":{
+      "name":"GetCapacityReservationUsage",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"GetCapacityReservationUsageRequest"},
+      "output":{"shape":"GetCapacityReservationUsageResult"}
+    },
     "GetConsoleOutput":{
       "name":"GetConsoleOutput",
       "http":{
@@ -2726,6 +2763,24 @@
       "input":{"shape":"ModifyVpnConnectionRequest"},
       "output":{"shape":"ModifyVpnConnectionResult"}
     },
+    "ModifyVpnTunnelCertificate":{
+      "name":"ModifyVpnTunnelCertificate",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ModifyVpnTunnelCertificateRequest"},
+      "output":{"shape":"ModifyVpnTunnelCertificateResult"}
+    },
+    "ModifyVpnTunnelOptions":{
+      "name":"ModifyVpnTunnelOptions",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"ModifyVpnTunnelOptionsRequest"},
+      "output":{"shape":"ModifyVpnTunnelOptionsResult"}
+    },
     "MonitorInstances":{
       "name":"MonitorInstances",
       "http":{
@@ -3030,6 +3085,14 @@
       "input":{"shape":"SearchTransitGatewayRoutesRequest"},
       "output":{"shape":"SearchTransitGatewayRoutesResult"}
     },
+    "SendDiagnosticInterrupt":{
+      "name":"SendDiagnosticInterrupt",
+      "http":{
+        "method":"POST",
+        "requestUri":"/"
+      },
+      "input":{"shape":"SendDiagnosticInterruptRequest"}
+    },
     "StartInstances":{
       "name":"StartInstances",
       "http":{
@@ -3149,7 +3212,7 @@
       "type":"structure",
       "required":["TransitGatewayAttachmentId"],
       "members":{
-        "TransitGatewayAttachmentId":{"shape":"String"},
+        "TransitGatewayAttachmentId":{"shape":"TransitGatewayAttachmentId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -3170,7 +3233,7 @@
       ],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "ServiceId":{"shape":"String"},
+        "ServiceId":{"shape":"ServiceId"},
         "VpcEndpointIds":{
           "shape":"ValueStringList",
           "locationName":"VpcEndpointId"
@@ -3194,7 +3257,7 @@
           "locationName":"dryRun"
         },
         "VpcPeeringConnectionId":{
-          "shape":"String",
+          "shape":"VpcPeeringConnectionId",
           "locationName":"vpcPeeringConnectionId"
         }
       }
@@ -3448,6 +3511,7 @@
         }
       }
     },
+    "AllocationId":{"type":"string"},
     "AllocationIdList":{
       "type":"list",
       "member":{
@@ -3470,7 +3534,8 @@
       "type":"string",
       "enum":[
         "lowestPrice",
-        "diversified"
+        "diversified",
+        "capacityOptimized"
       ]
     },
     "AllowedPrincipal":{
@@ -3501,8 +3566,8 @@
         "SecurityGroupIds"
       ],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
-        "VpcId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
+        "VpcId":{"shape":"VpcId"},
         "SecurityGroupIds":{
           "shape":"ClientVpnSecurityGroupIdSet",
           "locationName":"SecurityGroupId"
@@ -3540,7 +3605,7 @@
           "locationName":"ipv6Addresses"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "locationName":"networkInterfaceId"
         }
       }
@@ -3567,7 +3632,7 @@
           "locationName":"allowReassignment"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "locationName":"networkInterfaceId"
         },
         "PrivateIpAddresses":{
@@ -3580,11 +3645,40 @@
         }
       }
     },
+    "AssignPrivateIpAddressesResult":{
+      "type":"structure",
+      "members":{
+        "NetworkInterfaceId":{
+          "shape":"String",
+          "locationName":"networkInterfaceId"
+        },
+        "AssignedPrivateIpAddresses":{
+          "shape":"AssignedPrivateIpAddressList",
+          "locationName":"assignedPrivateIpAddressesSet"
+        }
+      }
+    },
+    "AssignedPrivateIpAddress":{
+      "type":"structure",
+      "members":{
+        "PrivateIpAddress":{
+          "shape":"String",
+          "locationName":"privateIpAddress"
+        }
+      }
+    },
+    "AssignedPrivateIpAddressList":{
+      "type":"list",
+      "member":{
+        "shape":"AssignedPrivateIpAddress",
+        "locationName":"item"
+      }
+    },
     "AssociateAddressRequest":{
       "type":"structure",
       "members":{
-        "AllocationId":{"shape":"String"},
-        "InstanceId":{"shape":"String"},
+        "AllocationId":{"shape":"AllocationId"},
+        "InstanceId":{"shape":"InstanceId"},
         "PublicIp":{"shape":"String"},
         "AllowReassociation":{
           "shape":"Boolean",
@@ -3595,7 +3689,7 @@
           "locationName":"dryRun"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "locationName":"networkInterfaceId"
         },
         "PrivateIpAddress":{
@@ -3620,8 +3714,8 @@
         "SubnetId"
       ],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
-        "SubnetId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
+        "SubnetId":{"shape":"SubnetId"},
         "ClientToken":{
           "shape":"String",
           "idempotencyToken":true
@@ -3649,8 +3743,8 @@
         "VpcId"
       ],
       "members":{
-        "DhcpOptionsId":{"shape":"String"},
-        "VpcId":{"shape":"String"},
+        "DhcpOptionsId":{"shape":"DhcpOptionsId"},
+        "VpcId":{"shape":"VpcId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -3665,7 +3759,7 @@
       ],
       "members":{
         "IamInstanceProfile":{"shape":"IamInstanceProfileSpecification"},
-        "InstanceId":{"shape":"String"}
+        "InstanceId":{"shape":"InstanceId"}
       }
     },
     "AssociateIamInstanceProfileResult":{
@@ -3689,11 +3783,11 @@
           "locationName":"dryRun"
         },
         "RouteTableId":{
-          "shape":"String",
+          "shape":"RouteTableId",
           "locationName":"routeTableId"
         },
         "SubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "locationName":"subnetId"
         }
       }
@@ -3719,7 +3813,7 @@
           "locationName":"ipv6CidrBlock"
         },
         "SubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "locationName":"subnetId"
         }
       }
@@ -3744,8 +3838,8 @@
         "TransitGatewayAttachmentId"
       ],
       "members":{
-        "TransitGatewayRouteTableId":{"shape":"String"},
-        "TransitGatewayAttachmentId":{"shape":"String"},
+        "TransitGatewayRouteTableId":{"shape":"TransitGatewayRouteTableId"},
+        "TransitGatewayAttachmentId":{"shape":"TransitGatewayAttachmentId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -3768,7 +3862,7 @@
         },
         "CidrBlock":{"shape":"String"},
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "locationName":"vpcId"
         }
       }
@@ -3861,11 +3955,11 @@
           "locationName":"SecurityGroupId"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "locationName":"instanceId"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "locationName":"vpcId"
         }
       }
@@ -3891,11 +3985,11 @@
           "locationName":"dryRun"
         },
         "InternetGatewayId":{
-          "shape":"String",
+          "shape":"InternetGatewayId",
           "locationName":"internetGatewayId"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "locationName":"vpcId"
         }
       }
@@ -3917,11 +4011,11 @@
           "locationName":"dryRun"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "locationName":"instanceId"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "locationName":"networkInterfaceId"
         }
       }
@@ -3944,8 +4038,8 @@
       ],
       "members":{
         "Device":{"shape":"String"},
-        "InstanceId":{"shape":"String"},
-        "VolumeId":{"shape":"String"},
+        "InstanceId":{"shape":"InstanceId"},
+        "VolumeId":{"shape":"VolumeId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -3959,8 +4053,8 @@
         "VpnGatewayId"
       ],
       "members":{
-        "VpcId":{"shape":"String"},
-        "VpnGatewayId":{"shape":"String"},
+        "VpcId":{"shape":"VpcId"},
+        "VpnGatewayId":{"shape":"VpnGatewayId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -3976,6 +4070,7 @@
         }
       }
     },
+    "AttachmentId":{"type":"string"},
     "AttachmentStatus":{
       "type":"string",
       "enum":[
@@ -4046,7 +4141,7 @@
         "TargetNetworkCidr"
       ],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
         "TargetNetworkCidr":{"shape":"String"},
         "AccessGroupId":{"shape":"String"},
         "AuthorizeAllGroups":{"shape":"Boolean"},
@@ -4297,7 +4392,7 @@
         "Storage"
       ],
       "members":{
-        "InstanceId":{"shape":"String"},
+        "InstanceId":{"shape":"InstanceId"},
         "Storage":{"shape":"Storage"},
         "DryRun":{
           "shape":"Boolean",
@@ -4456,7 +4551,7 @@
       "type":"structure",
       "required":["CapacityReservationId"],
       "members":{
-        "CapacityReservationId":{"shape":"String"},
+        "CapacityReservationId":{"shape":"CapacityReservationId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -4474,7 +4569,7 @@
       "required":["ConversionTaskId"],
       "members":{
         "ConversionTaskId":{
-          "shape":"String",
+          "shape":"ConversionTaskId",
           "locationName":"conversionTaskId"
         },
         "DryRun":{
@@ -4492,7 +4587,7 @@
       "required":["ExportTaskId"],
       "members":{
         "ExportTaskId":{
-          "shape":"String",
+          "shape":"ExportTaskId",
           "locationName":"exportTaskId"
         }
       }
@@ -4502,7 +4597,7 @@
       "members":{
         "CancelReason":{"shape":"String"},
         "DryRun":{"shape":"Boolean"},
-        "ImportTaskId":{"shape":"String"}
+        "ImportTaskId":{"shape":"ImportTaskId"}
       }
     },
     "CancelImportTaskResult":{
@@ -4527,7 +4622,7 @@
       "required":["ReservedInstancesListingId"],
       "members":{
         "ReservedInstancesListingId":{
-          "shape":"String",
+          "shape":"ReservedInstancesListingId",
           "locationName":"reservedInstancesListingId"
         }
       }
@@ -4692,6 +4787,18 @@
           "shape":"String",
           "locationName":"capacityReservationId"
         },
+        "OwnerId":{
+          "shape":"String",
+          "locationName":"ownerId"
+        },
+        "CapacityReservationArn":{
+          "shape":"String",
+          "locationName":"capacityReservationArn"
+        },
+        "AvailabilityZoneId":{
+          "shape":"String",
+          "locationName":"availabilityZoneId"
+        },
         "InstanceType":{
           "shape":"String",
           "locationName":"instanceType"
@@ -4750,6 +4857,7 @@
         }
       }
     },
+    "CapacityReservationId":{"type":"string"},
     "CapacityReservationIdSet":{
       "type":"list",
       "member":{
@@ -5207,6 +5315,7 @@
         }
       }
     },
+    "ClientVpnEndpointId":{"type":"string"},
     "ClientVpnEndpointStatus":{
       "type":"structure",
       "members":{
@@ -5305,7 +5414,7 @@
         "ProductCode"
       ],
       "members":{
-        "InstanceId":{"shape":"String"},
+        "InstanceId":{"shape":"InstanceId"},
         "ProductCode":{"shape":"String"},
         "DryRun":{
           "shape":"Boolean",
@@ -5375,6 +5484,7 @@
         }
       }
     },
+    "ConnectionNotificationId":{"type":"string"},
     "ConnectionNotificationSet":{
       "type":"list",
       "member":{
@@ -5437,6 +5547,7 @@
         }
       }
     },
+    "ConversionTaskId":{"type":"string"},
     "ConversionTaskState":{
       "type":"string",
       "enum":[
@@ -5485,7 +5596,7 @@
           "locationName":"encrypted"
         },
         "KmsKeyId":{
-          "shape":"String",
+          "shape":"KmsKeyId",
           "locationName":"kmsKeyId"
         },
         "Name":{"shape":"String"},
@@ -5523,7 +5634,7 @@
           "locationName":"encrypted"
         },
         "KmsKeyId":{
-          "shape":"String",
+          "shape":"KmsKeyId",
           "locationName":"kmsKeyId"
         },
         "PresignedUrl":{
@@ -5576,7 +5687,6 @@
       "required":[
         "InstanceType",
         "InstancePlatform",
-        "AvailabilityZone",
         "InstanceCount"
       ],
       "members":{
@@ -5584,6 +5694,7 @@
         "InstanceType":{"shape":"String"},
         "InstancePlatform":{"shape":"CapacityReservationInstancePlatform"},
         "AvailabilityZone":{"shape":"String"},
+        "AvailabilityZoneId":{"shape":"String"},
         "Tenancy":{"shape":"CapacityReservationTenancy"},
         "InstanceCount":{"shape":"Integer"},
         "EbsOptimized":{"shape":"Boolean"},
@@ -5623,6 +5734,7 @@
         "DnsServers":{"shape":"ValueStringList"},
         "TransportProtocol":{"shape":"TransportProtocol"},
         "Description":{"shape":"String"},
+        "SplitTunnel":{"shape":"Boolean"},
         "DryRun":{"shape":"Boolean"},
         "ClientToken":{
           "shape":"String",
@@ -5659,7 +5771,7 @@
         "TargetVpcSubnetId"
       ],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
         "DestinationCidrBlock":{"shape":"String"},
         "TargetVpcSubnetId":{"shape":"String"},
         "Description":{"shape":"String"},
@@ -5683,7 +5795,6 @@
       "type":"structure",
       "required":[
         "BgpAsn",
-        "PublicIp",
         "Type"
       ],
       "members":{
@@ -5692,6 +5803,7 @@
           "shape":"String",
           "locationName":"IpAddress"
         },
+        "CertificateArn":{"shape":"String"},
         "Type":{"shape":"GatewayType"},
         "DryRun":{
           "shape":"Boolean",
@@ -5769,7 +5881,7 @@
       "members":{
         "ClientToken":{"shape":"String"},
         "DryRun":{"shape":"Boolean"},
-        "VpcId":{"shape":"String"}
+        "VpcId":{"shape":"VpcId"}
       }
     },
     "CreateEgressOnlyInternetGatewayResult":{
@@ -5906,7 +6018,8 @@
         "ResourceType":{"shape":"FlowLogsResourceType"},
         "TrafficType":{"shape":"TrafficType"},
         "LogDestinationType":{"shape":"LogDestinationType"},
-        "LogDestination":{"shape":"String"}
+        "LogDestination":{"shape":"String"},
+        "LogFormat":{"shape":"String"}
       }
     },
     "CreateFlowLogsResult":{
@@ -5935,7 +6048,11 @@
         "LogsStorageLocation":{"shape":"StorageLocation"},
         "Description":{"shape":"String"},
         "Name":{"shape":"String"},
-        "ClientToken":{"shape":"String"}
+        "ClientToken":{"shape":"String"},
+        "TagSpecifications":{
+          "shape":"TagSpecificationList",
+          "locationName":"TagSpecification"
+        }
       }
     },
     "CreateFpgaImageResult":{
@@ -5971,7 +6088,7 @@
           "locationName":"dryRun"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "locationName":"instanceId"
         },
         "Name":{
@@ -6006,7 +6123,7 @@
           "locationName":"exportToS3"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "locationName":"instanceId"
         },
         "TargetEnvironment":{
@@ -6046,7 +6163,7 @@
       "type":"structure",
       "required":["KeyName"],
       "members":{
-        "KeyName":{"shape":"String"},
+        "KeyName":{"shape":"KeyPairName"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -6064,7 +6181,11 @@
         "ClientToken":{"shape":"String"},
         "LaunchTemplateName":{"shape":"LaunchTemplateName"},
         "VersionDescription":{"shape":"VersionDescription"},
-        "LaunchTemplateData":{"shape":"RequestLaunchTemplateData"}
+        "LaunchTemplateData":{"shape":"RequestLaunchTemplateData"},
+        "TagSpecifications":{
+          "shape":"TagSpecificationList",
+          "locationName":"TagSpecification"
+        }
       }
     },
     "CreateLaunchTemplateResult":{
@@ -6082,7 +6203,7 @@
       "members":{
         "DryRun":{"shape":"Boolean"},
         "ClientToken":{"shape":"String"},
-        "LaunchTemplateId":{"shape":"String"},
+        "LaunchTemplateId":{"shape":"LaunchTemplateId"},
         "LaunchTemplateName":{"shape":"LaunchTemplateName"},
         "SourceVersion":{"shape":"String"},
         "VersionDescription":{"shape":"VersionDescription"},
@@ -6105,9 +6226,9 @@
         "SubnetId"
       ],
       "members":{
-        "AllocationId":{"shape":"String"},
+        "AllocationId":{"shape":"AllocationId"},
         "ClientToken":{"shape":"String"},
-        "SubnetId":{"shape":"String"}
+        "SubnetId":{"shape":"SubnetId"}
       }
     },
     "CreateNatGatewayResult":{
@@ -6154,7 +6275,7 @@
           "locationName":"ipv6CidrBlock"
         },
         "NetworkAclId":{
-          "shape":"String",
+          "shape":"NetworkAclId",
           "locationName":"networkAclId"
         },
         "PortRange":{
@@ -6184,7 +6305,7 @@
           "locationName":"dryRun"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "locationName":"vpcId"
         }
       }
@@ -6205,7 +6326,7 @@
         "Permission"
       ],
       "members":{
-        "NetworkInterfaceId":{"shape":"String"},
+        "NetworkInterfaceId":{"shape":"NetworkInterfaceId"},
         "AwsAccountId":{"shape":"String"},
         "AwsService":{"shape":"String"},
         "Permission":{"shape":"InterfacePermissionType"},
@@ -6259,7 +6380,7 @@
         },
         "InterfaceType":{"shape":"NetworkInterfaceCreationType"},
         "SubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "locationName":"subnetId"
         }
       }
@@ -6344,32 +6465,32 @@
           "locationName":"dryRun"
         },
         "EgressOnlyInternetGatewayId":{
-          "shape":"String",
+          "shape":"EgressOnlyInternetGatewayId",
           "locationName":"egressOnlyInternetGatewayId"
         },
         "GatewayId":{
-          "shape":"String",
+          "shape":"RouteTableGatewayId",
           "locationName":"gatewayId"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "locationName":"instanceId"
         },
         "NatGatewayId":{
-          "shape":"String",
+          "shape":"NatGatewayId",
           "locationName":"natGatewayId"
         },
-        "TransitGatewayId":{"shape":"String"},
+        "TransitGatewayId":{"shape":"TransitGatewayId"},
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "locationName":"networkInterfaceId"
         },
         "RouteTableId":{
-          "shape":"String",
+          "shape":"RouteTableId",
           "locationName":"routeTableId"
         },
         "VpcPeeringConnectionId":{
-          "shape":"String",
+          "shape":"VpcPeeringConnectionId",
           "locationName":"vpcPeeringConnectionId"
         }
       }
@@ -6392,7 +6513,7 @@
           "locationName":"dryRun"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "locationName":"vpcId"
         }
       }
@@ -6418,7 +6539,7 @@
           "locationName":"GroupDescription"
         },
         "GroupName":{"shape":"String"},
-        "VpcId":{"shape":"String"},
+        "VpcId":{"shape":"VpcId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -6439,7 +6560,7 @@
       "required":["VolumeId"],
       "members":{
         "Description":{"shape":"String"},
-        "VolumeId":{"shape":"String"},
+        "VolumeId":{"shape":"VolumeId"},
         "TagSpecifications":{
           "shape":"TagSpecificationList",
           "locationName":"TagSpecification"
@@ -6511,7 +6632,7 @@
         "AvailabilityZoneId":{"shape":"String"},
         "CidrBlock":{"shape":"String"},
         "Ipv6CidrBlock":{"shape":"String"},
-        "VpcId":{"shape":"String"},
+        "VpcId":{"shape":"VpcId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -6587,7 +6708,7 @@
         "SourceCidrBlock"
       ],
       "members":{
-        "TrafficMirrorFilterId":{"shape":"String"},
+        "TrafficMirrorFilterId":{"shape":"TrafficMirrorFilterId"},
         "TrafficDirection":{"shape":"TrafficDirection"},
         "RuleNumber":{"shape":"Integer"},
         "RuleAction":{"shape":"TrafficMirrorRuleAction"},
@@ -6626,9 +6747,9 @@
         "SessionNumber"
       ],
       "members":{
-        "NetworkInterfaceId":{"shape":"String"},
-        "TrafficMirrorTargetId":{"shape":"String"},
-        "TrafficMirrorFilterId":{"shape":"String"},
+        "NetworkInterfaceId":{"shape":"NetworkInterfaceId"},
+        "TrafficMirrorTargetId":{"shape":"TrafficMirrorTargetId"},
+        "TrafficMirrorFilterId":{"shape":"TrafficMirrorFilterId"},
         "PacketLength":{"shape":"Integer"},
         "SessionNumber":{"shape":"Integer"},
         "VirtualNetworkId":{"shape":"Integer"},
@@ -6660,7 +6781,7 @@
     "CreateTrafficMirrorTargetRequest":{
       "type":"structure",
       "members":{
-        "NetworkInterfaceId":{"shape":"String"},
+        "NetworkInterfaceId":{"shape":"NetworkInterfaceId"},
         "NetworkLoadBalancerArn":{"shape":"String"},
         "Description":{"shape":"String"},
         "TagSpecifications":{
@@ -6716,8 +6837,8 @@
       ],
       "members":{
         "DestinationCidrBlock":{"shape":"String"},
-        "TransitGatewayRouteTableId":{"shape":"String"},
-        "TransitGatewayAttachmentId":{"shape":"String"},
+        "TransitGatewayRouteTableId":{"shape":"TransitGatewayRouteTableId"},
+        "TransitGatewayAttachmentId":{"shape":"TransitGatewayAttachmentId"},
         "Blackhole":{"shape":"Boolean"},
         "DryRun":{"shape":"Boolean"}
       }
@@ -6735,7 +6856,7 @@
       "type":"structure",
       "required":["TransitGatewayId"],
       "members":{
-        "TransitGatewayId":{"shape":"String"},
+        "TransitGatewayId":{"shape":"TransitGatewayId"},
         "TagSpecifications":{"shape":"TagSpecificationList"},
         "DryRun":{"shape":"Boolean"}
       }
@@ -6757,8 +6878,8 @@
         "SubnetIds"
       ],
       "members":{
-        "TransitGatewayId":{"shape":"String"},
-        "VpcId":{"shape":"String"},
+        "TransitGatewayId":{"shape":"TransitGatewayId"},
+        "VpcId":{"shape":"VpcId"},
         "SubnetIds":{"shape":"ValueStringList"},
         "Options":{"shape":"CreateTransitGatewayVpcAttachmentRequestOptions"},
         "TagSpecifications":{"shape":"TagSpecificationList"},
@@ -6818,9 +6939,9 @@
           "locationName":"encrypted"
         },
         "Iops":{"shape":"Integer"},
-        "KmsKeyId":{"shape":"String"},
+        "KmsKeyId":{"shape":"KmsKeyId"},
         "Size":{"shape":"Integer"},
-        "SnapshotId":{"shape":"String"},
+        "SnapshotId":{"shape":"SnapshotId"},
         "VolumeType":{"shape":"VolumeType"},
         "DryRun":{
           "shape":"Boolean",
@@ -6840,8 +6961,8 @@
       ],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "ServiceId":{"shape":"String"},
-        "VpcEndpointId":{"shape":"String"},
+        "ServiceId":{"shape":"ServiceId"},
+        "VpcEndpointId":{"shape":"VpcEndpointId"},
         "ConnectionNotificationArn":{"shape":"String"},
         "ConnectionEvents":{"shape":"ValueStringList"},
         "ClientToken":{"shape":"String"}
@@ -6869,7 +6990,7 @@
       "members":{
         "DryRun":{"shape":"Boolean"},
         "VpcEndpointType":{"shape":"VpcEndpointType"},
-        "VpcId":{"shape":"String"},
+        "VpcId":{"shape":"VpcId"},
         "ServiceName":{"shape":"String"},
         "PolicyDocument":{"shape":"String"},
         "RouteTableIds":{
@@ -6943,7 +7064,7 @@
           "locationName":"peerVpcId"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "locationName":"vpcId"
         },
         "PeerRegion":{"shape":"String"}
@@ -6993,10 +7114,10 @@
         "Type"
       ],
       "members":{
-        "CustomerGatewayId":{"shape":"String"},
+        "CustomerGatewayId":{"shape":"CustomerGatewayId"},
         "Type":{"shape":"String"},
-        "VpnGatewayId":{"shape":"String"},
-        "TransitGatewayId":{"shape":"String"},
+        "VpnGatewayId":{"shape":"VpnGatewayId"},
+        "TransitGatewayId":{"shape":"TransitGatewayId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -7024,7 +7145,7 @@
       ],
       "members":{
         "DestinationCidrBlock":{"shape":"String"},
-        "VpnConnectionId":{"shape":"String"}
+        "VpnConnectionId":{"shape":"VpnConnectionId"}
       }
     },
     "CreateVpnGatewayRequest":{
@@ -7084,6 +7205,10 @@
           "shape":"String",
           "locationName":"ipAddress"
         },
+        "CertificateArn":{
+          "shape":"String",
+          "locationName":"certificateArn"
+        },
         "State":{
           "shape":"String",
           "locationName":"state"
@@ -7098,6 +7223,7 @@
         }
       }
     },
+    "CustomerGatewayId":{"type":"string"},
     "CustomerGatewayIdStringList":{
       "type":"list",
       "member":{
@@ -7145,7 +7271,7 @@
       "type":"structure",
       "required":["ClientVpnEndpointId"],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -7165,7 +7291,7 @@
         "DestinationCidrBlock"
       ],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
         "TargetVpcSubnetId":{"shape":"String"},
         "DestinationCidrBlock":{"shape":"String"},
         "DryRun":{"shape":"Boolean"}
@@ -7184,7 +7310,7 @@
       "type":"structure",
       "required":["CustomerGatewayId"],
       "members":{
-        "CustomerGatewayId":{"shape":"String"},
+        "CustomerGatewayId":{"shape":"CustomerGatewayId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -7195,7 +7321,7 @@
       "type":"structure",
       "required":["DhcpOptionsId"],
       "members":{
-        "DhcpOptionsId":{"shape":"String"},
+        "DhcpOptionsId":{"shape":"DhcpOptionsId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -7338,7 +7464,7 @@
       "required":["FpgaImageId"],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "FpgaImageId":{"shape":"String"}
+        "FpgaImageId":{"shape":"FpgaImageId"}
       }
     },
     "DeleteFpgaImageResult":{
@@ -7359,7 +7485,7 @@
           "locationName":"dryRun"
         },
         "InternetGatewayId":{
-          "shape":"String",
+          "shape":"InternetGatewayId",
           "locationName":"internetGatewayId"
         }
       }
@@ -7379,7 +7505,7 @@
       "type":"structure",
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "LaunchTemplateId":{"shape":"String"},
+        "LaunchTemplateId":{"shape":"LaunchTemplateId"},
         "LaunchTemplateName":{"shape":"LaunchTemplateName"}
       }
     },
@@ -7397,7 +7523,7 @@
       "required":["Versions"],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "LaunchTemplateId":{"shape":"String"},
+        "LaunchTemplateId":{"shape":"LaunchTemplateId"},
         "LaunchTemplateName":{"shape":"LaunchTemplateName"},
         "Versions":{
           "shape":"VersionStringList",
@@ -7474,7 +7600,7 @@
       "type":"structure",
       "required":["NatGatewayId"],
       "members":{
-        "NatGatewayId":{"shape":"String"}
+        "NatGatewayId":{"shape":"NatGatewayId"}
       }
     },
     "DeleteNatGatewayResult":{
@@ -7503,7 +7629,7 @@
           "locationName":"egress"
         },
         "NetworkAclId":{
-          "shape":"String",
+          "shape":"NetworkAclId",
           "locationName":"networkAclId"
         },
         "RuleNumber":{
@@ -7521,7 +7647,7 @@
           "locationName":"dryRun"
         },
         "NetworkAclId":{
-          "shape":"String",
+          "shape":"NetworkAclId",
           "locationName":"networkAclId"
         }
       }
@@ -7553,7 +7679,7 @@
           "locationName":"dryRun"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "locationName":"networkInterfaceId"
         }
       }
@@ -7572,6 +7698,60 @@
         }
       }
     },
+    "DeleteQueuedReservedInstancesError":{
+      "type":"structure",
+      "members":{
+        "Code":{
+          "shape":"DeleteQueuedReservedInstancesErrorCode",
+          "locationName":"code"
+        },
+        "Message":{
+          "shape":"String",
+          "locationName":"message"
+        }
+      }
+    },
+    "DeleteQueuedReservedInstancesErrorCode":{
+      "type":"string",
+      "enum":[
+        "reserved-instances-id-invalid",
+        "reserved-instances-not-in-queued-state",
+        "unexpected-error"
+      ]
+    },
+    "DeleteQueuedReservedInstancesIdList":{
+      "type":"list",
+      "member":{
+        "shape":"String",
+        "locationName":"item"
+      },
+      "max":100,
+      "min":1
+    },
+    "DeleteQueuedReservedInstancesRequest":{
+      "type":"structure",
+      "required":["ReservedInstancesIds"],
+      "members":{
+        "DryRun":{"shape":"Boolean"},
+        "ReservedInstancesIds":{
+          "shape":"DeleteQueuedReservedInstancesIdList",
+          "locationName":"ReservedInstancesId"
+        }
+      }
+    },
+    "DeleteQueuedReservedInstancesResult":{
+      "type":"structure",
+      "members":{
+        "SuccessfulQueuedPurchaseDeletions":{
+          "shape":"SuccessfulQueuedPurchaseDeletionSet",
+          "locationName":"successfulQueuedPurchaseDeletionSet"
+        },
+        "FailedQueuedPurchaseDeletions":{
+          "shape":"FailedQueuedPurchaseDeletionSet",
+          "locationName":"failedQueuedPurchaseDeletionSet"
+        }
+      }
+    },
     "DeleteRouteRequest":{
       "type":"structure",
       "required":["RouteTableId"],
@@ -7589,7 +7769,7 @@
           "locationName":"dryRun"
         },
         "RouteTableId":{
-          "shape":"String",
+          "shape":"RouteTableId",
           "locationName":"routeTableId"
         }
       }
@@ -7623,7 +7803,7 @@
       "type":"structure",
       "required":["SnapshotId"],
       "members":{
-        "SnapshotId":{"shape":"String"},
+        "SnapshotId":{"shape":"SnapshotId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -7643,7 +7823,7 @@
       "type":"structure",
       "required":["SubnetId"],
       "members":{
-        "SubnetId":{"shape":"String"},
+        "SubnetId":{"shape":"SubnetId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -7672,7 +7852,7 @@
       "type":"structure",
       "required":["TrafficMirrorFilterId"],
       "members":{
-        "TrafficMirrorFilterId":{"shape":"String"},
+        "TrafficMirrorFilterId":{"shape":"TrafficMirrorFilterId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -7689,7 +7869,7 @@
       "type":"structure",
       "required":["TrafficMirrorFilterRuleId"],
       "members":{
-        "TrafficMirrorFilterRuleId":{"shape":"String"},
+        "TrafficMirrorFilterRuleId":{"shape":"TrafficMirrorFilterRuleId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -7706,7 +7886,7 @@
       "type":"structure",
       "required":["TrafficMirrorSessionId"],
       "members":{
-        "TrafficMirrorSessionId":{"shape":"String"},
+        "TrafficMirrorSessionId":{"shape":"TrafficMirrorSessionId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -7723,7 +7903,7 @@
       "type":"structure",
       "required":["TrafficMirrorTargetId"],
       "members":{
-        "TrafficMirrorTargetId":{"shape":"String"},
+        "TrafficMirrorTargetId":{"shape":"TrafficMirrorTargetId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -7740,7 +7920,7 @@
       "type":"structure",
       "required":["TransitGatewayId"],
       "members":{
-        "TransitGatewayId":{"shape":"String"},
+        "TransitGatewayId":{"shape":"TransitGatewayId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -7760,7 +7940,7 @@
         "DestinationCidrBlock"
       ],
       "members":{
-        "TransitGatewayRouteTableId":{"shape":"String"},
+        "TransitGatewayRouteTableId":{"shape":"TransitGatewayRouteTableId"},
         "DestinationCidrBlock":{"shape":"String"},
         "DryRun":{"shape":"Boolean"}
       }
@@ -7778,7 +7958,7 @@
       "type":"structure",
       "required":["TransitGatewayRouteTableId"],
       "members":{
-        "TransitGatewayRouteTableId":{"shape":"String"},
+        "TransitGatewayRouteTableId":{"shape":"TransitGatewayRouteTableId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -7795,7 +7975,7 @@
       "type":"structure",
       "required":["TransitGatewayAttachmentId"],
       "members":{
-        "TransitGatewayAttachmentId":{"shape":"String"},
+        "TransitGatewayAttachmentId":{"shape":"TransitGatewayAttachmentId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -7812,7 +7992,7 @@
       "type":"structure",
       "required":["VolumeId"],
       "members":{
-        "VolumeId":{"shape":"String"},
+        "VolumeId":{"shape":"VolumeId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -7888,7 +8068,7 @@
           "locationName":"dryRun"
         },
         "VpcPeeringConnectionId":{
-          "shape":"String",
+          "shape":"VpcPeeringConnectionId",
           "locationName":"vpcPeeringConnectionId"
         }
       }
@@ -7906,7 +8086,7 @@
       "type":"structure",
       "required":["VpcId"],
       "members":{
-        "VpcId":{"shape":"String"},
+        "VpcId":{"shape":"VpcId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -7917,7 +8097,7 @@
       "type":"structure",
       "required":["VpnConnectionId"],
       "members":{
-        "VpnConnectionId":{"shape":"String"},
+        "VpnConnectionId":{"shape":"VpnConnectionId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -7932,14 +8112,14 @@
       ],
       "members":{
         "DestinationCidrBlock":{"shape":"String"},
-        "VpnConnectionId":{"shape":"String"}
+        "VpnConnectionId":{"shape":"VpnConnectionId"}
       }
     },
     "DeleteVpnGatewayRequest":{
       "type":"structure",
       "required":["VpnGatewayId"],
       "members":{
-        "VpnGatewayId":{"shape":"String"},
+        "VpnGatewayId":{"shape":"VpnGatewayId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -7967,7 +8147,7 @@
       "type":"structure",
       "required":["ImageId"],
       "members":{
-        "ImageId":{"shape":"String"},
+        "ImageId":{"shape":"ImageId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -8101,12 +8281,17 @@
         }
       }
     },
+    "DescribeByoipCidrsMaxResults":{
+      "type":"integer",
+      "max":100,
+      "min":1
+    },
     "DescribeByoipCidrsRequest":{
       "type":"structure",
       "required":["MaxResults"],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "MaxResults":{"shape":"MaxResults"},
+        "MaxResults":{"shape":"DescribeByoipCidrsMaxResults"},
         "NextToken":{"shape":"NextToken"}
       }
     },
@@ -8157,6 +8342,11 @@
         }
       }
     },
+    "DescribeClassicLinkInstancesMaxResults":{
+      "type":"integer",
+      "max":1000,
+      "min":5
+    },
     "DescribeClassicLinkInstancesRequest":{
       "type":"structure",
       "members":{
@@ -8173,7 +8363,7 @@
           "locationName":"InstanceId"
         },
         "MaxResults":{
-          "shape":"Integer",
+          "shape":"DescribeClassicLinkInstancesMaxResults",
           "locationName":"maxResults"
         },
         "NextToken":{
@@ -8195,6 +8385,11 @@
         }
       }
     },
+    "DescribeClientVpnAuthorizationRulesMaxResults":{
+      "type":"integer",
+      "max":1000,
+      "min":5
+    },
     "DescribeClientVpnAuthorizationRulesRequest":{
       "type":"structure",
       "required":["ClientVpnEndpointId"],
@@ -8206,7 +8401,7 @@
           "shape":"FilterList",
           "locationName":"Filter"
         },
-        "MaxResults":{"shape":"MaxResults"}
+        "MaxResults":{"shape":"DescribeClientVpnAuthorizationRulesMaxResults"}
       }
     },
     "DescribeClientVpnAuthorizationRulesResult":{
@@ -8222,6 +8417,11 @@
         }
       }
     },
+    "DescribeClientVpnConnectionsMaxResults":{
+      "type":"integer",
+      "max":1000,
+      "min":5
+    },
     "DescribeClientVpnConnectionsRequest":{
       "type":"structure",
       "required":["ClientVpnEndpointId"],
@@ -8232,7 +8432,7 @@
           "locationName":"Filter"
         },
         "NextToken":{"shape":"NextToken"},
-        "MaxResults":{"shape":"MaxResults"},
+        "MaxResults":{"shape":"DescribeClientVpnConnectionsMaxResults"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -8249,6 +8449,11 @@
         }
       }
     },
+    "DescribeClientVpnEndpointMaxResults":{
+      "type":"integer",
+      "max":1000,
+      "min":5
+    },
     "DescribeClientVpnEndpointsRequest":{
       "type":"structure",
       "members":{
@@ -8256,7 +8461,7 @@
           "shape":"ValueStringList",
           "locationName":"ClientVpnEndpointId"
         },
-        "MaxResults":{"shape":"MaxResults"},
+        "MaxResults":{"shape":"DescribeClientVpnEndpointMaxResults"},
         "NextToken":{"shape":"NextToken"},
         "Filters":{
           "shape":"FilterList",
@@ -8278,6 +8483,11 @@
         }
       }
     },
+    "DescribeClientVpnRoutesMaxResults":{
+      "type":"integer",
+      "max":1000,
+      "min":5
+    },
     "DescribeClientVpnRoutesRequest":{
       "type":"structure",
       "required":["ClientVpnEndpointId"],
@@ -8287,7 +8497,7 @@
           "shape":"FilterList",
           "locationName":"Filter"
         },
-        "MaxResults":{"shape":"MaxResults"},
+        "MaxResults":{"shape":"DescribeClientVpnRoutesMaxResults"},
         "NextToken":{"shape":"NextToken"},
         "DryRun":{"shape":"Boolean"}
       }
@@ -8305,13 +8515,18 @@
         }
       }
     },
+    "DescribeClientVpnTargetNetworksMaxResults":{
+      "type":"integer",
+      "max":1000,
+      "min":5
+    },
     "DescribeClientVpnTargetNetworksRequest":{
       "type":"structure",
       "required":["ClientVpnEndpointId"],
       "members":{
         "ClientVpnEndpointId":{"shape":"String"},
         "AssociationIds":{"shape":"ValueStringList"},
-        "MaxResults":{"shape":"MaxResults"},
+        "MaxResults":{"shape":"DescribeClientVpnTargetNetworksMaxResults"},
         "NextToken":{"shape":"NextToken"},
         "Filters":{
           "shape":"FilterList",
@@ -8425,6 +8640,11 @@
         }
       }
     },
+    "DescribeEgressOnlyInternetGatewaysMaxResults":{
+      "type":"integer",
+      "max":255,
+      "min":5
+    },
     "DescribeEgressOnlyInternetGatewaysRequest":{
       "type":"structure",
       "members":{
@@ -8433,7 +8653,7 @@
           "shape":"EgressOnlyInternetGatewayIdList",
           "locationName":"EgressOnlyInternetGatewayId"
         },
-        "MaxResults":{"shape":"Integer"},
+        "MaxResults":{"shape":"DescribeEgressOnlyInternetGatewaysMaxResults"},
         "NextToken":{"shape":"String"}
       }
     },
@@ -8488,6 +8708,40 @@
         }
       }
     },
+    "DescribeExportImageTasksMaxResults":{
+      "type":"integer",
+      "max":500,
+      "min":1
+    },
+    "DescribeExportImageTasksRequest":{
+      "type":"structure",
+      "members":{
+        "DryRun":{"shape":"Boolean"},
+        "Filters":{
+          "shape":"FilterList",
+          "locationName":"Filter"
+        },
+        "ExportImageTaskIds":{
+          "shape":"ExportImageTaskIdList",
+          "locationName":"ExportImageTaskId"
+        },
+        "MaxResults":{"shape":"DescribeExportImageTasksMaxResults"},
+        "NextToken":{"shape":"NextToken"}
+      }
+    },
+    "DescribeExportImageTasksResult":{
+      "type":"structure",
+      "members":{
+        "ExportImageTasks":{
+          "shape":"ExportImageTaskList",
+          "locationName":"exportImageTaskSet"
+        },
+        "NextToken":{
+          "shape":"NextToken",
+          "locationName":"nextToken"
+        }
+      }
+    },
     "DescribeExportTasksRequest":{
       "type":"structure",
       "members":{
@@ -8713,8 +8967,13 @@
         }
       }
     },
-    "DescribeFpgaImagesRequest":{
-      "type":"structure",
+    "DescribeFpgaImagesMaxResults":{
+      "type":"integer",
+      "max":1000,
+      "min":5
+    },
+    "DescribeFpgaImagesRequest":{
+      "type":"structure",
       "members":{
         "DryRun":{"shape":"Boolean"},
         "FpgaImageIds":{
@@ -8730,7 +8989,7 @@
           "locationName":"Filter"
         },
         "NextToken":{"shape":"NextToken"},
-        "MaxResults":{"shape":"MaxResults"}
+        "MaxResults":{"shape":"DescribeFpgaImagesMaxResults"}
       }
     },
     "DescribeFpgaImagesResult":{
@@ -8831,6 +9090,11 @@
         }
       }
     },
+    "DescribeIamInstanceProfileAssociationsMaxResults":{
+      "type":"integer",
+      "max":1000,
+      "min":5
+    },
     "DescribeIamInstanceProfileAssociationsRequest":{
       "type":"structure",
       "members":{
@@ -8842,7 +9106,7 @@
           "shape":"FilterList",
           "locationName":"Filter"
         },
-        "MaxResults":{"shape":"MaxResults"},
+        "MaxResults":{"shape":"DescribeIamInstanceProfileAssociationsMaxResults"},
         "NextToken":{"shape":"NextToken"}
       }
     },
@@ -9261,6 +9525,11 @@
         }
       }
     },
+    "DescribeMovingAddressesMaxResults":{
+      "type":"integer",
+      "max":1000,
+      "min":5
+    },
     "DescribeMovingAddressesRequest":{
       "type":"structure",
       "members":{
@@ -9273,7 +9542,7 @@
           "locationName":"dryRun"
         },
         "MaxResults":{
-          "shape":"Integer",
+          "shape":"DescribeMovingAddressesMaxResults",
           "locationName":"maxResults"
         },
         "NextToken":{
@@ -9299,11 +9568,16 @@
         }
       }
     },
+    "DescribeNatGatewaysMaxResults":{
+      "type":"integer",
+      "max":1000,
+      "min":5
+    },
     "DescribeNatGatewaysRequest":{
       "type":"structure",
       "members":{
         "Filter":{"shape":"FilterList"},
-        "MaxResults":{"shape":"Integer"},
+        "MaxResults":{"shape":"DescribeNatGatewaysMaxResults"},
         "NatGatewayIds":{
           "shape":"ValueStringList",
           "locationName":"NatGatewayId"
@@ -9529,6 +9803,11 @@
         }
       }
     },
+    "DescribePrincipalIdFormatMaxResults":{
+      "type":"integer",
+      "max":1000,
+      "min":1
+    },
     "DescribePrincipalIdFormatRequest":{
       "type":"structure",
       "members":{
@@ -9537,7 +9816,7 @@
           "shape":"ResourceList",
           "locationName":"Resource"
         },
-        "MaxResults":{"shape":"Integer"},
+        "MaxResults":{"shape":"DescribePrincipalIdFormatMaxResults"},
         "NextToken":{"shape":"String"}
       }
     },
@@ -9592,7 +9871,8 @@
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
-        }
+        },
+        "AllRegions":{"shape":"Boolean"}
       }
     },
     "DescribeRegionsResult":{
@@ -9782,6 +10062,11 @@
         }
       }
     },
+    "DescribeScheduledInstanceAvailabilityMaxResults":{
+      "type":"integer",
+      "max":300,
+      "min":5
+    },
     "DescribeScheduledInstanceAvailabilityRequest":{
       "type":"structure",
       "required":[
@@ -9795,7 +10080,7 @@
           "locationName":"Filter"
         },
         "FirstSlotStartTimeRange":{"shape":"SlotDateTimeRangeRequest"},
-        "MaxResults":{"shape":"Integer"},
+        "MaxResults":{"shape":"DescribeScheduledInstanceAvailabilityMaxResults"},
         "MaxSlotDurationInHours":{"shape":"Integer"},
         "MinSlotDurationInHours":{"shape":"Integer"},
         "NextToken":{"shape":"String"},
@@ -9993,6 +10278,11 @@
         }
       }
     },
+    "DescribeSpotFleetInstancesMaxResults":{
+      "type":"integer",
+      "max":1000,
+      "min":1
+    },
     "DescribeSpotFleetInstancesRequest":{
       "type":"structure",
       "required":["SpotFleetRequestId"],
@@ -10002,7 +10292,7 @@
           "locationName":"dryRun"
         },
         "MaxResults":{
-          "shape":"Integer",
+          "shape":"DescribeSpotFleetInstancesMaxResults",
           "locationName":"maxResults"
         },
         "NextToken":{
@@ -10032,6 +10322,11 @@
         }
       }
     },
+    "DescribeSpotFleetRequestHistoryMaxResults":{
+      "type":"integer",
+      "max":1000,
+      "min":1
+    },
     "DescribeSpotFleetRequestHistoryRequest":{
       "type":"structure",
       "required":[
@@ -10048,7 +10343,7 @@
           "locationName":"eventType"
         },
         "MaxResults":{
-          "shape":"Integer",
+          "shape":"DescribeSpotFleetRequestHistoryMaxResults",
           "locationName":"maxResults"
         },
         "NextToken":{
@@ -10227,7 +10522,7 @@
         "DryRun":{"shape":"Boolean"},
         "MaxResults":{"shape":"DescribeStaleSecurityGroupsMaxResults"},
         "NextToken":{"shape":"DescribeStaleSecurityGroupsNextToken"},
-        "VpcId":{"shape":"String"}
+        "VpcId":{"shape":"VpcId"}
       }
     },
     "DescribeStaleSecurityGroupsResult":{
@@ -10668,15 +10963,25 @@
         }
       }
     },
+    "DescribeVpcClassicLinkDnsSupportMaxResults":{
+      "type":"integer",
+      "max":255,
+      "min":5
+    },
+    "DescribeVpcClassicLinkDnsSupportNextToken":{
+      "type":"string",
+      "max":1024,
+      "min":1
+    },
     "DescribeVpcClassicLinkDnsSupportRequest":{
       "type":"structure",
       "members":{
         "MaxResults":{
-          "shape":"MaxResults",
+          "shape":"DescribeVpcClassicLinkDnsSupportMaxResults",
           "locationName":"maxResults"
         },
         "NextToken":{
-          "shape":"NextToken",
+          "shape":"DescribeVpcClassicLinkDnsSupportNextToken",
           "locationName":"nextToken"
         },
         "VpcIds":{"shape":"VpcClassicLinkIdList"}
@@ -10686,7 +10991,7 @@
       "type":"structure",
       "members":{
         "NextToken":{
-          "shape":"NextToken",
+          "shape":"DescribeVpcClassicLinkDnsSupportNextToken",
           "locationName":"nextToken"
         },
         "Vpcs":{
@@ -11028,11 +11333,11 @@
           "locationName":"dryRun"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "locationName":"instanceId"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "locationName":"vpcId"
         }
       }
@@ -11058,11 +11363,11 @@
           "locationName":"dryRun"
         },
         "InternetGatewayId":{
-          "shape":"String",
+          "shape":"InternetGatewayId",
           "locationName":"internetGatewayId"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "locationName":"vpcId"
         }
       }
@@ -11072,7 +11377,7 @@
       "required":["AttachmentId"],
       "members":{
         "AttachmentId":{
-          "shape":"String",
+          "shape":"AttachmentId",
           "locationName":"attachmentId"
         },
         "DryRun":{
@@ -11091,8 +11396,8 @@
       "members":{
         "Device":{"shape":"String"},
         "Force":{"shape":"Boolean"},
-        "InstanceId":{"shape":"String"},
-        "VolumeId":{"shape":"String"},
+        "InstanceId":{"shape":"InstanceId"},
+        "VolumeId":{"shape":"VolumeId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -11106,8 +11411,8 @@
         "VpnGatewayId"
       ],
       "members":{
-        "VpcId":{"shape":"String"},
-        "VpnGatewayId":{"shape":"String"},
+        "VpcId":{"shape":"VpcId"},
+        "VpnGatewayId":{"shape":"VpnGatewayId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -11169,6 +11474,7 @@
         }
       }
     },
+    "DhcpOptionsId":{"type":"string"},
     "DhcpOptionsIdStringList":{
       "type":"list",
       "member":{
@@ -11220,8 +11526,8 @@
         "TransitGatewayAttachmentId"
       ],
       "members":{
-        "TransitGatewayRouteTableId":{"shape":"String"},
-        "TransitGatewayAttachmentId":{"shape":"String"},
+        "TransitGatewayRouteTableId":{"shape":"TransitGatewayRouteTableId"},
+        "TransitGatewayAttachmentId":{"shape":"TransitGatewayAttachmentId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -11241,14 +11547,14 @@
         "RouteTableId"
       ],
       "members":{
-        "GatewayId":{"shape":"String"},
-        "RouteTableId":{"shape":"String"}
+        "GatewayId":{"shape":"VpnGatewayId"},
+        "RouteTableId":{"shape":"RouteTableId"}
       }
     },
     "DisableVpcClassicLinkDnsSupportRequest":{
       "type":"structure",
       "members":{
-        "VpcId":{"shape":"String"}
+        "VpcId":{"shape":"VpcId"}
       }
     },
     "DisableVpcClassicLinkDnsSupportResult":{
@@ -11269,7 +11575,7 @@
           "locationName":"dryRun"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "locationName":"vpcId"
         }
       }
@@ -11301,7 +11607,7 @@
         "AssociationId"
       ],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
         "AssociationId":{"shape":"String"},
         "DryRun":{"shape":"Boolean"}
       }
@@ -11340,7 +11646,7 @@
       "required":["AssociationId"],
       "members":{
         "AssociationId":{
-          "shape":"String",
+          "shape":"RouteTableAssociationId",
           "locationName":"associationId"
         },
         "DryRun":{
@@ -11354,7 +11660,7 @@
       "required":["AssociationId"],
       "members":{
         "AssociationId":{
-          "shape":"String",
+          "shape":"SubnetCidrAssociationId",
           "locationName":"associationId"
         }
       }
@@ -11379,8 +11685,8 @@
         "TransitGatewayAttachmentId"
       ],
       "members":{
-        "TransitGatewayRouteTableId":{"shape":"String"},
-        "TransitGatewayAttachmentId":{"shape":"String"},
+        "TransitGatewayRouteTableId":{"shape":"TransitGatewayRouteTableId"},
+        "TransitGatewayAttachmentId":{"shape":"TransitGatewayAttachmentId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -11398,7 +11704,7 @@
       "required":["AssociationId"],
       "members":{
         "AssociationId":{
-          "shape":"String",
+          "shape":"VpcCidrAssociationId",
           "locationName":"associationId"
         }
       }
@@ -11822,8 +12128,8 @@
         "TransitGatewayAttachmentId"
       ],
       "members":{
-        "TransitGatewayRouteTableId":{"shape":"String"},
-        "TransitGatewayAttachmentId":{"shape":"String"},
+        "TransitGatewayRouteTableId":{"shape":"TransitGatewayRouteTableId"},
+        "TransitGatewayAttachmentId":{"shape":"TransitGatewayAttachmentId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -11843,8 +12149,8 @@
         "RouteTableId"
       ],
       "members":{
-        "GatewayId":{"shape":"String"},
-        "RouteTableId":{"shape":"String"}
+        "GatewayId":{"shape":"VpnGatewayId"},
+        "RouteTableId":{"shape":"RouteTableId"}
       }
     },
     "EnableVolumeIORequest":{
@@ -11856,7 +12162,7 @@
           "locationName":"dryRun"
         },
         "VolumeId":{
-          "shape":"String",
+          "shape":"VolumeId",
           "locationName":"volumeId"
         }
       }
@@ -11864,7 +12170,7 @@
     "EnableVpcClassicLinkDnsSupportRequest":{
       "type":"structure",
       "members":{
-        "VpcId":{"shape":"String"}
+        "VpcId":{"shape":"VpcId"}
       }
     },
     "EnableVpcClassicLinkDnsSupportResult":{
@@ -11885,7 +12191,7 @@
           "locationName":"dryRun"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "locationName":"vpcId"
         }
       }
@@ -11945,7 +12251,8 @@
       "enum":[
         "instanceChange",
         "fleetRequestChange",
-        "error"
+        "error",
+        "information"
       ]
     },
     "ExcessCapacityTerminationPolicy":{
@@ -11966,7 +12273,7 @@
       "type":"structure",
       "required":["ClientVpnEndpointId"],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -11987,7 +12294,7 @@
       "type":"structure",
       "required":["ClientVpnEndpointId"],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -12008,6 +12315,114 @@
         "microsoft"
       ]
     },
+    "ExportImageRequest":{
+      "type":"structure",
+      "required":[
+        "DiskImageFormat",
+        "ImageId",
+        "S3ExportLocation"
+      ],
+      "members":{
+        "ClientToken":{
+          "shape":"String",
+          "idempotencyToken":true
+        },
+        "Description":{"shape":"String"},
+        "DiskImageFormat":{"shape":"DiskImageFormat"},
+        "DryRun":{"shape":"Boolean"},
+        "ImageId":{"shape":"ImageId"},
+        "S3ExportLocation":{"shape":"ExportTaskS3LocationRequest"},
+        "RoleName":{"shape":"String"}
+      }
+    },
+    "ExportImageResult":{
+      "type":"structure",
+      "members":{
+        "Description":{
+          "shape":"String",
+          "locationName":"description"
+        },
+        "DiskImageFormat":{
+          "shape":"DiskImageFormat",
+          "locationName":"diskImageFormat"
+        },
+        "ExportImageTaskId":{
+          "shape":"String",
+          "locationName":"exportImageTaskId"
+        },
+        "ImageId":{
+          "shape":"String",
+          "locationName":"imageId"
+        },
+        "RoleName":{
+          "shape":"String",
+          "locationName":"roleName"
+        },
+        "Progress":{
+          "shape":"String",
+          "locationName":"progress"
+        },
+        "S3ExportLocation":{
+          "shape":"ExportTaskS3Location",
+          "locationName":"s3ExportLocation"
+        },
+        "Status":{
+          "shape":"String",
+          "locationName":"status"
+        },
+        "StatusMessage":{
+          "shape":"String",
+          "locationName":"statusMessage"
+        }
+      }
+    },
+    "ExportImageTask":{
+      "type":"structure",
+      "members":{
+        "Description":{
+          "shape":"String",
+          "locationName":"description"
+        },
+        "ExportImageTaskId":{
+          "shape":"String",
+          "locationName":"exportImageTaskId"
+        },
+        "ImageId":{
+          "shape":"String",
+          "locationName":"imageId"
+        },
+        "Progress":{
+          "shape":"String",
+          "locationName":"progress"
+        },
+        "S3ExportLocation":{
+          "shape":"ExportTaskS3Location",
+          "locationName":"s3ExportLocation"
+        },
+        "Status":{
+          "shape":"String",
+          "locationName":"status"
+        },
+        "StatusMessage":{
+          "shape":"String",
+          "locationName":"statusMessage"
+        }
+      }
+    },
+    "ExportImageTaskIdList":{
+      "type":"list",
+      "member":{
+        "shape":"String",
+        "locationName":"ExportImageTaskId"
+      }
+    },
+    "ExportImageTaskList":{
+      "type":"list",
+      "member":{
+        "shape":"ExportImageTask",
+        "locationName":"item"
+      }
+    },
     "ExportTask":{
       "type":"structure",
       "members":{
@@ -12037,6 +12452,7 @@
         }
       }
     },
+    "ExportTaskId":{"type":"string"},
     "ExportTaskIdStringList":{
       "type":"list",
       "member":{
@@ -12051,6 +12467,27 @@
         "locationName":"item"
       }
     },
+    "ExportTaskS3Location":{
+      "type":"structure",
+      "members":{
+        "S3Bucket":{
+          "shape":"String",
+          "locationName":"s3Bucket"
+        },
+        "S3Prefix":{
+          "shape":"String",
+          "locationName":"s3Prefix"
+        }
+      }
+    },
+    "ExportTaskS3LocationRequest":{
+      "type":"structure",
+      "required":["S3Bucket"],
+      "members":{
+        "S3Bucket":{"shape":"String"},
+        "S3Prefix":{"shape":"String"}
+      }
+    },
     "ExportTaskState":{
       "type":"string",
       "enum":[
@@ -12109,7 +12546,7 @@
         "S3Bucket"
       ],
       "members":{
-        "TransitGatewayRouteTableId":{"shape":"String"},
+        "TransitGatewayRouteTableId":{"shape":"TransitGatewayRouteTableId"},
         "Filters":{
           "shape":"FilterList",
           "locationName":"Filter"
@@ -12127,6 +12564,26 @@
         }
       }
     },
+    "FailedQueuedPurchaseDeletion":{
+      "type":"structure",
+      "members":{
+        "Error":{
+          "shape":"DeleteQueuedReservedInstancesError",
+          "locationName":"error"
+        },
+        "ReservedInstancesId":{
+          "shape":"String",
+          "locationName":"reservedInstancesId"
+        }
+      }
+    },
+    "FailedQueuedPurchaseDeletionSet":{
+      "type":"list",
+      "member":{
+        "shape":"FailedQueuedPurchaseDeletion",
+        "locationName":"item"
+      }
+    },
     "Filter":{
       "type":"structure",
       "members":{
@@ -12148,8 +12605,8 @@
       "type":"string",
       "enum":[
         "error",
-        "pending-fulfillment",
-        "pending-termination",
+        "pending_fulfillment",
+        "pending_termination",
         "fulfilled"
       ]
     },
@@ -12399,8 +12856,8 @@
         "active",
         "deleted",
         "failed",
-        "deleted-running",
-        "deleted-terminating",
+        "deleted_running",
+        "deleted_terminating",
         "modifying"
       ]
     },
@@ -12459,6 +12916,10 @@
         "LogDestination":{
           "shape":"String",
           "locationName":"logDestination"
+        },
+        "LogFormat":{
+          "shape":"String",
+          "locationName":"logFormat"
         }
       }
     },
@@ -12576,6 +13037,7 @@
         "productCodes"
       ]
     },
+    "FpgaImageId":{"type":"string"},
     "FpgaImageIdList":{
       "type":"list",
       "member":{
@@ -12616,11 +13078,59 @@
       "type":"string",
       "enum":["ipsec.1"]
     },
+    "GetCapacityReservationUsageRequest":{
+      "type":"structure",
+      "required":["CapacityReservationId"],
+      "members":{
+        "CapacityReservationId":{"shape":"CapacityReservationId"},
+        "NextToken":{"shape":"String"},
+        "MaxResults":{"shape":"GetCapacityReservationUsageRequestMaxResults"},
+        "DryRun":{"shape":"Boolean"}
+      }
+    },
+    "GetCapacityReservationUsageRequestMaxResults":{
+      "type":"integer",
+      "max":1000,
+      "min":1
+    },
+    "GetCapacityReservationUsageResult":{
+      "type":"structure",
+      "members":{
+        "NextToken":{
+          "shape":"String",
+          "locationName":"nextToken"
+        },
+        "CapacityReservationId":{
+          "shape":"String",
+          "locationName":"capacityReservationId"
+        },
+        "InstanceType":{
+          "shape":"String",
+          "locationName":"instanceType"
+        },
+        "TotalInstanceCount":{
+          "shape":"Integer",
+          "locationName":"totalInstanceCount"
+        },
+        "AvailableInstanceCount":{
+          "shape":"Integer",
+          "locationName":"availableInstanceCount"
+        },
+        "State":{
+          "shape":"CapacityReservationState",
+          "locationName":"state"
+        },
+        "InstanceUsages":{
+          "shape":"InstanceUsageSet",
+          "locationName":"instanceUsageSet"
+        }
+      }
+    },
     "GetConsoleOutputRequest":{
       "type":"structure",
       "required":["InstanceId"],
       "members":{
-        "InstanceId":{"shape":"String"},
+        "InstanceId":{"shape":"InstanceId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -12650,7 +13160,7 @@
       "required":["InstanceId"],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "InstanceId":{"shape":"String"},
+        "InstanceId":{"shape":"InstanceId"},
         "WakeUp":{"shape":"Boolean"}
       }
     },
@@ -12705,7 +13215,7 @@
       ],
       "members":{
         "HostIdSet":{"shape":"RequestHostIdSet"},
-        "OfferingId":{"shape":"String"}
+        "OfferingId":{"shape":"OfferingId"}
       }
     },
     "GetHostReservationPurchasePreviewResult":{
@@ -12734,7 +13244,7 @@
       "required":["InstanceId"],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "InstanceId":{"shape":"String"}
+        "InstanceId":{"shape":"InstanceId"}
       }
     },
     "GetLaunchTemplateDataResult":{
@@ -12750,7 +13260,7 @@
       "type":"structure",
       "required":["InstanceId"],
       "members":{
-        "InstanceId":{"shape":"String"},
+        "InstanceId":{"shape":"InstanceId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -12834,7 +13344,7 @@
       "type":"structure",
       "required":["TransitGatewayAttachmentId"],
       "members":{
-        "TransitGatewayAttachmentId":{"shape":"String"},
+        "TransitGatewayAttachmentId":{"shape":"TransitGatewayAttachmentId"},
         "Filters":{
           "shape":"FilterList",
           "locationName":"Filter"
@@ -12861,7 +13371,7 @@
       "type":"structure",
       "required":["TransitGatewayRouteTableId"],
       "members":{
-        "TransitGatewayRouteTableId":{"shape":"String"},
+        "TransitGatewayRouteTableId":{"shape":"TransitGatewayRouteTableId"},
         "Filters":{
           "shape":"FilterList",
           "locationName":"Filter"
@@ -12888,7 +13398,7 @@
       "type":"structure",
       "required":["TransitGatewayRouteTableId"],
       "members":{
-        "TransitGatewayRouteTableId":{"shape":"String"},
+        "TransitGatewayRouteTableId":{"shape":"TransitGatewayRouteTableId"},
         "Filters":{
           "shape":"FilterList",
           "locationName":"Filter"
@@ -13079,6 +13589,7 @@
         }
       }
     },
+    "HostId":{"type":"string"},
     "HostInstance":{
       "type":"structure",
       "members":{
@@ -13263,6 +13774,35 @@
         "xen"
       ]
     },
+    "IKEVersionsList":{
+      "type":"list",
+      "member":{
+        "shape":"IKEVersionsListValue",
+        "locationName":"item"
+      }
+    },
+    "IKEVersionsListValue":{
+      "type":"structure",
+      "members":{
+        "Value":{
+          "shape":"String",
+          "locationName":"value"
+        }
+      }
+    },
+    "IKEVersionsRequestList":{
+      "type":"list",
+      "member":{
+        "shape":"IKEVersionsRequestListValue",
+        "locationName":"item"
+      }
+    },
+    "IKEVersionsRequestListValue":{
+      "type":"structure",
+      "members":{
+        "Value":{"shape":"String"}
+      }
+    },
     "IamInstanceProfile":{
       "type":"structure",
       "members":{
@@ -13535,6 +14075,7 @@
         "locationName":"item"
       }
     },
+    "ImageId":{"type":"string"},
     "ImageIdStringList":{
       "type":"list",
       "member":{
@@ -13576,7 +14117,7 @@
         "CertificateRevocationList"
       ],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
         "CertificateRevocationList":{"shape":"String"},
         "DryRun":{"shape":"Boolean"}
       }
@@ -13604,7 +14145,7 @@
         "DryRun":{"shape":"Boolean"},
         "Encrypted":{"shape":"Boolean"},
         "Hypervisor":{"shape":"String"},
-        "KmsKeyId":{"shape":"String"},
+        "KmsKeyId":{"shape":"KmsKeyId"},
         "LicenseType":{"shape":"String"},
         "Platform":{"shape":"String"},
         "RoleName":{"shape":"String"}
@@ -13919,7 +14460,7 @@
         "DiskContainer":{"shape":"SnapshotDiskContainer"},
         "DryRun":{"shape":"Boolean"},
         "Encrypted":{"shape":"Boolean"},
-        "KmsKeyId":{"shape":"String"},
+        "KmsKeyId":{"shape":"KmsKeyId"},
         "RoleName":{"shape":"String"}
       }
     },
@@ -13964,6 +14505,7 @@
         "locationName":"item"
       }
     },
+    "ImportTaskId":{"type":"string"},
     "ImportTaskIdList":{
       "type":"list",
       "member":{
@@ -14989,20 +15531,26 @@
         "r5.xlarge",
         "r5.2xlarge",
         "r5.4xlarge",
+        "r5.8xlarge",
         "r5.12xlarge",
+        "r5.16xlarge",
         "r5.24xlarge",
         "r5.metal",
         "r5a.large",
         "r5a.xlarge",
         "r5a.2xlarge",
         "r5a.4xlarge",
+        "r5a.8xlarge",
         "r5a.12xlarge",
+        "r5a.16xlarge",
         "r5a.24xlarge",
         "r5d.large",
         "r5d.xlarge",
         "r5d.2xlarge",
         "r5d.4xlarge",
+        "r5d.8xlarge",
         "r5d.12xlarge",
+        "r5d.16xlarge",
         "r5d.24xlarge",
         "r5d.metal",
         "r5ad.large",
@@ -15039,6 +15587,7 @@
         "i3en.6xlarge",
         "i3en.12xlarge",
         "i3en.24xlarge",
+        "i3en.metal",
         "hi1.4xlarge",
         "hs1.8xlarge",
         "c1.medium",
@@ -15061,6 +15610,7 @@
         "c5.12xlarge",
         "c5.18xlarge",
         "c5.24xlarge",
+        "c5.metal",
         "c5d.large",
         "c5d.xlarge",
         "c5d.2xlarge",
@@ -15081,6 +15631,12 @@
         "g3.8xlarge",
         "g3.16xlarge",
         "g3s.xlarge",
+        "g4dn.xlarge",
+        "g4dn.2xlarge",
+        "g4dn.4xlarge",
+        "g4dn.8xlarge",
+        "g4dn.12xlarge",
+        "g4dn.16xlarge",
         "cg1.4xlarge",
         "p2.xlarge",
         "p2.8xlarge",
@@ -15100,20 +15656,26 @@
         "m5.xlarge",
         "m5.2xlarge",
         "m5.4xlarge",
+        "m5.8xlarge",
         "m5.12xlarge",
+        "m5.16xlarge",
         "m5.24xlarge",
         "m5.metal",
         "m5a.large",
         "m5a.xlarge",
         "m5a.2xlarge",
         "m5a.4xlarge",
+        "m5a.8xlarge",
         "m5a.12xlarge",
+        "m5a.16xlarge",
         "m5a.24xlarge",
         "m5d.large",
         "m5d.xlarge",
         "m5d.2xlarge",
         "m5d.4xlarge",
+        "m5d.8xlarge",
         "m5d.12xlarge",
+        "m5d.16xlarge",
         "m5d.24xlarge",
         "m5d.metal",
         "m5ad.large",
@@ -15138,17 +15700,72 @@
         "u-6tb1.metal",
         "u-9tb1.metal",
         "u-12tb1.metal",
+        "u-18tb1.metal",
+        "u-24tb1.metal",
         "a1.medium",
         "a1.large",
         "a1.xlarge",
         "a1.2xlarge",
-        "a1.4xlarge"
+        "a1.4xlarge",
+        "a1.metal",
+        "m5dn.large",
+        "m5dn.xlarge",
+        "m5dn.2xlarge",
+        "m5dn.4xlarge",
+        "m5dn.8xlarge",
+        "m5dn.12xlarge",
+        "m5dn.16xlarge",
+        "m5dn.24xlarge",
+        "m5n.large",
+        "m5n.xlarge",
+        "m5n.2xlarge",
+        "m5n.4xlarge",
+        "m5n.8xlarge",
+        "m5n.12xlarge",
+        "m5n.16xlarge",
+        "m5n.24xlarge",
+        "r5dn.large",
+        "r5dn.xlarge",
+        "r5dn.2xlarge",
+        "r5dn.4xlarge",
+        "r5dn.8xlarge",
+        "r5dn.12xlarge",
+        "r5dn.16xlarge",
+        "r5dn.24xlarge",
+        "r5n.large",
+        "r5n.xlarge",
+        "r5n.2xlarge",
+        "r5n.4xlarge",
+        "r5n.8xlarge",
+        "r5n.12xlarge",
+        "r5n.16xlarge",
+        "r5n.24xlarge"
       ]
     },
     "InstanceTypeList":{
       "type":"list",
       "member":{"shape":"InstanceType"}
     },
+    "InstanceUsage":{
+      "type":"structure",
+      "members":{
+        "AccountId":{
+          "shape":"String",
+          "locationName":"accountId"
+        },
+        "UsedInstanceCount":{
+          "shape":"Integer",
+          "locationName":"usedInstanceCount"
+        }
+      }
+    },
+    "InstanceUsageSet":{
+      "type":"list",
+      "member":{
+        "shape":"InstanceUsage",
+        "locationName":"item"
+      }
+    },
     "Integer":{"type":"integer"},
     "InterfacePermissionType":{
       "type":"string",
@@ -15198,6 +15815,7 @@
         "locationName":"item"
       }
     },
+    "InternetGatewayId":{"type":"string"},
     "InternetGatewayList":{
       "type":"list",
       "member":{
@@ -15323,6 +15941,7 @@
         "disable"
       ]
     },
+    "KernelId":{"type":"string"},
     "KeyNameStringList":{
       "type":"list",
       "member":{
@@ -15338,7 +15957,7 @@
           "locationName":"keyFingerprint"
         },
         "KeyMaterial":{
-          "shape":"String",
+          "shape":"SensitiveUserData",
           "locationName":"keyMaterial"
         },
         "KeyName":{
@@ -15367,6 +15986,8 @@
         "locationName":"item"
       }
     },
+    "KeyPairName":{"type":"string"},
+    "KmsKeyId":{"type":"string"},
     "LaunchPermission":{
       "type":"structure",
       "members":{
@@ -15737,6 +16358,7 @@
         "Name":{"shape":"String"}
       }
     },
+    "LaunchTemplateId":{"type":"string"},
     "LaunchTemplateInstanceMarketOptions":{
       "type":"structure",
       "members":{
@@ -16226,17 +16848,12 @@
       "type":"string",
       "enum":["spot"]
     },
-    "MaxResults":{
-      "type":"integer",
-      "max":255,
-      "min":5
-    },
     "MillisecondDateTime":{"type":"timestamp"},
     "ModifyCapacityReservationRequest":{
       "type":"structure",
       "required":["CapacityReservationId"],
       "members":{
-        "CapacityReservationId":{"shape":"String"},
+        "CapacityReservationId":{"shape":"CapacityReservationId"},
         "InstanceCount":{"shape":"Integer"},
         "EndDate":{"shape":"DateTime"},
         "EndDateType":{"shape":"EndDateType"},
@@ -16256,11 +16873,12 @@
       "type":"structure",
       "required":["ClientVpnEndpointId"],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
         "ServerCertificateArn":{"shape":"String"},
         "ConnectionLogOptions":{"shape":"ConnectionLogOptions"},
         "DnsServers":{"shape":"DnsServersOptionsModifyStructure"},
         "Description":{"shape":"String"},
+        "SplitTunnel":{"shape":"Boolean"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -16277,7 +16895,7 @@
       "type":"structure",
       "required":["KmsKeyId"],
       "members":{
-        "KmsKeyId":{"shape":"String"},
+        "KmsKeyId":{"shape":"KmsKeyId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -16317,7 +16935,7 @@
       "required":["FpgaImageId"],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "FpgaImageId":{"shape":"String"},
+        "FpgaImageId":{"shape":"FpgaImageId"},
         "Attribute":{"shape":"FpgaImageAttributeName"},
         "OperationType":{"shape":"OperationType"},
         "UserIds":{
@@ -16413,7 +17031,7 @@
       "members":{
         "Attribute":{"shape":"String"},
         "Description":{"shape":"AttributeValue"},
-        "ImageId":{"shape":"String"},
+        "ImageId":{"shape":"ImageId"},
         "LaunchPermission":{"shape":"LaunchPermissionModifications"},
         "OperationType":{"shape":"OperationType"},
         "ProductCodes":{
@@ -16469,7 +17087,7 @@
           "locationName":"GroupId"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "locationName":"instanceId"
         },
         "InstanceInitiatedShutdownBehavior":{
@@ -16509,7 +17127,7 @@
         "CapacityReservationSpecification"
       ],
       "members":{
-        "InstanceId":{"shape":"String"},
+        "InstanceId":{"shape":"InstanceId"},
         "CapacityReservationSpecification":{"shape":"CapacityReservationSpecification"},
         "DryRun":{"shape":"Boolean"}
       }
@@ -16557,7 +17175,7 @@
       ],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "InstanceId":{"shape":"String"},
+        "InstanceId":{"shape":"InstanceId"},
         "InstanceEventId":{"shape":"String"},
         "NotBefore":{"shape":"DateTime"}
       }
@@ -16579,13 +17197,13 @@
           "shape":"Affinity",
           "locationName":"affinity"
         },
-        "GroupName":{"shape":"String"},
+        "GroupName":{"shape":"PlacementGroupName"},
         "HostId":{
-          "shape":"String",
+          "shape":"HostId",
           "locationName":"hostId"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "locationName":"instanceId"
         },
         "Tenancy":{
@@ -16609,7 +17227,7 @@
       "members":{
         "DryRun":{"shape":"Boolean"},
         "ClientToken":{"shape":"String"},
-        "LaunchTemplateId":{"shape":"String"},
+        "LaunchTemplateId":{"shape":"LaunchTemplateId"},
         "LaunchTemplateName":{"shape":"LaunchTemplateName"},
         "DefaultVersion":{
           "shape":"String",
@@ -16647,7 +17265,7 @@
           "locationName":"SecurityGroupId"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "locationName":"networkInterfaceId"
         },
         "SourceDestCheck":{
@@ -16697,7 +17315,7 @@
           "locationName":"UserGroup"
         },
         "OperationType":{"shape":"OperationType"},
-        "SnapshotId":{"shape":"String"},
+        "SnapshotId":{"shape":"SnapshotId"},
         "UserIds":{
           "shape":"UserIdStringList",
           "locationName":"UserId"
@@ -16717,13 +17335,14 @@
           "locationName":"excessCapacityTerminationPolicy"
         },
         "SpotFleetRequestId":{
-          "shape":"String",
+          "shape":"SpotFleetRequestId",
           "locationName":"spotFleetRequestId"
         },
         "TargetCapacity":{
           "shape":"Integer",
           "locationName":"targetCapacity"
-        }
+        },
+        "OnDemandTargetCapacity":{"shape":"Integer"}
       }
     },
     "ModifySpotFleetRequestResponse":{
@@ -16742,7 +17361,7 @@
         "AssignIpv6AddressOnCreation":{"shape":"AttributeBooleanValue"},
         "MapPublicIpOnLaunch":{"shape":"AttributeBooleanValue"},
         "SubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "locationName":"subnetId"
         }
       }
@@ -16751,7 +17370,7 @@
       "type":"structure",
       "required":["TrafficMirrorFilterId"],
       "members":{
-        "TrafficMirrorFilterId":{"shape":"String"},
+        "TrafficMirrorFilterId":{"shape":"TrafficMirrorFilterId"},
         "AddNetworkServices":{
           "shape":"TrafficMirrorNetworkServiceList",
           "locationName":"AddNetworkService"
@@ -16776,7 +17395,7 @@
       "type":"structure",
       "required":["TrafficMirrorFilterRuleId"],
       "members":{
-        "TrafficMirrorFilterRuleId":{"shape":"String"},
+        "TrafficMirrorFilterRuleId":{"shape":"TrafficMirrorFilterRuleId"},
         "TrafficDirection":{"shape":"TrafficDirection"},
         "RuleNumber":{"shape":"Integer"},
         "RuleAction":{"shape":"TrafficMirrorRuleAction"},
@@ -16806,9 +17425,9 @@
       "type":"structure",
       "required":["TrafficMirrorSessionId"],
       "members":{
-        "TrafficMirrorSessionId":{"shape":"String"},
-        "TrafficMirrorTargetId":{"shape":"String"},
-        "TrafficMirrorFilterId":{"shape":"String"},
+        "TrafficMirrorSessionId":{"shape":"TrafficMirrorSessionId"},
+        "TrafficMirrorTargetId":{"shape":"TrafficMirrorTargetId"},
+        "TrafficMirrorFilterId":{"shape":"TrafficMirrorFilterId"},
         "PacketLength":{"shape":"Integer"},
         "SessionNumber":{"shape":"Integer"},
         "VirtualNetworkId":{"shape":"Integer"},
@@ -16833,7 +17452,7 @@
       "type":"structure",
       "required":["TransitGatewayAttachmentId"],
       "members":{
-        "TransitGatewayAttachmentId":{"shape":"String"},
+        "TransitGatewayAttachmentId":{"shape":"TransitGatewayAttachmentId"},
         "AddSubnetIds":{"shape":"ValueStringList"},
         "RemoveSubnetIds":{"shape":"ValueStringList"},
         "Options":{"shape":"ModifyTransitGatewayVpcAttachmentRequestOptions"},
@@ -16861,7 +17480,7 @@
       "required":["VolumeId"],
       "members":{
         "AutoEnableIO":{"shape":"AttributeBooleanValue"},
-        "VolumeId":{"shape":"String"},
+        "VolumeId":{"shape":"VolumeId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -16873,7 +17492,7 @@
       "required":["VolumeId"],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "VolumeId":{"shape":"String"},
+        "VolumeId":{"shape":"VolumeId"},
         "Size":{"shape":"Integer"},
         "VolumeType":{"shape":"VolumeType"},
         "Iops":{"shape":"Integer"}
@@ -16895,7 +17514,7 @@
         "EnableDnsHostnames":{"shape":"AttributeBooleanValue"},
         "EnableDnsSupport":{"shape":"AttributeBooleanValue"},
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "locationName":"vpcId"
         }
       }
@@ -16905,7 +17524,7 @@
       "required":["ConnectionNotificationId"],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "ConnectionNotificationId":{"shape":"String"},
+        "ConnectionNotificationId":{"shape":"ConnectionNotificationId"},
         "ConnectionNotificationArn":{"shape":"String"},
         "ConnectionEvents":{"shape":"ValueStringList"}
       }
@@ -16924,7 +17543,7 @@
       "required":["VpcEndpointId"],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "VpcEndpointId":{"shape":"String"},
+        "VpcEndpointId":{"shape":"VpcEndpointId"},
         "ResetPolicy":{"shape":"Boolean"},
         "PolicyDocument":{"shape":"String"},
         "AddRouteTableIds":{
@@ -16968,7 +17587,7 @@
       "required":["ServiceId"],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "ServiceId":{"shape":"String"},
+        "ServiceId":{"shape":"ServiceId"},
         "AcceptanceRequired":{"shape":"Boolean"},
         "AddNetworkLoadBalancerArns":{
           "shape":"ValueStringList",
@@ -17015,7 +17634,7 @@
         "AccepterPeeringConnectionOptions":{"shape":"PeeringConnectionOptionsRequest"},
         "DryRun":{"shape":"Boolean"},
         "RequesterPeeringConnectionOptions":{"shape":"PeeringConnectionOptionsRequest"},
-        "VpcPeeringConnectionId":{"shape":"String"}
+        "VpcPeeringConnectionId":{"shape":"VpcPeeringConnectionId"}
       }
     },
     "ModifyVpcPeeringConnectionOptionsResult":{
@@ -17038,7 +17657,7 @@
         "InstanceTenancy"
       ],
       "members":{
-        "VpcId":{"shape":"String"},
+        "VpcId":{"shape":"VpcId"},
         "InstanceTenancy":{"shape":"VpcTenancy"},
         "DryRun":{"shape":"Boolean"}
       }
@@ -17056,9 +17675,10 @@
       "type":"structure",
       "required":["VpnConnectionId"],
       "members":{
-        "VpnConnectionId":{"shape":"String"},
-        "TransitGatewayId":{"shape":"String"},
-        "VpnGatewayId":{"shape":"String"},
+        "VpnConnectionId":{"shape":"VpnConnectionId"},
+        "TransitGatewayId":{"shape":"TransitGatewayId"},
+        "CustomerGatewayId":{"shape":"CustomerGatewayId"},
+        "VpnGatewayId":{"shape":"VpnGatewayId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -17071,6 +17691,91 @@
         }
       }
     },
+    "ModifyVpnTunnelCertificateRequest":{
+      "type":"structure",
+      "required":[
+        "VpnConnectionId",
+        "VpnTunnelOutsideIpAddress"
+      ],
+      "members":{
+        "VpnConnectionId":{"shape":"VpnConnectionId"},
+        "VpnTunnelOutsideIpAddress":{"shape":"String"},
+        "DryRun":{"shape":"Boolean"}
+      }
+    },
+    "ModifyVpnTunnelCertificateResult":{
+      "type":"structure",
+      "members":{
+        "VpnConnection":{
+          "shape":"VpnConnection",
+          "locationName":"vpnConnection"
+        }
+      }
+    },
+    "ModifyVpnTunnelOptionsRequest":{
+      "type":"structure",
+      "required":[
+        "VpnConnectionId",
+        "VpnTunnelOutsideIpAddress",
+        "TunnelOptions"
+      ],
+      "members":{
+        "VpnConnectionId":{"shape":"VpnConnectionId"},
+        "VpnTunnelOutsideIpAddress":{"shape":"String"},
+        "TunnelOptions":{"shape":"ModifyVpnTunnelOptionsSpecification"},
+        "DryRun":{"shape":"Boolean"}
+      }
+    },
+    "ModifyVpnTunnelOptionsResult":{
+      "type":"structure",
+      "members":{
+        "VpnConnection":{
+          "shape":"VpnConnection",
+          "locationName":"vpnConnection"
+        }
+      }
+    },
+    "ModifyVpnTunnelOptionsSpecification":{
+      "type":"structure",
+      "members":{
+        "TunnelInsideCidr":{"shape":"String"},
+        "PreSharedKey":{"shape":"String"},
+        "Phase1LifetimeSeconds":{"shape":"Integer"},
+        "Phase2LifetimeSeconds":{"shape":"Integer"},
+        "RekeyMarginTimeSeconds":{"shape":"Integer"},
+        "RekeyFuzzPercentage":{"shape":"Integer"},
+        "ReplayWindowSize":{"shape":"Integer"},
+        "DPDTimeoutSeconds":{"shape":"Integer"},
+        "Phase1EncryptionAlgorithms":{
+          "shape":"Phase1EncryptionAlgorithmsRequestList",
+          "locationName":"Phase1EncryptionAlgorithm"
+        },
+        "Phase2EncryptionAlgorithms":{
+          "shape":"Phase2EncryptionAlgorithmsRequestList",
+          "locationName":"Phase2EncryptionAlgorithm"
+        },
+        "Phase1IntegrityAlgorithms":{
+          "shape":"Phase1IntegrityAlgorithmsRequestList",
+          "locationName":"Phase1IntegrityAlgorithm"
+        },
+        "Phase2IntegrityAlgorithms":{
+          "shape":"Phase2IntegrityAlgorithmsRequestList",
+          "locationName":"Phase2IntegrityAlgorithm"
+        },
+        "Phase1DHGroupNumbers":{
+          "shape":"Phase1DHGroupNumbersRequestList",
+          "locationName":"Phase1DHGroupNumber"
+        },
+        "Phase2DHGroupNumbers":{
+          "shape":"Phase2DHGroupNumbersRequestList",
+          "locationName":"Phase2DHGroupNumber"
+        },
+        "IKEVersions":{
+          "shape":"IKEVersionsRequestList",
+          "locationName":"IKEVersion"
+        }
+      }
+    },
     "MonitorInstancesRequest":{
       "type":"structure",
       "required":["InstanceIds"],
@@ -17243,6 +17948,7 @@
         "locationName":"item"
       }
     },
+    "NatGatewayId":{"type":"string"},
     "NatGatewayList":{
       "type":"list",
       "member":{
@@ -17310,6 +18016,7 @@
         }
       }
     },
+    "NetworkAclAssociationId":{"type":"string"},
     "NetworkAclAssociationList":{
       "type":"list",
       "member":{
@@ -17361,6 +18068,7 @@
         "locationName":"item"
       }
     },
+    "NetworkAclId":{"type":"string"},
     "NetworkAclList":{
       "type":"list",
       "member":{
@@ -17537,6 +18245,7 @@
       "type":"string",
       "enum":["efa"]
     },
+    "NetworkInterfaceId":{"type":"string"},
     "NetworkInterfaceIdList":{
       "type":"list",
       "member":{
@@ -17695,11 +18404,7 @@
         "locationName":"item"
       }
     },
-    "NextToken":{
-      "type":"string",
-      "max":1024,
-      "min":1
-    },
+    "NextToken":{"type":"string"},
     "OccurrenceDayRequestSet":{
       "type":"list",
       "member":{
@@ -17721,6 +18426,7 @@
         "convertible"
       ]
     },
+    "OfferingId":{"type":"string"},
     "OfferingTypeValues":{
       "type":"string",
       "enum":[
@@ -17757,6 +18463,10 @@
         "MinTargetCapacity":{
           "shape":"Integer",
           "locationName":"minTargetCapacity"
+        },
+        "MaxTotalPrice":{
+          "shape":"String",
+          "locationName":"maxTotalPrice"
         }
       }
     },
@@ -17766,7 +18476,8 @@
         "AllocationStrategy":{"shape":"FleetOnDemandAllocationStrategy"},
         "SingleInstanceType":{"shape":"Boolean"},
         "SingleAvailabilityZone":{"shape":"Boolean"},
-        "MinTargetCapacity":{"shape":"Integer"}
+        "MinTargetCapacity":{"shape":"Integer"},
+        "MaxTotalPrice":{"shape":"String"}
       }
     },
     "OperationType":{
@@ -17829,6 +18540,180 @@
       "type":"string",
       "enum":["all"]
     },
+    "Phase1DHGroupNumbersList":{
+      "type":"list",
+      "member":{
+        "shape":"Phase1DHGroupNumbersListValue",
+        "locationName":"item"
+      }
+    },
+    "Phase1DHGroupNumbersListValue":{
+      "type":"structure",
+      "members":{
+        "Value":{
+          "shape":"Integer",
+          "locationName":"value"
+        }
+      }
+    },
+    "Phase1DHGroupNumbersRequestList":{
+      "type":"list",
+      "member":{
+        "shape":"Phase1DHGroupNumbersRequestListValue",
+        "locationName":"item"
+      }
+    },
+    "Phase1DHGroupNumbersRequestListValue":{
+      "type":"structure",
+      "members":{
+        "Value":{"shape":"Integer"}
+      }
+    },
+    "Phase1EncryptionAlgorithmsList":{
+      "type":"list",
+      "member":{
+        "shape":"Phase1EncryptionAlgorithmsListValue",
+        "locationName":"item"
+      }
+    },
+    "Phase1EncryptionAlgorithmsListValue":{
+      "type":"structure",
+      "members":{
+        "Value":{
+          "shape":"String",
+          "locationName":"value"
+        }
+      }
+    },
+    "Phase1EncryptionAlgorithmsRequestList":{
+      "type":"list",
+      "member":{
+        "shape":"Phase1EncryptionAlgorithmsRequestListValue",
+        "locationName":"item"
+      }
+    },
+    "Phase1EncryptionAlgorithmsRequestListValue":{
+      "type":"structure",
+      "members":{
+        "Value":{"shape":"String"}
+      }
+    },
+    "Phase1IntegrityAlgorithmsList":{
+      "type":"list",
+      "member":{
+        "shape":"Phase1IntegrityAlgorithmsListValue",
+        "locationName":"item"
+      }
+    },
+    "Phase1IntegrityAlgorithmsListValue":{
+      "type":"structure",
+      "members":{
+        "Value":{
+          "shape":"String",
+          "locationName":"value"
+        }
+      }
+    },
+    "Phase1IntegrityAlgorithmsRequestList":{
+      "type":"list",
+      "member":{
+        "shape":"Phase1IntegrityAlgorithmsRequestListValue",
+        "locationName":"item"
+      }
+    },
+    "Phase1IntegrityAlgorithmsRequestListValue":{
+      "type":"structure",
+      "members":{
+        "Value":{"shape":"String"}
+      }
+    },
+    "Phase2DHGroupNumbersList":{
+      "type":"list",
+      "member":{
+        "shape":"Phase2DHGroupNumbersListValue",
+        "locationName":"item"
+      }
+    },
+    "Phase2DHGroupNumbersListValue":{
+      "type":"structure",
+      "members":{
+        "Value":{
+          "shape":"Integer",
+          "locationName":"value"
+        }
+      }
+    },
+    "Phase2DHGroupNumbersRequestList":{
+      "type":"list",
+      "member":{
+        "shape":"Phase2DHGroupNumbersRequestListValue",
+        "locationName":"item"
+      }
+    },
+    "Phase2DHGroupNumbersRequestListValue":{
+      "type":"structure",
+      "members":{
+        "Value":{"shape":"Integer"}
+      }
+    },
+    "Phase2EncryptionAlgorithmsList":{
+      "type":"list",
+      "member":{
+        "shape":"Phase2EncryptionAlgorithmsListValue",
+        "locationName":"item"
+      }
+    },
+    "Phase2EncryptionAlgorithmsListValue":{
+      "type":"structure",
+      "members":{
+        "Value":{
+          "shape":"String",
+          "locationName":"value"
+        }
+      }
+    },
+    "Phase2EncryptionAlgorithmsRequestList":{
+      "type":"list",
+      "member":{
+        "shape":"Phase2EncryptionAlgorithmsRequestListValue",
+        "locationName":"item"
+      }
+    },
+    "Phase2EncryptionAlgorithmsRequestListValue":{
+      "type":"structure",
+      "members":{
+        "Value":{"shape":"String"}
+      }
+    },
+    "Phase2IntegrityAlgorithmsList":{
+      "type":"list",
+      "member":{
+        "shape":"Phase2IntegrityAlgorithmsListValue",
+        "locationName":"item"
+      }
+    },
+    "Phase2IntegrityAlgorithmsListValue":{
+      "type":"structure",
+      "members":{
+        "Value":{
+          "shape":"String",
+          "locationName":"value"
+        }
+      }
+    },
+    "Phase2IntegrityAlgorithmsRequestList":{
+      "type":"list",
+      "member":{
+        "shape":"Phase2IntegrityAlgorithmsRequestListValue",
+        "locationName":"item"
+      }
+    },
+    "Phase2IntegrityAlgorithmsRequestListValue":{
+      "type":"structure",
+      "members":{
+        "Value":{"shape":"String"}
+      }
+    },
     "Placement":{
       "type":"structure",
       "members":{
@@ -17890,6 +18775,7 @@
         "locationName":"item"
       }
     },
+    "PlacementGroupName":{"type":"string"},
     "PlacementGroupState":{
       "type":"string",
       "enum":[
@@ -18343,7 +19229,7 @@
         "CurrencyCode":{"shape":"CurrencyCodeValues"},
         "HostIdSet":{"shape":"RequestHostIdSet"},
         "LimitPrice":{"shape":"String"},
-        "OfferingId":{"shape":"String"}
+        "OfferingId":{"shape":"OfferingId"}
       }
     },
     "PurchaseHostReservationResult":{
@@ -18406,7 +19292,8 @@
         "LimitPrice":{
           "shape":"ReservedInstanceLimitPrice",
           "locationName":"limitPrice"
-        }
+        },
+        "PurchaseTime":{"shape":"DateTime"}
       }
     },
     "PurchaseReservedInstancesOfferingResult":{
@@ -18465,6 +19352,7 @@
         "Windows (Amazon VPC)"
       ]
     },
+    "RamdiskId":{"type":"string"},
     "ReasonCodesList":{
       "type":"list",
       "member":{
@@ -18520,6 +19408,10 @@
         "RegionName":{
           "shape":"String",
           "locationName":"regionName"
+        },
+        "OptInStatus":{
+          "shape":"String",
+          "locationName":"optInStatus"
         }
       }
     },
@@ -18563,7 +19455,7 @@
           "locationName":"enaSupport"
         },
         "KernelId":{
-          "shape":"String",
+          "shape":"KernelId",
           "locationName":"kernelId"
         },
         "Name":{
@@ -18575,7 +19467,7 @@
           "locationName":"BillingProduct"
         },
         "RamdiskId":{
-          "shape":"String",
+          "shape":"RamdiskId",
           "locationName":"ramdiskId"
         },
         "RootDeviceName":{
@@ -18605,7 +19497,7 @@
       "type":"structure",
       "required":["TransitGatewayAttachmentId"],
       "members":{
-        "TransitGatewayAttachmentId":{"shape":"String"},
+        "TransitGatewayAttachmentId":{"shape":"TransitGatewayAttachmentId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -18626,7 +19518,7 @@
       ],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "ServiceId":{"shape":"String"},
+        "ServiceId":{"shape":"ServiceId"},
         "VpcEndpointIds":{
           "shape":"ValueStringList",
           "locationName":"VpcEndpointId"
@@ -18651,7 +19543,7 @@
           "locationName":"dryRun"
         },
         "VpcPeeringConnectionId":{
-          "shape":"String",
+          "shape":"VpcPeeringConnectionId",
           "locationName":"vpcPeeringConnectionId"
         }
       }
@@ -18668,7 +19560,7 @@
     "ReleaseAddressRequest":{
       "type":"structure",
       "members":{
-        "AllocationId":{"shape":"String"},
+        "AllocationId":{"shape":"AllocationId"},
         "PublicIp":{"shape":"String"},
         "DryRun":{
           "shape":"Boolean",
@@ -18727,7 +19619,7 @@
       ],
       "members":{
         "AssociationId":{
-          "shape":"String",
+          "shape":"NetworkAclAssociationId",
           "locationName":"associationId"
         },
         "DryRun":{
@@ -18735,7 +19627,7 @@
           "locationName":"dryRun"
         },
         "NetworkAclId":{
-          "shape":"String",
+          "shape":"NetworkAclId",
           "locationName":"networkAclId"
         }
       }
@@ -18780,7 +19672,7 @@
           "locationName":"ipv6CidrBlock"
         },
         "NetworkAclId":{
-          "shape":"String",
+          "shape":"NetworkAclId",
           "locationName":"networkAclId"
         },
         "PortRange":{
@@ -18818,32 +19710,32 @@
           "locationName":"dryRun"
         },
         "EgressOnlyInternetGatewayId":{
-          "shape":"String",
+          "shape":"EgressOnlyInternetGatewayId",
           "locationName":"egressOnlyInternetGatewayId"
         },
         "GatewayId":{
-          "shape":"String",
+          "shape":"RouteTableGatewayId",
           "locationName":"gatewayId"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "locationName":"instanceId"
         },
         "NatGatewayId":{
-          "shape":"String",
+          "shape":"NatGatewayId",
           "locationName":"natGatewayId"
         },
-        "TransitGatewayId":{"shape":"String"},
+        "TransitGatewayId":{"shape":"TransitGatewayId"},
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "locationName":"networkInterfaceId"
         },
         "RouteTableId":{
-          "shape":"String",
+          "shape":"RouteTableId",
           "locationName":"routeTableId"
         },
         "VpcPeeringConnectionId":{
-          "shape":"String",
+          "shape":"VpcPeeringConnectionId",
           "locationName":"vpcPeeringConnectionId"
         }
       }
@@ -18856,7 +19748,7 @@
       ],
       "members":{
         "AssociationId":{
-          "shape":"String",
+          "shape":"RouteTableAssociationId",
           "locationName":"associationId"
         },
         "DryRun":{
@@ -18864,7 +19756,7 @@
           "locationName":"dryRun"
         },
         "RouteTableId":{
-          "shape":"String",
+          "shape":"RouteTableId",
           "locationName":"routeTableId"
         }
       }
@@ -18886,8 +19778,8 @@
       ],
       "members":{
         "DestinationCidrBlock":{"shape":"String"},
-        "TransitGatewayRouteTableId":{"shape":"String"},
-        "TransitGatewayAttachmentId":{"shape":"String"},
+        "TransitGatewayRouteTableId":{"shape":"TransitGatewayRouteTableId"},
+        "TransitGatewayAttachmentId":{"shape":"TransitGatewayAttachmentId"},
         "Blackhole":{"shape":"Boolean"},
         "DryRun":{"shape":"Boolean"}
       }
@@ -18970,7 +19862,7 @@
     "RequestHostIdSet":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"HostId",
         "locationName":"item"
       }
     },
@@ -19280,7 +20172,9 @@
         "payment-pending",
         "active",
         "payment-failed",
-        "retired"
+        "retired",
+        "queued",
+        "queued-deleted"
       ]
     },
     "ReservedInstances":{
@@ -19460,6 +20354,7 @@
         }
       }
     },
+    "ReservedInstancesListingId":{"type":"string"},
     "ReservedInstancesListingList":{
       "type":"list",
       "member":{
@@ -19649,7 +20544,7 @@
       "required":["FpgaImageId"],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "FpgaImageId":{"shape":"String"},
+        "FpgaImageId":{"shape":"FpgaImageId"},
         "Attribute":{"shape":"ResetFpgaImageAttributeName"}
       }
     },
@@ -19674,7 +20569,7 @@
       ],
       "members":{
         "Attribute":{"shape":"ResetImageAttributeName"},
-        "ImageId":{"shape":"String"},
+        "ImageId":{"shape":"ImageId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -19697,7 +20592,7 @@
           "locationName":"dryRun"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "locationName":"instanceId"
         }
       }
@@ -19711,7 +20606,7 @@
           "locationName":"dryRun"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "locationName":"networkInterfaceId"
         },
         "SourceDestCheck":{
@@ -19728,7 +20623,7 @@
       ],
       "members":{
         "Attribute":{"shape":"SnapshotAttributeName"},
-        "SnapshotId":{"shape":"String"},
+        "SnapshotId":{"shape":"SnapshotId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -19953,7 +20848,7 @@
         "TargetNetworkCidr"
       ],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
         "TargetNetworkCidr":{"shape":"String"},
         "AccessGroupId":{"shape":"String"},
         "RevokeAllGroups":{"shape":"Boolean"},
@@ -20162,6 +21057,7 @@
         }
       }
     },
+    "RouteTableAssociationId":{"type":"string"},
     "RouteTableAssociationList":{
       "type":"list",
       "member":{
@@ -20169,6 +21065,8 @@
         "locationName":"item"
       }
     },
+    "RouteTableGatewayId":{"type":"string"},
+    "RouteTableId":{"type":"string"},
     "RouteTableList":{
       "type":"list",
       "member":{
@@ -20204,7 +21102,7 @@
           "shape":"BlockDeviceMappingRequestList",
           "locationName":"BlockDeviceMapping"
         },
-        "ImageId":{"shape":"String"},
+        "ImageId":{"shape":"ImageId"},
         "InstanceType":{"shape":"InstanceType"},
         "Ipv6AddressCount":{"shape":"Integer"},
         "Ipv6Addresses":{
@@ -20299,7 +21197,7 @@
         "DryRun":{"shape":"Boolean"},
         "InstanceCount":{"shape":"Integer"},
         "LaunchSpecification":{"shape":"ScheduledInstancesLaunchSpecification"},
-        "ScheduledInstanceId":{"shape":"String"}
+        "ScheduledInstanceId":{"shape":"ScheduledInstanceId"}
       }
     },
     "RunScheduledInstancesResult":{
@@ -20462,6 +21360,7 @@
         "locationName":"item"
       }
     },
+    "ScheduledInstanceId":{"type":"string"},
     "ScheduledInstanceIdRequestSet":{
       "type":"list",
       "member":{
@@ -20657,7 +21556,7 @@
         "Filters"
       ],
       "members":{
-        "TransitGatewayRouteTableId":{"shape":"String"},
+        "TransitGatewayRouteTableId":{"shape":"TransitGatewayRouteTableId"},
         "Filters":{
           "shape":"FilterList",
           "locationName":"Filter"
@@ -20774,6 +21673,18 @@
         "locationName":"SecurityGroup"
       }
     },
+    "SendDiagnosticInterruptRequest":{
+      "type":"structure",
+      "required":["InstanceId"],
+      "members":{
+        "InstanceId":{"shape":"InstanceId"},
+        "DryRun":{"shape":"Boolean"}
+      }
+    },
+    "SensitiveUserData":{
+      "type":"string",
+      "sensitive":true
+    },
     "ServiceConfiguration":{
       "type":"structure",
       "members":{
@@ -20886,6 +21797,7 @@
         "locationName":"item"
       }
     },
+    "ServiceId":{"type":"string"},
     "ServiceState":{
       "type":"string",
       "enum":[
@@ -21073,6 +21985,7 @@
         "UserBucket":{"shape":"UserBucket"}
       }
     },
+    "SnapshotId":{"type":"string"},
     "SnapshotIdStringList":{
       "type":"list",
       "member":{
@@ -21200,7 +22113,8 @@
       "type":"string",
       "enum":[
         "lowest-price",
-        "diversified"
+        "diversified",
+        "capacity-optimized"
       ]
     },
     "SpotDatafeedSubscription":{
@@ -21394,6 +22308,14 @@
           "shape":"Integer",
           "locationName":"onDemandTargetCapacity"
         },
+        "OnDemandMaxTotalPrice":{
+          "shape":"String",
+          "locationName":"onDemandMaxTotalPrice"
+        },
+        "SpotMaxTotalPrice":{
+          "shape":"String",
+          "locationName":"spotMaxTotalPrice"
+        },
         "TerminateInstancesWithExpiration":{
           "shape":"Boolean",
           "locationName":"terminateInstancesWithExpiration"
@@ -21435,6 +22357,7 @@
         "locationName":"item"
       }
     },
+    "SpotFleetRequestId":{"type":"string"},
     "SpotFleetTagSpecification":{
       "type":"structure",
       "members":{
@@ -21641,6 +22564,10 @@
         "MinTargetCapacity":{
           "shape":"Integer",
           "locationName":"minTargetCapacity"
+        },
+        "MaxTotalPrice":{
+          "shape":"String",
+          "locationName":"maxTotalPrice"
         }
       }
     },
@@ -21652,7 +22579,8 @@
         "InstancePoolsToUseCount":{"shape":"Integer"},
         "SingleInstanceType":{"shape":"Boolean"},
         "SingleAvailabilityZone":{"shape":"Boolean"},
-        "MinTargetCapacity":{"shape":"Integer"}
+        "MinTargetCapacity":{"shape":"Integer"},
+        "MaxTotalPrice":{"shape":"String"}
       }
     },
     "SpotPlacement":{
@@ -21953,6 +22881,7 @@
         }
       }
     },
+    "SubnetCidrAssociationId":{"type":"string"},
     "SubnetCidrBlockState":{
       "type":"structure",
       "members":{
@@ -21977,6 +22906,7 @@
         "failed"
       ]
     },
+    "SubnetId":{"type":"string"},
     "SubnetIdStringList":{
       "type":"list",
       "member":{
@@ -22038,6 +22968,22 @@
         "locationName":"item"
       }
     },
+    "SuccessfulQueuedPurchaseDeletion":{
+      "type":"structure",
+      "members":{
+        "ReservedInstancesId":{
+          "shape":"String",
+          "locationName":"reservedInstancesId"
+        }
+      }
+    },
+    "SuccessfulQueuedPurchaseDeletionSet":{
+      "type":"list",
+      "member":{
+        "shape":"SuccessfulQueuedPurchaseDeletion",
+        "locationName":"item"
+      }
+    },
     "SummaryStatus":{
       "type":"string",
       "enum":[
@@ -22277,7 +23223,7 @@
       "type":"structure",
       "required":["ClientVpnEndpointId"],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
         "ConnectionId":{"shape":"String"},
         "Username":{"shape":"String"},
         "DryRun":{"shape":"Boolean"}
@@ -22383,6 +23329,7 @@
         }
       }
     },
+    "TrafficMirrorFilterId":{"type":"string"},
     "TrafficMirrorFilterRule":{
       "type":"structure",
       "members":{
@@ -22445,6 +23392,7 @@
       "type":"list",
       "member":{"shape":"TrafficMirrorFilterRuleField"}
     },
+    "TrafficMirrorFilterRuleId":{"type":"string"},
     "TrafficMirrorFilterRuleList":{
       "type":"list",
       "member":{
@@ -22554,6 +23502,7 @@
       "type":"list",
       "member":{"shape":"TrafficMirrorSessionField"}
     },
+    "TrafficMirrorSessionId":{"type":"string"},
     "TrafficMirrorSessionSet":{
       "type":"list",
       "member":{
@@ -22594,6 +23543,7 @@
         }
       }
     },
+    "TrafficMirrorTargetId":{"type":"string"},
     "TrafficMirrorTargetSet":{
       "type":"list",
       "member":{
@@ -22750,6 +23700,7 @@
         }
       }
     },
+    "TransitGatewayAttachmentId":{"type":"string"},
     "TransitGatewayAttachmentIdStringList":{
       "type":"list",
       "member":{"shape":"String"}
@@ -22805,6 +23756,7 @@
         "failing"
       ]
     },
+    "TransitGatewayId":{"type":"string"},
     "TransitGatewayIdStringList":{
       "type":"list",
       "member":{
@@ -23029,6 +23981,7 @@
         "locationName":"item"
       }
     },
+    "TransitGatewayRouteTableId":{"type":"string"},
     "TransitGatewayRouteTableIdStringList":{
       "type":"list",
       "member":{
@@ -23165,10 +24118,79 @@
         "udp"
       ]
     },
+    "TunnelOption":{
+      "type":"structure",
+      "members":{
+        "OutsideIpAddress":{
+          "shape":"String",
+          "locationName":"outsideIpAddress"
+        },
+        "TunnelInsideCidr":{
+          "shape":"String",
+          "locationName":"tunnelInsideCidr"
+        },
+        "PreSharedKey":{
+          "shape":"String",
+          "locationName":"preSharedKey"
+        },
+        "Phase1LifetimeSeconds":{
+          "shape":"Integer",
+          "locationName":"phase1LifetimeSeconds"
+        },
+        "Phase2LifetimeSeconds":{
+          "shape":"Integer",
+          "locationName":"phase2LifetimeSeconds"
+        },
+        "RekeyMarginTimeSeconds":{
+          "shape":"Integer",
+          "locationName":"rekeyMarginTimeSeconds"
+        },
+        "RekeyFuzzPercentage":{
+          "shape":"Integer",
+          "locationName":"rekeyFuzzPercentage"
+        },
+        "ReplayWindowSize":{
+          "shape":"Integer",
+          "locationName":"replayWindowSize"
+        },
+        "DpdTimeoutSeconds":{
+          "shape":"Integer",
+          "locationName":"dpdTimeoutSeconds"
+        },
+        "Phase1EncryptionAlgorithms":{
+          "shape":"Phase1EncryptionAlgorithmsList",
+          "locationName":"phase1EncryptionAlgorithmSet"
+        },
+        "Phase2EncryptionAlgorithms":{
+          "shape":"Phase2EncryptionAlgorithmsList",
+          "locationName":"phase2EncryptionAlgorithmSet"
+        },
+        "Phase1IntegrityAlgorithms":{
+          "shape":"Phase1IntegrityAlgorithmsList",
+          "locationName":"phase1IntegrityAlgorithmSet"
+        },
+        "Phase2IntegrityAlgorithms":{
+          "shape":"Phase2IntegrityAlgorithmsList",
+          "locationName":"phase2IntegrityAlgorithmSet"
+        },
+        "Phase1DHGroupNumbers":{
+          "shape":"Phase1DHGroupNumbersList",
+          "locationName":"phase1DHGroupNumberSet"
+        },
+        "Phase2DHGroupNumbers":{
+          "shape":"Phase2DHGroupNumbersList",
+          "locationName":"phase2DHGroupNumberSet"
+        },
+        "IkeVersions":{
+          "shape":"IKEVersionsList",
+          "locationName":"ikeVersionSet"
+        }
+      }
+    },
     "TunnelOptionsList":{
       "type":"list",
       "member":{
-        "shape":"VpnTunnelOptionsSpecification",
+        "shape":"TunnelOption",
         "locationName":"item"
       }
     },
@@ -23184,7 +24206,7 @@
           "locationName":"ipv6Addresses"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "locationName":"networkInterfaceId"
         }
       }
@@ -23210,7 +24232,7 @@
       ],
       "members":{
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "locationName":"networkInterfaceId"
         },
         "PrivateIpAddresses":{
@@ -23389,7 +24411,8 @@
           "shape":"String",
           "locationName":"data"
         }
-      }
+      },
+      "sensitive":true
     },
     "UserGroupStringList":{
       "type":"list",
@@ -23492,6 +24515,10 @@
         "StatusMessage":{
           "shape":"String",
           "locationName":"statusMessage"
+        },
+        "CertificateArn":{
+          "shape":"String",
+          "locationName":"certificateArn"
         }
       }
     },
@@ -23625,6 +24652,7 @@
         }
       }
     },
+    "VolumeId":{"type":"string"},
     "VolumeIdStringList":{
       "type":"list",
       "member":{
@@ -23941,6 +24969,7 @@
         "enableDnsHostnames"
       ]
     },
+    "VpcCidrAssociationId":{"type":"string"},
     "VpcCidrBlockAssociation":{
       "type":"structure",
       "members":{
@@ -24129,6 +25158,7 @@
         "locationName":"item"
       }
     },
+    "VpcEndpointId":{"type":"string"},
     "VpcEndpointSet":{
       "type":"list",
       "member":{
@@ -24143,6 +25173,7 @@
         "Gateway"
       ]
     },
+    "VpcId":{"type":"string"},
     "VpcIdStringList":{
       "type":"list",
       "member":{
@@ -24210,6 +25241,7 @@
         }
       }
     },
+    "VpcPeeringConnectionId":{"type":"string"},
     "VpcPeeringConnectionList":{
       "type":"list",
       "member":{
@@ -24358,6 +25390,7 @@
         }
       }
     },
+    "VpnConnectionId":{"type":"string"},
     "VpnConnectionIdStringList":{
       "type":"list",
       "member":{
@@ -24378,6 +25411,10 @@
         "StaticRoutesOnly":{
           "shape":"Boolean",
           "locationName":"staticRoutesOnly"
+        },
+        "TunnelOptions":{
+          "shape":"TunnelOptionsList",
+          "locationName":"tunnelOptionSet"
         }
       }
     },
@@ -24388,7 +25425,7 @@
           "shape":"Boolean",
           "locationName":"staticRoutesOnly"
         },
-        "TunnelOptions":{"shape":"TunnelOptionsList"}
+        "TunnelOptions":{"shape":"VpnTunnelOptionsSpecificationsList"}
       }
     },
     "VpnEcmpSupportValue":{
@@ -24431,6 +25468,7 @@
         }
       }
     },
+    "VpnGatewayId":{"type":"string"},
     "VpnGatewayIdStringList":{
       "type":"list",
       "member":{
@@ -24490,9 +25528,47 @@
       "type":"structure",
       "members":{
         "TunnelInsideCidr":{"shape":"String"},
-        "PreSharedKey":{"shape":"String"}
+        "PreSharedKey":{"shape":"String"},
+        "Phase1LifetimeSeconds":{"shape":"Integer"},
+        "Phase2LifetimeSeconds":{"shape":"Integer"},
+        "RekeyMarginTimeSeconds":{"shape":"Integer"},
+        "RekeyFuzzPercentage":{"shape":"Integer"},
+        "ReplayWindowSize":{"shape":"Integer"},
+        "DPDTimeoutSeconds":{"shape":"Integer"},
+        "Phase1EncryptionAlgorithms":{
+          "shape":"Phase1EncryptionAlgorithmsRequestList",
+          "locationName":"Phase1EncryptionAlgorithm"
+        },
+        "Phase2EncryptionAlgorithms":{
+          "shape":"Phase2EncryptionAlgorithmsRequestList",
+          "locationName":"Phase2EncryptionAlgorithm"
+        },
+        "Phase1IntegrityAlgorithms":{
+          "shape":"Phase1IntegrityAlgorithmsRequestList",
+          "locationName":"Phase1IntegrityAlgorithm"
+        },
+        "Phase2IntegrityAlgorithms":{
+          "shape":"Phase2IntegrityAlgorithmsRequestList",
+          "locationName":"Phase2IntegrityAlgorithm"
+        },
+        "Phase1DHGroupNumbers":{
+          "shape":"Phase1DHGroupNumbersRequestList",
+          "locationName":"Phase1DHGroupNumber"
+        },
+        "Phase2DHGroupNumbers":{
+          "shape":"Phase2DHGroupNumbersRequestList",
+          "locationName":"Phase2DHGroupNumber"
+        },
+        "IKEVersions":{
+          "shape":"IKEVersionsRequestList",
+          "locationName":"IKEVersion"
+        }
       }
     },
+    "VpnTunnelOptionsSpecificationsList":{
+      "type":"list",
+      "member":{"shape":"VpnTunnelOptionsSpecification"}
+    },
     "WithdrawByoipCidrRequest":{
       "type":"structure",
       "required":["Cidr"],