aws-sdk-ec2 1.522.0 → 1.560.0

data/lib/aws-sdk-ec2/client_api.rb

@@ -55,6 +55,7 @@ module Aws::EC2
     AccountID = Shapes::StringShape.new(name: 'AccountID')
     ActiveInstance = Shapes::StructureShape.new(name: 'ActiveInstance')
     ActiveInstanceSet = Shapes::ListShape.new(name: 'ActiveInstanceSet')
+    ActiveVpnTunnelStatus = Shapes::StructureShape.new(name: 'ActiveVpnTunnelStatus')
     ActivityStatus = Shapes::StringShape.new(name: 'ActivityStatus')
     AddIpamOperatingRegion = Shapes::StructureShape.new(name: 'AddIpamOperatingRegion')
     AddIpamOperatingRegionSet = Shapes::ListShape.new(name: 'AddIpamOperatingRegionSet')
@@ -174,6 +175,7 @@ module Aws::EC2
     AssociatedNetworkType = Shapes::StringShape.new(name: 'AssociatedNetworkType')
     AssociatedRole = Shapes::StructureShape.new(name: 'AssociatedRole')
     AssociatedRolesList = Shapes::ListShape.new(name: 'AssociatedRolesList')
+    AssociatedSubnetList = Shapes::ListShape.new(name: 'AssociatedSubnetList')
     AssociatedTargetNetwork = Shapes::StructureShape.new(name: 'AssociatedTargetNetwork')
     AssociatedTargetNetworkSet = Shapes::ListShape.new(name: 'AssociatedTargetNetworkSet')
     AssociationIdList = Shapes::ListShape.new(name: 'AssociationIdList')
@@ -193,6 +195,7 @@ module Aws::EC2
     AttachVpnGatewayResult = Shapes::StructureShape.new(name: 'AttachVpnGatewayResult')
     AttachmentEnaSrdSpecification = Shapes::StructureShape.new(name: 'AttachmentEnaSrdSpecification')
     AttachmentEnaSrdUdpSpecification = Shapes::StructureShape.new(name: 'AttachmentEnaSrdUdpSpecification')
+    AttachmentLimitType = Shapes::StringShape.new(name: 'AttachmentLimitType')
     AttachmentStatus = Shapes::StringShape.new(name: 'AttachmentStatus')
     AttributeBooleanValue = Shapes::StructureShape.new(name: 'AttributeBooleanValue')
     AttributeSummary = Shapes::StructureShape.new(name: 'AttributeSummary')
@@ -302,13 +305,21 @@ module Aws::EC2
     CancelledSpotInstanceRequestList = Shapes::ListShape.new(name: 'CancelledSpotInstanceRequestList')
     CapacityAllocation = Shapes::StructureShape.new(name: 'CapacityAllocation')
     CapacityAllocations = Shapes::ListShape.new(name: 'CapacityAllocations')
+    CapacityBlock = Shapes::StructureShape.new(name: 'CapacityBlock')
     CapacityBlockExtension = Shapes::StructureShape.new(name: 'CapacityBlockExtension')
     CapacityBlockExtensionOffering = Shapes::StructureShape.new(name: 'CapacityBlockExtensionOffering')
     CapacityBlockExtensionOfferingSet = Shapes::ListShape.new(name: 'CapacityBlockExtensionOfferingSet')
     CapacityBlockExtensionSet = Shapes::ListShape.new(name: 'CapacityBlockExtensionSet')
     CapacityBlockExtensionStatus = Shapes::StringShape.new(name: 'CapacityBlockExtensionStatus')
+    CapacityBlockId = Shapes::StringShape.new(name: 'CapacityBlockId')
+    CapacityBlockIds = Shapes::ListShape.new(name: 'CapacityBlockIds')
+    CapacityBlockInterconnectStatus = Shapes::StringShape.new(name: 'CapacityBlockInterconnectStatus')
     CapacityBlockOffering = Shapes::StructureShape.new(name: 'CapacityBlockOffering')
     CapacityBlockOfferingSet = Shapes::ListShape.new(name: 'CapacityBlockOfferingSet')
+    CapacityBlockResourceState = Shapes::StringShape.new(name: 'CapacityBlockResourceState')
+    CapacityBlockSet = Shapes::ListShape.new(name: 'CapacityBlockSet')
+    CapacityBlockStatus = Shapes::StructureShape.new(name: 'CapacityBlockStatus')
+    CapacityBlockStatusSet = Shapes::ListShape.new(name: 'CapacityBlockStatusSet')
     CapacityReservation = Shapes::StructureShape.new(name: 'CapacityReservation')
     CapacityReservationBillingRequest = Shapes::StructureShape.new(name: 'CapacityReservationBillingRequest')
     CapacityReservationBillingRequestSet = Shapes::ListShape.new(name: 'CapacityReservationBillingRequestSet')
@@ -336,6 +347,8 @@ module Aws::EC2
     CapacityReservationSpecification = Shapes::StructureShape.new(name: 'CapacityReservationSpecification')
     CapacityReservationSpecificationResponse = Shapes::StructureShape.new(name: 'CapacityReservationSpecificationResponse')
     CapacityReservationState = Shapes::StringShape.new(name: 'CapacityReservationState')
+    CapacityReservationStatus = Shapes::StructureShape.new(name: 'CapacityReservationStatus')
+    CapacityReservationStatusSet = Shapes::ListShape.new(name: 'CapacityReservationStatusSet')
     CapacityReservationTarget = Shapes::StructureShape.new(name: 'CapacityReservationTarget')
     CapacityReservationTargetResponse = Shapes::StructureShape.new(name: 'CapacityReservationTargetResponse')
     CapacityReservationTenancy = Shapes::StringShape.new(name: 'CapacityReservationTenancy')
@@ -468,6 +481,8 @@ module Aws::EC2
     CreateDefaultSubnetResult = Shapes::StructureShape.new(name: 'CreateDefaultSubnetResult')
     CreateDefaultVpcRequest = Shapes::StructureShape.new(name: 'CreateDefaultVpcRequest')
     CreateDefaultVpcResult = Shapes::StructureShape.new(name: 'CreateDefaultVpcResult')
+    CreateDelegateMacVolumeOwnershipTaskRequest = Shapes::StructureShape.new(name: 'CreateDelegateMacVolumeOwnershipTaskRequest')
+    CreateDelegateMacVolumeOwnershipTaskResult = Shapes::StructureShape.new(name: 'CreateDelegateMacVolumeOwnershipTaskResult')
     CreateDhcpOptionsRequest = Shapes::StructureShape.new(name: 'CreateDhcpOptionsRequest')
     CreateDhcpOptionsResult = Shapes::StructureShape.new(name: 'CreateDhcpOptionsResult')
     CreateEgressOnlyInternetGatewayRequest = Shapes::StructureShape.new(name: 'CreateEgressOnlyInternetGatewayRequest')
@@ -484,6 +499,8 @@ module Aws::EC2
     CreateFpgaImageResult = Shapes::StructureShape.new(name: 'CreateFpgaImageResult')
     CreateImageRequest = Shapes::StructureShape.new(name: 'CreateImageRequest')
     CreateImageResult = Shapes::StructureShape.new(name: 'CreateImageResult')
+    CreateImageUsageReportRequest = Shapes::StructureShape.new(name: 'CreateImageUsageReportRequest')
+    CreateImageUsageReportResult = Shapes::StructureShape.new(name: 'CreateImageUsageReportResult')
     CreateInstanceConnectEndpointRequest = Shapes::StructureShape.new(name: 'CreateInstanceConnectEndpointRequest')
     CreateInstanceConnectEndpointResult = Shapes::StructureShape.new(name: 'CreateInstanceConnectEndpointResult')
     CreateInstanceEventWindowRequest = Shapes::StructureShape.new(name: 'CreateInstanceEventWindowRequest')
@@ -519,6 +536,8 @@ module Aws::EC2
     CreateLocalGatewayVirtualInterfaceGroupResult = Shapes::StructureShape.new(name: 'CreateLocalGatewayVirtualInterfaceGroupResult')
     CreateLocalGatewayVirtualInterfaceRequest = Shapes::StructureShape.new(name: 'CreateLocalGatewayVirtualInterfaceRequest')
     CreateLocalGatewayVirtualInterfaceResult = Shapes::StructureShape.new(name: 'CreateLocalGatewayVirtualInterfaceResult')
+    CreateMacSystemIntegrityProtectionModificationTaskRequest = Shapes::StructureShape.new(name: 'CreateMacSystemIntegrityProtectionModificationTaskRequest')
+    CreateMacSystemIntegrityProtectionModificationTaskResult = Shapes::StructureShape.new(name: 'CreateMacSystemIntegrityProtectionModificationTaskResult')
     CreateManagedPrefixListRequest = Shapes::StructureShape.new(name: 'CreateManagedPrefixListRequest')
     CreateManagedPrefixListResult = Shapes::StructureShape.new(name: 'CreateManagedPrefixListResult')
     CreateNatGatewayRequest = Shapes::StructureShape.new(name: 'CreateNatGatewayRequest')
@@ -641,6 +660,8 @@ module Aws::EC2
     CreateVpnConnectionRouteRequest = Shapes::StructureShape.new(name: 'CreateVpnConnectionRouteRequest')
     CreateVpnGatewayRequest = Shapes::StructureShape.new(name: 'CreateVpnGatewayRequest')
     CreateVpnGatewayResult = Shapes::StructureShape.new(name: 'CreateVpnGatewayResult')
+    CreationDateCondition = Shapes::StructureShape.new(name: 'CreationDateCondition')
+    CreationDateConditionRequest = Shapes::StructureShape.new(name: 'CreationDateConditionRequest')
     CreditSpecification = Shapes::StructureShape.new(name: 'CreditSpecification')
     CreditSpecificationRequest = Shapes::StructureShape.new(name: 'CreditSpecificationRequest')
     CurrencyCodeValues = Shapes::StringShape.new(name: 'CurrencyCodeValues')
@@ -698,6 +719,8 @@ module Aws::EC2
     DeleteFlowLogsResult = Shapes::StructureShape.new(name: 'DeleteFlowLogsResult')
     DeleteFpgaImageRequest = Shapes::StructureShape.new(name: 'DeleteFpgaImageRequest')
     DeleteFpgaImageResult = Shapes::StructureShape.new(name: 'DeleteFpgaImageResult')
+    DeleteImageUsageReportRequest = Shapes::StructureShape.new(name: 'DeleteImageUsageReportRequest')
+    DeleteImageUsageReportResult = Shapes::StructureShape.new(name: 'DeleteImageUsageReportResult')
     DeleteInstanceConnectEndpointRequest = Shapes::StructureShape.new(name: 'DeleteInstanceConnectEndpointRequest')
     DeleteInstanceConnectEndpointResult = Shapes::StructureShape.new(name: 'DeleteInstanceConnectEndpointResult')
     DeleteInstanceEventWindowRequest = Shapes::StructureShape.new(name: 'DeleteInstanceEventWindowRequest')
@@ -771,6 +794,8 @@ module Aws::EC2
     DeleteSecurityGroupRequest = Shapes::StructureShape.new(name: 'DeleteSecurityGroupRequest')
     DeleteSecurityGroupResult = Shapes::StructureShape.new(name: 'DeleteSecurityGroupResult')
     DeleteSnapshotRequest = Shapes::StructureShape.new(name: 'DeleteSnapshotRequest')
+    DeleteSnapshotResultSet = Shapes::ListShape.new(name: 'DeleteSnapshotResultSet')
+    DeleteSnapshotReturnCode = Shapes::StructureShape.new(name: 'DeleteSnapshotReturnCode')
     DeleteSpotDatafeedSubscriptionRequest = Shapes::StructureShape.new(name: 'DeleteSpotDatafeedSubscriptionRequest')
     DeleteSubnetCidrReservationRequest = Shapes::StructureShape.new(name: 'DeleteSubnetCidrReservationRequest')
     DeleteSubnetCidrReservationResult = Shapes::StructureShape.new(name: 'DeleteSubnetCidrReservationResult')
@@ -829,6 +854,8 @@ module Aws::EC2
     DeleteVpnConnectionRequest = Shapes::StructureShape.new(name: 'DeleteVpnConnectionRequest')
     DeleteVpnConnectionRouteRequest = Shapes::StructureShape.new(name: 'DeleteVpnConnectionRouteRequest')
     DeleteVpnGatewayRequest = Shapes::StructureShape.new(name: 'DeleteVpnGatewayRequest')
+    DeprecationTimeCondition = Shapes::StructureShape.new(name: 'DeprecationTimeCondition')
+    DeprecationTimeConditionRequest = Shapes::StructureShape.new(name: 'DeprecationTimeConditionRequest')
     DeprovisionByoipCidrRequest = Shapes::StructureShape.new(name: 'DeprovisionByoipCidrRequest')
     DeprovisionByoipCidrResult = Shapes::StructureShape.new(name: 'DeprovisionByoipCidrResult')
     DeprovisionIpamByoasnRequest = Shapes::StructureShape.new(name: 'DeprovisionIpamByoasnRequest')
@@ -875,6 +902,12 @@ module Aws::EC2
     DescribeCapacityBlockOfferingsMaxResults = Shapes::IntegerShape.new(name: 'DescribeCapacityBlockOfferingsMaxResults')
     DescribeCapacityBlockOfferingsRequest = Shapes::StructureShape.new(name: 'DescribeCapacityBlockOfferingsRequest')
     DescribeCapacityBlockOfferingsResult = Shapes::StructureShape.new(name: 'DescribeCapacityBlockOfferingsResult')
+    DescribeCapacityBlockStatusMaxResults = Shapes::IntegerShape.new(name: 'DescribeCapacityBlockStatusMaxResults')
+    DescribeCapacityBlockStatusRequest = Shapes::StructureShape.new(name: 'DescribeCapacityBlockStatusRequest')
+    DescribeCapacityBlockStatusResult = Shapes::StructureShape.new(name: 'DescribeCapacityBlockStatusResult')
+    DescribeCapacityBlocksMaxResults = Shapes::IntegerShape.new(name: 'DescribeCapacityBlocksMaxResults')
+    DescribeCapacityBlocksRequest = Shapes::StructureShape.new(name: 'DescribeCapacityBlocksRequest')
+    DescribeCapacityBlocksResult = Shapes::StructureShape.new(name: 'DescribeCapacityBlocksResult')
     DescribeCapacityReservationBillingRequestsRequest = Shapes::StructureShape.new(name: 'DescribeCapacityReservationBillingRequestsRequest')
     DescribeCapacityReservationBillingRequestsRequestMaxResults = Shapes::IntegerShape.new(name: 'DescribeCapacityReservationBillingRequestsRequestMaxResults')
     DescribeCapacityReservationBillingRequestsResult = Shapes::StructureShape.new(name: 'DescribeCapacityReservationBillingRequestsResult')
@@ -970,6 +1003,17 @@ module Aws::EC2
     DescribeIdentityIdFormatRequest = Shapes::StructureShape.new(name: 'DescribeIdentityIdFormatRequest')
     DescribeIdentityIdFormatResult = Shapes::StructureShape.new(name: 'DescribeIdentityIdFormatResult')
     DescribeImageAttributeRequest = Shapes::StructureShape.new(name: 'DescribeImageAttributeRequest')
+    DescribeImageReferencesImageIdStringList = Shapes::ListShape.new(name: 'DescribeImageReferencesImageIdStringList')
+    DescribeImageReferencesMaxResults = Shapes::IntegerShape.new(name: 'DescribeImageReferencesMaxResults')
+    DescribeImageReferencesRequest = Shapes::StructureShape.new(name: 'DescribeImageReferencesRequest')
+    DescribeImageReferencesResult = Shapes::StructureShape.new(name: 'DescribeImageReferencesResult')
+    DescribeImageUsageReportEntriesMaxResults = Shapes::IntegerShape.new(name: 'DescribeImageUsageReportEntriesMaxResults')
+    DescribeImageUsageReportEntriesRequest = Shapes::StructureShape.new(name: 'DescribeImageUsageReportEntriesRequest')
+    DescribeImageUsageReportEntriesResult = Shapes::StructureShape.new(name: 'DescribeImageUsageReportEntriesResult')
+    DescribeImageUsageReportsImageIdStringList = Shapes::ListShape.new(name: 'DescribeImageUsageReportsImageIdStringList')
+    DescribeImageUsageReportsMaxResults = Shapes::IntegerShape.new(name: 'DescribeImageUsageReportsMaxResults')
+    DescribeImageUsageReportsRequest = Shapes::StructureShape.new(name: 'DescribeImageUsageReportsRequest')
+    DescribeImageUsageReportsResult = Shapes::StructureShape.new(name: 'DescribeImageUsageReportsResult')
     DescribeImagesRequest = Shapes::StructureShape.new(name: 'DescribeImagesRequest')
     DescribeImagesResult = Shapes::StructureShape.new(name: 'DescribeImagesResult')
     DescribeImportImageTasksRequest = Shapes::StructureShape.new(name: 'DescribeImportImageTasksRequest')
@@ -1047,6 +1091,9 @@ module Aws::EC2
     DescribeMacHostsRequest = Shapes::StructureShape.new(name: 'DescribeMacHostsRequest')
     DescribeMacHostsRequestMaxResults = Shapes::IntegerShape.new(name: 'DescribeMacHostsRequestMaxResults')
     DescribeMacHostsResult = Shapes::StructureShape.new(name: 'DescribeMacHostsResult')
+    DescribeMacModificationTasksMaxResults = Shapes::IntegerShape.new(name: 'DescribeMacModificationTasksMaxResults')
+    DescribeMacModificationTasksRequest = Shapes::StructureShape.new(name: 'DescribeMacModificationTasksRequest')
+    DescribeMacModificationTasksResult = Shapes::StructureShape.new(name: 'DescribeMacModificationTasksResult')
     DescribeManagedPrefixListsRequest = Shapes::StructureShape.new(name: 'DescribeManagedPrefixListsRequest')
     DescribeManagedPrefixListsResult = Shapes::StructureShape.new(name: 'DescribeManagedPrefixListsResult')
     DescribeMovingAddressesMaxResults = Shapes::IntegerShape.new(name: 'DescribeMovingAddressesMaxResults')
@@ -1474,6 +1521,7 @@ module Aws::EC2
     EnclaveOptionsRequest = Shapes::StructureShape.new(name: 'EnclaveOptionsRequest')
     EncryptionInTransitSupported = Shapes::BooleanShape.new(name: 'EncryptionInTransitSupported')
     EndDateType = Shapes::StringShape.new(name: 'EndDateType')
+    EndpointIpAddressType = Shapes::StringShape.new(name: 'EndpointIpAddressType')
     EndpointSet = Shapes::ListShape.new(name: 'EndpointSet')
     EphemeralNvmeSupport = Shapes::StringShape.new(name: 'EphemeralNvmeSupport')
     ErrorSet = Shapes::ListShape.new(name: 'ErrorSet')
@@ -1592,6 +1640,8 @@ module Aws::EC2
     GVCDMaxResults = Shapes::IntegerShape.new(name: 'GVCDMaxResults')
     GatewayAssociationState = Shapes::StringShape.new(name: 'GatewayAssociationState')
     GatewayType = Shapes::StringShape.new(name: 'GatewayType')
+    GetActiveVpnTunnelStatusRequest = Shapes::StructureShape.new(name: 'GetActiveVpnTunnelStatusRequest')
+    GetActiveVpnTunnelStatusResult = Shapes::StructureShape.new(name: 'GetActiveVpnTunnelStatusResult')
     GetAllowedImagesSettingsRequest = Shapes::StructureShape.new(name: 'GetAllowedImagesSettingsRequest')
     GetAllowedImagesSettingsResult = Shapes::StructureShape.new(name: 'GetAllowedImagesSettingsResult')
     GetAssociatedEnclaveCertificateIamRolesRequest = Shapes::StructureShape.new(name: 'GetAssociatedEnclaveCertificateIamRolesRequest')
@@ -1779,14 +1829,42 @@ module Aws::EC2
     ImageIdStringList = Shapes::ListShape.new(name: 'ImageIdStringList')
     ImageList = Shapes::ListShape.new(name: 'ImageList')
     ImageMetadata = Shapes::StructureShape.new(name: 'ImageMetadata')
+    ImageName = Shapes::StringShape.new(name: 'ImageName')
+    ImageNameList = Shapes::ListShape.new(name: 'ImageNameList')
+    ImageNameRequest = Shapes::StringShape.new(name: 'ImageNameRequest')
+    ImageNameRequestList = Shapes::ListShape.new(name: 'ImageNameRequestList')
     ImageProvider = Shapes::StringShape.new(name: 'ImageProvider')
     ImageProviderList = Shapes::ListShape.new(name: 'ImageProviderList')
     ImageProviderRequest = Shapes::StringShape.new(name: 'ImageProviderRequest')
     ImageProviderRequestList = Shapes::ListShape.new(name: 'ImageProviderRequestList')
     ImageRecycleBinInfo = Shapes::StructureShape.new(name: 'ImageRecycleBinInfo')
     ImageRecycleBinInfoList = Shapes::ListShape.new(name: 'ImageRecycleBinInfoList')
+    ImageReference = Shapes::StructureShape.new(name: 'ImageReference')
+    ImageReferenceList = Shapes::ListShape.new(name: 'ImageReferenceList')
+    ImageReferenceOptionName = Shapes::StringShape.new(name: 'ImageReferenceOptionName')
+    ImageReferenceResourceType = Shapes::StringShape.new(name: 'ImageReferenceResourceType')
     ImageState = Shapes::StringShape.new(name: 'ImageState')
     ImageTypeValues = Shapes::StringShape.new(name: 'ImageTypeValues')
+    ImageUsageReport = Shapes::StructureShape.new(name: 'ImageUsageReport')
+    ImageUsageReportEntry = Shapes::StructureShape.new(name: 'ImageUsageReportEntry')
+    ImageUsageReportEntryList = Shapes::ListShape.new(name: 'ImageUsageReportEntryList')
+    ImageUsageReportId = Shapes::StringShape.new(name: 'ImageUsageReportId')
+    ImageUsageReportIdStringList = Shapes::ListShape.new(name: 'ImageUsageReportIdStringList')
+    ImageUsageReportList = Shapes::ListShape.new(name: 'ImageUsageReportList')
+    ImageUsageReportState = Shapes::StringShape.new(name: 'ImageUsageReportState')
+    ImageUsageReportStateReason = Shapes::StringShape.new(name: 'ImageUsageReportStateReason')
+    ImageUsageReportUserIdStringList = Shapes::ListShape.new(name: 'ImageUsageReportUserIdStringList')
+    ImageUsageResourceType = Shapes::StructureShape.new(name: 'ImageUsageResourceType')
+    ImageUsageResourceTypeList = Shapes::ListShape.new(name: 'ImageUsageResourceTypeList')
+    ImageUsageResourceTypeName = Shapes::StringShape.new(name: 'ImageUsageResourceTypeName')
+    ImageUsageResourceTypeOption = Shapes::StructureShape.new(name: 'ImageUsageResourceTypeOption')
+    ImageUsageResourceTypeOptionList = Shapes::ListShape.new(name: 'ImageUsageResourceTypeOptionList')
+    ImageUsageResourceTypeOptionRequest = Shapes::StructureShape.new(name: 'ImageUsageResourceTypeOptionRequest')
+    ImageUsageResourceTypeOptionRequestList = Shapes::ListShape.new(name: 'ImageUsageResourceTypeOptionRequestList')
+    ImageUsageResourceTypeOptionValue = Shapes::StringShape.new(name: 'ImageUsageResourceTypeOptionValue')
+    ImageUsageResourceTypeOptionValuesList = Shapes::ListShape.new(name: 'ImageUsageResourceTypeOptionValuesList')
+    ImageUsageResourceTypeRequest = Shapes::StructureShape.new(name: 'ImageUsageResourceTypeRequest')
+    ImageUsageResourceTypeRequestList = Shapes::ListShape.new(name: 'ImageUsageResourceTypeRequestList')
     ImdsSupportValues = Shapes::StringShape.new(name: 'ImdsSupportValues')
     ImportClientVpnClientCertificateRevocationListRequest = Shapes::StructureShape.new(name: 'ImportClientVpnClientCertificateRevocationListRequest')
     ImportClientVpnClientCertificateRevocationListResult = Shapes::StructureShape.new(name: 'ImportClientVpnClientCertificateRevocationListResult')
@@ -1827,6 +1905,8 @@ module Aws::EC2
     InferenceDeviceMemoryInfo = Shapes::StructureShape.new(name: 'InferenceDeviceMemoryInfo')
     InferenceDeviceMemorySize = Shapes::IntegerShape.new(name: 'InferenceDeviceMemorySize')
     InferenceDeviceName = Shapes::StringShape.new(name: 'InferenceDeviceName')
+    InitializationStatusDetails = Shapes::StructureShape.new(name: 'InitializationStatusDetails')
+    InitializationType = Shapes::StringShape.new(name: 'InitializationType')
     InsideCidrBlocksStringList = Shapes::ListShape.new(name: 'InsideCidrBlocksStringList')
     Instance = Shapes::StructureShape.new(name: 'Instance')
     InstanceAttachmentEnaSrdSpecification = Shapes::StructureShape.new(name: 'InstanceAttachmentEnaSrdSpecification')
@@ -1841,8 +1921,10 @@ module Aws::EC2
     InstanceBlockDeviceMappingSpecificationList = Shapes::ListShape.new(name: 'InstanceBlockDeviceMappingSpecificationList')
     InstanceBootModeValues = Shapes::StringShape.new(name: 'InstanceBootModeValues')
     InstanceCapacity = Shapes::StructureShape.new(name: 'InstanceCapacity')
+    InstanceConnectEndpointDnsNames = Shapes::StructureShape.new(name: 'InstanceConnectEndpointDnsNames')
     InstanceConnectEndpointId = Shapes::StringShape.new(name: 'InstanceConnectEndpointId')
     InstanceConnectEndpointMaxResults = Shapes::IntegerShape.new(name: 'InstanceConnectEndpointMaxResults')
+    InstanceConnectEndpointPublicDnsNames = Shapes::StructureShape.new(name: 'InstanceConnectEndpointPublicDnsNames')
     InstanceConnectEndpointSet = Shapes::ListShape.new(name: 'InstanceConnectEndpointSet')
     InstanceCount = Shapes::StructureShape.new(name: 'InstanceCount')
     InstanceCountList = Shapes::ListShape.new(name: 'InstanceCountList')
@@ -1914,6 +1996,7 @@ module Aws::EC2
     InstanceNetworkPerformanceOptionsRequest = Shapes::StructureShape.new(name: 'InstanceNetworkPerformanceOptionsRequest')
     InstancePrivateIpAddress = Shapes::StructureShape.new(name: 'InstancePrivateIpAddress')
     InstancePrivateIpAddressList = Shapes::ListShape.new(name: 'InstancePrivateIpAddressList')
+    InstanceRebootMigrationState = Shapes::StringShape.new(name: 'InstanceRebootMigrationState')
     InstanceRequirements = Shapes::StructureShape.new(name: 'InstanceRequirements')
     InstanceRequirementsRequest = Shapes::StructureShape.new(name: 'InstanceRequirementsRequest')
     InstanceRequirementsWithMetadataRequest = Shapes::StructureShape.new(name: 'InstanceRequirementsWithMetadataRequest')
@@ -2242,18 +2325,34 @@ module Aws::EC2
     Long = Shapes::IntegerShape.new(name: 'Long')
     MacHost = Shapes::StructureShape.new(name: 'MacHost')
     MacHostList = Shapes::ListShape.new(name: 'MacHostList')
+    MacModificationTask = Shapes::StructureShape.new(name: 'MacModificationTask')
+    MacModificationTaskId = Shapes::StringShape.new(name: 'MacModificationTaskId')
+    MacModificationTaskIdList = Shapes::ListShape.new(name: 'MacModificationTaskIdList')
+    MacModificationTaskList = Shapes::ListShape.new(name: 'MacModificationTaskList')
+    MacModificationTaskState = Shapes::StringShape.new(name: 'MacModificationTaskState')
+    MacModificationTaskType = Shapes::StringShape.new(name: 'MacModificationTaskType')
     MacOSVersionStringList = Shapes::ListShape.new(name: 'MacOSVersionStringList')
+    MacSystemIntegrityProtectionConfiguration = Shapes::StructureShape.new(name: 'MacSystemIntegrityProtectionConfiguration')
+    MacSystemIntegrityProtectionConfigurationRequest = Shapes::StructureShape.new(name: 'MacSystemIntegrityProtectionConfigurationRequest')
+    MacSystemIntegrityProtectionSettingStatus = Shapes::StringShape.new(name: 'MacSystemIntegrityProtectionSettingStatus')
     MaintenanceDetails = Shapes::StructureShape.new(name: 'MaintenanceDetails')
     ManagedBy = Shapes::StringShape.new(name: 'ManagedBy')
     ManagedPrefixList = Shapes::StructureShape.new(name: 'ManagedPrefixList')
     ManagedPrefixListSet = Shapes::ListShape.new(name: 'ManagedPrefixListSet')
     MarketType = Shapes::StringShape.new(name: 'MarketType')
+    MarketplaceProductCode = Shapes::StringShape.new(name: 'MarketplaceProductCode')
+    MarketplaceProductCodeList = Shapes::ListShape.new(name: 'MarketplaceProductCodeList')
+    MarketplaceProductCodeRequest = Shapes::StringShape.new(name: 'MarketplaceProductCodeRequest')
+    MarketplaceProductCodeRequestList = Shapes::ListShape.new(name: 'MarketplaceProductCodeRequestList')
     MaxIpv4AddrPerInterface = Shapes::IntegerShape.new(name: 'MaxIpv4AddrPerInterface')
     MaxIpv6AddrPerInterface = Shapes::IntegerShape.new(name: 'MaxIpv6AddrPerInterface')
     MaxNetworkInterfaces = Shapes::IntegerShape.new(name: 'MaxNetworkInterfaces')
     MaxResults = Shapes::IntegerShape.new(name: 'MaxResults')
     MaxResultsParam = Shapes::IntegerShape.new(name: 'MaxResultsParam')
     MaximumBandwidthInMbps = Shapes::IntegerShape.new(name: 'MaximumBandwidthInMbps')
+    MaximumDaysSinceCreatedValue = Shapes::IntegerShape.new(name: 'MaximumDaysSinceCreatedValue')
+    MaximumDaysSinceDeprecatedValue = Shapes::IntegerShape.new(name: 'MaximumDaysSinceDeprecatedValue')
+    MaximumEbsAttachments = Shapes::IntegerShape.new(name: 'MaximumEbsAttachments')
     MaximumEfaInterfaces = Shapes::IntegerShape.new(name: 'MaximumEfaInterfaces')
     MaximumEnaQueueCount = Shapes::IntegerShape.new(name: 'MaximumEnaQueueCount')
     MaximumEnaQueueCountPerInterface = Shapes::IntegerShape.new(name: 'MaximumEnaQueueCountPerInterface')
@@ -2307,6 +2406,8 @@ module Aws::EC2
     ModifyInstanceAttributeRequest = Shapes::StructureShape.new(name: 'ModifyInstanceAttributeRequest')
     ModifyInstanceCapacityReservationAttributesRequest = Shapes::StructureShape.new(name: 'ModifyInstanceCapacityReservationAttributesRequest')
     ModifyInstanceCapacityReservationAttributesResult = Shapes::StructureShape.new(name: 'ModifyInstanceCapacityReservationAttributesResult')
+    ModifyInstanceConnectEndpointRequest = Shapes::StructureShape.new(name: 'ModifyInstanceConnectEndpointRequest')
+    ModifyInstanceConnectEndpointResult = Shapes::StructureShape.new(name: 'ModifyInstanceConnectEndpointResult')
     ModifyInstanceCpuOptionsRequest = Shapes::StructureShape.new(name: 'ModifyInstanceCpuOptionsRequest')
     ModifyInstanceCpuOptionsResult = Shapes::StructureShape.new(name: 'ModifyInstanceCpuOptionsResult')
     ModifyInstanceCreditSpecificationRequest = Shapes::StructureShape.new(name: 'ModifyInstanceCreditSpecificationRequest')
@@ -2344,6 +2445,8 @@ module Aws::EC2
     ModifyNetworkInterfaceAttributeRequest = Shapes::StructureShape.new(name: 'ModifyNetworkInterfaceAttributeRequest')
     ModifyPrivateDnsNameOptionsRequest = Shapes::StructureShape.new(name: 'ModifyPrivateDnsNameOptionsRequest')
     ModifyPrivateDnsNameOptionsResult = Shapes::StructureShape.new(name: 'ModifyPrivateDnsNameOptionsResult')
+    ModifyPublicIpDnsNameOptionsRequest = Shapes::StructureShape.new(name: 'ModifyPublicIpDnsNameOptionsRequest')
+    ModifyPublicIpDnsNameOptionsResult = Shapes::StructureShape.new(name: 'ModifyPublicIpDnsNameOptionsResult')
     ModifyReservedInstancesRequest = Shapes::StructureShape.new(name: 'ModifyReservedInstancesRequest')
     ModifyReservedInstancesResult = Shapes::StructureShape.new(name: 'ModifyReservedInstancesResult')
     ModifyRouteServerRequest = Shapes::StructureShape.new(name: 'ModifyRouteServerRequest')
@@ -2530,6 +2633,7 @@ module Aws::EC2
     NitroTpmSupportedVersionsList = Shapes::ListShape.new(name: 'NitroTpmSupportedVersionsList')
     OccurrenceDayRequestSet = Shapes::ListShape.new(name: 'OccurrenceDayRequestSet')
     OccurrenceDaySet = Shapes::ListShape.new(name: 'OccurrenceDaySet')
+    OdbNetworkArn = Shapes::StringShape.new(name: 'OdbNetworkArn')
     OfferingClassType = Shapes::StringShape.new(name: 'OfferingClassType')
     OfferingId = Shapes::StringShape.new(name: 'OfferingId')
     OfferingTypeValues = Shapes::StringShape.new(name: 'OfferingTypeValues')
@@ -2678,6 +2782,8 @@ module Aws::EC2
     ProvisionedBandwidth = Shapes::StructureShape.new(name: 'ProvisionedBandwidth')
     PtrUpdateStatus = Shapes::StructureShape.new(name: 'PtrUpdateStatus')
     PublicIpAddress = Shapes::StringShape.new(name: 'PublicIpAddress')
+    PublicIpDnsNameOptions = Shapes::StructureShape.new(name: 'PublicIpDnsNameOptions')
+    PublicIpDnsOption = Shapes::StringShape.new(name: 'PublicIpDnsOption')
     PublicIpStringList = Shapes::ListShape.new(name: 'PublicIpStringList')
     PublicIpv4Pool = Shapes::StructureShape.new(name: 'PublicIpv4Pool')
     PublicIpv4PoolIdStringList = Shapes::ListShape.new(name: 'PublicIpv4PoolIdStringList')
@@ -2706,6 +2812,7 @@ module Aws::EC2
     RdsDbProxyArn = Shapes::StringShape.new(name: 'RdsDbProxyArn')
     ReasonCodesList = Shapes::ListShape.new(name: 'ReasonCodesList')
     RebootInstancesRequest = Shapes::StructureShape.new(name: 'RebootInstancesRequest')
+    RebootMigrationSupport = Shapes::StringShape.new(name: 'RebootMigrationSupport')
     RecurringCharge = Shapes::StructureShape.new(name: 'RecurringCharge')
     RecurringChargeFrequency = Shapes::StringShape.new(name: 'RecurringChargeFrequency')
     RecurringChargesList = Shapes::ListShape.new(name: 'RecurringChargesList')
@@ -2838,6 +2945,12 @@ module Aws::EC2
     ResourceStatement = Shapes::StructureShape.new(name: 'ResourceStatement')
     ResourceStatementRequest = Shapes::StructureShape.new(name: 'ResourceStatementRequest')
     ResourceType = Shapes::StringShape.new(name: 'ResourceType')
+    ResourceTypeOption = Shapes::StructureShape.new(name: 'ResourceTypeOption')
+    ResourceTypeOptionList = Shapes::ListShape.new(name: 'ResourceTypeOptionList')
+    ResourceTypeOptionValue = Shapes::StringShape.new(name: 'ResourceTypeOptionValue')
+    ResourceTypeOptionValuesList = Shapes::ListShape.new(name: 'ResourceTypeOptionValuesList')
+    ResourceTypeRequest = Shapes::StructureShape.new(name: 'ResourceTypeRequest')
+    ResourceTypeRequestList = Shapes::ListShape.new(name: 'ResourceTypeRequestList')
     ResponseError = Shapes::StructureShape.new(name: 'ResponseError')
     ResponseHostIdList = Shapes::ListShape.new(name: 'ResponseHostIdList')
     ResponseHostIdSet = Shapes::ListShape.new(name: 'ResponseHostIdSet')
@@ -2993,6 +3106,7 @@ module Aws::EC2
     SecurityGroupVpcAssociationState = Shapes::StringShape.new(name: 'SecurityGroupVpcAssociationState')
     SelfServicePortal = Shapes::StringShape.new(name: 'SelfServicePortal')
     SendDiagnosticInterruptRequest = Shapes::StructureShape.new(name: 'SendDiagnosticInterruptRequest')
+    SensitiveMacCredentials = Shapes::StringShape.new(name: 'SensitiveMacCredentials')
     SensitiveUrl = Shapes::StringShape.new(name: 'SensitiveUrl')
     SensitiveUserData = Shapes::StringShape.new(name: 'SensitiveUserData')
     ServiceConfiguration = Shapes::StructureShape.new(name: 'ServiceConfiguration')
@@ -3030,6 +3144,7 @@ module Aws::EC2
     SnapshotLocationEnum = Shapes::StringShape.new(name: 'SnapshotLocationEnum')
     SnapshotRecycleBinInfo = Shapes::StructureShape.new(name: 'SnapshotRecycleBinInfo')
     SnapshotRecycleBinInfoList = Shapes::ListShape.new(name: 'SnapshotRecycleBinInfoList')
+    SnapshotReturnCodes = Shapes::StringShape.new(name: 'SnapshotReturnCodes')
     SnapshotSet = Shapes::ListShape.new(name: 'SnapshotSet')
     SnapshotState = Shapes::StringShape.new(name: 'SnapshotState')
     SnapshotTaskDetail = Shapes::StructureShape.new(name: 'SnapshotTaskDetail')
@@ -3111,6 +3226,7 @@ module Aws::EC2
     SubnetConfiguration = Shapes::StructureShape.new(name: 'SubnetConfiguration')
     SubnetConfigurationsList = Shapes::ListShape.new(name: 'SubnetConfigurationsList')
     SubnetId = Shapes::StringShape.new(name: 'SubnetId')
+    SubnetIdList = Shapes::ListShape.new(name: 'SubnetIdList')
     SubnetIdStringList = Shapes::ListShape.new(name: 'SubnetIdStringList')
     SubnetIpPrefixes = Shapes::StructureShape.new(name: 'SubnetIpPrefixes')
     SubnetIpPrefixesList = Shapes::ListShape.new(name: 'SubnetIpPrefixesList')
@@ -3173,6 +3289,7 @@ module Aws::EC2
     TotalNeuronMemory = Shapes::IntegerShape.new(name: 'TotalNeuronMemory')
     TpmSupportValues = Shapes::StringShape.new(name: 'TpmSupportValues')
     TrafficDirection = Shapes::StringShape.new(name: 'TrafficDirection')
+    TrafficIpAddressType = Shapes::StringShape.new(name: 'TrafficIpAddressType')
     TrafficMirrorFilter = Shapes::StructureShape.new(name: 'TrafficMirrorFilter')
     TrafficMirrorFilterId = Shapes::StringShape.new(name: 'TrafficMirrorFilterId')
     TrafficMirrorFilterIdList = Shapes::ListShape.new(name: 'TrafficMirrorFilterIdList')
@@ -3339,6 +3456,7 @@ module Aws::EC2
     UserIdGroupPair = Shapes::StructureShape.new(name: 'UserIdGroupPair')
     UserIdGroupPairList = Shapes::ListShape.new(name: 'UserIdGroupPairList')
     UserIdGroupPairSet = Shapes::ListShape.new(name: 'UserIdGroupPairSet')
+    UserIdList = Shapes::ListShape.new(name: 'UserIdList')
     UserIdStringList = Shapes::ListShape.new(name: 'UserIdStringList')
     UserTrustProviderType = Shapes::StringShape.new(name: 'UserTrustProviderType')
     VCpuCount = Shapes::IntegerShape.new(name: 'VCpuCount')
@@ -3519,6 +3637,7 @@ module Aws::EC2
     VpnTunnelLogOptionsSpecification = Shapes::StructureShape.new(name: 'VpnTunnelLogOptionsSpecification')
     VpnTunnelOptionsSpecification = Shapes::StructureShape.new(name: 'VpnTunnelOptionsSpecification')
     VpnTunnelOptionsSpecificationsList = Shapes::ListShape.new(name: 'VpnTunnelOptionsSpecificationsList')
+    VpnTunnelProvisioningStatus = Shapes::StringShape.new(name: 'VpnTunnelProvisioningStatus')
     WeekDay = Shapes::StringShape.new(name: 'WeekDay')
     WithdrawByoipCidrRequest = Shapes::StructureShape.new(name: 'WithdrawByoipCidrRequest')
     WithdrawByoipCidrResult = Shapes::StructureShape.new(name: 'WithdrawByoipCidrResult')
@@ -3659,6 +3778,17 @@ module Aws::EC2
 
     ActiveInstanceSet.member = Shapes::ShapeRef.new(shape: ActiveInstance, location_name: "item")
 
+    ActiveVpnTunnelStatus.add_member(:phase_1_encryption_algorithm, Shapes::ShapeRef.new(shape: String, location_name: "phase1EncryptionAlgorithm"))
+    ActiveVpnTunnelStatus.add_member(:phase_2_encryption_algorithm, Shapes::ShapeRef.new(shape: String, location_name: "phase2EncryptionAlgorithm"))
+    ActiveVpnTunnelStatus.add_member(:phase_1_integrity_algorithm, Shapes::ShapeRef.new(shape: String, location_name: "phase1IntegrityAlgorithm"))
+    ActiveVpnTunnelStatus.add_member(:phase_2_integrity_algorithm, Shapes::ShapeRef.new(shape: String, location_name: "phase2IntegrityAlgorithm"))
+    ActiveVpnTunnelStatus.add_member(:phase_1_dh_group, Shapes::ShapeRef.new(shape: Integer, location_name: "phase1DHGroup"))
+    ActiveVpnTunnelStatus.add_member(:phase_2_dh_group, Shapes::ShapeRef.new(shape: Integer, location_name: "phase2DHGroup"))
+    ActiveVpnTunnelStatus.add_member(:ike_version, Shapes::ShapeRef.new(shape: String, location_name: "ikeVersion"))
+    ActiveVpnTunnelStatus.add_member(:provisioning_status, Shapes::ShapeRef.new(shape: VpnTunnelProvisioningStatus, location_name: "provisioningStatus"))
+    ActiveVpnTunnelStatus.add_member(:provisioning_status_reason, Shapes::ShapeRef.new(shape: String, location_name: "provisioningStatusReason"))
+    ActiveVpnTunnelStatus.struct_class = Types::ActiveVpnTunnelStatus
+
     AddIpamOperatingRegion.add_member(:region_name, Shapes::ShapeRef.new(shape: String, location_name: "RegionName"))
     AddIpamOperatingRegion.struct_class = Types::AddIpamOperatingRegion
 
@@ -3707,6 +3837,7 @@ module Aws::EC2
     Address.add_member(:customer_owned_ip, Shapes::ShapeRef.new(shape: String, location_name: "customerOwnedIp"))
     Address.add_member(:customer_owned_ipv_4_pool, Shapes::ShapeRef.new(shape: String, location_name: "customerOwnedIpv4Pool"))
     Address.add_member(:carrier_ip, Shapes::ShapeRef.new(shape: String, location_name: "carrierIp"))
+    Address.add_member(:subnet_id, Shapes::ShapeRef.new(shape: String, location_name: "subnetId"))
     Address.add_member(:service_managed, Shapes::ShapeRef.new(shape: ServiceManaged, location_name: "serviceManaged"))
     Address.add_member(:instance_id, Shapes::ShapeRef.new(shape: String, location_name: "instanceId"))
     Address.add_member(:public_ip, Shapes::ShapeRef.new(shape: String, location_name: "publicIp"))
@@ -3767,11 +3898,12 @@ module Aws::EC2
     AllocateHostsRequest.add_member(:outpost_arn, Shapes::ShapeRef.new(shape: String, location_name: "OutpostArn"))
     AllocateHostsRequest.add_member(:host_maintenance, Shapes::ShapeRef.new(shape: HostMaintenance, location_name: "HostMaintenance"))
     AllocateHostsRequest.add_member(:asset_ids, Shapes::ShapeRef.new(shape: AssetIdList, location_name: "AssetId"))
+    AllocateHostsRequest.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: AvailabilityZoneId, location_name: "AvailabilityZoneId"))
     AllocateHostsRequest.add_member(:auto_placement, Shapes::ShapeRef.new(shape: AutoPlacement, location_name: "autoPlacement"))
     AllocateHostsRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "clientToken"))
     AllocateHostsRequest.add_member(:instance_type, Shapes::ShapeRef.new(shape: String, location_name: "instanceType"))
     AllocateHostsRequest.add_member(:quantity, Shapes::ShapeRef.new(shape: Integer, location_name: "quantity"))
-    AllocateHostsRequest.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, required: true, location_name: "availabilityZone"))
+    AllocateHostsRequest.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZone"))
     AllocateHostsRequest.struct_class = Types::AllocateHostsRequest
 
     AllocateHostsResult.add_member(:host_ids, Shapes::ShapeRef.new(shape: ResponseHostIdList, location_name: "hostIdSet"))
@@ -3833,6 +3965,7 @@ module Aws::EC2
 
     AnalysisLoadBalancerTarget.add_member(:address, Shapes::ShapeRef.new(shape: IpAddress, location_name: "address"))
     AnalysisLoadBalancerTarget.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZone"))
+    AnalysisLoadBalancerTarget.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZoneId"))
     AnalysisLoadBalancerTarget.add_member(:instance, Shapes::ShapeRef.new(shape: AnalysisComponent, location_name: "instance"))
     AnalysisLoadBalancerTarget.add_member(:port, Shapes::ShapeRef.new(shape: Port, location_name: "port"))
     AnalysisLoadBalancerTarget.struct_class = Types::AnalysisLoadBalancerTarget
@@ -4036,6 +4169,7 @@ module Aws::EC2
     AssociateRouteServerResult.struct_class = Types::AssociateRouteServerResult
 
     AssociateRouteTableRequest.add_member(:gateway_id, Shapes::ShapeRef.new(shape: RouteGatewayId, location_name: "GatewayId"))
+    AssociateRouteTableRequest.add_member(:public_ipv_4_pool, Shapes::ShapeRef.new(shape: Ipv4PoolEc2Id, location_name: "PublicIpv4Pool"))
     AssociateRouteTableRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     AssociateRouteTableRequest.add_member(:subnet_id, Shapes::ShapeRef.new(shape: SubnetId, location_name: "subnetId"))
     AssociateRouteTableRequest.add_member(:route_table_id, Shapes::ShapeRef.new(shape: RouteTableId, required: true, location_name: "routeTableId"))
@@ -4125,6 +4259,8 @@ module Aws::EC2
 
     AssociatedRolesList.member = Shapes::ShapeRef.new(shape: AssociatedRole, location_name: "item")
 
+    AssociatedSubnetList.member = Shapes::ShapeRef.new(shape: SubnetId, location_name: "item")
+
     AssociatedTargetNetwork.add_member(:network_id, Shapes::ShapeRef.new(shape: String, location_name: "networkId"))
     AssociatedTargetNetwork.add_member(:network_type, Shapes::ShapeRef.new(shape: AssociatedNetworkType, location_name: "networkType"))
     AssociatedTargetNetwork.struct_class = Types::AssociatedTargetNetwork
@@ -4499,6 +4635,18 @@ module Aws::EC2
 
     CapacityAllocations.member = Shapes::ShapeRef.new(shape: CapacityAllocation, location_name: "item")
 
+    CapacityBlock.add_member(:capacity_block_id, Shapes::ShapeRef.new(shape: CapacityBlockId, location_name: "capacityBlockId"))
+    CapacityBlock.add_member(:ultraserver_type, Shapes::ShapeRef.new(shape: String, location_name: "ultraserverType"))
+    CapacityBlock.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZone"))
+    CapacityBlock.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZoneId"))
+    CapacityBlock.add_member(:capacity_reservation_ids, Shapes::ShapeRef.new(shape: CapacityReservationIdSet, location_name: "capacityReservationIdSet"))
+    CapacityBlock.add_member(:start_date, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "startDate"))
+    CapacityBlock.add_member(:end_date, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "endDate"))
+    CapacityBlock.add_member(:create_date, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "createDate"))
+    CapacityBlock.add_member(:state, Shapes::ShapeRef.new(shape: CapacityBlockResourceState, location_name: "state"))
+    CapacityBlock.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
+    CapacityBlock.struct_class = Types::CapacityBlock
+
     CapacityBlockExtension.add_member(:capacity_reservation_id, Shapes::ShapeRef.new(shape: CapacityReservationId, location_name: "capacityReservationId"))
     CapacityBlockExtension.add_member(:instance_type, Shapes::ShapeRef.new(shape: String, location_name: "instanceType"))
     CapacityBlockExtension.add_member(:instance_count, Shapes::ShapeRef.new(shape: Integer, location_name: "instanceCount"))
@@ -4532,6 +4680,8 @@ module Aws::EC2
 
     CapacityBlockExtensionSet.member = Shapes::ShapeRef.new(shape: CapacityBlockExtension, location_name: "item")
 
+    CapacityBlockIds.member = Shapes::ShapeRef.new(shape: CapacityBlockId, location_name: "item")
+
     CapacityBlockOffering.add_member(:capacity_block_offering_id, Shapes::ShapeRef.new(shape: OfferingId, location_name: "capacityBlockOfferingId"))
     CapacityBlockOffering.add_member(:instance_type, Shapes::ShapeRef.new(shape: String, location_name: "instanceType"))
     CapacityBlockOffering.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZone"))
@@ -4542,11 +4692,25 @@ module Aws::EC2
     CapacityBlockOffering.add_member(:upfront_fee, Shapes::ShapeRef.new(shape: String, location_name: "upfrontFee"))
     CapacityBlockOffering.add_member(:currency_code, Shapes::ShapeRef.new(shape: String, location_name: "currencyCode"))
     CapacityBlockOffering.add_member(:tenancy, Shapes::ShapeRef.new(shape: CapacityReservationTenancy, location_name: "tenancy"))
+    CapacityBlockOffering.add_member(:ultraserver_type, Shapes::ShapeRef.new(shape: String, location_name: "ultraserverType"))
+    CapacityBlockOffering.add_member(:ultraserver_count, Shapes::ShapeRef.new(shape: BoxedInteger, location_name: "ultraserverCount"))
     CapacityBlockOffering.add_member(:capacity_block_duration_minutes, Shapes::ShapeRef.new(shape: Integer, location_name: "capacityBlockDurationMinutes"))
     CapacityBlockOffering.struct_class = Types::CapacityBlockOffering
 
     CapacityBlockOfferingSet.member = Shapes::ShapeRef.new(shape: CapacityBlockOffering, location_name: "item")
 
+    CapacityBlockSet.member = Shapes::ShapeRef.new(shape: CapacityBlock, location_name: "item")
+
+    CapacityBlockStatus.add_member(:capacity_block_id, Shapes::ShapeRef.new(shape: CapacityBlockId, location_name: "capacityBlockId"))
+    CapacityBlockStatus.add_member(:interconnect_status, Shapes::ShapeRef.new(shape: CapacityBlockInterconnectStatus, location_name: "interconnectStatus"))
+    CapacityBlockStatus.add_member(:total_capacity, Shapes::ShapeRef.new(shape: Integer, location_name: "totalCapacity"))
+    CapacityBlockStatus.add_member(:total_available_capacity, Shapes::ShapeRef.new(shape: Integer, location_name: "totalAvailableCapacity"))
+    CapacityBlockStatus.add_member(:total_unavailable_capacity, Shapes::ShapeRef.new(shape: Integer, location_name: "totalUnavailableCapacity"))
+    CapacityBlockStatus.add_member(:capacity_reservation_statuses, Shapes::ShapeRef.new(shape: CapacityReservationStatusSet, location_name: "capacityReservationStatusSet"))
+    CapacityBlockStatus.struct_class = Types::CapacityBlockStatus
+
+    CapacityBlockStatusSet.member = Shapes::ShapeRef.new(shape: CapacityBlockStatus, location_name: "item")
+
     CapacityReservation.add_member(:capacity_reservation_id, Shapes::ShapeRef.new(shape: String, location_name: "capacityReservationId"))
     CapacityReservation.add_member(:owner_id, Shapes::ShapeRef.new(shape: String, location_name: "ownerId"))
     CapacityReservation.add_member(:capacity_reservation_arn, Shapes::ShapeRef.new(shape: String, location_name: "capacityReservationArn"))
@@ -4574,6 +4738,7 @@ module Aws::EC2
     CapacityReservation.add_member(:unused_reservation_billing_owner_id, Shapes::ShapeRef.new(shape: AccountID, location_name: "unusedReservationBillingOwnerId"))
     CapacityReservation.add_member(:commitment_info, Shapes::ShapeRef.new(shape: CapacityReservationCommitmentInfo, location_name: "commitmentInfo"))
     CapacityReservation.add_member(:delivery_preference, Shapes::ShapeRef.new(shape: CapacityReservationDeliveryPreference, location_name: "deliveryPreference"))
+    CapacityReservation.add_member(:capacity_block_id, Shapes::ShapeRef.new(shape: CapacityBlockId, location_name: "capacityBlockId"))
     CapacityReservation.struct_class = Types::CapacityReservation
 
     CapacityReservationBillingRequest.add_member(:capacity_reservation_id, Shapes::ShapeRef.new(shape: String, location_name: "capacityReservationId"))
@@ -4627,6 +4792,7 @@ module Aws::EC2
     CapacityReservationInfo.add_member(:instance_type, Shapes::ShapeRef.new(shape: String, location_name: "instanceType"))
     CapacityReservationInfo.add_member(:availability_zone, Shapes::ShapeRef.new(shape: AvailabilityZoneName, location_name: "availabilityZone"))
     CapacityReservationInfo.add_member(:tenancy, Shapes::ShapeRef.new(shape: CapacityReservationTenancy, location_name: "tenancy"))
+    CapacityReservationInfo.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: AvailabilityZoneId, location_name: "availabilityZoneId"))
     CapacityReservationInfo.struct_class = Types::CapacityReservationInfo
 
     CapacityReservationOptions.add_member(:usage_strategy, Shapes::ShapeRef.new(shape: FleetCapacityReservationUsageStrategy, location_name: "usageStrategy"))
@@ -4645,6 +4811,14 @@ module Aws::EC2
     CapacityReservationSpecificationResponse.add_member(:capacity_reservation_target, Shapes::ShapeRef.new(shape: CapacityReservationTargetResponse, location_name: "capacityReservationTarget"))
     CapacityReservationSpecificationResponse.struct_class = Types::CapacityReservationSpecificationResponse
 
+    CapacityReservationStatus.add_member(:capacity_reservation_id, Shapes::ShapeRef.new(shape: CapacityReservationId, location_name: "capacityReservationId"))
+    CapacityReservationStatus.add_member(:total_capacity, Shapes::ShapeRef.new(shape: Integer, location_name: "totalCapacity"))
+    CapacityReservationStatus.add_member(:total_available_capacity, Shapes::ShapeRef.new(shape: Integer, location_name: "totalAvailableCapacity"))
+    CapacityReservationStatus.add_member(:total_unavailable_capacity, Shapes::ShapeRef.new(shape: Integer, location_name: "totalUnavailableCapacity"))
+    CapacityReservationStatus.struct_class = Types::CapacityReservationStatus
+
+    CapacityReservationStatusSet.member = Shapes::ShapeRef.new(shape: CapacityReservationStatus, location_name: "item")
+
     CapacityReservationTarget.add_member(:capacity_reservation_id, Shapes::ShapeRef.new(shape: CapacityReservationId, location_name: "CapacityReservationId"))
     CapacityReservationTarget.add_member(:capacity_reservation_resource_group_arn, Shapes::ShapeRef.new(shape: String, location_name: "CapacityReservationResourceGroupArn"))
     CapacityReservationTarget.struct_class = Types::CapacityReservationTarget
@@ -4764,6 +4938,7 @@ module Aws::EC2
     ClientVpnConnection.add_member(:ingress_packets, Shapes::ShapeRef.new(shape: String, location_name: "ingressPackets"))
     ClientVpnConnection.add_member(:egress_packets, Shapes::ShapeRef.new(shape: String, location_name: "egressPackets"))
     ClientVpnConnection.add_member(:client_ip, Shapes::ShapeRef.new(shape: String, location_name: "clientIp"))
+    ClientVpnConnection.add_member(:client_ipv_6_address, Shapes::ShapeRef.new(shape: String, location_name: "clientIpv6Address"))
     ClientVpnConnection.add_member(:common_name, Shapes::ShapeRef.new(shape: String, location_name: "commonName"))
     ClientVpnConnection.add_member(:status, Shapes::ShapeRef.new(shape: ClientVpnConnectionStatus, location_name: "status"))
     ClientVpnConnection.add_member(:connection_end_time, Shapes::ShapeRef.new(shape: String, location_name: "connectionEndTime"))
@@ -4801,6 +4976,8 @@ module Aws::EC2
     ClientVpnEndpoint.add_member(:client_login_banner_options, Shapes::ShapeRef.new(shape: ClientLoginBannerResponseOptions, location_name: "clientLoginBannerOptions"))
     ClientVpnEndpoint.add_member(:client_route_enforcement_options, Shapes::ShapeRef.new(shape: ClientRouteEnforcementResponseOptions, location_name: "clientRouteEnforcementOptions"))
     ClientVpnEndpoint.add_member(:disconnect_on_session_timeout, Shapes::ShapeRef.new(shape: Boolean, location_name: "disconnectOnSessionTimeout"))
+    ClientVpnEndpoint.add_member(:endpoint_ip_address_type, Shapes::ShapeRef.new(shape: EndpointIpAddressType, location_name: "endpointIpAddressType"))
+    ClientVpnEndpoint.add_member(:traffic_ip_address_type, Shapes::ShapeRef.new(shape: TrafficIpAddressType, location_name: "trafficIpAddressType"))
     ClientVpnEndpoint.struct_class = Types::ClientVpnEndpoint
 
     ClientVpnEndpointAttributeStatus.add_member(:code, Shapes::ShapeRef.new(shape: ClientVpnEndpointAttributeStatusCode, location_name: "code"))
@@ -4950,6 +5127,8 @@ module Aws::EC2
     CopyImageRequest.add_member(:copy_image_tags, Shapes::ShapeRef.new(shape: Boolean, location_name: "CopyImageTags"))
     CopyImageRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
     CopyImageRequest.add_member(:snapshot_copy_completion_duration_minutes, Shapes::ShapeRef.new(shape: Long, location_name: "SnapshotCopyCompletionDurationMinutes"))
+    CopyImageRequest.add_member(:destination_availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "DestinationAvailabilityZone"))
+    CopyImageRequest.add_member(:destination_availability_zone_id, Shapes::ShapeRef.new(shape: String, location_name: "DestinationAvailabilityZoneId"))
     CopyImageRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     CopyImageRequest.struct_class = Types::CopyImageRequest
 
@@ -4966,6 +5145,7 @@ module Aws::EC2
     CopySnapshotRequest.add_member(:source_snapshot_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "SourceSnapshotId"))
     CopySnapshotRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
     CopySnapshotRequest.add_member(:completion_duration_minutes, Shapes::ShapeRef.new(shape: SnapshotCompletionDurationMinutesRequest, location_name: "CompletionDurationMinutes"))
+    CopySnapshotRequest.add_member(:destination_availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "DestinationAvailabilityZone"))
     CopySnapshotRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     CopySnapshotRequest.struct_class = Types::CopySnapshotRequest
 
@@ -5062,7 +5242,7 @@ module Aws::EC2
     CreateCarrierGatewayResult.add_member(:carrier_gateway, Shapes::ShapeRef.new(shape: CarrierGateway, location_name: "carrierGateway"))
     CreateCarrierGatewayResult.struct_class = Types::CreateCarrierGatewayResult
 
-    CreateClientVpnEndpointRequest.add_member(:client_cidr_block, Shapes::ShapeRef.new(shape: String, required: true, location_name: "ClientCidrBlock"))
+    CreateClientVpnEndpointRequest.add_member(:client_cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "ClientCidrBlock"))
     CreateClientVpnEndpointRequest.add_member(:server_certificate_arn, Shapes::ShapeRef.new(shape: String, required: true, location_name: "ServerCertificateArn"))
     CreateClientVpnEndpointRequest.add_member(:authentication_options, Shapes::ShapeRef.new(shape: ClientVpnAuthenticationRequestList, required: true, location_name: "Authentication"))
     CreateClientVpnEndpointRequest.add_member(:connection_log_options, Shapes::ShapeRef.new(shape: ConnectionLogOptions, required: true, location_name: "ConnectionLogOptions"))
@@ -5082,6 +5262,8 @@ module Aws::EC2
     CreateClientVpnEndpointRequest.add_member(:client_login_banner_options, Shapes::ShapeRef.new(shape: ClientLoginBannerOptions, location_name: "ClientLoginBannerOptions"))
     CreateClientVpnEndpointRequest.add_member(:client_route_enforcement_options, Shapes::ShapeRef.new(shape: ClientRouteEnforcementOptions, location_name: "ClientRouteEnforcementOptions"))
     CreateClientVpnEndpointRequest.add_member(:disconnect_on_session_timeout, Shapes::ShapeRef.new(shape: Boolean, location_name: "DisconnectOnSessionTimeout"))
+    CreateClientVpnEndpointRequest.add_member(:endpoint_ip_address_type, Shapes::ShapeRef.new(shape: EndpointIpAddressType, location_name: "EndpointIpAddressType"))
+    CreateClientVpnEndpointRequest.add_member(:traffic_ip_address_type, Shapes::ShapeRef.new(shape: TrafficIpAddressType, location_name: "TrafficIpAddressType"))
     CreateClientVpnEndpointRequest.struct_class = Types::CreateClientVpnEndpointRequest
 
     CreateClientVpnEndpointResult.add_member(:client_vpn_endpoint_id, Shapes::ShapeRef.new(shape: String, location_name: "clientVpnEndpointId"))
@@ -5130,9 +5312,10 @@ module Aws::EC2
     CreateCustomerGatewayResult.add_member(:customer_gateway, Shapes::ShapeRef.new(shape: CustomerGateway, location_name: "customerGateway"))
     CreateCustomerGatewayResult.struct_class = Types::CreateCustomerGatewayResult
 
-    CreateDefaultSubnetRequest.add_member(:availability_zone, Shapes::ShapeRef.new(shape: AvailabilityZoneName, required: true, location_name: "AvailabilityZone"))
+    CreateDefaultSubnetRequest.add_member(:availability_zone, Shapes::ShapeRef.new(shape: AvailabilityZoneName, location_name: "AvailabilityZone"))
     CreateDefaultSubnetRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     CreateDefaultSubnetRequest.add_member(:ipv_6_native, Shapes::ShapeRef.new(shape: Boolean, location_name: "Ipv6Native"))
+    CreateDefaultSubnetRequest.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: AvailabilityZoneId, location_name: "AvailabilityZoneId"))
     CreateDefaultSubnetRequest.struct_class = Types::CreateDefaultSubnetRequest
 
     CreateDefaultSubnetResult.add_member(:subnet, Shapes::ShapeRef.new(shape: Subnet, location_name: "subnet"))
@@ -5144,6 +5327,16 @@ module Aws::EC2
     CreateDefaultVpcResult.add_member(:vpc, Shapes::ShapeRef.new(shape: Vpc, location_name: "vpc"))
     CreateDefaultVpcResult.struct_class = Types::CreateDefaultVpcResult
 
+    CreateDelegateMacVolumeOwnershipTaskRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "ClientToken", metadata: {"idempotencyToken" => true}))
+    CreateDelegateMacVolumeOwnershipTaskRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    CreateDelegateMacVolumeOwnershipTaskRequest.add_member(:instance_id, Shapes::ShapeRef.new(shape: InstanceId, required: true, location_name: "InstanceId"))
+    CreateDelegateMacVolumeOwnershipTaskRequest.add_member(:mac_credentials, Shapes::ShapeRef.new(shape: SensitiveMacCredentials, required: true, location_name: "MacCredentials"))
+    CreateDelegateMacVolumeOwnershipTaskRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
+    CreateDelegateMacVolumeOwnershipTaskRequest.struct_class = Types::CreateDelegateMacVolumeOwnershipTaskRequest
+
+    CreateDelegateMacVolumeOwnershipTaskResult.add_member(:mac_modification_task, Shapes::ShapeRef.new(shape: MacModificationTask, location_name: "macModificationTask"))
+    CreateDelegateMacVolumeOwnershipTaskResult.struct_class = Types::CreateDelegateMacVolumeOwnershipTaskResult
+
     CreateDhcpOptionsRequest.add_member(:dhcp_configurations, Shapes::ShapeRef.new(shape: NewDhcpConfigurationList, required: true, location_name: "dhcpConfiguration"))
     CreateDhcpOptionsRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
     CreateDhcpOptionsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
@@ -5235,6 +5428,7 @@ module Aws::EC2
     CreateFpgaImageResult.struct_class = Types::CreateFpgaImageResult
 
     CreateImageRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
+    CreateImageRequest.add_member(:snapshot_location, Shapes::ShapeRef.new(shape: SnapshotLocationEnum, location_name: "SnapshotLocation"))
     CreateImageRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     CreateImageRequest.add_member(:instance_id, Shapes::ShapeRef.new(shape: InstanceId, required: true, location_name: "instanceId"))
     CreateImageRequest.add_member(:name, Shapes::ShapeRef.new(shape: String, required: true, location_name: "name"))
@@ -5246,12 +5440,24 @@ module Aws::EC2
     CreateImageResult.add_member(:image_id, Shapes::ShapeRef.new(shape: String, location_name: "imageId"))
     CreateImageResult.struct_class = Types::CreateImageResult
 
+    CreateImageUsageReportRequest.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, required: true, location_name: "ImageId"))
+    CreateImageUsageReportRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    CreateImageUsageReportRequest.add_member(:resource_types, Shapes::ShapeRef.new(shape: ImageUsageResourceTypeRequestList, required: true, location_name: "ResourceType"))
+    CreateImageUsageReportRequest.add_member(:account_ids, Shapes::ShapeRef.new(shape: ImageUsageReportUserIdStringList, location_name: "AccountId"))
+    CreateImageUsageReportRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "ClientToken", metadata: {"idempotencyToken" => true}))
+    CreateImageUsageReportRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
+    CreateImageUsageReportRequest.struct_class = Types::CreateImageUsageReportRequest
+
+    CreateImageUsageReportResult.add_member(:report_id, Shapes::ShapeRef.new(shape: ImageUsageReportId, location_name: "reportId"))
+    CreateImageUsageReportResult.struct_class = Types::CreateImageUsageReportResult
+
     CreateInstanceConnectEndpointRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     CreateInstanceConnectEndpointRequest.add_member(:subnet_id, Shapes::ShapeRef.new(shape: SubnetId, required: true, location_name: "SubnetId"))
     CreateInstanceConnectEndpointRequest.add_member(:security_group_ids, Shapes::ShapeRef.new(shape: SecurityGroupIdStringListRequest, location_name: "SecurityGroupId"))
     CreateInstanceConnectEndpointRequest.add_member(:preserve_client_ip, Shapes::ShapeRef.new(shape: Boolean, location_name: "PreserveClientIp"))
     CreateInstanceConnectEndpointRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "ClientToken", metadata: {"idempotencyToken" => true}))
     CreateInstanceConnectEndpointRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
+    CreateInstanceConnectEndpointRequest.add_member(:ip_address_type, Shapes::ShapeRef.new(shape: IpAddressType, location_name: "IpAddressType"))
     CreateInstanceConnectEndpointRequest.struct_class = Types::CreateInstanceConnectEndpointRequest
 
     CreateInstanceConnectEndpointResult.add_member(:instance_connect_endpoint, Shapes::ShapeRef.new(shape: Ec2InstanceConnectEndpoint, location_name: "instanceConnectEndpoint"))
@@ -5445,6 +5651,18 @@ module Aws::EC2
     CreateLocalGatewayVirtualInterfaceResult.add_member(:local_gateway_virtual_interface, Shapes::ShapeRef.new(shape: LocalGatewayVirtualInterface, location_name: "localGatewayVirtualInterface"))
     CreateLocalGatewayVirtualInterfaceResult.struct_class = Types::CreateLocalGatewayVirtualInterfaceResult
 
+    CreateMacSystemIntegrityProtectionModificationTaskRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "ClientToken", metadata: {"idempotencyToken" => true}))
+    CreateMacSystemIntegrityProtectionModificationTaskRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    CreateMacSystemIntegrityProtectionModificationTaskRequest.add_member(:instance_id, Shapes::ShapeRef.new(shape: InstanceId, required: true, location_name: "InstanceId"))
+    CreateMacSystemIntegrityProtectionModificationTaskRequest.add_member(:mac_credentials, Shapes::ShapeRef.new(shape: SensitiveMacCredentials, location_name: "MacCredentials"))
+    CreateMacSystemIntegrityProtectionModificationTaskRequest.add_member(:mac_system_integrity_protection_configuration, Shapes::ShapeRef.new(shape: MacSystemIntegrityProtectionConfigurationRequest, location_name: "MacSystemIntegrityProtectionConfiguration"))
+    CreateMacSystemIntegrityProtectionModificationTaskRequest.add_member(:mac_system_integrity_protection_status, Shapes::ShapeRef.new(shape: MacSystemIntegrityProtectionSettingStatus, required: true, location_name: "MacSystemIntegrityProtectionStatus"))
+    CreateMacSystemIntegrityProtectionModificationTaskRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
+    CreateMacSystemIntegrityProtectionModificationTaskRequest.struct_class = Types::CreateMacSystemIntegrityProtectionModificationTaskRequest
+
+    CreateMacSystemIntegrityProtectionModificationTaskResult.add_member(:mac_modification_task, Shapes::ShapeRef.new(shape: MacModificationTask, location_name: "macModificationTask"))
+    CreateMacSystemIntegrityProtectionModificationTaskResult.struct_class = Types::CreateMacSystemIntegrityProtectionModificationTaskResult
+
     CreateManagedPrefixListRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     CreateManagedPrefixListRequest.add_member(:prefix_list_name, Shapes::ShapeRef.new(shape: String, required: true, location_name: "PrefixListName"))
     CreateManagedPrefixListRequest.add_member(:entries, Shapes::ShapeRef.new(shape: AddPrefixListEntries, location_name: "Entry"))
@@ -5614,6 +5832,7 @@ module Aws::EC2
     CreateRouteRequest.add_member(:local_gateway_id, Shapes::ShapeRef.new(shape: LocalGatewayId, location_name: "LocalGatewayId"))
     CreateRouteRequest.add_member(:carrier_gateway_id, Shapes::ShapeRef.new(shape: CarrierGatewayId, location_name: "CarrierGatewayId"))
     CreateRouteRequest.add_member(:core_network_arn, Shapes::ShapeRef.new(shape: CoreNetworkArn, location_name: "CoreNetworkArn"))
+    CreateRouteRequest.add_member(:odb_network_arn, Shapes::ShapeRef.new(shape: OdbNetworkArn, location_name: "OdbNetworkArn"))
     CreateRouteRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     CreateRouteRequest.add_member(:route_table_id, Shapes::ShapeRef.new(shape: RouteTableId, required: true, location_name: "routeTableId"))
     CreateRouteRequest.add_member(:destination_cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "destinationCidrBlock"))
@@ -6067,7 +6286,8 @@ module Aws::EC2
     CreateVolumePermissionModifications.add_member(:remove, Shapes::ShapeRef.new(shape: CreateVolumePermissionList, location_name: "Remove"))
     CreateVolumePermissionModifications.struct_class = Types::CreateVolumePermissionModifications
 
-    CreateVolumeRequest.add_member(:availability_zone, Shapes::ShapeRef.new(shape: AvailabilityZoneName, required: true, location_name: "AvailabilityZone"))
+    CreateVolumeRequest.add_member(:availability_zone, Shapes::ShapeRef.new(shape: AvailabilityZoneName, location_name: "AvailabilityZone"))
+    CreateVolumeRequest.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: AvailabilityZoneId, location_name: "AvailabilityZoneId"))
     CreateVolumeRequest.add_member(:encrypted, Shapes::ShapeRef.new(shape: Boolean, location_name: "encrypted"))
     CreateVolumeRequest.add_member(:iops, Shapes::ShapeRef.new(shape: Integer, location_name: "Iops"))
     CreateVolumeRequest.add_member(:kms_key_id, Shapes::ShapeRef.new(shape: KmsKeyId, location_name: "KmsKeyId"))
@@ -6177,6 +6397,7 @@ module Aws::EC2
     CreateVpnConnectionRequest.add_member(:vpn_gateway_id, Shapes::ShapeRef.new(shape: VpnGatewayId, location_name: "VpnGatewayId"))
     CreateVpnConnectionRequest.add_member(:transit_gateway_id, Shapes::ShapeRef.new(shape: TransitGatewayId, location_name: "TransitGatewayId"))
     CreateVpnConnectionRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
+    CreateVpnConnectionRequest.add_member(:pre_shared_key_storage, Shapes::ShapeRef.new(shape: String, location_name: "PreSharedKeyStorage"))
     CreateVpnConnectionRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     CreateVpnConnectionRequest.add_member(:options, Shapes::ShapeRef.new(shape: VpnConnectionOptionsSpecification, location_name: "options"))
     CreateVpnConnectionRequest.struct_class = Types::CreateVpnConnectionRequest
@@ -6198,6 +6419,12 @@ module Aws::EC2
     CreateVpnGatewayResult.add_member(:vpn_gateway, Shapes::ShapeRef.new(shape: VpnGateway, location_name: "vpnGateway"))
     CreateVpnGatewayResult.struct_class = Types::CreateVpnGatewayResult
 
+    CreationDateCondition.add_member(:maximum_days_since_created, Shapes::ShapeRef.new(shape: MaximumDaysSinceCreatedValue, location_name: "maximumDaysSinceCreated"))
+    CreationDateCondition.struct_class = Types::CreationDateCondition
+
+    CreationDateConditionRequest.add_member(:maximum_days_since_created, Shapes::ShapeRef.new(shape: MaximumDaysSinceCreatedValue, location_name: "MaximumDaysSinceCreated"))
+    CreationDateConditionRequest.struct_class = Types::CreationDateConditionRequest
+
     CreditSpecification.add_member(:cpu_credits, Shapes::ShapeRef.new(shape: String, location_name: "cpuCredits"))
     CreditSpecification.struct_class = Types::CreditSpecification
 
@@ -6347,6 +6574,13 @@ module Aws::EC2
     DeleteFpgaImageResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
     DeleteFpgaImageResult.struct_class = Types::DeleteFpgaImageResult
 
+    DeleteImageUsageReportRequest.add_member(:report_id, Shapes::ShapeRef.new(shape: ImageUsageReportId, required: true, location_name: "ReportId"))
+    DeleteImageUsageReportRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DeleteImageUsageReportRequest.struct_class = Types::DeleteImageUsageReportRequest
+
+    DeleteImageUsageReportResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
+    DeleteImageUsageReportResult.struct_class = Types::DeleteImageUsageReportResult
+
     DeleteInstanceConnectEndpointRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     DeleteInstanceConnectEndpointRequest.add_member(:instance_connect_endpoint_id, Shapes::ShapeRef.new(shape: InstanceConnectEndpointId, required: true, location_name: "InstanceConnectEndpointId"))
     DeleteInstanceConnectEndpointRequest.struct_class = Types::DeleteInstanceConnectEndpointRequest
@@ -6624,6 +6858,12 @@ module Aws::EC2
     DeleteSnapshotRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DeleteSnapshotRequest.struct_class = Types::DeleteSnapshotRequest
 
+    DeleteSnapshotResultSet.member = Shapes::ShapeRef.new(shape: DeleteSnapshotReturnCode, location_name: "item")
+
+    DeleteSnapshotReturnCode.add_member(:snapshot_id, Shapes::ShapeRef.new(shape: SnapshotId, location_name: "snapshotId"))
+    DeleteSnapshotReturnCode.add_member(:return_code, Shapes::ShapeRef.new(shape: SnapshotReturnCodes, location_name: "returnCode"))
+    DeleteSnapshotReturnCode.struct_class = Types::DeleteSnapshotReturnCode
+
     DeleteSpotDatafeedSubscriptionRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DeleteSpotDatafeedSubscriptionRequest.struct_class = Types::DeleteSpotDatafeedSubscriptionRequest
 
@@ -6837,6 +7077,12 @@ module Aws::EC2
     DeleteVpnGatewayRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DeleteVpnGatewayRequest.struct_class = Types::DeleteVpnGatewayRequest
 
+    DeprecationTimeCondition.add_member(:maximum_days_since_deprecated, Shapes::ShapeRef.new(shape: MaximumDaysSinceDeprecatedValue, location_name: "maximumDaysSinceDeprecated"))
+    DeprecationTimeCondition.struct_class = Types::DeprecationTimeCondition
+
+    DeprecationTimeConditionRequest.add_member(:maximum_days_since_deprecated, Shapes::ShapeRef.new(shape: MaximumDaysSinceDeprecatedValue, location_name: "MaximumDaysSinceDeprecated"))
+    DeprecationTimeConditionRequest.struct_class = Types::DeprecationTimeConditionRequest
+
     DeprovisionByoipCidrRequest.add_member(:cidr, Shapes::ShapeRef.new(shape: String, required: true, location_name: "Cidr"))
     DeprovisionByoipCidrRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     DeprovisionByoipCidrRequest.struct_class = Types::DeprovisionByoipCidrRequest
@@ -6872,9 +7118,12 @@ module Aws::EC2
     DeprovisionedAddressSet.member = Shapes::ShapeRef.new(shape: String, location_name: "item")
 
     DeregisterImageRequest.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, required: true, location_name: "ImageId"))
+    DeregisterImageRequest.add_member(:delete_associated_snapshots, Shapes::ShapeRef.new(shape: Boolean, location_name: "DeleteAssociatedSnapshots"))
     DeregisterImageRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DeregisterImageRequest.struct_class = Types::DeregisterImageRequest
 
+    DeregisterImageResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
+    DeregisterImageResult.add_member(:delete_snapshot_results, Shapes::ShapeRef.new(shape: DeleteSnapshotResultSet, location_name: "deleteSnapshotResultSet"))
     DeregisterImageResult.struct_class = Types::DeregisterImageResult
 
     DeregisterInstanceEventNotificationAttributesRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
@@ -7017,12 +7266,36 @@ module Aws::EC2
     DescribeCapacityBlockOfferingsRequest.add_member(:capacity_duration_hours, Shapes::ShapeRef.new(shape: Integer, required: true, location_name: "CapacityDurationHours"))
     DescribeCapacityBlockOfferingsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
     DescribeCapacityBlockOfferingsRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: DescribeCapacityBlockOfferingsMaxResults, location_name: "MaxResults"))
+    DescribeCapacityBlockOfferingsRequest.add_member(:ultraserver_type, Shapes::ShapeRef.new(shape: String, location_name: "UltraserverType"))
+    DescribeCapacityBlockOfferingsRequest.add_member(:ultraserver_count, Shapes::ShapeRef.new(shape: Integer, location_name: "UltraserverCount"))
     DescribeCapacityBlockOfferingsRequest.struct_class = Types::DescribeCapacityBlockOfferingsRequest
 
     DescribeCapacityBlockOfferingsResult.add_member(:capacity_block_offerings, Shapes::ShapeRef.new(shape: CapacityBlockOfferingSet, location_name: "capacityBlockOfferingSet"))
     DescribeCapacityBlockOfferingsResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
     DescribeCapacityBlockOfferingsResult.struct_class = Types::DescribeCapacityBlockOfferingsResult
 
+    DescribeCapacityBlockStatusRequest.add_member(:capacity_block_ids, Shapes::ShapeRef.new(shape: CapacityBlockIds, location_name: "CapacityBlockId"))
+    DescribeCapacityBlockStatusRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
+    DescribeCapacityBlockStatusRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: DescribeCapacityBlockStatusMaxResults, location_name: "MaxResults"))
+    DescribeCapacityBlockStatusRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
+    DescribeCapacityBlockStatusRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DescribeCapacityBlockStatusRequest.struct_class = Types::DescribeCapacityBlockStatusRequest
+
+    DescribeCapacityBlockStatusResult.add_member(:capacity_block_statuses, Shapes::ShapeRef.new(shape: CapacityBlockStatusSet, location_name: "capacityBlockStatusSet"))
+    DescribeCapacityBlockStatusResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
+    DescribeCapacityBlockStatusResult.struct_class = Types::DescribeCapacityBlockStatusResult
+
+    DescribeCapacityBlocksRequest.add_member(:capacity_block_ids, Shapes::ShapeRef.new(shape: CapacityBlockIds, location_name: "CapacityBlockId"))
+    DescribeCapacityBlocksRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
+    DescribeCapacityBlocksRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: DescribeCapacityBlocksMaxResults, location_name: "MaxResults"))
+    DescribeCapacityBlocksRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
+    DescribeCapacityBlocksRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DescribeCapacityBlocksRequest.struct_class = Types::DescribeCapacityBlocksRequest
+
+    DescribeCapacityBlocksResult.add_member(:capacity_blocks, Shapes::ShapeRef.new(shape: CapacityBlockSet, location_name: "capacityBlockSet"))
+    DescribeCapacityBlocksResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
+    DescribeCapacityBlocksResult.struct_class = Types::DescribeCapacityBlocksResult
+
     DescribeCapacityReservationBillingRequestsRequest.add_member(:capacity_reservation_ids, Shapes::ShapeRef.new(shape: CapacityReservationIdSet, location_name: "CapacityReservationId"))
     DescribeCapacityReservationBillingRequestsRequest.add_member(:role, Shapes::ShapeRef.new(shape: CallerRole, required: true, location_name: "Role"))
     DescribeCapacityReservationBillingRequestsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
@@ -7420,6 +7693,46 @@ module Aws::EC2
     DescribeImageAttributeRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DescribeImageAttributeRequest.struct_class = Types::DescribeImageAttributeRequest
 
+    DescribeImageReferencesImageIdStringList.member = Shapes::ShapeRef.new(shape: ImageId)
+
+    DescribeImageReferencesRequest.add_member(:image_ids, Shapes::ShapeRef.new(shape: DescribeImageReferencesImageIdStringList, required: true, location_name: "ImageId"))
+    DescribeImageReferencesRequest.add_member(:include_all_resource_types, Shapes::ShapeRef.new(shape: Boolean, location_name: "IncludeAllResourceTypes"))
+    DescribeImageReferencesRequest.add_member(:resource_types, Shapes::ShapeRef.new(shape: ResourceTypeRequestList, location_name: "ResourceType"))
+    DescribeImageReferencesRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
+    DescribeImageReferencesRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DescribeImageReferencesRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: DescribeImageReferencesMaxResults, location_name: "MaxResults"))
+    DescribeImageReferencesRequest.struct_class = Types::DescribeImageReferencesRequest
+
+    DescribeImageReferencesResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
+    DescribeImageReferencesResult.add_member(:image_references, Shapes::ShapeRef.new(shape: ImageReferenceList, location_name: "imageReferenceSet"))
+    DescribeImageReferencesResult.struct_class = Types::DescribeImageReferencesResult
+
+    DescribeImageUsageReportEntriesRequest.add_member(:image_ids, Shapes::ShapeRef.new(shape: DescribeImageUsageReportsImageIdStringList, location_name: "ImageId"))
+    DescribeImageUsageReportEntriesRequest.add_member(:report_ids, Shapes::ShapeRef.new(shape: ImageUsageReportIdStringList, location_name: "ReportId"))
+    DescribeImageUsageReportEntriesRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
+    DescribeImageUsageReportEntriesRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
+    DescribeImageUsageReportEntriesRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DescribeImageUsageReportEntriesRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: DescribeImageUsageReportEntriesMaxResults, location_name: "MaxResults"))
+    DescribeImageUsageReportEntriesRequest.struct_class = Types::DescribeImageUsageReportEntriesRequest
+
+    DescribeImageUsageReportEntriesResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
+    DescribeImageUsageReportEntriesResult.add_member(:image_usage_report_entries, Shapes::ShapeRef.new(shape: ImageUsageReportEntryList, location_name: "imageUsageReportEntrySet"))
+    DescribeImageUsageReportEntriesResult.struct_class = Types::DescribeImageUsageReportEntriesResult
+
+    DescribeImageUsageReportsImageIdStringList.member = Shapes::ShapeRef.new(shape: ImageId)
+
+    DescribeImageUsageReportsRequest.add_member(:image_ids, Shapes::ShapeRef.new(shape: DescribeImageUsageReportsImageIdStringList, location_name: "ImageId"))
+    DescribeImageUsageReportsRequest.add_member(:report_ids, Shapes::ShapeRef.new(shape: ImageUsageReportIdStringList, location_name: "ReportId"))
+    DescribeImageUsageReportsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
+    DescribeImageUsageReportsRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
+    DescribeImageUsageReportsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DescribeImageUsageReportsRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: DescribeImageUsageReportsMaxResults, location_name: "MaxResults"))
+    DescribeImageUsageReportsRequest.struct_class = Types::DescribeImageUsageReportsRequest
+
+    DescribeImageUsageReportsResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
+    DescribeImageUsageReportsResult.add_member(:image_usage_reports, Shapes::ShapeRef.new(shape: ImageUsageReportList, location_name: "imageUsageReportSet"))
+    DescribeImageUsageReportsResult.struct_class = Types::DescribeImageUsageReportsResult
+
     DescribeImagesRequest.add_member(:executable_users, Shapes::ShapeRef.new(shape: ExecutableByStringList, location_name: "ExecutableBy"))
     DescribeImagesRequest.add_member(:image_ids, Shapes::ShapeRef.new(shape: ImageIdStringList, location_name: "ImageId"))
     DescribeImagesRequest.add_member(:owners, Shapes::ShapeRef.new(shape: OwnerStringList, location_name: "Owner"))
@@ -7795,6 +8108,17 @@ module Aws::EC2
     DescribeMacHostsResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
     DescribeMacHostsResult.struct_class = Types::DescribeMacHostsResult
 
+    DescribeMacModificationTasksRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DescribeMacModificationTasksRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
+    DescribeMacModificationTasksRequest.add_member(:mac_modification_task_ids, Shapes::ShapeRef.new(shape: MacModificationTaskIdList, location_name: "MacModificationTaskId"))
+    DescribeMacModificationTasksRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: DescribeMacModificationTasksMaxResults, location_name: "MaxResults"))
+    DescribeMacModificationTasksRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
+    DescribeMacModificationTasksRequest.struct_class = Types::DescribeMacModificationTasksRequest
+
+    DescribeMacModificationTasksResult.add_member(:mac_modification_tasks, Shapes::ShapeRef.new(shape: MacModificationTaskList, location_name: "macModificationTaskSet"))
+    DescribeMacModificationTasksResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
+    DescribeMacModificationTasksResult.struct_class = Types::DescribeMacModificationTasksResult
+
     DescribeManagedPrefixListsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     DescribeManagedPrefixListsRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
     DescribeManagedPrefixListsRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: PrefixListMaxResults, location_name: "MaxResults"))
@@ -8020,6 +8344,7 @@ module Aws::EC2
     DescribeReservedInstancesOfferingsRequest.add_member(:offering_class, Shapes::ShapeRef.new(shape: OfferingClassType, location_name: "OfferingClass"))
     DescribeReservedInstancesOfferingsRequest.add_member(:product_description, Shapes::ShapeRef.new(shape: RIProductDescription, location_name: "ProductDescription"))
     DescribeReservedInstancesOfferingsRequest.add_member(:reserved_instances_offering_ids, Shapes::ShapeRef.new(shape: ReservedInstancesOfferingIdStringList, location_name: "ReservedInstancesOfferingId"))
+    DescribeReservedInstancesOfferingsRequest.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: AvailabilityZoneId, location_name: "AvailabilityZoneId"))
     DescribeReservedInstancesOfferingsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DescribeReservedInstancesOfferingsRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
     DescribeReservedInstancesOfferingsRequest.add_member(:instance_tenancy, Shapes::ShapeRef.new(shape: Tenancy, location_name: "instanceTenancy"))
@@ -8249,6 +8574,7 @@ module Aws::EC2
     DescribeSpotInstanceRequestsResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
     DescribeSpotInstanceRequestsResult.struct_class = Types::DescribeSpotInstanceRequestsResult
 
+    DescribeSpotPriceHistoryRequest.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: AvailabilityZoneId, location_name: "AvailabilityZoneId"))
     DescribeSpotPriceHistoryRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DescribeSpotPriceHistoryRequest.add_member(:start_time, Shapes::ShapeRef.new(shape: DateTime, location_name: "startTime"))
     DescribeSpotPriceHistoryRequest.add_member(:end_time, Shapes::ShapeRef.new(shape: DateTime, location_name: "endTime"))
@@ -9173,8 +9499,10 @@ module Aws::EC2
     EbsBlockDevice.add_member(:kms_key_id, Shapes::ShapeRef.new(shape: String, location_name: "kmsKeyId"))
     EbsBlockDevice.add_member(:throughput, Shapes::ShapeRef.new(shape: Integer, location_name: "throughput"))
     EbsBlockDevice.add_member(:outpost_arn, Shapes::ShapeRef.new(shape: String, location_name: "outpostArn"))
+    EbsBlockDevice.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZone"))
     EbsBlockDevice.add_member(:encrypted, Shapes::ShapeRef.new(shape: Boolean, location_name: "encrypted"))
     EbsBlockDevice.add_member(:volume_initialization_rate, Shapes::ShapeRef.new(shape: Integer, location_name: "VolumeInitializationRate"))
+    EbsBlockDevice.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: String, location_name: "AvailabilityZoneId"))
     EbsBlockDevice.struct_class = Types::EbsBlockDevice
 
     EbsBlockDeviceResponse.add_member(:encrypted, Shapes::ShapeRef.new(shape: Boolean, location_name: "encrypted"))
@@ -9191,6 +9519,8 @@ module Aws::EC2
     EbsInfo.add_member(:encryption_support, Shapes::ShapeRef.new(shape: EbsEncryptionSupport, location_name: "encryptionSupport"))
     EbsInfo.add_member(:ebs_optimized_info, Shapes::ShapeRef.new(shape: EbsOptimizedInfo, location_name: "ebsOptimizedInfo"))
     EbsInfo.add_member(:nvme_support, Shapes::ShapeRef.new(shape: EbsNvmeSupport, location_name: "nvmeSupport"))
+    EbsInfo.add_member(:maximum_ebs_attachments, Shapes::ShapeRef.new(shape: MaximumEbsAttachments, location_name: "maximumEbsAttachments"))
+    EbsInfo.add_member(:attachment_limit_type, Shapes::ShapeRef.new(shape: AttachmentLimitType, location_name: "attachmentLimitType"))
     EbsInfo.struct_class = Types::EbsInfo
 
     EbsInstanceBlockDevice.add_member(:attach_time, Shapes::ShapeRef.new(shape: DateTime, location_name: "attachTime"))
@@ -9240,6 +9570,8 @@ module Aws::EC2
     Ec2InstanceConnectEndpoint.add_member(:preserve_client_ip, Shapes::ShapeRef.new(shape: Boolean, location_name: "preserveClientIp"))
     Ec2InstanceConnectEndpoint.add_member(:security_group_ids, Shapes::ShapeRef.new(shape: SecurityGroupIdSet, location_name: "securityGroupIdSet"))
     Ec2InstanceConnectEndpoint.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
+    Ec2InstanceConnectEndpoint.add_member(:ip_address_type, Shapes::ShapeRef.new(shape: IpAddressType, location_name: "ipAddressType"))
+    Ec2InstanceConnectEndpoint.add_member(:public_dns_names, Shapes::ShapeRef.new(shape: InstanceConnectEndpointPublicDnsNames, location_name: "publicDnsNames"))
     Ec2InstanceConnectEndpoint.struct_class = Types::Ec2InstanceConnectEndpoint
 
     EfaInfo.add_member(:maximum_efa_interfaces, Shapes::ShapeRef.new(shape: MaximumEfaInterfaces, location_name: "maximumEfaInterfaces"))
@@ -9530,6 +9862,7 @@ module Aws::EC2
     Explanation.add_member(:addresses, Shapes::ShapeRef.new(shape: IpAddressList, location_name: "addressSet"))
     Explanation.add_member(:attached_to, Shapes::ShapeRef.new(shape: AnalysisComponent, location_name: "attachedTo"))
     Explanation.add_member(:availability_zones, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "availabilityZoneSet"))
+    Explanation.add_member(:availability_zone_ids, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "availabilityZoneIdSet"))
     Explanation.add_member(:cidrs, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "cidrSet"))
     Explanation.add_member(:component, Shapes::ShapeRef.new(shape: AnalysisComponent, location_name: "component"))
     Explanation.add_member(:customer_gateway, Shapes::ShapeRef.new(shape: AnalysisComponent, location_name: "customerGateway"))
@@ -9827,7 +10160,7 @@ module Aws::EC2
     FleetLaunchTemplateOverrides.add_member(:instance_type, Shapes::ShapeRef.new(shape: InstanceType, location_name: "instanceType"))
     FleetLaunchTemplateOverrides.add_member(:max_price, Shapes::ShapeRef.new(shape: String, location_name: "maxPrice"))
     FleetLaunchTemplateOverrides.add_member(:subnet_id, Shapes::ShapeRef.new(shape: String, location_name: "subnetId"))
-    FleetLaunchTemplateOverrides.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZone"))
+    FleetLaunchTemplateOverrides.add_member(:availability_zone, Shapes::ShapeRef.new(shape: AvailabilityZoneName, location_name: "availabilityZone"))
     FleetLaunchTemplateOverrides.add_member(:weighted_capacity, Shapes::ShapeRef.new(shape: Double, location_name: "weightedCapacity"))
     FleetLaunchTemplateOverrides.add_member(:priority, Shapes::ShapeRef.new(shape: Double, location_name: "priority"))
     FleetLaunchTemplateOverrides.add_member(:placement, Shapes::ShapeRef.new(shape: PlacementResponse, location_name: "placement"))
@@ -9843,7 +10176,7 @@ module Aws::EC2
     FleetLaunchTemplateOverridesRequest.add_member(:instance_type, Shapes::ShapeRef.new(shape: InstanceType, location_name: "InstanceType"))
     FleetLaunchTemplateOverridesRequest.add_member(:max_price, Shapes::ShapeRef.new(shape: String, location_name: "MaxPrice"))
     FleetLaunchTemplateOverridesRequest.add_member(:subnet_id, Shapes::ShapeRef.new(shape: SubnetId, location_name: "SubnetId"))
-    FleetLaunchTemplateOverridesRequest.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "AvailabilityZone"))
+    FleetLaunchTemplateOverridesRequest.add_member(:availability_zone, Shapes::ShapeRef.new(shape: AvailabilityZoneName, location_name: "AvailabilityZone"))
     FleetLaunchTemplateOverridesRequest.add_member(:weighted_capacity, Shapes::ShapeRef.new(shape: Double, location_name: "WeightedCapacity"))
     FleetLaunchTemplateOverridesRequest.add_member(:priority, Shapes::ShapeRef.new(shape: Double, location_name: "Priority"))
     FleetLaunchTemplateOverridesRequest.add_member(:placement, Shapes::ShapeRef.new(shape: Placement, location_name: "Placement"))
@@ -9950,6 +10283,14 @@ module Aws::EC2
     FpgaInfo.add_member(:total_fpga_memory_in_mi_b, Shapes::ShapeRef.new(shape: totalFpgaMemory, location_name: "totalFpgaMemoryInMiB"))
     FpgaInfo.struct_class = Types::FpgaInfo
 
+    GetActiveVpnTunnelStatusRequest.add_member(:vpn_connection_id, Shapes::ShapeRef.new(shape: VpnConnectionId, required: true, location_name: "VpnConnectionId"))
+    GetActiveVpnTunnelStatusRequest.add_member(:vpn_tunnel_outside_ip_address, Shapes::ShapeRef.new(shape: String, required: true, location_name: "VpnTunnelOutsideIpAddress"))
+    GetActiveVpnTunnelStatusRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    GetActiveVpnTunnelStatusRequest.struct_class = Types::GetActiveVpnTunnelStatusRequest
+
+    GetActiveVpnTunnelStatusResult.add_member(:active_vpn_tunnel_status, Shapes::ShapeRef.new(shape: ActiveVpnTunnelStatus, location_name: "activeVpnTunnelStatus"))
+    GetActiveVpnTunnelStatusResult.struct_class = Types::GetActiveVpnTunnelStatusResult
+
     GetAllowedImagesSettingsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     GetAllowedImagesSettingsRequest.struct_class = Types::GetAllowedImagesSettingsRequest
 
@@ -10129,6 +10470,7 @@ module Aws::EC2
     GetInstanceTypesFromInstanceRequirementsRequest.add_member(:instance_requirements, Shapes::ShapeRef.new(shape: InstanceRequirementsRequest, required: true, location_name: "InstanceRequirements"))
     GetInstanceTypesFromInstanceRequirementsRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: Integer, location_name: "MaxResults"))
     GetInstanceTypesFromInstanceRequirementsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
+    GetInstanceTypesFromInstanceRequirementsRequest.add_member(:context, Shapes::ShapeRef.new(shape: String, location_name: "Context"))
     GetInstanceTypesFromInstanceRequirementsRequest.struct_class = Types::GetInstanceTypesFromInstanceRequirementsRequest
 
     GetInstanceTypesFromInstanceRequirementsResult.add_member(:instance_types, Shapes::ShapeRef.new(shape: InstanceTypeInfoFromInstanceRequirementsSet, location_name: "instanceTypeSet"))
@@ -10489,6 +10831,7 @@ module Aws::EC2
     GetVpnConnectionDeviceSampleConfigurationRequest.add_member(:vpn_connection_id, Shapes::ShapeRef.new(shape: VpnConnectionId, required: true, location_name: "VpnConnectionId"))
     GetVpnConnectionDeviceSampleConfigurationRequest.add_member(:vpn_connection_device_type_id, Shapes::ShapeRef.new(shape: VpnConnectionDeviceTypeId, required: true, location_name: "VpnConnectionDeviceTypeId"))
     GetVpnConnectionDeviceSampleConfigurationRequest.add_member(:internet_key_exchange_version, Shapes::ShapeRef.new(shape: String, location_name: "InternetKeyExchangeVersion"))
+    GetVpnConnectionDeviceSampleConfigurationRequest.add_member(:sample_type, Shapes::ShapeRef.new(shape: String, location_name: "SampleType"))
     GetVpnConnectionDeviceSampleConfigurationRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     GetVpnConnectionDeviceSampleConfigurationRequest.struct_class = Types::GetVpnConnectionDeviceSampleConfigurationRequest
 
@@ -10697,6 +11040,7 @@ module Aws::EC2
     Image.add_member(:image_allowed, Shapes::ShapeRef.new(shape: Boolean, location_name: "imageAllowed"))
     Image.add_member(:source_image_id, Shapes::ShapeRef.new(shape: String, location_name: "sourceImageId"))
     Image.add_member(:source_image_region, Shapes::ShapeRef.new(shape: String, location_name: "sourceImageRegion"))
+    Image.add_member(:free_tier_eligible, Shapes::ShapeRef.new(shape: Boolean, location_name: "freeTierEligible"))
     Image.add_member(:image_id, Shapes::ShapeRef.new(shape: String, location_name: "imageId"))
     Image.add_member(:image_location, Shapes::ShapeRef.new(shape: String, location_name: "imageLocation"))
     Image.add_member(:state, Shapes::ShapeRef.new(shape: ImageState, location_name: "imageState"))
@@ -10728,11 +11072,19 @@ module Aws::EC2
     ImageAttribute.struct_class = Types::ImageAttribute
 
     ImageCriterion.add_member(:image_providers, Shapes::ShapeRef.new(shape: ImageProviderList, location_name: "imageProviderSet"))
+    ImageCriterion.add_member(:marketplace_product_codes, Shapes::ShapeRef.new(shape: MarketplaceProductCodeList, location_name: "marketplaceProductCodeSet"))
+    ImageCriterion.add_member(:image_names, Shapes::ShapeRef.new(shape: ImageNameList, location_name: "imageNameSet"))
+    ImageCriterion.add_member(:deprecation_time_condition, Shapes::ShapeRef.new(shape: DeprecationTimeCondition, location_name: "deprecationTimeCondition"))
+    ImageCriterion.add_member(:creation_date_condition, Shapes::ShapeRef.new(shape: CreationDateCondition, location_name: "creationDateCondition"))
     ImageCriterion.struct_class = Types::ImageCriterion
 
     ImageCriterionList.member = Shapes::ShapeRef.new(shape: ImageCriterion, location_name: "item")
 
     ImageCriterionRequest.add_member(:image_providers, Shapes::ShapeRef.new(shape: ImageProviderRequestList, location_name: "ImageProvider"))
+    ImageCriterionRequest.add_member(:marketplace_product_codes, Shapes::ShapeRef.new(shape: MarketplaceProductCodeRequestList, location_name: "MarketplaceProductCode"))
+    ImageCriterionRequest.add_member(:image_names, Shapes::ShapeRef.new(shape: ImageNameRequestList, location_name: "ImageName"))
+    ImageCriterionRequest.add_member(:deprecation_time_condition, Shapes::ShapeRef.new(shape: DeprecationTimeConditionRequest, location_name: "DeprecationTimeCondition"))
+    ImageCriterionRequest.add_member(:creation_date_condition, Shapes::ShapeRef.new(shape: CreationDateConditionRequest, location_name: "CreationDateCondition"))
     ImageCriterionRequest.struct_class = Types::ImageCriterionRequest
 
     ImageCriterionRequestList.member = Shapes::ShapeRef.new(shape: ImageCriterionRequest, location_name: "ImageCriterion")
@@ -10764,6 +11116,10 @@ module Aws::EC2
     ImageMetadata.add_member(:is_public, Shapes::ShapeRef.new(shape: Boolean, location_name: "isPublic"))
     ImageMetadata.struct_class = Types::ImageMetadata
 
+    ImageNameList.member = Shapes::ShapeRef.new(shape: ImageName, location_name: "item")
+
+    ImageNameRequestList.member = Shapes::ShapeRef.new(shape: ImageNameRequest, location_name: "item")
+
     ImageProviderList.member = Shapes::ShapeRef.new(shape: ImageProvider, location_name: "item")
 
     ImageProviderRequestList.member = Shapes::ShapeRef.new(shape: ImageProviderRequest, location_name: "item")
@@ -10777,6 +11133,66 @@ module Aws::EC2
 
     ImageRecycleBinInfoList.member = Shapes::ShapeRef.new(shape: ImageRecycleBinInfo, location_name: "item")
 
+    ImageReference.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, location_name: "imageId"))
+    ImageReference.add_member(:resource_type, Shapes::ShapeRef.new(shape: ImageReferenceResourceType, location_name: "resourceType"))
+    ImageReference.add_member(:arn, Shapes::ShapeRef.new(shape: String, location_name: "arn"))
+    ImageReference.struct_class = Types::ImageReference
+
+    ImageReferenceList.member = Shapes::ShapeRef.new(shape: ImageReference, location_name: "item")
+
+    ImageUsageReport.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, location_name: "imageId"))
+    ImageUsageReport.add_member(:report_id, Shapes::ShapeRef.new(shape: ImageUsageReportId, location_name: "reportId"))
+    ImageUsageReport.add_member(:resource_types, Shapes::ShapeRef.new(shape: ImageUsageResourceTypeList, location_name: "resourceTypeSet"))
+    ImageUsageReport.add_member(:account_ids, Shapes::ShapeRef.new(shape: UserIdList, location_name: "accountIdSet"))
+    ImageUsageReport.add_member(:state, Shapes::ShapeRef.new(shape: ImageUsageReportState, location_name: "state"))
+    ImageUsageReport.add_member(:state_reason, Shapes::ShapeRef.new(shape: ImageUsageReportStateReason, location_name: "stateReason"))
+    ImageUsageReport.add_member(:creation_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "creationTime"))
+    ImageUsageReport.add_member(:expiration_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "expirationTime"))
+    ImageUsageReport.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
+    ImageUsageReport.struct_class = Types::ImageUsageReport
+
+    ImageUsageReportEntry.add_member(:resource_type, Shapes::ShapeRef.new(shape: ImageUsageResourceTypeName, location_name: "resourceType"))
+    ImageUsageReportEntry.add_member(:report_id, Shapes::ShapeRef.new(shape: ImageUsageReportId, location_name: "reportId"))
+    ImageUsageReportEntry.add_member(:usage_count, Shapes::ShapeRef.new(shape: Long, location_name: "usageCount"))
+    ImageUsageReportEntry.add_member(:account_id, Shapes::ShapeRef.new(shape: String, location_name: "accountId"))
+    ImageUsageReportEntry.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, location_name: "imageId"))
+    ImageUsageReportEntry.add_member(:report_creation_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "reportCreationTime"))
+    ImageUsageReportEntry.struct_class = Types::ImageUsageReportEntry
+
+    ImageUsageReportEntryList.member = Shapes::ShapeRef.new(shape: ImageUsageReportEntry, location_name: "item")
+
+    ImageUsageReportIdStringList.member = Shapes::ShapeRef.new(shape: ImageUsageReportId)
+
+    ImageUsageReportList.member = Shapes::ShapeRef.new(shape: ImageUsageReport, location_name: "item")
+
+    ImageUsageReportUserIdStringList.member = Shapes::ShapeRef.new(shape: String, location_name: "UserId")
+
+    ImageUsageResourceType.add_member(:resource_type, Shapes::ShapeRef.new(shape: ImageUsageResourceTypeName, location_name: "resourceType"))
+    ImageUsageResourceType.add_member(:resource_type_options, Shapes::ShapeRef.new(shape: ImageUsageResourceTypeOptionList, location_name: "resourceTypeOptionSet"))
+    ImageUsageResourceType.struct_class = Types::ImageUsageResourceType
+
+    ImageUsageResourceTypeList.member = Shapes::ShapeRef.new(shape: ImageUsageResourceType, location_name: "item")
+
+    ImageUsageResourceTypeOption.add_member(:option_name, Shapes::ShapeRef.new(shape: String, location_name: "optionName"))
+    ImageUsageResourceTypeOption.add_member(:option_values, Shapes::ShapeRef.new(shape: ImageUsageResourceTypeOptionValuesList, location_name: "optionValueSet"))
+    ImageUsageResourceTypeOption.struct_class = Types::ImageUsageResourceTypeOption
+
+    ImageUsageResourceTypeOptionList.member = Shapes::ShapeRef.new(shape: ImageUsageResourceTypeOption, location_name: "item")
+
+    ImageUsageResourceTypeOptionRequest.add_member(:option_name, Shapes::ShapeRef.new(shape: String, location_name: "OptionName"))
+    ImageUsageResourceTypeOptionRequest.add_member(:option_values, Shapes::ShapeRef.new(shape: ImageUsageResourceTypeOptionValuesList, location_name: "OptionValue"))
+    ImageUsageResourceTypeOptionRequest.struct_class = Types::ImageUsageResourceTypeOptionRequest
+
+    ImageUsageResourceTypeOptionRequestList.member = Shapes::ShapeRef.new(shape: ImageUsageResourceTypeOptionRequest)
+
+    ImageUsageResourceTypeOptionValuesList.member = Shapes::ShapeRef.new(shape: ImageUsageResourceTypeOptionValue, location_name: "item")
+
+    ImageUsageResourceTypeRequest.add_member(:resource_type, Shapes::ShapeRef.new(shape: ImageUsageResourceTypeName, location_name: "ResourceType"))
+    ImageUsageResourceTypeRequest.add_member(:resource_type_options, Shapes::ShapeRef.new(shape: ImageUsageResourceTypeOptionRequestList, location_name: "ResourceTypeOption"))
+    ImageUsageResourceTypeRequest.struct_class = Types::ImageUsageResourceTypeRequest
+
+    ImageUsageResourceTypeRequestList.member = Shapes::ShapeRef.new(shape: ImageUsageResourceTypeRequest)
+
     ImportClientVpnClientCertificateRevocationListRequest.add_member(:client_vpn_endpoint_id, Shapes::ShapeRef.new(shape: ClientVpnEndpointId, required: true, location_name: "ClientVpnEndpointId"))
     ImportClientVpnClientCertificateRevocationListRequest.add_member(:certificate_revocation_list, Shapes::ShapeRef.new(shape: String, required: true, location_name: "CertificateRevocationList"))
     ImportClientVpnClientCertificateRevocationListRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
@@ -10882,6 +11298,7 @@ module Aws::EC2
     ImportInstanceTaskDetails.struct_class = Types::ImportInstanceTaskDetails
 
     ImportInstanceVolumeDetailItem.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZone"))
+    ImportInstanceVolumeDetailItem.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZoneId"))
     ImportInstanceVolumeDetailItem.add_member(:bytes_converted, Shapes::ShapeRef.new(shape: Long, location_name: "bytesConverted"))
     ImportInstanceVolumeDetailItem.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
     ImportInstanceVolumeDetailItem.add_member(:image, Shapes::ShapeRef.new(shape: DiskImageDescription, location_name: "image"))
@@ -10933,8 +11350,9 @@ module Aws::EC2
 
     ImportTaskIdList.member = Shapes::ShapeRef.new(shape: ImportImageTaskId, location_name: "ImportTaskId")
 
+    ImportVolumeRequest.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: AvailabilityZoneId, location_name: "AvailabilityZoneId"))
     ImportVolumeRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
-    ImportVolumeRequest.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, required: true, location_name: "availabilityZone"))
+    ImportVolumeRequest.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZone"))
     ImportVolumeRequest.add_member(:image, Shapes::ShapeRef.new(shape: DiskImageDetail, required: true, location_name: "image"))
     ImportVolumeRequest.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
     ImportVolumeRequest.add_member(:volume, Shapes::ShapeRef.new(shape: VolumeDetail, required: true, location_name: "volume"))
@@ -10944,6 +11362,7 @@ module Aws::EC2
     ImportVolumeResult.struct_class = Types::ImportVolumeResult
 
     ImportVolumeTaskDetails.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZone"))
+    ImportVolumeTaskDetails.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZoneId"))
     ImportVolumeTaskDetails.add_member(:bytes_converted, Shapes::ShapeRef.new(shape: Long, location_name: "bytesConverted"))
     ImportVolumeTaskDetails.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
     ImportVolumeTaskDetails.add_member(:image, Shapes::ShapeRef.new(shape: DiskImageDescription, location_name: "image"))
@@ -10965,6 +11384,11 @@ module Aws::EC2
     InferenceDeviceMemoryInfo.add_member(:size_in_mi_b, Shapes::ShapeRef.new(shape: InferenceDeviceMemorySize, location_name: "sizeInMiB"))
     InferenceDeviceMemoryInfo.struct_class = Types::InferenceDeviceMemoryInfo
 
+    InitializationStatusDetails.add_member(:initialization_type, Shapes::ShapeRef.new(shape: InitializationType, location_name: "initializationType"))
+    InitializationStatusDetails.add_member(:progress, Shapes::ShapeRef.new(shape: Long, location_name: "progress"))
+    InitializationStatusDetails.add_member(:estimated_time_to_complete_in_seconds, Shapes::ShapeRef.new(shape: Long, location_name: "estimatedTimeToCompleteInSeconds"))
+    InitializationStatusDetails.struct_class = Types::InitializationStatusDetails
+
     InsideCidrBlocksStringList.member = Shapes::ShapeRef.new(shape: String, location_name: "item")
 
     Instance.add_member(:architecture, Shapes::ShapeRef.new(shape: ArchitectureValues, location_name: "architecture"))
@@ -10989,6 +11413,7 @@ module Aws::EC2
     Instance.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
     Instance.add_member(:virtualization_type, Shapes::ShapeRef.new(shape: VirtualizationType, location_name: "virtualizationType"))
     Instance.add_member(:cpu_options, Shapes::ShapeRef.new(shape: CpuOptions, location_name: "cpuOptions"))
+    Instance.add_member(:capacity_block_id, Shapes::ShapeRef.new(shape: String, location_name: "capacityBlockId"))
     Instance.add_member(:capacity_reservation_id, Shapes::ShapeRef.new(shape: String, location_name: "capacityReservationId"))
     Instance.add_member(:capacity_reservation_specification, Shapes::ShapeRef.new(shape: CapacityReservationSpecificationResponse, location_name: "capacityReservationSpecification"))
     Instance.add_member(:hibernation_options, Shapes::ShapeRef.new(shape: HibernationOptions, location_name: "hibernationOptions"))
@@ -11073,6 +11498,14 @@ module Aws::EC2
     InstanceCapacity.add_member(:total_capacity, Shapes::ShapeRef.new(shape: Integer, location_name: "totalCapacity"))
     InstanceCapacity.struct_class = Types::InstanceCapacity
 
+    InstanceConnectEndpointDnsNames.add_member(:dns_name, Shapes::ShapeRef.new(shape: String, location_name: "dnsName"))
+    InstanceConnectEndpointDnsNames.add_member(:fips_dns_name, Shapes::ShapeRef.new(shape: String, location_name: "fipsDnsName"))
+    InstanceConnectEndpointDnsNames.struct_class = Types::InstanceConnectEndpointDnsNames
+
+    InstanceConnectEndpointPublicDnsNames.add_member(:ipv_4, Shapes::ShapeRef.new(shape: InstanceConnectEndpointDnsNames, location_name: "ipv4"))
+    InstanceConnectEndpointPublicDnsNames.add_member(:dualstack, Shapes::ShapeRef.new(shape: InstanceConnectEndpointDnsNames, location_name: "dualstack"))
+    InstanceConnectEndpointPublicDnsNames.struct_class = Types::InstanceConnectEndpointPublicDnsNames
+
     InstanceConnectEndpointSet.member = Shapes::ShapeRef.new(shape: Ec2InstanceConnectEndpoint, location_name: "item")
 
     InstanceCount.add_member(:instance_count, Shapes::ShapeRef.new(shape: Integer, location_name: "instanceCount"))
@@ -11197,6 +11630,7 @@ module Aws::EC2
     InstanceList.member = Shapes::ShapeRef.new(shape: Instance, location_name: "item")
 
     InstanceMaintenanceOptions.add_member(:auto_recovery, Shapes::ShapeRef.new(shape: InstanceAutoRecoveryState, location_name: "autoRecovery"))
+    InstanceMaintenanceOptions.add_member(:reboot_migration, Shapes::ShapeRef.new(shape: InstanceRebootMigrationState, location_name: "rebootMigration"))
     InstanceMaintenanceOptions.struct_class = Types::InstanceMaintenanceOptions
 
     InstanceMaintenanceOptionsRequest.add_member(:auto_recovery, Shapes::ShapeRef.new(shape: InstanceAutoRecoveryState, location_name: "AutoRecovery"))
@@ -11395,6 +11829,7 @@ module Aws::EC2
     InstanceStateChangeList.member = Shapes::ShapeRef.new(shape: InstanceStateChange, location_name: "item")
 
     InstanceStatus.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZone"))
+    InstanceStatus.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: AvailabilityZoneId, location_name: "availabilityZoneId"))
     InstanceStatus.add_member(:outpost_arn, Shapes::ShapeRef.new(shape: String, location_name: "outpostArn"))
     InstanceStatus.add_member(:operator, Shapes::ShapeRef.new(shape: OperatorResponse, location_name: "operator"))
     InstanceStatus.add_member(:events, Shapes::ShapeRef.new(shape: InstanceStatusEventList, location_name: "eventsSet"))
@@ -11446,6 +11881,7 @@ module Aws::EC2
     InstanceTopology.add_member(:network_nodes, Shapes::ShapeRef.new(shape: NetworkNodesList, location_name: "networkNodeSet"))
     InstanceTopology.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZone"))
     InstanceTopology.add_member(:zone_id, Shapes::ShapeRef.new(shape: String, location_name: "zoneId"))
+    InstanceTopology.add_member(:capacity_block_id, Shapes::ShapeRef.new(shape: String, location_name: "capacityBlockId"))
     InstanceTopology.struct_class = Types::InstanceTopology
 
     InstanceTypeInfo.add_member(:instance_type, Shapes::ShapeRef.new(shape: InstanceType, location_name: "instanceType"))
@@ -11478,6 +11914,7 @@ module Aws::EC2
     InstanceTypeInfo.add_member(:media_accelerator_info, Shapes::ShapeRef.new(shape: MediaAcceleratorInfo, location_name: "mediaAcceleratorInfo"))
     InstanceTypeInfo.add_member(:neuron_info, Shapes::ShapeRef.new(shape: NeuronInfo, location_name: "neuronInfo"))
     InstanceTypeInfo.add_member(:phc_support, Shapes::ShapeRef.new(shape: PhcSupport, location_name: "phcSupport"))
+    InstanceTypeInfo.add_member(:reboot_migration_support, Shapes::ShapeRef.new(shape: RebootMigrationSupport, location_name: "rebootMigrationSupport"))
     InstanceTypeInfo.struct_class = Types::InstanceTypeInfo
 
     InstanceTypeInfoFromInstanceRequirements.add_member(:instance_type, Shapes::ShapeRef.new(shape: String, location_name: "instanceType"))
@@ -12170,6 +12607,7 @@ module Aws::EC2
     LaunchTemplateOverridesList.member = Shapes::ShapeRef.new(shape: LaunchTemplateOverrides, location_name: "item")
 
     LaunchTemplatePlacement.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZone"))
+    LaunchTemplatePlacement.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: AvailabilityZoneId, location_name: "availabilityZoneId"))
     LaunchTemplatePlacement.add_member(:affinity, Shapes::ShapeRef.new(shape: String, location_name: "affinity"))
     LaunchTemplatePlacement.add_member(:group_name, Shapes::ShapeRef.new(shape: String, location_name: "groupName"))
     LaunchTemplatePlacement.add_member(:host_id, Shapes::ShapeRef.new(shape: String, location_name: "hostId"))
@@ -12181,6 +12619,7 @@ module Aws::EC2
     LaunchTemplatePlacement.struct_class = Types::LaunchTemplatePlacement
 
     LaunchTemplatePlacementRequest.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "AvailabilityZone"))
+    LaunchTemplatePlacementRequest.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: AvailabilityZoneId, location_name: "AvailabilityZoneId"))
     LaunchTemplatePlacementRequest.add_member(:affinity, Shapes::ShapeRef.new(shape: String, location_name: "Affinity"))
     LaunchTemplatePlacementRequest.add_member(:group_name, Shapes::ShapeRef.new(shape: PlacementGroupName, location_name: "GroupName"))
     LaunchTemplatePlacementRequest.add_member(:host_id, Shapes::ShapeRef.new(shape: DedicatedHostId, location_name: "HostId"))
@@ -12446,8 +12885,40 @@ module Aws::EC2
 
     MacHostList.member = Shapes::ShapeRef.new(shape: MacHost, location_name: "item")
 
+    MacModificationTask.add_member(:instance_id, Shapes::ShapeRef.new(shape: InstanceId, location_name: "instanceId"))
+    MacModificationTask.add_member(:mac_modification_task_id, Shapes::ShapeRef.new(shape: MacModificationTaskId, location_name: "macModificationTaskId"))
+    MacModificationTask.add_member(:mac_system_integrity_protection_config, Shapes::ShapeRef.new(shape: MacSystemIntegrityProtectionConfiguration, location_name: "macSystemIntegrityProtectionConfig"))
+    MacModificationTask.add_member(:start_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "startTime"))
+    MacModificationTask.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
+    MacModificationTask.add_member(:task_state, Shapes::ShapeRef.new(shape: MacModificationTaskState, location_name: "taskState"))
+    MacModificationTask.add_member(:task_type, Shapes::ShapeRef.new(shape: MacModificationTaskType, location_name: "taskType"))
+    MacModificationTask.struct_class = Types::MacModificationTask
+
+    MacModificationTaskIdList.member = Shapes::ShapeRef.new(shape: MacModificationTaskId, location_name: "item")
+
+    MacModificationTaskList.member = Shapes::ShapeRef.new(shape: MacModificationTask, location_name: "item")
+
     MacOSVersionStringList.member = Shapes::ShapeRef.new(shape: String, location_name: "item")
 
+    MacSystemIntegrityProtectionConfiguration.add_member(:apple_internal, Shapes::ShapeRef.new(shape: MacSystemIntegrityProtectionSettingStatus, location_name: "appleInternal"))
+    MacSystemIntegrityProtectionConfiguration.add_member(:base_system, Shapes::ShapeRef.new(shape: MacSystemIntegrityProtectionSettingStatus, location_name: "baseSystem"))
+    MacSystemIntegrityProtectionConfiguration.add_member(:debugging_restrictions, Shapes::ShapeRef.new(shape: MacSystemIntegrityProtectionSettingStatus, location_name: "debuggingRestrictions"))
+    MacSystemIntegrityProtectionConfiguration.add_member(:d_trace_restrictions, Shapes::ShapeRef.new(shape: MacSystemIntegrityProtectionSettingStatus, location_name: "dTraceRestrictions"))
+    MacSystemIntegrityProtectionConfiguration.add_member(:filesystem_protections, Shapes::ShapeRef.new(shape: MacSystemIntegrityProtectionSettingStatus, location_name: "filesystemProtections"))
+    MacSystemIntegrityProtectionConfiguration.add_member(:kext_signing, Shapes::ShapeRef.new(shape: MacSystemIntegrityProtectionSettingStatus, location_name: "kextSigning"))
+    MacSystemIntegrityProtectionConfiguration.add_member(:nvram_protections, Shapes::ShapeRef.new(shape: MacSystemIntegrityProtectionSettingStatus, location_name: "nvramProtections"))
+    MacSystemIntegrityProtectionConfiguration.add_member(:status, Shapes::ShapeRef.new(shape: MacSystemIntegrityProtectionSettingStatus, location_name: "status"))
+    MacSystemIntegrityProtectionConfiguration.struct_class = Types::MacSystemIntegrityProtectionConfiguration
+
+    MacSystemIntegrityProtectionConfigurationRequest.add_member(:apple_internal, Shapes::ShapeRef.new(shape: MacSystemIntegrityProtectionSettingStatus, location_name: "AppleInternal"))
+    MacSystemIntegrityProtectionConfigurationRequest.add_member(:base_system, Shapes::ShapeRef.new(shape: MacSystemIntegrityProtectionSettingStatus, location_name: "BaseSystem"))
+    MacSystemIntegrityProtectionConfigurationRequest.add_member(:debugging_restrictions, Shapes::ShapeRef.new(shape: MacSystemIntegrityProtectionSettingStatus, location_name: "DebuggingRestrictions"))
+    MacSystemIntegrityProtectionConfigurationRequest.add_member(:d_trace_restrictions, Shapes::ShapeRef.new(shape: MacSystemIntegrityProtectionSettingStatus, location_name: "DTraceRestrictions"))
+    MacSystemIntegrityProtectionConfigurationRequest.add_member(:filesystem_protections, Shapes::ShapeRef.new(shape: MacSystemIntegrityProtectionSettingStatus, location_name: "FilesystemProtections"))
+    MacSystemIntegrityProtectionConfigurationRequest.add_member(:kext_signing, Shapes::ShapeRef.new(shape: MacSystemIntegrityProtectionSettingStatus, location_name: "KextSigning"))
+    MacSystemIntegrityProtectionConfigurationRequest.add_member(:nvram_protections, Shapes::ShapeRef.new(shape: MacSystemIntegrityProtectionSettingStatus, location_name: "NvramProtections"))
+    MacSystemIntegrityProtectionConfigurationRequest.struct_class = Types::MacSystemIntegrityProtectionConfigurationRequest
+
     MaintenanceDetails.add_member(:pending_maintenance, Shapes::ShapeRef.new(shape: String, location_name: "pendingMaintenance"))
     MaintenanceDetails.add_member(:maintenance_auto_applied_after, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "maintenanceAutoAppliedAfter"))
     MaintenanceDetails.add_member(:last_maintenance_applied, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "lastMaintenanceApplied"))
@@ -12467,6 +12938,10 @@ module Aws::EC2
 
     ManagedPrefixListSet.member = Shapes::ShapeRef.new(shape: ManagedPrefixList, location_name: "item")
 
+    MarketplaceProductCodeList.member = Shapes::ShapeRef.new(shape: MarketplaceProductCode, location_name: "item")
+
+    MarketplaceProductCodeRequestList.member = Shapes::ShapeRef.new(shape: MarketplaceProductCodeRequest, location_name: "item")
+
     MediaAcceleratorInfo.add_member(:accelerators, Shapes::ShapeRef.new(shape: MediaDeviceInfoList, location_name: "accelerators"))
     MediaAcceleratorInfo.add_member(:total_media_memory_in_mi_b, Shapes::ShapeRef.new(shape: TotalMediaMemory, location_name: "totalMediaMemoryInMiB"))
     MediaAcceleratorInfo.struct_class = Types::MediaAcceleratorInfo
@@ -12673,6 +13148,16 @@ module Aws::EC2
     ModifyInstanceCapacityReservationAttributesResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
     ModifyInstanceCapacityReservationAttributesResult.struct_class = Types::ModifyInstanceCapacityReservationAttributesResult
 
+    ModifyInstanceConnectEndpointRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    ModifyInstanceConnectEndpointRequest.add_member(:instance_connect_endpoint_id, Shapes::ShapeRef.new(shape: InstanceConnectEndpointId, required: true, location_name: "InstanceConnectEndpointId"))
+    ModifyInstanceConnectEndpointRequest.add_member(:ip_address_type, Shapes::ShapeRef.new(shape: IpAddressType, location_name: "IpAddressType"))
+    ModifyInstanceConnectEndpointRequest.add_member(:security_group_ids, Shapes::ShapeRef.new(shape: SecurityGroupIdStringListRequest, location_name: "SecurityGroupId"))
+    ModifyInstanceConnectEndpointRequest.add_member(:preserve_client_ip, Shapes::ShapeRef.new(shape: Boolean, location_name: "PreserveClientIp"))
+    ModifyInstanceConnectEndpointRequest.struct_class = Types::ModifyInstanceConnectEndpointRequest
+
+    ModifyInstanceConnectEndpointResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
+    ModifyInstanceConnectEndpointResult.struct_class = Types::ModifyInstanceConnectEndpointResult
+
     ModifyInstanceCpuOptionsRequest.add_member(:instance_id, Shapes::ShapeRef.new(shape: InstanceId, required: true, location_name: "InstanceId"))
     ModifyInstanceCpuOptionsRequest.add_member(:core_count, Shapes::ShapeRef.new(shape: Integer, required: true, location_name: "CoreCount"))
     ModifyInstanceCpuOptionsRequest.add_member(:threads_per_core, Shapes::ShapeRef.new(shape: Integer, required: true, location_name: "ThreadsPerCore"))
@@ -12714,11 +13199,13 @@ module Aws::EC2
 
     ModifyInstanceMaintenanceOptionsRequest.add_member(:instance_id, Shapes::ShapeRef.new(shape: InstanceId, required: true, location_name: "InstanceId"))
     ModifyInstanceMaintenanceOptionsRequest.add_member(:auto_recovery, Shapes::ShapeRef.new(shape: InstanceAutoRecoveryState, location_name: "AutoRecovery"))
+    ModifyInstanceMaintenanceOptionsRequest.add_member(:reboot_migration, Shapes::ShapeRef.new(shape: InstanceRebootMigrationState, location_name: "RebootMigration"))
     ModifyInstanceMaintenanceOptionsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     ModifyInstanceMaintenanceOptionsRequest.struct_class = Types::ModifyInstanceMaintenanceOptionsRequest
 
     ModifyInstanceMaintenanceOptionsResult.add_member(:instance_id, Shapes::ShapeRef.new(shape: String, location_name: "instanceId"))
     ModifyInstanceMaintenanceOptionsResult.add_member(:auto_recovery, Shapes::ShapeRef.new(shape: InstanceAutoRecoveryState, location_name: "autoRecovery"))
+    ModifyInstanceMaintenanceOptionsResult.add_member(:reboot_migration, Shapes::ShapeRef.new(shape: InstanceRebootMigrationState, location_name: "rebootMigration"))
     ModifyInstanceMaintenanceOptionsResult.struct_class = Types::ModifyInstanceMaintenanceOptionsResult
 
     ModifyInstanceMetadataDefaultsRequest.add_member(:http_tokens, Shapes::ShapeRef.new(shape: MetadataDefaultHttpTokensState, location_name: "HttpTokens"))
@@ -12863,6 +13350,7 @@ module Aws::EC2
     ModifyNetworkInterfaceAttributeRequest.add_member(:enable_primary_ipv_6, Shapes::ShapeRef.new(shape: Boolean, location_name: "EnablePrimaryIpv6"))
     ModifyNetworkInterfaceAttributeRequest.add_member(:connection_tracking_specification, Shapes::ShapeRef.new(shape: ConnectionTrackingSpecificationRequest, location_name: "ConnectionTrackingSpecification"))
     ModifyNetworkInterfaceAttributeRequest.add_member(:associate_public_ip_address, Shapes::ShapeRef.new(shape: Boolean, location_name: "AssociatePublicIpAddress"))
+    ModifyNetworkInterfaceAttributeRequest.add_member(:associated_subnet_ids, Shapes::ShapeRef.new(shape: SubnetIdList, location_name: "AssociatedSubnetId"))
     ModifyNetworkInterfaceAttributeRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     ModifyNetworkInterfaceAttributeRequest.add_member(:network_interface_id, Shapes::ShapeRef.new(shape: NetworkInterfaceId, required: true, location_name: "networkInterfaceId"))
     ModifyNetworkInterfaceAttributeRequest.add_member(:description, Shapes::ShapeRef.new(shape: AttributeValue, location_name: "description"))
@@ -12881,6 +13369,14 @@ module Aws::EC2
     ModifyPrivateDnsNameOptionsResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
     ModifyPrivateDnsNameOptionsResult.struct_class = Types::ModifyPrivateDnsNameOptionsResult
 
+    ModifyPublicIpDnsNameOptionsRequest.add_member(:network_interface_id, Shapes::ShapeRef.new(shape: NetworkInterfaceId, required: true, location_name: "NetworkInterfaceId"))
+    ModifyPublicIpDnsNameOptionsRequest.add_member(:hostname_type, Shapes::ShapeRef.new(shape: PublicIpDnsOption, required: true, location_name: "HostnameType"))
+    ModifyPublicIpDnsNameOptionsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    ModifyPublicIpDnsNameOptionsRequest.struct_class = Types::ModifyPublicIpDnsNameOptionsRequest
+
+    ModifyPublicIpDnsNameOptionsResult.add_member(:successful, Shapes::ShapeRef.new(shape: Boolean, location_name: "successful"))
+    ModifyPublicIpDnsNameOptionsResult.struct_class = Types::ModifyPublicIpDnsNameOptionsResult
+
     ModifyReservedInstancesRequest.add_member(:reserved_instances_ids, Shapes::ShapeRef.new(shape: ReservedInstancesIdStringList, required: true, location_name: "ReservedInstancesId"))
     ModifyReservedInstancesRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "clientToken"))
     ModifyReservedInstancesRequest.add_member(:target_configurations, Shapes::ShapeRef.new(shape: ReservedInstancesConfigurationList, required: true, location_name: "ReservedInstancesConfigurationSetItemType"))
@@ -13322,6 +13818,7 @@ module Aws::EC2
     ModifyVpnTunnelOptionsRequest.add_member(:tunnel_options, Shapes::ShapeRef.new(shape: ModifyVpnTunnelOptionsSpecification, required: true, location_name: "TunnelOptions"))
     ModifyVpnTunnelOptionsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     ModifyVpnTunnelOptionsRequest.add_member(:skip_tunnel_replacement, Shapes::ShapeRef.new(shape: Boolean, location_name: "SkipTunnelReplacement"))
+    ModifyVpnTunnelOptionsRequest.add_member(:pre_shared_key_storage, Shapes::ShapeRef.new(shape: String, location_name: "PreSharedKeyStorage"))
     ModifyVpnTunnelOptionsRequest.struct_class = Types::ModifyVpnTunnelOptionsRequest
 
     ModifyVpnTunnelOptionsResult.add_member(:vpn_connection, Shapes::ShapeRef.new(shape: VpnConnection, location_name: "vpnConnection"))
@@ -13591,6 +14088,8 @@ module Aws::EC2
     NetworkInterface.add_member(:outpost_arn, Shapes::ShapeRef.new(shape: String, location_name: "outpostArn"))
     NetworkInterface.add_member(:owner_id, Shapes::ShapeRef.new(shape: String, location_name: "ownerId"))
     NetworkInterface.add_member(:private_dns_name, Shapes::ShapeRef.new(shape: String, location_name: "privateDnsName"))
+    NetworkInterface.add_member(:public_dns_name, Shapes::ShapeRef.new(shape: String, location_name: "publicDnsName"))
+    NetworkInterface.add_member(:public_ip_dns_name_options, Shapes::ShapeRef.new(shape: PublicIpDnsNameOptions, location_name: "publicIpDnsNameOptions"))
     NetworkInterface.add_member(:private_ip_address, Shapes::ShapeRef.new(shape: String, location_name: "privateIpAddress"))
     NetworkInterface.add_member(:private_ip_addresses, Shapes::ShapeRef.new(shape: NetworkInterfacePrivateIpAddressList, location_name: "privateIpAddressesSet"))
     NetworkInterface.add_member(:ipv_4_prefixes, Shapes::ShapeRef.new(shape: Ipv4PrefixesList, location_name: "ipv4PrefixSet"))
@@ -13606,6 +14105,7 @@ module Aws::EC2
     NetworkInterface.add_member(:ipv_6_native, Shapes::ShapeRef.new(shape: Boolean, location_name: "ipv6Native"))
     NetworkInterface.add_member(:ipv_6_address, Shapes::ShapeRef.new(shape: String, location_name: "ipv6Address"))
     NetworkInterface.add_member(:operator, Shapes::ShapeRef.new(shape: OperatorResponse, location_name: "operator"))
+    NetworkInterface.add_member(:associated_subnets, Shapes::ShapeRef.new(shape: AssociatedSubnetList, location_name: "associatedSubnetSet"))
     NetworkInterface.struct_class = Types::NetworkInterface
 
     NetworkInterfaceAssociation.add_member(:allocation_id, Shapes::ShapeRef.new(shape: String, location_name: "allocationId"))
@@ -13648,6 +14148,7 @@ module Aws::EC2
     NetworkInterfaceIdSet.member = Shapes::ShapeRef.new(shape: String, location_name: "item")
 
     NetworkInterfaceIpv6Address.add_member(:ipv_6_address, Shapes::ShapeRef.new(shape: String, location_name: "ipv6Address"))
+    NetworkInterfaceIpv6Address.add_member(:public_ipv_6_dns_name, Shapes::ShapeRef.new(shape: String, location_name: "publicIpv6DnsName"))
     NetworkInterfaceIpv6Address.add_member(:is_primary_ipv_6, Shapes::ShapeRef.new(shape: Boolean, location_name: "isPrimaryIpv6"))
     NetworkInterfaceIpv6Address.struct_class = Types::NetworkInterfaceIpv6Address
 
@@ -13924,6 +14425,7 @@ module Aws::EC2
     Phase2IntegrityAlgorithmsRequestListValue.add_member(:value, Shapes::ShapeRef.new(shape: String, location_name: "Value"))
     Phase2IntegrityAlgorithmsRequestListValue.struct_class = Types::Phase2IntegrityAlgorithmsRequestListValue
 
+    Placement.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: AvailabilityZoneId, location_name: "availabilityZoneId"))
     Placement.add_member(:affinity, Shapes::ShapeRef.new(shape: String, location_name: "affinity"))
     Placement.add_member(:group_name, Shapes::ShapeRef.new(shape: PlacementGroupName, location_name: "groupName"))
     Placement.add_member(:partition_number, Shapes::ShapeRef.new(shape: Integer, location_name: "partitionNumber"))
@@ -14145,6 +14647,12 @@ module Aws::EC2
     PtrUpdateStatus.add_member(:reason, Shapes::ShapeRef.new(shape: String, location_name: "reason"))
     PtrUpdateStatus.struct_class = Types::PtrUpdateStatus
 
+    PublicIpDnsNameOptions.add_member(:dns_hostname_type, Shapes::ShapeRef.new(shape: String, location_name: "dnsHostnameType"))
+    PublicIpDnsNameOptions.add_member(:public_ipv_4_dns_name, Shapes::ShapeRef.new(shape: String, location_name: "publicIpv4DnsName"))
+    PublicIpDnsNameOptions.add_member(:public_ipv_6_dns_name, Shapes::ShapeRef.new(shape: String, location_name: "publicIpv6DnsName"))
+    PublicIpDnsNameOptions.add_member(:public_dual_stack_dns_name, Shapes::ShapeRef.new(shape: String, location_name: "publicDualStackDnsName"))
+    PublicIpDnsNameOptions.struct_class = Types::PublicIpDnsNameOptions
+
     PublicIpStringList.member = Shapes::ShapeRef.new(shape: String, location_name: "PublicIp")
 
     PublicIpv4Pool.add_member(:pool_id, Shapes::ShapeRef.new(shape: String, location_name: "poolId"))
@@ -14193,6 +14701,7 @@ module Aws::EC2
     PurchaseCapacityBlockRequest.struct_class = Types::PurchaseCapacityBlockRequest
 
     PurchaseCapacityBlockResult.add_member(:capacity_reservation, Shapes::ShapeRef.new(shape: CapacityReservation, location_name: "capacityReservation"))
+    PurchaseCapacityBlockResult.add_member(:capacity_blocks, Shapes::ShapeRef.new(shape: CapacityBlockSet, location_name: "capacityBlockSet"))
     PurchaseCapacityBlockResult.struct_class = Types::PurchaseCapacityBlockResult
 
     PurchaseHostReservationRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "ClientToken"))
@@ -14465,6 +14974,7 @@ module Aws::EC2
     ReplaceRouteRequest.add_member(:local_gateway_id, Shapes::ShapeRef.new(shape: LocalGatewayId, location_name: "LocalGatewayId"))
     ReplaceRouteRequest.add_member(:carrier_gateway_id, Shapes::ShapeRef.new(shape: CarrierGatewayId, location_name: "CarrierGatewayId"))
     ReplaceRouteRequest.add_member(:core_network_arn, Shapes::ShapeRef.new(shape: CoreNetworkArn, location_name: "CoreNetworkArn"))
+    ReplaceRouteRequest.add_member(:odb_network_arn, Shapes::ShapeRef.new(shape: OdbNetworkArn, location_name: "OdbNetworkArn"))
     ReplaceRouteRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     ReplaceRouteRequest.add_member(:route_table_id, Shapes::ShapeRef.new(shape: RouteTableId, required: true, location_name: "routeTableId"))
     ReplaceRouteRequest.add_member(:destination_cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "destinationCidrBlock"))
@@ -14545,8 +15055,8 @@ module Aws::EC2
     RequestLaunchTemplateData.add_member(:instance_initiated_shutdown_behavior, Shapes::ShapeRef.new(shape: ShutdownBehavior, location_name: "InstanceInitiatedShutdownBehavior"))
     RequestLaunchTemplateData.add_member(:user_data, Shapes::ShapeRef.new(shape: SensitiveUserData, location_name: "UserData"))
     RequestLaunchTemplateData.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: LaunchTemplateTagSpecificationRequestList, location_name: "TagSpecification"))
-    RequestLaunchTemplateData.add_member(:elastic_gpu_specifications, Shapes::ShapeRef.new(shape: ElasticGpuSpecificationList, location_name: "ElasticGpuSpecification"))
-    RequestLaunchTemplateData.add_member(:elastic_inference_accelerators, Shapes::ShapeRef.new(shape: LaunchTemplateElasticInferenceAcceleratorList, location_name: "ElasticInferenceAccelerator"))
+    RequestLaunchTemplateData.add_member(:elastic_gpu_specifications, Shapes::ShapeRef.new(shape: ElasticGpuSpecificationList, deprecated: true, location_name: "ElasticGpuSpecification", metadata: {"deprecatedMessage" => "Specifying Elastic Graphics accelerators is no longer supported on the RunInstances API.", "deprecatedSince" => "2024-01-08"}))
+    RequestLaunchTemplateData.add_member(:elastic_inference_accelerators, Shapes::ShapeRef.new(shape: LaunchTemplateElasticInferenceAcceleratorList, deprecated: true, location_name: "ElasticInferenceAccelerator", metadata: {"deprecatedMessage" => "Specifying Elastic Inference accelerators is no longer supported on the RunInstances API.", "deprecatedSince" => "2024-01-08"}))
     RequestLaunchTemplateData.add_member(:security_group_ids, Shapes::ShapeRef.new(shape: SecurityGroupIdStringList, location_name: "SecurityGroupId"))
     RequestLaunchTemplateData.add_member(:security_groups, Shapes::ShapeRef.new(shape: SecurityGroupStringList, location_name: "SecurityGroup"))
     RequestLaunchTemplateData.add_member(:instance_market_options, Shapes::ShapeRef.new(shape: LaunchTemplateInstanceMarketOptionsRequest, location_name: "InstanceMarketOptions"))
@@ -14656,6 +15166,7 @@ module Aws::EC2
     ReservedInstances.add_member(:recurring_charges, Shapes::ShapeRef.new(shape: RecurringChargesList, location_name: "recurringCharges"))
     ReservedInstances.add_member(:scope, Shapes::ShapeRef.new(shape: scope, location_name: "scope"))
     ReservedInstances.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
+    ReservedInstances.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZoneId"))
     ReservedInstances.add_member(:reserved_instances_id, Shapes::ShapeRef.new(shape: String, location_name: "reservedInstancesId"))
     ReservedInstances.add_member(:instance_type, Shapes::ShapeRef.new(shape: InstanceType, location_name: "instanceType"))
     ReservedInstances.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZone"))
@@ -14674,6 +15185,7 @@ module Aws::EC2
     ReservedInstancesConfiguration.add_member(:instance_type, Shapes::ShapeRef.new(shape: InstanceType, location_name: "instanceType"))
     ReservedInstancesConfiguration.add_member(:platform, Shapes::ShapeRef.new(shape: String, location_name: "platform"))
     ReservedInstancesConfiguration.add_member(:scope, Shapes::ShapeRef.new(shape: scope, location_name: "scope"))
+    ReservedInstancesConfiguration.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZoneId"))
     ReservedInstancesConfiguration.struct_class = Types::ReservedInstancesConfiguration
 
     ReservedInstancesConfigurationList.member = Shapes::ShapeRef.new(shape: ReservedInstancesConfiguration, location_name: "item")
@@ -14728,6 +15240,7 @@ module Aws::EC2
     ReservedInstancesOffering.add_member(:pricing_details, Shapes::ShapeRef.new(shape: PricingDetailsList, location_name: "pricingDetailsSet"))
     ReservedInstancesOffering.add_member(:recurring_charges, Shapes::ShapeRef.new(shape: RecurringChargesList, location_name: "recurringCharges"))
     ReservedInstancesOffering.add_member(:scope, Shapes::ShapeRef.new(shape: scope, location_name: "scope"))
+    ReservedInstancesOffering.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: AvailabilityZoneId, location_name: "availabilityZoneId"))
     ReservedInstancesOffering.add_member(:reserved_instances_offering_id, Shapes::ShapeRef.new(shape: String, location_name: "reservedInstancesOfferingId"))
     ReservedInstancesOffering.add_member(:instance_type, Shapes::ShapeRef.new(shape: InstanceType, location_name: "instanceType"))
     ReservedInstancesOffering.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZone"))
@@ -14797,6 +15310,20 @@ module Aws::EC2
     ResourceStatementRequest.add_member(:resource_types, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "ResourceType"))
     ResourceStatementRequest.struct_class = Types::ResourceStatementRequest
 
+    ResourceTypeOption.add_member(:option_name, Shapes::ShapeRef.new(shape: ImageReferenceOptionName, location_name: "OptionName"))
+    ResourceTypeOption.add_member(:option_values, Shapes::ShapeRef.new(shape: ResourceTypeOptionValuesList, location_name: "OptionValue"))
+    ResourceTypeOption.struct_class = Types::ResourceTypeOption
+
+    ResourceTypeOptionList.member = Shapes::ShapeRef.new(shape: ResourceTypeOption)
+
+    ResourceTypeOptionValuesList.member = Shapes::ShapeRef.new(shape: ResourceTypeOptionValue)
+
+    ResourceTypeRequest.add_member(:resource_type, Shapes::ShapeRef.new(shape: ImageReferenceResourceType, location_name: "ResourceType"))
+    ResourceTypeRequest.add_member(:resource_type_options, Shapes::ShapeRef.new(shape: ResourceTypeOptionList, location_name: "ResourceTypeOption"))
+    ResourceTypeRequest.struct_class = Types::ResourceTypeRequest
+
+    ResourceTypeRequestList.member = Shapes::ShapeRef.new(shape: ResourceTypeRequest)
+
     ResponseError.add_member(:code, Shapes::ShapeRef.new(shape: LaunchTemplateErrorCode, location_name: "code"))
     ResponseError.add_member(:message, Shapes::ShapeRef.new(shape: String, location_name: "message"))
     ResponseError.struct_class = Types::ResponseError
@@ -14973,6 +15500,8 @@ module Aws::EC2
     Route.add_member(:state, Shapes::ShapeRef.new(shape: RouteState, location_name: "state"))
     Route.add_member(:vpc_peering_connection_id, Shapes::ShapeRef.new(shape: String, location_name: "vpcPeeringConnectionId"))
     Route.add_member(:core_network_arn, Shapes::ShapeRef.new(shape: CoreNetworkArn, location_name: "coreNetworkArn"))
+    Route.add_member(:odb_network_arn, Shapes::ShapeRef.new(shape: OdbNetworkArn, location_name: "odbNetworkArn"))
+    Route.add_member(:ip_address, Shapes::ShapeRef.new(shape: String, location_name: "ipAddress"))
     Route.struct_class = Types::Route
 
     RouteList.member = Shapes::ShapeRef.new(shape: Route, location_name: "item")
@@ -15087,6 +15616,7 @@ module Aws::EC2
     RouteTableAssociation.add_member(:route_table_id, Shapes::ShapeRef.new(shape: String, location_name: "routeTableId"))
     RouteTableAssociation.add_member(:subnet_id, Shapes::ShapeRef.new(shape: String, location_name: "subnetId"))
     RouteTableAssociation.add_member(:gateway_id, Shapes::ShapeRef.new(shape: String, location_name: "gatewayId"))
+    RouteTableAssociation.add_member(:public_ipv_4_pool, Shapes::ShapeRef.new(shape: String, location_name: "publicIpv4Pool"))
     RouteTableAssociation.add_member(:association_state, Shapes::ShapeRef.new(shape: RouteTableAssociationState, location_name: "associationState"))
     RouteTableAssociation.struct_class = Types::RouteTableAssociation
 
@@ -15137,8 +15667,8 @@ module Aws::EC2
     RunInstancesRequest.add_member(:security_groups, Shapes::ShapeRef.new(shape: SecurityGroupStringList, location_name: "SecurityGroup"))
     RunInstancesRequest.add_member(:subnet_id, Shapes::ShapeRef.new(shape: SubnetId, location_name: "SubnetId"))
     RunInstancesRequest.add_member(:user_data, Shapes::ShapeRef.new(shape: RunInstancesUserData, location_name: "UserData"))
-    RunInstancesRequest.add_member(:elastic_gpu_specification, Shapes::ShapeRef.new(shape: ElasticGpuSpecifications, location_name: "ElasticGpuSpecification"))
-    RunInstancesRequest.add_member(:elastic_inference_accelerators, Shapes::ShapeRef.new(shape: ElasticInferenceAccelerators, location_name: "ElasticInferenceAccelerator"))
+    RunInstancesRequest.add_member(:elastic_gpu_specification, Shapes::ShapeRef.new(shape: ElasticGpuSpecifications, deprecated: true, location_name: "ElasticGpuSpecification", metadata: {"deprecatedMessage" => "Specifying Elastic Graphics accelerators is no longer supported on the RunInstances API.", "deprecatedSince" => "2024-01-08"}))
+    RunInstancesRequest.add_member(:elastic_inference_accelerators, Shapes::ShapeRef.new(shape: ElasticInferenceAccelerators, deprecated: true, location_name: "ElasticInferenceAccelerator", metadata: {"deprecatedMessage" => "Specifying Elastic Inference accelerators is no longer supported on the RunInstances API.", "deprecatedSince" => "2024-01-08"}))
     RunInstancesRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
     RunInstancesRequest.add_member(:launch_template, Shapes::ShapeRef.new(shape: LaunchTemplateSpecification, location_name: "LaunchTemplate"))
     RunInstancesRequest.add_member(:instance_market_options, Shapes::ShapeRef.new(shape: InstanceMarketOptionsRequest, location_name: "InstanceMarketOptions"))
@@ -15435,6 +15965,7 @@ module Aws::EC2
     SecurityGroupVpcAssociation.add_member(:vpc_owner_id, Shapes::ShapeRef.new(shape: String, location_name: "vpcOwnerId"))
     SecurityGroupVpcAssociation.add_member(:state, Shapes::ShapeRef.new(shape: SecurityGroupVpcAssociationState, location_name: "state"))
     SecurityGroupVpcAssociation.add_member(:state_reason, Shapes::ShapeRef.new(shape: String, location_name: "stateReason"))
+    SecurityGroupVpcAssociation.add_member(:group_owner_id, Shapes::ShapeRef.new(shape: String, location_name: "groupOwnerId"))
     SecurityGroupVpcAssociation.struct_class = Types::SecurityGroupVpcAssociation
 
     SecurityGroupVpcAssociationList.member = Shapes::ShapeRef.new(shape: SecurityGroupVpcAssociation, location_name: "item")
@@ -15447,6 +15978,7 @@ module Aws::EC2
     ServiceConfiguration.add_member(:service_id, Shapes::ShapeRef.new(shape: String, location_name: "serviceId"))
     ServiceConfiguration.add_member(:service_name, Shapes::ShapeRef.new(shape: String, location_name: "serviceName"))
     ServiceConfiguration.add_member(:service_state, Shapes::ShapeRef.new(shape: ServiceState, location_name: "serviceState"))
+    ServiceConfiguration.add_member(:availability_zone_ids, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "availabilityZoneIdSet"))
     ServiceConfiguration.add_member(:availability_zones, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "availabilityZoneSet"))
     ServiceConfiguration.add_member(:acceptance_required, Shapes::ShapeRef.new(shape: Boolean, location_name: "acceptanceRequired"))
     ServiceConfiguration.add_member(:manages_vpc_endpoints, Shapes::ShapeRef.new(shape: Boolean, location_name: "managesVpcEndpoints"))
@@ -15468,6 +16000,7 @@ module Aws::EC2
     ServiceDetail.add_member(:service_id, Shapes::ShapeRef.new(shape: String, location_name: "serviceId"))
     ServiceDetail.add_member(:service_type, Shapes::ShapeRef.new(shape: ServiceTypeDetailSet, location_name: "serviceType"))
     ServiceDetail.add_member(:service_region, Shapes::ShapeRef.new(shape: String, location_name: "serviceRegion"))
+    ServiceDetail.add_member(:availability_zone_ids, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "availabilityZoneIdSet"))
     ServiceDetail.add_member(:availability_zones, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "availabilityZoneSet"))
     ServiceDetail.add_member(:owner, Shapes::ShapeRef.new(shape: String, location_name: "owner"))
     ServiceDetail.add_member(:base_endpoint_dns_names, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "baseEndpointDnsNameSet"))
@@ -15707,6 +16240,7 @@ module Aws::EC2
     SpotInstanceRequest.add_member(:launch_group, Shapes::ShapeRef.new(shape: String, location_name: "launchGroup"))
     SpotInstanceRequest.add_member(:launch_specification, Shapes::ShapeRef.new(shape: LaunchSpecification, location_name: "launchSpecification"))
     SpotInstanceRequest.add_member(:launched_availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "launchedAvailabilityZone"))
+    SpotInstanceRequest.add_member(:launched_availability_zone_id, Shapes::ShapeRef.new(shape: String, location_name: "launchedAvailabilityZoneId"))
     SpotInstanceRequest.add_member(:product_description, Shapes::ShapeRef.new(shape: RIProductDescription, location_name: "productDescription"))
     SpotInstanceRequest.add_member(:spot_instance_request_id, Shapes::ShapeRef.new(shape: String, location_name: "spotInstanceRequestId"))
     SpotInstanceRequest.add_member(:spot_price, Shapes::ShapeRef.new(shape: String, location_name: "spotPrice"))
@@ -15775,6 +16309,7 @@ module Aws::EC2
     SpotPlacementScores.member = Shapes::ShapeRef.new(shape: SpotPlacementScore, location_name: "item")
 
     SpotPrice.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZone"))
+    SpotPrice.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZoneId"))
     SpotPrice.add_member(:instance_type, Shapes::ShapeRef.new(shape: InstanceType, location_name: "instanceType"))
     SpotPrice.add_member(:product_description, Shapes::ShapeRef.new(shape: RIProductDescription, location_name: "productDescription"))
     SpotPrice.add_member(:spot_price, Shapes::ShapeRef.new(shape: String, location_name: "spotPrice"))
@@ -15855,6 +16390,7 @@ module Aws::EC2
 
     StopInstancesRequest.add_member(:instance_ids, Shapes::ShapeRef.new(shape: InstanceIdStringList, required: true, location_name: "InstanceId"))
     StopInstancesRequest.add_member(:hibernate, Shapes::ShapeRef.new(shape: Boolean, location_name: "Hibernate"))
+    StopInstancesRequest.add_member(:skip_os_shutdown, Shapes::ShapeRef.new(shape: Boolean, location_name: "SkipOsShutdown"))
     StopInstancesRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     StopInstancesRequest.add_member(:force, Shapes::ShapeRef.new(shape: Boolean, location_name: "force"))
     StopInstancesRequest.struct_class = Types::StopInstancesRequest
@@ -15896,6 +16432,7 @@ module Aws::EC2
     Subnet.add_member(:ipv_6_native, Shapes::ShapeRef.new(shape: Boolean, location_name: "ipv6Native"))
     Subnet.add_member(:private_dns_name_options_on_launch, Shapes::ShapeRef.new(shape: PrivateDnsNameOptionsOnLaunch, location_name: "privateDnsNameOptionsOnLaunch"))
     Subnet.add_member(:block_public_access_states, Shapes::ShapeRef.new(shape: BlockPublicAccessStates, location_name: "blockPublicAccessStates"))
+    Subnet.add_member(:type, Shapes::ShapeRef.new(shape: String, location_name: "type"))
     Subnet.add_member(:subnet_id, Shapes::ShapeRef.new(shape: String, location_name: "subnetId"))
     Subnet.add_member(:state, Shapes::ShapeRef.new(shape: SubnetState, location_name: "state"))
     Subnet.add_member(:vpc_id, Shapes::ShapeRef.new(shape: String, location_name: "vpcId"))
@@ -15934,6 +16471,8 @@ module Aws::EC2
 
     SubnetConfigurationsList.member = Shapes::ShapeRef.new(shape: SubnetConfiguration, location_name: "item")
 
+    SubnetIdList.member = Shapes::ShapeRef.new(shape: SubnetId, location_name: "AssociatedSubnetId")
+
     SubnetIdStringList.member = Shapes::ShapeRef.new(shape: SubnetId, location_name: "SubnetId")
 
     SubnetIpPrefixes.add_member(:subnet_id, Shapes::ShapeRef.new(shape: String, location_name: "subnetId"))
@@ -16069,6 +16608,8 @@ module Aws::EC2
     TerminateConnectionStatusSet.member = Shapes::ShapeRef.new(shape: TerminateConnectionStatus, location_name: "item")
 
     TerminateInstancesRequest.add_member(:instance_ids, Shapes::ShapeRef.new(shape: InstanceIdStringList, required: true, location_name: "InstanceId"))
+    TerminateInstancesRequest.add_member(:force, Shapes::ShapeRef.new(shape: Boolean, location_name: "Force"))
+    TerminateInstancesRequest.add_member(:skip_os_shutdown, Shapes::ShapeRef.new(shape: Boolean, location_name: "SkipOsShutdown"))
     TerminateInstancesRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     TerminateInstancesRequest.struct_class = Types::TerminateInstancesRequest
 
@@ -16681,6 +17222,8 @@ module Aws::EC2
 
     UserIdGroupPairSet.member = Shapes::ShapeRef.new(shape: UserIdGroupPair, location_name: "item")
 
+    UserIdList.member = Shapes::ShapeRef.new(shape: String, location_name: "item")
+
     UserIdStringList.member = Shapes::ShapeRef.new(shape: String, location_name: "UserId")
 
     VCpuCountRange.add_member(:min, Shapes::ShapeRef.new(shape: Integer, location_name: "min"))
@@ -16945,6 +17488,7 @@ module Aws::EC2
 
     VirtualizationTypeSet.member = Shapes::ShapeRef.new(shape: VirtualizationType, location_name: "item")
 
+    Volume.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZoneId"))
     Volume.add_member(:outpost_arn, Shapes::ShapeRef.new(shape: String, location_name: "outpostArn"))
     Volume.add_member(:iops, Shapes::ShapeRef.new(shape: Integer, location_name: "iops"))
     Volume.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
@@ -17046,6 +17590,8 @@ module Aws::EC2
     VolumeStatusItem.add_member(:volume_id, Shapes::ShapeRef.new(shape: String, location_name: "volumeId"))
     VolumeStatusItem.add_member(:volume_status, Shapes::ShapeRef.new(shape: VolumeStatusInfo, location_name: "volumeStatus"))
     VolumeStatusItem.add_member(:attachment_statuses, Shapes::ShapeRef.new(shape: VolumeStatusAttachmentStatusList, location_name: "attachmentStatuses"))
+    VolumeStatusItem.add_member(:initialization_status_details, Shapes::ShapeRef.new(shape: InitializationStatusDetails, location_name: "initializationStatusDetails"))
+    VolumeStatusItem.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZoneId"))
     VolumeStatusItem.struct_class = Types::VolumeStatusItem
 
     VolumeStatusList.member = Shapes::ShapeRef.new(shape: VolumeStatusItem, location_name: "item")
@@ -17260,6 +17806,7 @@ module Aws::EC2
     VpnConnection.add_member(:routes, Shapes::ShapeRef.new(shape: VpnStaticRouteList, location_name: "routes"))
     VpnConnection.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
     VpnConnection.add_member(:vgw_telemetry, Shapes::ShapeRef.new(shape: VgwTelemetryList, location_name: "vgwTelemetry"))
+    VpnConnection.add_member(:pre_shared_key_arn, Shapes::ShapeRef.new(shape: String, location_name: "preSharedKeyArn"))
     VpnConnection.add_member(:vpn_connection_id, Shapes::ShapeRef.new(shape: String, location_name: "vpnConnectionId"))
     VpnConnection.add_member(:state, Shapes::ShapeRef.new(shape: VpnState, location_name: "state"))
     VpnConnection.add_member(:customer_gateway_configuration, Shapes::ShapeRef.new(shape: customerGatewayConfiguration, location_name: "customerGatewayConfiguration"))
@@ -17955,6 +18502,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: CreateDefaultVpcResult)
       end)
 
+      api.add_operation(:create_delegate_mac_volume_ownership_task, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "CreateDelegateMacVolumeOwnershipTask"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: CreateDelegateMacVolumeOwnershipTaskRequest)
+        o.output = Shapes::ShapeRef.new(shape: CreateDelegateMacVolumeOwnershipTaskResult)
+      end)
+
       api.add_operation(:create_dhcp_options, Seahorse::Model::Operation.new.tap do |o|
         o.name = "CreateDhcpOptions"
         o.http_method = "POST"
@@ -18003,6 +18558,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: CreateImageResult)
       end)
 
+      api.add_operation(:create_image_usage_report, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "CreateImageUsageReport"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: CreateImageUsageReportRequest)
+        o.output = Shapes::ShapeRef.new(shape: CreateImageUsageReportResult)
+      end)
+
       api.add_operation(:create_instance_connect_endpoint, Seahorse::Model::Operation.new.tap do |o|
         o.name = "CreateInstanceConnectEndpoint"
         o.http_method = "POST"
@@ -18147,6 +18710,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: CreateLocalGatewayVirtualInterfaceGroupResult)
       end)
 
+      api.add_operation(:create_mac_system_integrity_protection_modification_task, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "CreateMacSystemIntegrityProtectionModificationTask"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: CreateMacSystemIntegrityProtectionModificationTaskRequest)
+        o.output = Shapes::ShapeRef.new(shape: CreateMacSystemIntegrityProtectionModificationTaskResult)
+      end)
+
       api.add_operation(:create_managed_prefix_list, Seahorse::Model::Operation.new.tap do |o|
         o.name = "CreateManagedPrefixList"
         o.http_method = "POST"
@@ -18675,6 +19246,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: DeleteFpgaImageResult)
       end)
 
+      api.add_operation(:delete_image_usage_report, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DeleteImageUsageReport"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DeleteImageUsageReportRequest)
+        o.output = Shapes::ShapeRef.new(shape: DeleteImageUsageReportResult)
+      end)
+
       api.add_operation(:delete_instance_connect_endpoint, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteInstanceConnectEndpoint"
         o.http_method = "POST"
@@ -19437,6 +20016,34 @@ module Aws::EC2
         )
       end)
 
+      api.add_operation(:describe_capacity_block_status, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeCapacityBlockStatus"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeCapacityBlockStatusRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribeCapacityBlockStatusResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
+      api.add_operation(:describe_capacity_blocks, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeCapacityBlocks"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeCapacityBlocksRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribeCapacityBlocksResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
       api.add_operation(:describe_capacity_reservation_billing_requests, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DescribeCapacityReservationBillingRequests"
         o.http_method = "POST"
@@ -19847,6 +20454,48 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: ImageAttribute)
       end)
 
+      api.add_operation(:describe_image_references, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeImageReferences"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeImageReferencesRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribeImageReferencesResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
+      api.add_operation(:describe_image_usage_report_entries, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeImageUsageReportEntries"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeImageUsageReportEntriesRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribeImageUsageReportEntriesResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
+      api.add_operation(:describe_image_usage_reports, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeImageUsageReports"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeImageUsageReportsRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribeImageUsageReportsResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
       api.add_operation(:describe_images, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DescribeImages"
         o.http_method = "POST"
@@ -20287,6 +20936,20 @@ module Aws::EC2
         )
       end)
 
+      api.add_operation(:describe_mac_modification_tasks, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeMacModificationTasks"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeMacModificationTasksRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribeMacModificationTasksResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
       api.add_operation(:describe_managed_prefix_lists, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DescribeManagedPrefixLists"
         o.http_method = "POST"
@@ -21894,6 +22557,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: ExportVerifiedAccessInstanceClientConfigurationResult)
       end)
 
+      api.add_operation(:get_active_vpn_tunnel_status, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetActiveVpnTunnelStatus"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: GetActiveVpnTunnelStatusRequest)
+        o.output = Shapes::ShapeRef.new(shape: GetActiveVpnTunnelStatusResult)
+      end)
+
       api.add_operation(:get_allowed_images_settings, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetAllowedImagesSettings"
         o.http_method = "POST"
@@ -22670,6 +23341,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: ModifyInstanceCapacityReservationAttributesResult)
       end)
 
+      api.add_operation(:modify_instance_connect_endpoint, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ModifyInstanceConnectEndpoint"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ModifyInstanceConnectEndpointRequest)
+        o.output = Shapes::ShapeRef.new(shape: ModifyInstanceConnectEndpointResult)
+      end)
+
       api.add_operation(:modify_instance_cpu_options, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ModifyInstanceCpuOptions"
         o.http_method = "POST"
@@ -22822,6 +23501,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: ModifyPrivateDnsNameOptionsResult)
       end)
 
+      api.add_operation(:modify_public_ip_dns_name_options, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ModifyPublicIpDnsNameOptions"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ModifyPublicIpDnsNameOptionsRequest)
+        o.output = Shapes::ShapeRef.new(shape: ModifyPublicIpDnsNameOptionsResult)
+      end)
+
       api.add_operation(:modify_reserved_instances, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ModifyReservedInstances"
         o.http_method = "POST"