aws-sdk-core 2.11.388 → 2.11.389

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20fcaa9109b43bcd7e556b84565678944e867d0d
-  data.tar.gz: 0c9b537f7d9af06957c6f39ccc2a12b093b8f208
+  metadata.gz: dbc939ae7378578e1b030d7d5fd485e8b25b6dfe
+  data.tar.gz: 8b77fe9d546d6a65647081aaae2407d800984b7e
 SHA512:
-  metadata.gz: 637aef1535a29d8dbad165c960d7c7cb0c69f21d162b8773af339951d516a2ecf149c58a8544e51fd1eb1a9c5659982feb3ec4cc0a522f675046cfa21c2022b0
-  data.tar.gz: 829fc9a11690d9901f0eb8279ef44bac6618ad585e46d817de48559757a9dfa4abd54df2421443d5b5e6b6873be8db4143a00172c93208fcaecc77e1970f6fdd
+  metadata.gz: bdd8a57af1f3d7f2222984515bf8e835e1c4f042374abde1c8dc19b60acf80f3211cbaccd1aa5e3421ed35ed17bacd6ed7791b2963f5537d0986ea35106a1ddd
+  data.tar.gz: c75956736aff9693602145ca36b32eddd51b1f06f6432cc77f8ecec937bb61c9843242b4f21cb43e7951df4a2648f51761f63832be55344e1196d58a58ad137f

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

@@ -3212,7 +3212,7 @@
       "type":"structure",
       "required":["TransitGatewayAttachmentId"],
       "members":{
-        "TransitGatewayAttachmentId":{"shape":"String"},
+        "TransitGatewayAttachmentId":{"shape":"TransitGatewayAttachmentId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -3233,7 +3233,7 @@
       ],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "ServiceId":{"shape":"String"},
+        "ServiceId":{"shape":"ServiceId"},
         "VpcEndpointIds":{
           "shape":"ValueStringList",
           "locationName":"VpcEndpointId"
@@ -3257,7 +3257,7 @@
           "locationName":"dryRun"
         },
         "VpcPeeringConnectionId":{
-          "shape":"String",
+          "shape":"VpcPeeringConnectionId",
           "locationName":"vpcPeeringConnectionId"
         }
       }
@@ -3511,6 +3511,7 @@
         }
       }
     },
+    "AllocationId":{"type":"string"},
     "AllocationIdList":{
       "type":"list",
       "member":{
@@ -3565,8 +3566,8 @@
         "SecurityGroupIds"
       ],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
-        "VpcId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
+        "VpcId":{"shape":"VpcId"},
         "SecurityGroupIds":{
           "shape":"ClientVpnSecurityGroupIdSet",
           "locationName":"SecurityGroupId"
@@ -3604,7 +3605,7 @@
           "locationName":"ipv6Addresses"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "locationName":"networkInterfaceId"
         }
       }
@@ -3631,7 +3632,7 @@
           "locationName":"allowReassignment"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "locationName":"networkInterfaceId"
         },
         "PrivateIpAddresses":{
@@ -3676,8 +3677,8 @@
     "AssociateAddressRequest":{
       "type":"structure",
       "members":{
-        "AllocationId":{"shape":"String"},
-        "InstanceId":{"shape":"String"},
+        "AllocationId":{"shape":"AllocationId"},
+        "InstanceId":{"shape":"InstanceId"},
         "PublicIp":{"shape":"String"},
         "AllowReassociation":{
           "shape":"Boolean",
@@ -3688,7 +3689,7 @@
           "locationName":"dryRun"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "locationName":"networkInterfaceId"
         },
         "PrivateIpAddress":{
@@ -3713,8 +3714,8 @@
         "SubnetId"
       ],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
-        "SubnetId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
+        "SubnetId":{"shape":"SubnetId"},
         "ClientToken":{
           "shape":"String",
           "idempotencyToken":true
@@ -3742,8 +3743,8 @@
         "VpcId"
       ],
       "members":{
-        "DhcpOptionsId":{"shape":"String"},
-        "VpcId":{"shape":"String"},
+        "DhcpOptionsId":{"shape":"DhcpOptionsId"},
+        "VpcId":{"shape":"VpcId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -3758,7 +3759,7 @@
       ],
       "members":{
         "IamInstanceProfile":{"shape":"IamInstanceProfileSpecification"},
-        "InstanceId":{"shape":"String"}
+        "InstanceId":{"shape":"InstanceId"}
       }
     },
     "AssociateIamInstanceProfileResult":{
@@ -3782,11 +3783,11 @@
           "locationName":"dryRun"
         },
         "RouteTableId":{
-          "shape":"String",
+          "shape":"RouteTableId",
           "locationName":"routeTableId"
         },
         "SubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "locationName":"subnetId"
         }
       }
@@ -3812,7 +3813,7 @@
           "locationName":"ipv6CidrBlock"
         },
         "SubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "locationName":"subnetId"
         }
       }
@@ -3837,8 +3838,8 @@
         "TransitGatewayAttachmentId"
       ],
       "members":{
-        "TransitGatewayRouteTableId":{"shape":"String"},
-        "TransitGatewayAttachmentId":{"shape":"String"},
+        "TransitGatewayRouteTableId":{"shape":"TransitGatewayRouteTableId"},
+        "TransitGatewayAttachmentId":{"shape":"TransitGatewayAttachmentId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -3861,7 +3862,7 @@
         },
         "CidrBlock":{"shape":"String"},
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "locationName":"vpcId"
         }
       }
@@ -3954,11 +3955,11 @@
           "locationName":"SecurityGroupId"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "locationName":"instanceId"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "locationName":"vpcId"
         }
       }
@@ -3984,11 +3985,11 @@
           "locationName":"dryRun"
         },
         "InternetGatewayId":{
-          "shape":"String",
+          "shape":"InternetGatewayId",
           "locationName":"internetGatewayId"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "locationName":"vpcId"
         }
       }
@@ -4010,11 +4011,11 @@
           "locationName":"dryRun"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "locationName":"instanceId"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "locationName":"networkInterfaceId"
         }
       }
@@ -4037,8 +4038,8 @@
       ],
       "members":{
         "Device":{"shape":"String"},
-        "InstanceId":{"shape":"String"},
-        "VolumeId":{"shape":"String"},
+        "InstanceId":{"shape":"InstanceId"},
+        "VolumeId":{"shape":"VolumeId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -4052,8 +4053,8 @@
         "VpnGatewayId"
       ],
       "members":{
-        "VpcId":{"shape":"String"},
-        "VpnGatewayId":{"shape":"String"},
+        "VpcId":{"shape":"VpcId"},
+        "VpnGatewayId":{"shape":"VpnGatewayId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -4069,6 +4070,7 @@
         }
       }
     },
+    "AttachmentId":{"type":"string"},
     "AttachmentStatus":{
       "type":"string",
       "enum":[
@@ -4139,7 +4141,7 @@
         "TargetNetworkCidr"
       ],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
         "TargetNetworkCidr":{"shape":"String"},
         "AccessGroupId":{"shape":"String"},
         "AuthorizeAllGroups":{"shape":"Boolean"},
@@ -4390,7 +4392,7 @@
         "Storage"
       ],
       "members":{
-        "InstanceId":{"shape":"String"},
+        "InstanceId":{"shape":"InstanceId"},
         "Storage":{"shape":"Storage"},
         "DryRun":{
           "shape":"Boolean",
@@ -4549,7 +4551,7 @@
       "type":"structure",
       "required":["CapacityReservationId"],
       "members":{
-        "CapacityReservationId":{"shape":"String"},
+        "CapacityReservationId":{"shape":"CapacityReservationId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -4567,7 +4569,7 @@
       "required":["ConversionTaskId"],
       "members":{
         "ConversionTaskId":{
-          "shape":"String",
+          "shape":"ConversionTaskId",
           "locationName":"conversionTaskId"
         },
         "DryRun":{
@@ -4585,7 +4587,7 @@
       "required":["ExportTaskId"],
       "members":{
         "ExportTaskId":{
-          "shape":"String",
+          "shape":"ExportTaskId",
           "locationName":"exportTaskId"
         }
       }
@@ -4595,7 +4597,7 @@
       "members":{
         "CancelReason":{"shape":"String"},
         "DryRun":{"shape":"Boolean"},
-        "ImportTaskId":{"shape":"String"}
+        "ImportTaskId":{"shape":"ImportTaskId"}
       }
     },
     "CancelImportTaskResult":{
@@ -4620,7 +4622,7 @@
       "required":["ReservedInstancesListingId"],
       "members":{
         "ReservedInstancesListingId":{
-          "shape":"String",
+          "shape":"ReservedInstancesListingId",
           "locationName":"reservedInstancesListingId"
         }
       }
@@ -4855,6 +4857,7 @@
         }
       }
     },
+    "CapacityReservationId":{"type":"string"},
     "CapacityReservationIdSet":{
       "type":"list",
       "member":{
@@ -5312,6 +5315,7 @@
         }
       }
     },
+    "ClientVpnEndpointId":{"type":"string"},
     "ClientVpnEndpointStatus":{
       "type":"structure",
       "members":{
@@ -5410,7 +5414,7 @@
         "ProductCode"
       ],
       "members":{
-        "InstanceId":{"shape":"String"},
+        "InstanceId":{"shape":"InstanceId"},
         "ProductCode":{"shape":"String"},
         "DryRun":{
           "shape":"Boolean",
@@ -5480,6 +5484,7 @@
         }
       }
     },
+    "ConnectionNotificationId":{"type":"string"},
     "ConnectionNotificationSet":{
       "type":"list",
       "member":{
@@ -5542,6 +5547,7 @@
         }
       }
     },
+    "ConversionTaskId":{"type":"string"},
     "ConversionTaskState":{
       "type":"string",
       "enum":[
@@ -5590,7 +5596,7 @@
           "locationName":"encrypted"
         },
         "KmsKeyId":{
-          "shape":"String",
+          "shape":"KmsKeyId",
           "locationName":"kmsKeyId"
         },
         "Name":{"shape":"String"},
@@ -5628,7 +5634,7 @@
           "locationName":"encrypted"
         },
         "KmsKeyId":{
-          "shape":"String",
+          "shape":"KmsKeyId",
           "locationName":"kmsKeyId"
         },
         "PresignedUrl":{
@@ -5765,7 +5771,7 @@
         "TargetVpcSubnetId"
       ],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
         "DestinationCidrBlock":{"shape":"String"},
         "TargetVpcSubnetId":{"shape":"String"},
         "Description":{"shape":"String"},
@@ -5875,7 +5881,7 @@
       "members":{
         "ClientToken":{"shape":"String"},
         "DryRun":{"shape":"Boolean"},
-        "VpcId":{"shape":"String"}
+        "VpcId":{"shape":"VpcId"}
       }
     },
     "CreateEgressOnlyInternetGatewayResult":{
@@ -6082,7 +6088,7 @@
           "locationName":"dryRun"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "locationName":"instanceId"
         },
         "Name":{
@@ -6117,7 +6123,7 @@
           "locationName":"exportToS3"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "locationName":"instanceId"
         },
         "TargetEnvironment":{
@@ -6157,7 +6163,7 @@
       "type":"structure",
       "required":["KeyName"],
       "members":{
-        "KeyName":{"shape":"String"},
+        "KeyName":{"shape":"KeyPairName"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -6197,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"},
@@ -6220,9 +6226,9 @@
         "SubnetId"
       ],
       "members":{
-        "AllocationId":{"shape":"String"},
+        "AllocationId":{"shape":"AllocationId"},
         "ClientToken":{"shape":"String"},
-        "SubnetId":{"shape":"String"}
+        "SubnetId":{"shape":"SubnetId"}
       }
     },
     "CreateNatGatewayResult":{
@@ -6269,7 +6275,7 @@
           "locationName":"ipv6CidrBlock"
         },
         "NetworkAclId":{
-          "shape":"String",
+          "shape":"NetworkAclId",
           "locationName":"networkAclId"
         },
         "PortRange":{
@@ -6299,7 +6305,7 @@
           "locationName":"dryRun"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "locationName":"vpcId"
         }
       }
@@ -6320,7 +6326,7 @@
         "Permission"
       ],
       "members":{
-        "NetworkInterfaceId":{"shape":"String"},
+        "NetworkInterfaceId":{"shape":"NetworkInterfaceId"},
         "AwsAccountId":{"shape":"String"},
         "AwsService":{"shape":"String"},
         "Permission":{"shape":"InterfacePermissionType"},
@@ -6374,7 +6380,7 @@
         },
         "InterfaceType":{"shape":"NetworkInterfaceCreationType"},
         "SubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "locationName":"subnetId"
         }
       }
@@ -6459,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"
         }
       }
@@ -6507,7 +6513,7 @@
           "locationName":"dryRun"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "locationName":"vpcId"
         }
       }
@@ -6533,7 +6539,7 @@
           "locationName":"GroupDescription"
         },
         "GroupName":{"shape":"String"},
-        "VpcId":{"shape":"String"},
+        "VpcId":{"shape":"VpcId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -6554,7 +6560,7 @@
       "required":["VolumeId"],
       "members":{
         "Description":{"shape":"String"},
-        "VolumeId":{"shape":"String"},
+        "VolumeId":{"shape":"VolumeId"},
         "TagSpecifications":{
           "shape":"TagSpecificationList",
           "locationName":"TagSpecification"
@@ -6626,7 +6632,7 @@
         "AvailabilityZoneId":{"shape":"String"},
         "CidrBlock":{"shape":"String"},
         "Ipv6CidrBlock":{"shape":"String"},
-        "VpcId":{"shape":"String"},
+        "VpcId":{"shape":"VpcId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -6702,7 +6708,7 @@
         "SourceCidrBlock"
       ],
       "members":{
-        "TrafficMirrorFilterId":{"shape":"String"},
+        "TrafficMirrorFilterId":{"shape":"TrafficMirrorFilterId"},
         "TrafficDirection":{"shape":"TrafficDirection"},
         "RuleNumber":{"shape":"Integer"},
         "RuleAction":{"shape":"TrafficMirrorRuleAction"},
@@ -6741,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"},
@@ -6775,7 +6781,7 @@
     "CreateTrafficMirrorTargetRequest":{
       "type":"structure",
       "members":{
-        "NetworkInterfaceId":{"shape":"String"},
+        "NetworkInterfaceId":{"shape":"NetworkInterfaceId"},
         "NetworkLoadBalancerArn":{"shape":"String"},
         "Description":{"shape":"String"},
         "TagSpecifications":{
@@ -6831,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"}
       }
@@ -6850,7 +6856,7 @@
       "type":"structure",
       "required":["TransitGatewayId"],
       "members":{
-        "TransitGatewayId":{"shape":"String"},
+        "TransitGatewayId":{"shape":"TransitGatewayId"},
         "TagSpecifications":{"shape":"TagSpecificationList"},
         "DryRun":{"shape":"Boolean"}
       }
@@ -6872,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"},
@@ -6933,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",
@@ -6955,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"}
@@ -6984,7 +6990,7 @@
       "members":{
         "DryRun":{"shape":"Boolean"},
         "VpcEndpointType":{"shape":"VpcEndpointType"},
-        "VpcId":{"shape":"String"},
+        "VpcId":{"shape":"VpcId"},
         "ServiceName":{"shape":"String"},
         "PolicyDocument":{"shape":"String"},
         "RouteTableIds":{
@@ -7058,7 +7064,7 @@
           "locationName":"peerVpcId"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "locationName":"vpcId"
         },
         "PeerRegion":{"shape":"String"}
@@ -7108,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"
@@ -7139,7 +7145,7 @@
       ],
       "members":{
         "DestinationCidrBlock":{"shape":"String"},
-        "VpnConnectionId":{"shape":"String"}
+        "VpnConnectionId":{"shape":"VpnConnectionId"}
       }
     },
     "CreateVpnGatewayRequest":{
@@ -7217,6 +7223,7 @@
         }
       }
     },
+    "CustomerGatewayId":{"type":"string"},
     "CustomerGatewayIdStringList":{
       "type":"list",
       "member":{
@@ -7264,7 +7271,7 @@
       "type":"structure",
       "required":["ClientVpnEndpointId"],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -7284,7 +7291,7 @@
         "DestinationCidrBlock"
       ],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
         "TargetVpcSubnetId":{"shape":"String"},
         "DestinationCidrBlock":{"shape":"String"},
         "DryRun":{"shape":"Boolean"}
@@ -7303,7 +7310,7 @@
       "type":"structure",
       "required":["CustomerGatewayId"],
       "members":{
-        "CustomerGatewayId":{"shape":"String"},
+        "CustomerGatewayId":{"shape":"CustomerGatewayId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -7314,7 +7321,7 @@
       "type":"structure",
       "required":["DhcpOptionsId"],
       "members":{
-        "DhcpOptionsId":{"shape":"String"},
+        "DhcpOptionsId":{"shape":"DhcpOptionsId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -7457,7 +7464,7 @@
       "required":["FpgaImageId"],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "FpgaImageId":{"shape":"String"}
+        "FpgaImageId":{"shape":"FpgaImageId"}
       }
     },
     "DeleteFpgaImageResult":{
@@ -7478,7 +7485,7 @@
           "locationName":"dryRun"
         },
         "InternetGatewayId":{
-          "shape":"String",
+          "shape":"InternetGatewayId",
           "locationName":"internetGatewayId"
         }
       }
@@ -7498,7 +7505,7 @@
       "type":"structure",
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "LaunchTemplateId":{"shape":"String"},
+        "LaunchTemplateId":{"shape":"LaunchTemplateId"},
         "LaunchTemplateName":{"shape":"LaunchTemplateName"}
       }
     },
@@ -7516,7 +7523,7 @@
       "required":["Versions"],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "LaunchTemplateId":{"shape":"String"},
+        "LaunchTemplateId":{"shape":"LaunchTemplateId"},
         "LaunchTemplateName":{"shape":"LaunchTemplateName"},
         "Versions":{
           "shape":"VersionStringList",
@@ -7593,7 +7600,7 @@
       "type":"structure",
       "required":["NatGatewayId"],
       "members":{
-        "NatGatewayId":{"shape":"String"}
+        "NatGatewayId":{"shape":"NatGatewayId"}
       }
     },
     "DeleteNatGatewayResult":{
@@ -7622,7 +7629,7 @@
           "locationName":"egress"
         },
         "NetworkAclId":{
-          "shape":"String",
+          "shape":"NetworkAclId",
           "locationName":"networkAclId"
         },
         "RuleNumber":{
@@ -7640,7 +7647,7 @@
           "locationName":"dryRun"
         },
         "NetworkAclId":{
-          "shape":"String",
+          "shape":"NetworkAclId",
           "locationName":"networkAclId"
         }
       }
@@ -7672,7 +7679,7 @@
           "locationName":"dryRun"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "locationName":"networkInterfaceId"
         }
       }
@@ -7762,7 +7769,7 @@
           "locationName":"dryRun"
         },
         "RouteTableId":{
-          "shape":"String",
+          "shape":"RouteTableId",
           "locationName":"routeTableId"
         }
       }
@@ -7796,7 +7803,7 @@
       "type":"structure",
       "required":["SnapshotId"],
       "members":{
-        "SnapshotId":{"shape":"String"},
+        "SnapshotId":{"shape":"SnapshotId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -7816,7 +7823,7 @@
       "type":"structure",
       "required":["SubnetId"],
       "members":{
-        "SubnetId":{"shape":"String"},
+        "SubnetId":{"shape":"SubnetId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -7845,7 +7852,7 @@
       "type":"structure",
       "required":["TrafficMirrorFilterId"],
       "members":{
-        "TrafficMirrorFilterId":{"shape":"String"},
+        "TrafficMirrorFilterId":{"shape":"TrafficMirrorFilterId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -7862,7 +7869,7 @@
       "type":"structure",
       "required":["TrafficMirrorFilterRuleId"],
       "members":{
-        "TrafficMirrorFilterRuleId":{"shape":"String"},
+        "TrafficMirrorFilterRuleId":{"shape":"TrafficMirrorFilterRuleId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -7879,7 +7886,7 @@
       "type":"structure",
       "required":["TrafficMirrorSessionId"],
       "members":{
-        "TrafficMirrorSessionId":{"shape":"String"},
+        "TrafficMirrorSessionId":{"shape":"TrafficMirrorSessionId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -7896,7 +7903,7 @@
       "type":"structure",
       "required":["TrafficMirrorTargetId"],
       "members":{
-        "TrafficMirrorTargetId":{"shape":"String"},
+        "TrafficMirrorTargetId":{"shape":"TrafficMirrorTargetId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -7913,7 +7920,7 @@
       "type":"structure",
       "required":["TransitGatewayId"],
       "members":{
-        "TransitGatewayId":{"shape":"String"},
+        "TransitGatewayId":{"shape":"TransitGatewayId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -7933,7 +7940,7 @@
         "DestinationCidrBlock"
       ],
       "members":{
-        "TransitGatewayRouteTableId":{"shape":"String"},
+        "TransitGatewayRouteTableId":{"shape":"TransitGatewayRouteTableId"},
         "DestinationCidrBlock":{"shape":"String"},
         "DryRun":{"shape":"Boolean"}
       }
@@ -7951,7 +7958,7 @@
       "type":"structure",
       "required":["TransitGatewayRouteTableId"],
       "members":{
-        "TransitGatewayRouteTableId":{"shape":"String"},
+        "TransitGatewayRouteTableId":{"shape":"TransitGatewayRouteTableId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -7968,7 +7975,7 @@
       "type":"structure",
       "required":["TransitGatewayAttachmentId"],
       "members":{
-        "TransitGatewayAttachmentId":{"shape":"String"},
+        "TransitGatewayAttachmentId":{"shape":"TransitGatewayAttachmentId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -7985,7 +7992,7 @@
       "type":"structure",
       "required":["VolumeId"],
       "members":{
-        "VolumeId":{"shape":"String"},
+        "VolumeId":{"shape":"VolumeId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -8061,7 +8068,7 @@
           "locationName":"dryRun"
         },
         "VpcPeeringConnectionId":{
-          "shape":"String",
+          "shape":"VpcPeeringConnectionId",
           "locationName":"vpcPeeringConnectionId"
         }
       }
@@ -8079,7 +8086,7 @@
       "type":"structure",
       "required":["VpcId"],
       "members":{
-        "VpcId":{"shape":"String"},
+        "VpcId":{"shape":"VpcId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -8090,7 +8097,7 @@
       "type":"structure",
       "required":["VpnConnectionId"],
       "members":{
-        "VpnConnectionId":{"shape":"String"},
+        "VpnConnectionId":{"shape":"VpnConnectionId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -8105,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"
@@ -8140,7 +8147,7 @@
       "type":"structure",
       "required":["ImageId"],
       "members":{
-        "ImageId":{"shape":"String"},
+        "ImageId":{"shape":"ImageId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -10515,7 +10522,7 @@
         "DryRun":{"shape":"Boolean"},
         "MaxResults":{"shape":"DescribeStaleSecurityGroupsMaxResults"},
         "NextToken":{"shape":"DescribeStaleSecurityGroupsNextToken"},
-        "VpcId":{"shape":"String"}
+        "VpcId":{"shape":"VpcId"}
       }
     },
     "DescribeStaleSecurityGroupsResult":{
@@ -11326,11 +11333,11 @@
           "locationName":"dryRun"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "locationName":"instanceId"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "locationName":"vpcId"
         }
       }
@@ -11356,11 +11363,11 @@
           "locationName":"dryRun"
         },
         "InternetGatewayId":{
-          "shape":"String",
+          "shape":"InternetGatewayId",
           "locationName":"internetGatewayId"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "locationName":"vpcId"
         }
       }
@@ -11370,7 +11377,7 @@
       "required":["AttachmentId"],
       "members":{
         "AttachmentId":{
-          "shape":"String",
+          "shape":"AttachmentId",
           "locationName":"attachmentId"
         },
         "DryRun":{
@@ -11389,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"
@@ -11404,8 +11411,8 @@
         "VpnGatewayId"
       ],
       "members":{
-        "VpcId":{"shape":"String"},
-        "VpnGatewayId":{"shape":"String"},
+        "VpcId":{"shape":"VpcId"},
+        "VpnGatewayId":{"shape":"VpnGatewayId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -11467,6 +11474,7 @@
         }
       }
     },
+    "DhcpOptionsId":{"type":"string"},
     "DhcpOptionsIdStringList":{
       "type":"list",
       "member":{
@@ -11518,8 +11526,8 @@
         "TransitGatewayAttachmentId"
       ],
       "members":{
-        "TransitGatewayRouteTableId":{"shape":"String"},
-        "TransitGatewayAttachmentId":{"shape":"String"},
+        "TransitGatewayRouteTableId":{"shape":"TransitGatewayRouteTableId"},
+        "TransitGatewayAttachmentId":{"shape":"TransitGatewayAttachmentId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -11539,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":{
@@ -11567,7 +11575,7 @@
           "locationName":"dryRun"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "locationName":"vpcId"
         }
       }
@@ -11599,7 +11607,7 @@
         "AssociationId"
       ],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
         "AssociationId":{"shape":"String"},
         "DryRun":{"shape":"Boolean"}
       }
@@ -11638,7 +11646,7 @@
       "required":["AssociationId"],
       "members":{
         "AssociationId":{
-          "shape":"String",
+          "shape":"RouteTableAssociationId",
           "locationName":"associationId"
         },
         "DryRun":{
@@ -11652,7 +11660,7 @@
       "required":["AssociationId"],
       "members":{
         "AssociationId":{
-          "shape":"String",
+          "shape":"SubnetCidrAssociationId",
           "locationName":"associationId"
         }
       }
@@ -11677,8 +11685,8 @@
         "TransitGatewayAttachmentId"
       ],
       "members":{
-        "TransitGatewayRouteTableId":{"shape":"String"},
-        "TransitGatewayAttachmentId":{"shape":"String"},
+        "TransitGatewayRouteTableId":{"shape":"TransitGatewayRouteTableId"},
+        "TransitGatewayAttachmentId":{"shape":"TransitGatewayAttachmentId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -11696,7 +11704,7 @@
       "required":["AssociationId"],
       "members":{
         "AssociationId":{
-          "shape":"String",
+          "shape":"VpcCidrAssociationId",
           "locationName":"associationId"
         }
       }
@@ -12120,8 +12128,8 @@
         "TransitGatewayAttachmentId"
       ],
       "members":{
-        "TransitGatewayRouteTableId":{"shape":"String"},
-        "TransitGatewayAttachmentId":{"shape":"String"},
+        "TransitGatewayRouteTableId":{"shape":"TransitGatewayRouteTableId"},
+        "TransitGatewayAttachmentId":{"shape":"TransitGatewayAttachmentId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -12141,8 +12149,8 @@
         "RouteTableId"
       ],
       "members":{
-        "GatewayId":{"shape":"String"},
-        "RouteTableId":{"shape":"String"}
+        "GatewayId":{"shape":"VpnGatewayId"},
+        "RouteTableId":{"shape":"RouteTableId"}
       }
     },
     "EnableVolumeIORequest":{
@@ -12154,7 +12162,7 @@
           "locationName":"dryRun"
         },
         "VolumeId":{
-          "shape":"String",
+          "shape":"VolumeId",
           "locationName":"volumeId"
         }
       }
@@ -12162,7 +12170,7 @@
     "EnableVpcClassicLinkDnsSupportRequest":{
       "type":"structure",
       "members":{
-        "VpcId":{"shape":"String"}
+        "VpcId":{"shape":"VpcId"}
       }
     },
     "EnableVpcClassicLinkDnsSupportResult":{
@@ -12183,7 +12191,7 @@
           "locationName":"dryRun"
         },
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "locationName":"vpcId"
         }
       }
@@ -12265,7 +12273,7 @@
       "type":"structure",
       "required":["ClientVpnEndpointId"],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -12286,7 +12294,7 @@
       "type":"structure",
       "required":["ClientVpnEndpointId"],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -12322,7 +12330,7 @@
         "Description":{"shape":"String"},
         "DiskImageFormat":{"shape":"DiskImageFormat"},
         "DryRun":{"shape":"Boolean"},
-        "ImageId":{"shape":"String"},
+        "ImageId":{"shape":"ImageId"},
         "S3ExportLocation":{"shape":"ExportTaskS3LocationRequest"},
         "RoleName":{"shape":"String"}
       }
@@ -12444,6 +12452,7 @@
         }
       }
     },
+    "ExportTaskId":{"type":"string"},
     "ExportTaskIdStringList":{
       "type":"list",
       "member":{
@@ -12537,7 +12546,7 @@
         "S3Bucket"
       ],
       "members":{
-        "TransitGatewayRouteTableId":{"shape":"String"},
+        "TransitGatewayRouteTableId":{"shape":"TransitGatewayRouteTableId"},
         "Filters":{
           "shape":"FilterList",
           "locationName":"Filter"
@@ -13028,6 +13037,7 @@
         "productCodes"
       ]
     },
+    "FpgaImageId":{"type":"string"},
     "FpgaImageIdList":{
       "type":"list",
       "member":{
@@ -13072,7 +13082,7 @@
       "type":"structure",
       "required":["CapacityReservationId"],
       "members":{
-        "CapacityReservationId":{"shape":"String"},
+        "CapacityReservationId":{"shape":"CapacityReservationId"},
         "NextToken":{"shape":"String"},
         "MaxResults":{"shape":"GetCapacityReservationUsageRequestMaxResults"},
         "DryRun":{"shape":"Boolean"}
@@ -13120,7 +13130,7 @@
       "type":"structure",
       "required":["InstanceId"],
       "members":{
-        "InstanceId":{"shape":"String"},
+        "InstanceId":{"shape":"InstanceId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -13150,7 +13160,7 @@
       "required":["InstanceId"],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "InstanceId":{"shape":"String"},
+        "InstanceId":{"shape":"InstanceId"},
         "WakeUp":{"shape":"Boolean"}
       }
     },
@@ -13205,7 +13215,7 @@
       ],
       "members":{
         "HostIdSet":{"shape":"RequestHostIdSet"},
-        "OfferingId":{"shape":"String"}
+        "OfferingId":{"shape":"OfferingId"}
       }
     },
     "GetHostReservationPurchasePreviewResult":{
@@ -13234,7 +13244,7 @@
       "required":["InstanceId"],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "InstanceId":{"shape":"String"}
+        "InstanceId":{"shape":"InstanceId"}
       }
     },
     "GetLaunchTemplateDataResult":{
@@ -13250,7 +13260,7 @@
       "type":"structure",
       "required":["InstanceId"],
       "members":{
-        "InstanceId":{"shape":"String"},
+        "InstanceId":{"shape":"InstanceId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -13334,7 +13344,7 @@
       "type":"structure",
       "required":["TransitGatewayAttachmentId"],
       "members":{
-        "TransitGatewayAttachmentId":{"shape":"String"},
+        "TransitGatewayAttachmentId":{"shape":"TransitGatewayAttachmentId"},
         "Filters":{
           "shape":"FilterList",
           "locationName":"Filter"
@@ -13361,7 +13371,7 @@
       "type":"structure",
       "required":["TransitGatewayRouteTableId"],
       "members":{
-        "TransitGatewayRouteTableId":{"shape":"String"},
+        "TransitGatewayRouteTableId":{"shape":"TransitGatewayRouteTableId"},
         "Filters":{
           "shape":"FilterList",
           "locationName":"Filter"
@@ -13388,7 +13398,7 @@
       "type":"structure",
       "required":["TransitGatewayRouteTableId"],
       "members":{
-        "TransitGatewayRouteTableId":{"shape":"String"},
+        "TransitGatewayRouteTableId":{"shape":"TransitGatewayRouteTableId"},
         "Filters":{
           "shape":"FilterList",
           "locationName":"Filter"
@@ -13579,6 +13589,7 @@
         }
       }
     },
+    "HostId":{"type":"string"},
     "HostInstance":{
       "type":"structure",
       "members":{
@@ -14064,6 +14075,7 @@
         "locationName":"item"
       }
     },
+    "ImageId":{"type":"string"},
     "ImageIdStringList":{
       "type":"list",
       "member":{
@@ -14105,7 +14117,7 @@
         "CertificateRevocationList"
       ],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
         "CertificateRevocationList":{"shape":"String"},
         "DryRun":{"shape":"Boolean"}
       }
@@ -14133,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"}
@@ -14448,7 +14460,7 @@
         "DiskContainer":{"shape":"SnapshotDiskContainer"},
         "DryRun":{"shape":"Boolean"},
         "Encrypted":{"shape":"Boolean"},
-        "KmsKeyId":{"shape":"String"},
+        "KmsKeyId":{"shape":"KmsKeyId"},
         "RoleName":{"shape":"String"}
       }
     },
@@ -14493,6 +14505,7 @@
         "locationName":"item"
       }
     },
+    "ImportTaskId":{"type":"string"},
     "ImportTaskIdList":{
       "type":"list",
       "member":{
@@ -15687,6 +15700,8 @@
         "u-6tb1.metal",
         "u-9tb1.metal",
         "u-12tb1.metal",
+        "u-18tb1.metal",
+        "u-24tb1.metal",
         "a1.medium",
         "a1.large",
         "a1.xlarge",
@@ -15800,6 +15815,7 @@
         "locationName":"item"
       }
     },
+    "InternetGatewayId":{"type":"string"},
     "InternetGatewayList":{
       "type":"list",
       "member":{
@@ -15925,6 +15941,7 @@
         "disable"
       ]
     },
+    "KernelId":{"type":"string"},
     "KeyNameStringList":{
       "type":"list",
       "member":{
@@ -15940,7 +15957,7 @@
           "locationName":"keyFingerprint"
         },
         "KeyMaterial":{
-          "shape":"String",
+          "shape":"SensitiveUserData",
           "locationName":"keyMaterial"
         },
         "KeyName":{
@@ -15969,6 +15986,8 @@
         "locationName":"item"
       }
     },
+    "KeyPairName":{"type":"string"},
+    "KmsKeyId":{"type":"string"},
     "LaunchPermission":{
       "type":"structure",
       "members":{
@@ -16339,6 +16358,7 @@
         "Name":{"shape":"String"}
       }
     },
+    "LaunchTemplateId":{"type":"string"},
     "LaunchTemplateInstanceMarketOptions":{
       "type":"structure",
       "members":{
@@ -16833,7 +16853,7 @@
       "type":"structure",
       "required":["CapacityReservationId"],
       "members":{
-        "CapacityReservationId":{"shape":"String"},
+        "CapacityReservationId":{"shape":"CapacityReservationId"},
         "InstanceCount":{"shape":"Integer"},
         "EndDate":{"shape":"DateTime"},
         "EndDateType":{"shape":"EndDateType"},
@@ -16853,7 +16873,7 @@
       "type":"structure",
       "required":["ClientVpnEndpointId"],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
         "ServerCertificateArn":{"shape":"String"},
         "ConnectionLogOptions":{"shape":"ConnectionLogOptions"},
         "DnsServers":{"shape":"DnsServersOptionsModifyStructure"},
@@ -16875,7 +16895,7 @@
       "type":"structure",
       "required":["KmsKeyId"],
       "members":{
-        "KmsKeyId":{"shape":"String"},
+        "KmsKeyId":{"shape":"KmsKeyId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -16915,7 +16935,7 @@
       "required":["FpgaImageId"],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "FpgaImageId":{"shape":"String"},
+        "FpgaImageId":{"shape":"FpgaImageId"},
         "Attribute":{"shape":"FpgaImageAttributeName"},
         "OperationType":{"shape":"OperationType"},
         "UserIds":{
@@ -17011,7 +17031,7 @@
       "members":{
         "Attribute":{"shape":"String"},
         "Description":{"shape":"AttributeValue"},
-        "ImageId":{"shape":"String"},
+        "ImageId":{"shape":"ImageId"},
         "LaunchPermission":{"shape":"LaunchPermissionModifications"},
         "OperationType":{"shape":"OperationType"},
         "ProductCodes":{
@@ -17067,7 +17087,7 @@
           "locationName":"GroupId"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "locationName":"instanceId"
         },
         "InstanceInitiatedShutdownBehavior":{
@@ -17107,7 +17127,7 @@
         "CapacityReservationSpecification"
       ],
       "members":{
-        "InstanceId":{"shape":"String"},
+        "InstanceId":{"shape":"InstanceId"},
         "CapacityReservationSpecification":{"shape":"CapacityReservationSpecification"},
         "DryRun":{"shape":"Boolean"}
       }
@@ -17155,7 +17175,7 @@
       ],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "InstanceId":{"shape":"String"},
+        "InstanceId":{"shape":"InstanceId"},
         "InstanceEventId":{"shape":"String"},
         "NotBefore":{"shape":"DateTime"}
       }
@@ -17177,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":{
@@ -17207,7 +17227,7 @@
       "members":{
         "DryRun":{"shape":"Boolean"},
         "ClientToken":{"shape":"String"},
-        "LaunchTemplateId":{"shape":"String"},
+        "LaunchTemplateId":{"shape":"LaunchTemplateId"},
         "LaunchTemplateName":{"shape":"LaunchTemplateName"},
         "DefaultVersion":{
           "shape":"String",
@@ -17245,7 +17265,7 @@
           "locationName":"SecurityGroupId"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "locationName":"networkInterfaceId"
         },
         "SourceDestCheck":{
@@ -17295,7 +17315,7 @@
           "locationName":"UserGroup"
         },
         "OperationType":{"shape":"OperationType"},
-        "SnapshotId":{"shape":"String"},
+        "SnapshotId":{"shape":"SnapshotId"},
         "UserIds":{
           "shape":"UserIdStringList",
           "locationName":"UserId"
@@ -17315,7 +17335,7 @@
           "locationName":"excessCapacityTerminationPolicy"
         },
         "SpotFleetRequestId":{
-          "shape":"String",
+          "shape":"SpotFleetRequestId",
           "locationName":"spotFleetRequestId"
         },
         "TargetCapacity":{
@@ -17341,7 +17361,7 @@
         "AssignIpv6AddressOnCreation":{"shape":"AttributeBooleanValue"},
         "MapPublicIpOnLaunch":{"shape":"AttributeBooleanValue"},
         "SubnetId":{
-          "shape":"String",
+          "shape":"SubnetId",
           "locationName":"subnetId"
         }
       }
@@ -17350,7 +17370,7 @@
       "type":"structure",
       "required":["TrafficMirrorFilterId"],
       "members":{
-        "TrafficMirrorFilterId":{"shape":"String"},
+        "TrafficMirrorFilterId":{"shape":"TrafficMirrorFilterId"},
         "AddNetworkServices":{
           "shape":"TrafficMirrorNetworkServiceList",
           "locationName":"AddNetworkService"
@@ -17375,7 +17395,7 @@
       "type":"structure",
       "required":["TrafficMirrorFilterRuleId"],
       "members":{
-        "TrafficMirrorFilterRuleId":{"shape":"String"},
+        "TrafficMirrorFilterRuleId":{"shape":"TrafficMirrorFilterRuleId"},
         "TrafficDirection":{"shape":"TrafficDirection"},
         "RuleNumber":{"shape":"Integer"},
         "RuleAction":{"shape":"TrafficMirrorRuleAction"},
@@ -17405,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"},
@@ -17432,7 +17452,7 @@
       "type":"structure",
       "required":["TransitGatewayAttachmentId"],
       "members":{
-        "TransitGatewayAttachmentId":{"shape":"String"},
+        "TransitGatewayAttachmentId":{"shape":"TransitGatewayAttachmentId"},
         "AddSubnetIds":{"shape":"ValueStringList"},
         "RemoveSubnetIds":{"shape":"ValueStringList"},
         "Options":{"shape":"ModifyTransitGatewayVpcAttachmentRequestOptions"},
@@ -17460,7 +17480,7 @@
       "required":["VolumeId"],
       "members":{
         "AutoEnableIO":{"shape":"AttributeBooleanValue"},
-        "VolumeId":{"shape":"String"},
+        "VolumeId":{"shape":"VolumeId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -17472,7 +17492,7 @@
       "required":["VolumeId"],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "VolumeId":{"shape":"String"},
+        "VolumeId":{"shape":"VolumeId"},
         "Size":{"shape":"Integer"},
         "VolumeType":{"shape":"VolumeType"},
         "Iops":{"shape":"Integer"}
@@ -17494,7 +17514,7 @@
         "EnableDnsHostnames":{"shape":"AttributeBooleanValue"},
         "EnableDnsSupport":{"shape":"AttributeBooleanValue"},
         "VpcId":{
-          "shape":"String",
+          "shape":"VpcId",
           "locationName":"vpcId"
         }
       }
@@ -17504,7 +17524,7 @@
       "required":["ConnectionNotificationId"],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "ConnectionNotificationId":{"shape":"String"},
+        "ConnectionNotificationId":{"shape":"ConnectionNotificationId"},
         "ConnectionNotificationArn":{"shape":"String"},
         "ConnectionEvents":{"shape":"ValueStringList"}
       }
@@ -17523,7 +17543,7 @@
       "required":["VpcEndpointId"],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "VpcEndpointId":{"shape":"String"},
+        "VpcEndpointId":{"shape":"VpcEndpointId"},
         "ResetPolicy":{"shape":"Boolean"},
         "PolicyDocument":{"shape":"String"},
         "AddRouteTableIds":{
@@ -17567,7 +17587,7 @@
       "required":["ServiceId"],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "ServiceId":{"shape":"String"},
+        "ServiceId":{"shape":"ServiceId"},
         "AcceptanceRequired":{"shape":"Boolean"},
         "AddNetworkLoadBalancerArns":{
           "shape":"ValueStringList",
@@ -17614,7 +17634,7 @@
         "AccepterPeeringConnectionOptions":{"shape":"PeeringConnectionOptionsRequest"},
         "DryRun":{"shape":"Boolean"},
         "RequesterPeeringConnectionOptions":{"shape":"PeeringConnectionOptionsRequest"},
-        "VpcPeeringConnectionId":{"shape":"String"}
+        "VpcPeeringConnectionId":{"shape":"VpcPeeringConnectionId"}
       }
     },
     "ModifyVpcPeeringConnectionOptionsResult":{
@@ -17637,7 +17657,7 @@
         "InstanceTenancy"
       ],
       "members":{
-        "VpcId":{"shape":"String"},
+        "VpcId":{"shape":"VpcId"},
         "InstanceTenancy":{"shape":"VpcTenancy"},
         "DryRun":{"shape":"Boolean"}
       }
@@ -17655,10 +17675,10 @@
       "type":"structure",
       "required":["VpnConnectionId"],
       "members":{
-        "VpnConnectionId":{"shape":"String"},
-        "TransitGatewayId":{"shape":"String"},
-        "CustomerGatewayId":{"shape":"String"},
-        "VpnGatewayId":{"shape":"String"},
+        "VpnConnectionId":{"shape":"VpnConnectionId"},
+        "TransitGatewayId":{"shape":"TransitGatewayId"},
+        "CustomerGatewayId":{"shape":"CustomerGatewayId"},
+        "VpnGatewayId":{"shape":"VpnGatewayId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -17678,7 +17698,7 @@
         "VpnTunnelOutsideIpAddress"
       ],
       "members":{
-        "VpnConnectionId":{"shape":"String"},
+        "VpnConnectionId":{"shape":"VpnConnectionId"},
         "VpnTunnelOutsideIpAddress":{"shape":"String"},
         "DryRun":{"shape":"Boolean"}
       }
@@ -17700,7 +17720,7 @@
         "TunnelOptions"
       ],
       "members":{
-        "VpnConnectionId":{"shape":"String"},
+        "VpnConnectionId":{"shape":"VpnConnectionId"},
         "VpnTunnelOutsideIpAddress":{"shape":"String"},
         "TunnelOptions":{"shape":"ModifyVpnTunnelOptionsSpecification"},
         "DryRun":{"shape":"Boolean"}
@@ -17928,6 +17948,7 @@
         "locationName":"item"
       }
     },
+    "NatGatewayId":{"type":"string"},
     "NatGatewayList":{
       "type":"list",
       "member":{
@@ -17995,6 +18016,7 @@
         }
       }
     },
+    "NetworkAclAssociationId":{"type":"string"},
     "NetworkAclAssociationList":{
       "type":"list",
       "member":{
@@ -18046,6 +18068,7 @@
         "locationName":"item"
       }
     },
+    "NetworkAclId":{"type":"string"},
     "NetworkAclList":{
       "type":"list",
       "member":{
@@ -18222,6 +18245,7 @@
       "type":"string",
       "enum":["efa"]
     },
+    "NetworkInterfaceId":{"type":"string"},
     "NetworkInterfaceIdList":{
       "type":"list",
       "member":{
@@ -18402,6 +18426,7 @@
         "convertible"
       ]
     },
+    "OfferingId":{"type":"string"},
     "OfferingTypeValues":{
       "type":"string",
       "enum":[
@@ -18750,6 +18775,7 @@
         "locationName":"item"
       }
     },
+    "PlacementGroupName":{"type":"string"},
     "PlacementGroupState":{
       "type":"string",
       "enum":[
@@ -19203,7 +19229,7 @@
         "CurrencyCode":{"shape":"CurrencyCodeValues"},
         "HostIdSet":{"shape":"RequestHostIdSet"},
         "LimitPrice":{"shape":"String"},
-        "OfferingId":{"shape":"String"}
+        "OfferingId":{"shape":"OfferingId"}
       }
     },
     "PurchaseHostReservationResult":{
@@ -19326,6 +19352,7 @@
         "Windows (Amazon VPC)"
       ]
     },
+    "RamdiskId":{"type":"string"},
     "ReasonCodesList":{
       "type":"list",
       "member":{
@@ -19428,7 +19455,7 @@
           "locationName":"enaSupport"
         },
         "KernelId":{
-          "shape":"String",
+          "shape":"KernelId",
           "locationName":"kernelId"
         },
         "Name":{
@@ -19440,7 +19467,7 @@
           "locationName":"BillingProduct"
         },
         "RamdiskId":{
-          "shape":"String",
+          "shape":"RamdiskId",
           "locationName":"ramdiskId"
         },
         "RootDeviceName":{
@@ -19470,7 +19497,7 @@
       "type":"structure",
       "required":["TransitGatewayAttachmentId"],
       "members":{
-        "TransitGatewayAttachmentId":{"shape":"String"},
+        "TransitGatewayAttachmentId":{"shape":"TransitGatewayAttachmentId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
@@ -19491,7 +19518,7 @@
       ],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "ServiceId":{"shape":"String"},
+        "ServiceId":{"shape":"ServiceId"},
         "VpcEndpointIds":{
           "shape":"ValueStringList",
           "locationName":"VpcEndpointId"
@@ -19516,7 +19543,7 @@
           "locationName":"dryRun"
         },
         "VpcPeeringConnectionId":{
-          "shape":"String",
+          "shape":"VpcPeeringConnectionId",
           "locationName":"vpcPeeringConnectionId"
         }
       }
@@ -19533,7 +19560,7 @@
     "ReleaseAddressRequest":{
       "type":"structure",
       "members":{
-        "AllocationId":{"shape":"String"},
+        "AllocationId":{"shape":"AllocationId"},
         "PublicIp":{"shape":"String"},
         "DryRun":{
           "shape":"Boolean",
@@ -19592,7 +19619,7 @@
       ],
       "members":{
         "AssociationId":{
-          "shape":"String",
+          "shape":"NetworkAclAssociationId",
           "locationName":"associationId"
         },
         "DryRun":{
@@ -19600,7 +19627,7 @@
           "locationName":"dryRun"
         },
         "NetworkAclId":{
-          "shape":"String",
+          "shape":"NetworkAclId",
           "locationName":"networkAclId"
         }
       }
@@ -19645,7 +19672,7 @@
           "locationName":"ipv6CidrBlock"
         },
         "NetworkAclId":{
-          "shape":"String",
+          "shape":"NetworkAclId",
           "locationName":"networkAclId"
         },
         "PortRange":{
@@ -19683,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"
         }
       }
@@ -19721,7 +19748,7 @@
       ],
       "members":{
         "AssociationId":{
-          "shape":"String",
+          "shape":"RouteTableAssociationId",
           "locationName":"associationId"
         },
         "DryRun":{
@@ -19729,7 +19756,7 @@
           "locationName":"dryRun"
         },
         "RouteTableId":{
-          "shape":"String",
+          "shape":"RouteTableId",
           "locationName":"routeTableId"
         }
       }
@@ -19751,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"}
       }
@@ -19835,7 +19862,7 @@
     "RequestHostIdSet":{
       "type":"list",
       "member":{
-        "shape":"String",
+        "shape":"HostId",
         "locationName":"item"
       }
     },
@@ -20327,6 +20354,7 @@
         }
       }
     },
+    "ReservedInstancesListingId":{"type":"string"},
     "ReservedInstancesListingList":{
       "type":"list",
       "member":{
@@ -20516,7 +20544,7 @@
       "required":["FpgaImageId"],
       "members":{
         "DryRun":{"shape":"Boolean"},
-        "FpgaImageId":{"shape":"String"},
+        "FpgaImageId":{"shape":"FpgaImageId"},
         "Attribute":{"shape":"ResetFpgaImageAttributeName"}
       }
     },
@@ -20541,7 +20569,7 @@
       ],
       "members":{
         "Attribute":{"shape":"ResetImageAttributeName"},
-        "ImageId":{"shape":"String"},
+        "ImageId":{"shape":"ImageId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -20564,7 +20592,7 @@
           "locationName":"dryRun"
         },
         "InstanceId":{
-          "shape":"String",
+          "shape":"InstanceId",
           "locationName":"instanceId"
         }
       }
@@ -20578,7 +20606,7 @@
           "locationName":"dryRun"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "locationName":"networkInterfaceId"
         },
         "SourceDestCheck":{
@@ -20595,7 +20623,7 @@
       ],
       "members":{
         "Attribute":{"shape":"SnapshotAttributeName"},
-        "SnapshotId":{"shape":"String"},
+        "SnapshotId":{"shape":"SnapshotId"},
         "DryRun":{
           "shape":"Boolean",
           "locationName":"dryRun"
@@ -20820,7 +20848,7 @@
         "TargetNetworkCidr"
       ],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
         "TargetNetworkCidr":{"shape":"String"},
         "AccessGroupId":{"shape":"String"},
         "RevokeAllGroups":{"shape":"Boolean"},
@@ -21029,6 +21057,7 @@
         }
       }
     },
+    "RouteTableAssociationId":{"type":"string"},
     "RouteTableAssociationList":{
       "type":"list",
       "member":{
@@ -21036,6 +21065,8 @@
         "locationName":"item"
       }
     },
+    "RouteTableGatewayId":{"type":"string"},
+    "RouteTableId":{"type":"string"},
     "RouteTableList":{
       "type":"list",
       "member":{
@@ -21071,7 +21102,7 @@
           "shape":"BlockDeviceMappingRequestList",
           "locationName":"BlockDeviceMapping"
         },
-        "ImageId":{"shape":"String"},
+        "ImageId":{"shape":"ImageId"},
         "InstanceType":{"shape":"InstanceType"},
         "Ipv6AddressCount":{"shape":"Integer"},
         "Ipv6Addresses":{
@@ -21166,7 +21197,7 @@
         "DryRun":{"shape":"Boolean"},
         "InstanceCount":{"shape":"Integer"},
         "LaunchSpecification":{"shape":"ScheduledInstancesLaunchSpecification"},
-        "ScheduledInstanceId":{"shape":"String"}
+        "ScheduledInstanceId":{"shape":"ScheduledInstanceId"}
       }
     },
     "RunScheduledInstancesResult":{
@@ -21329,6 +21360,7 @@
         "locationName":"item"
       }
     },
+    "ScheduledInstanceId":{"type":"string"},
     "ScheduledInstanceIdRequestSet":{
       "type":"list",
       "member":{
@@ -21524,7 +21556,7 @@
         "Filters"
       ],
       "members":{
-        "TransitGatewayRouteTableId":{"shape":"String"},
+        "TransitGatewayRouteTableId":{"shape":"TransitGatewayRouteTableId"},
         "Filters":{
           "shape":"FilterList",
           "locationName":"Filter"
@@ -21645,10 +21677,14 @@
       "type":"structure",
       "required":["InstanceId"],
       "members":{
-        "InstanceId":{"shape":"String"},
+        "InstanceId":{"shape":"InstanceId"},
         "DryRun":{"shape":"Boolean"}
       }
     },
+    "SensitiveUserData":{
+      "type":"string",
+      "sensitive":true
+    },
     "ServiceConfiguration":{
       "type":"structure",
       "members":{
@@ -21761,6 +21797,7 @@
         "locationName":"item"
       }
     },
+    "ServiceId":{"type":"string"},
     "ServiceState":{
       "type":"string",
       "enum":[
@@ -21948,6 +21985,7 @@
         "UserBucket":{"shape":"UserBucket"}
       }
     },
+    "SnapshotId":{"type":"string"},
     "SnapshotIdStringList":{
       "type":"list",
       "member":{
@@ -22319,6 +22357,7 @@
         "locationName":"item"
       }
     },
+    "SpotFleetRequestId":{"type":"string"},
     "SpotFleetTagSpecification":{
       "type":"structure",
       "members":{
@@ -22842,6 +22881,7 @@
         }
       }
     },
+    "SubnetCidrAssociationId":{"type":"string"},
     "SubnetCidrBlockState":{
       "type":"structure",
       "members":{
@@ -22866,6 +22906,7 @@
         "failed"
       ]
     },
+    "SubnetId":{"type":"string"},
     "SubnetIdStringList":{
       "type":"list",
       "member":{
@@ -23182,7 +23223,7 @@
       "type":"structure",
       "required":["ClientVpnEndpointId"],
       "members":{
-        "ClientVpnEndpointId":{"shape":"String"},
+        "ClientVpnEndpointId":{"shape":"ClientVpnEndpointId"},
         "ConnectionId":{"shape":"String"},
         "Username":{"shape":"String"},
         "DryRun":{"shape":"Boolean"}
@@ -23288,6 +23329,7 @@
         }
       }
     },
+    "TrafficMirrorFilterId":{"type":"string"},
     "TrafficMirrorFilterRule":{
       "type":"structure",
       "members":{
@@ -23350,6 +23392,7 @@
       "type":"list",
       "member":{"shape":"TrafficMirrorFilterRuleField"}
     },
+    "TrafficMirrorFilterRuleId":{"type":"string"},
     "TrafficMirrorFilterRuleList":{
       "type":"list",
       "member":{
@@ -23459,6 +23502,7 @@
       "type":"list",
       "member":{"shape":"TrafficMirrorSessionField"}
     },
+    "TrafficMirrorSessionId":{"type":"string"},
     "TrafficMirrorSessionSet":{
       "type":"list",
       "member":{
@@ -23499,6 +23543,7 @@
         }
       }
     },
+    "TrafficMirrorTargetId":{"type":"string"},
     "TrafficMirrorTargetSet":{
       "type":"list",
       "member":{
@@ -23655,6 +23700,7 @@
         }
       }
     },
+    "TransitGatewayAttachmentId":{"type":"string"},
     "TransitGatewayAttachmentIdStringList":{
       "type":"list",
       "member":{"shape":"String"}
@@ -23710,6 +23756,7 @@
         "failing"
       ]
     },
+    "TransitGatewayId":{"type":"string"},
     "TransitGatewayIdStringList":{
       "type":"list",
       "member":{
@@ -23934,6 +23981,7 @@
         "locationName":"item"
       }
     },
+    "TransitGatewayRouteTableId":{"type":"string"},
     "TransitGatewayRouteTableIdStringList":{
       "type":"list",
       "member":{
@@ -24158,7 +24206,7 @@
           "locationName":"ipv6Addresses"
         },
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "locationName":"networkInterfaceId"
         }
       }
@@ -24184,7 +24232,7 @@
       ],
       "members":{
         "NetworkInterfaceId":{
-          "shape":"String",
+          "shape":"NetworkInterfaceId",
           "locationName":"networkInterfaceId"
         },
         "PrivateIpAddresses":{
@@ -24363,7 +24411,8 @@
           "shape":"String",
           "locationName":"data"
         }
-      }
+      },
+      "sensitive":true
     },
     "UserGroupStringList":{
       "type":"list",
@@ -24603,6 +24652,7 @@
         }
       }
     },
+    "VolumeId":{"type":"string"},
     "VolumeIdStringList":{
       "type":"list",
       "member":{
@@ -24919,6 +24969,7 @@
         "enableDnsHostnames"
       ]
     },
+    "VpcCidrAssociationId":{"type":"string"},
     "VpcCidrBlockAssociation":{
       "type":"structure",
       "members":{
@@ -25107,6 +25158,7 @@
         "locationName":"item"
       }
     },
+    "VpcEndpointId":{"type":"string"},
     "VpcEndpointSet":{
       "type":"list",
       "member":{
@@ -25121,6 +25173,7 @@
         "Gateway"
       ]
     },
+    "VpcId":{"type":"string"},
     "VpcIdStringList":{
       "type":"list",
       "member":{
@@ -25188,6 +25241,7 @@
         }
       }
     },
+    "VpcPeeringConnectionId":{"type":"string"},
     "VpcPeeringConnectionList":{
       "type":"list",
       "member":{
@@ -25336,6 +25390,7 @@
         }
       }
     },
+    "VpnConnectionId":{"type":"string"},
     "VpnConnectionIdStringList":{
       "type":"list",
       "member":{
@@ -25413,6 +25468,7 @@
         }
       }
     },
+    "VpnGatewayId":{"type":"string"},
     "VpnGatewayIdStringList":{
       "type":"list",
       "member":{