aws-sdk-ec2 1.271.0 → 1.296.0

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

@@ -13,6 +13,16 @@ module Aws::EC2
 
     include Seahorse::Model
 
+    AcceleratorCount = Shapes::StructureShape.new(name: 'AcceleratorCount')
+    AcceleratorCountRequest = Shapes::StructureShape.new(name: 'AcceleratorCountRequest')
+    AcceleratorManufacturer = Shapes::StringShape.new(name: 'AcceleratorManufacturer')
+    AcceleratorManufacturerSet = Shapes::ListShape.new(name: 'AcceleratorManufacturerSet')
+    AcceleratorName = Shapes::StringShape.new(name: 'AcceleratorName')
+    AcceleratorNameSet = Shapes::ListShape.new(name: 'AcceleratorNameSet')
+    AcceleratorTotalMemoryMiB = Shapes::StructureShape.new(name: 'AcceleratorTotalMemoryMiB')
+    AcceleratorTotalMemoryMiBRequest = Shapes::StructureShape.new(name: 'AcceleratorTotalMemoryMiBRequest')
+    AcceleratorType = Shapes::StringShape.new(name: 'AcceleratorType')
+    AcceleratorTypeSet = Shapes::ListShape.new(name: 'AcceleratorTypeSet')
     AcceptReservedInstancesExchangeQuoteRequest = Shapes::StructureShape.new(name: 'AcceptReservedInstancesExchangeQuoteRequest')
     AcceptReservedInstancesExchangeQuoteResult = Shapes::StructureShape.new(name: 'AcceptReservedInstancesExchangeQuoteResult')
     AcceptTransitGatewayMulticastDomainAssociationsRequest = Shapes::StructureShape.new(name: 'AcceptTransitGatewayMulticastDomainAssociationsRequest')
@@ -25,6 +35,12 @@ module Aws::EC2
     AcceptVpcEndpointConnectionsResult = Shapes::StructureShape.new(name: 'AcceptVpcEndpointConnectionsResult')
     AcceptVpcPeeringConnectionRequest = Shapes::StructureShape.new(name: 'AcceptVpcPeeringConnectionRequest')
     AcceptVpcPeeringConnectionResult = Shapes::StructureShape.new(name: 'AcceptVpcPeeringConnectionResult')
+    AccessScopeAnalysisFinding = Shapes::StructureShape.new(name: 'AccessScopeAnalysisFinding')
+    AccessScopeAnalysisFindingList = Shapes::ListShape.new(name: 'AccessScopeAnalysisFindingList')
+    AccessScopePath = Shapes::StructureShape.new(name: 'AccessScopePath')
+    AccessScopePathList = Shapes::ListShape.new(name: 'AccessScopePathList')
+    AccessScopePathListRequest = Shapes::ListShape.new(name: 'AccessScopePathListRequest')
+    AccessScopePathRequest = Shapes::StructureShape.new(name: 'AccessScopePathRequest')
     AccountAttribute = Shapes::StructureShape.new(name: 'AccountAttribute')
     AccountAttributeList = Shapes::ListShape.new(name: 'AccountAttributeList')
     AccountAttributeName = Shapes::StringShape.new(name: 'AccountAttributeName')
@@ -34,11 +50,14 @@ module Aws::EC2
     ActiveInstance = Shapes::StructureShape.new(name: 'ActiveInstance')
     ActiveInstanceSet = Shapes::ListShape.new(name: 'ActiveInstanceSet')
     ActivityStatus = Shapes::StringShape.new(name: 'ActivityStatus')
+    AddIpamOperatingRegion = Shapes::StructureShape.new(name: 'AddIpamOperatingRegion')
+    AddIpamOperatingRegionSet = Shapes::ListShape.new(name: 'AddIpamOperatingRegionSet')
     AddPrefixListEntries = Shapes::ListShape.new(name: 'AddPrefixListEntries')
     AddPrefixListEntry = Shapes::StructureShape.new(name: 'AddPrefixListEntry')
     Address = Shapes::StructureShape.new(name: 'Address')
     AddressAttribute = Shapes::StructureShape.new(name: 'AddressAttribute')
     AddressAttributeName = Shapes::StringShape.new(name: 'AddressAttributeName')
+    AddressFamily = Shapes::StringShape.new(name: 'AddressFamily')
     AddressList = Shapes::ListShape.new(name: 'AddressList')
     AddressMaxResults = Shapes::IntegerShape.new(name: 'AddressMaxResults')
     AddressSet = Shapes::ListShape.new(name: 'AddressSet')
@@ -49,6 +68,8 @@ module Aws::EC2
     AllocateAddressResult = Shapes::StructureShape.new(name: 'AllocateAddressResult')
     AllocateHostsRequest = Shapes::StructureShape.new(name: 'AllocateHostsRequest')
     AllocateHostsResult = Shapes::StructureShape.new(name: 'AllocateHostsResult')
+    AllocateIpamPoolCidrRequest = Shapes::StructureShape.new(name: 'AllocateIpamPoolCidrRequest')
+    AllocateIpamPoolCidrResult = Shapes::StructureShape.new(name: 'AllocateIpamPoolCidrResult')
     AllocationId = Shapes::StringShape.new(name: 'AllocationId')
     AllocationIdList = Shapes::ListShape.new(name: 'AllocationIdList')
     AllocationIds = Shapes::ListShape.new(name: 'AllocationIds')
@@ -73,6 +94,7 @@ module Aws::EC2
     ApplySecurityGroupsToClientVpnTargetNetworkResult = Shapes::StructureShape.new(name: 'ApplySecurityGroupsToClientVpnTargetNetworkResult')
     ArchitectureType = Shapes::StringShape.new(name: 'ArchitectureType')
     ArchitectureTypeList = Shapes::ListShape.new(name: 'ArchitectureTypeList')
+    ArchitectureTypeSet = Shapes::ListShape.new(name: 'ArchitectureTypeSet')
     ArchitectureValues = Shapes::StringShape.new(name: 'ArchitectureValues')
     ArnList = Shapes::ListShape.new(name: 'ArnList')
     AssignIpv6AddressesRequest = Shapes::StructureShape.new(name: 'AssignIpv6AddressesRequest')
@@ -146,8 +168,11 @@ module Aws::EC2
     AvailabilityZoneStringList = Shapes::ListShape.new(name: 'AvailabilityZoneStringList')
     AvailableCapacity = Shapes::StructureShape.new(name: 'AvailableCapacity')
     AvailableInstanceCapacityList = Shapes::ListShape.new(name: 'AvailableInstanceCapacityList')
+    BareMetal = Shapes::StringShape.new(name: 'BareMetal')
     BareMetalFlag = Shapes::BooleanShape.new(name: 'BareMetalFlag')
     BaselineBandwidthInMbps = Shapes::IntegerShape.new(name: 'BaselineBandwidthInMbps')
+    BaselineEbsBandwidthMbps = Shapes::StructureShape.new(name: 'BaselineEbsBandwidthMbps')
+    BaselineEbsBandwidthMbpsRequest = Shapes::StructureShape.new(name: 'BaselineEbsBandwidthMbpsRequest')
     BaselineIops = Shapes::IntegerShape.new(name: 'BaselineIops')
     BaselineThroughputInMBps = Shapes::FloatShape.new(name: 'BaselineThroughputInMBps')
     BatchState = Shapes::StringShape.new(name: 'BatchState')
@@ -162,6 +187,7 @@ module Aws::EC2
     BootModeType = Shapes::StringShape.new(name: 'BootModeType')
     BootModeTypeList = Shapes::ListShape.new(name: 'BootModeTypeList')
     BootModeValues = Shapes::StringShape.new(name: 'BootModeValues')
+    BoxedDouble = Shapes::FloatShape.new(name: 'BoxedDouble')
     BundleId = Shapes::StringShape.new(name: 'BundleId')
     BundleIdStringList = Shapes::ListShape.new(name: 'BundleIdStringList')
     BundleInstanceRequest = Shapes::StructureShape.new(name: 'BundleInstanceRequest')
@@ -170,6 +196,7 @@ module Aws::EC2
     BundleTaskError = Shapes::StructureShape.new(name: 'BundleTaskError')
     BundleTaskList = Shapes::ListShape.new(name: 'BundleTaskList')
     BundleTaskState = Shapes::StringShape.new(name: 'BundleTaskState')
+    BurstablePerformance = Shapes::StringShape.new(name: 'BurstablePerformance')
     BurstablePerformanceFlag = Shapes::BooleanShape.new(name: 'BurstablePerformanceFlag')
     ByoipCidr = Shapes::StructureShape.new(name: 'ByoipCidr')
     ByoipCidrSet = Shapes::ListShape.new(name: 'ByoipCidrSet')
@@ -248,6 +275,8 @@ module Aws::EC2
     ClientConnectOptions = Shapes::StructureShape.new(name: 'ClientConnectOptions')
     ClientConnectResponseOptions = Shapes::StructureShape.new(name: 'ClientConnectResponseOptions')
     ClientData = Shapes::StructureShape.new(name: 'ClientData')
+    ClientLoginBannerOptions = Shapes::StructureShape.new(name: 'ClientLoginBannerOptions')
+    ClientLoginBannerResponseOptions = Shapes::StructureShape.new(name: 'ClientLoginBannerResponseOptions')
     ClientVpnAssociationId = Shapes::StringShape.new(name: 'ClientVpnAssociationId')
     ClientVpnAuthentication = Shapes::StructureShape.new(name: 'ClientVpnAuthentication')
     ClientVpnAuthenticationList = Shapes::ListShape.new(name: 'ClientVpnAuthenticationList')
@@ -304,6 +333,9 @@ module Aws::EC2
     CopyTagsFromSource = Shapes::StringShape.new(name: 'CopyTagsFromSource')
     CoreCount = Shapes::IntegerShape.new(name: 'CoreCount')
     CoreCountList = Shapes::ListShape.new(name: 'CoreCountList')
+    CoreNetworkArn = Shapes::StringShape.new(name: 'CoreNetworkArn')
+    CpuManufacturer = Shapes::StringShape.new(name: 'CpuManufacturer')
+    CpuManufacturerSet = Shapes::ListShape.new(name: 'CpuManufacturerSet')
     CpuOptions = Shapes::StructureShape.new(name: 'CpuOptions')
     CpuOptionsRequest = Shapes::StructureShape.new(name: 'CpuOptionsRequest')
     CreateCapacityReservationFleetRequest = Shapes::StructureShape.new(name: 'CreateCapacityReservationFleetRequest')
@@ -344,6 +376,12 @@ module Aws::EC2
     CreateInstanceExportTaskResult = Shapes::StructureShape.new(name: 'CreateInstanceExportTaskResult')
     CreateInternetGatewayRequest = Shapes::StructureShape.new(name: 'CreateInternetGatewayRequest')
     CreateInternetGatewayResult = Shapes::StructureShape.new(name: 'CreateInternetGatewayResult')
+    CreateIpamPoolRequest = Shapes::StructureShape.new(name: 'CreateIpamPoolRequest')
+    CreateIpamPoolResult = Shapes::StructureShape.new(name: 'CreateIpamPoolResult')
+    CreateIpamRequest = Shapes::StructureShape.new(name: 'CreateIpamRequest')
+    CreateIpamResult = Shapes::StructureShape.new(name: 'CreateIpamResult')
+    CreateIpamScopeRequest = Shapes::StructureShape.new(name: 'CreateIpamScopeRequest')
+    CreateIpamScopeResult = Shapes::StructureShape.new(name: 'CreateIpamScopeResult')
     CreateKeyPairRequest = Shapes::StructureShape.new(name: 'CreateKeyPairRequest')
     CreateLaunchTemplateRequest = Shapes::StructureShape.new(name: 'CreateLaunchTemplateRequest')
     CreateLaunchTemplateResult = Shapes::StructureShape.new(name: 'CreateLaunchTemplateResult')
@@ -360,6 +398,8 @@ module Aws::EC2
     CreateNetworkAclEntryRequest = Shapes::StructureShape.new(name: 'CreateNetworkAclEntryRequest')
     CreateNetworkAclRequest = Shapes::StructureShape.new(name: 'CreateNetworkAclRequest')
     CreateNetworkAclResult = Shapes::StructureShape.new(name: 'CreateNetworkAclResult')
+    CreateNetworkInsightsAccessScopeRequest = Shapes::StructureShape.new(name: 'CreateNetworkInsightsAccessScopeRequest')
+    CreateNetworkInsightsAccessScopeResult = Shapes::StructureShape.new(name: 'CreateNetworkInsightsAccessScopeResult')
     CreateNetworkInsightsPathRequest = Shapes::StructureShape.new(name: 'CreateNetworkInsightsPathRequest')
     CreateNetworkInsightsPathResult = Shapes::StructureShape.new(name: 'CreateNetworkInsightsPathResult')
     CreateNetworkInterfacePermissionRequest = Shapes::StructureShape.new(name: 'CreateNetworkInterfacePermissionRequest')
@@ -368,6 +408,8 @@ module Aws::EC2
     CreateNetworkInterfaceResult = Shapes::StructureShape.new(name: 'CreateNetworkInterfaceResult')
     CreatePlacementGroupRequest = Shapes::StructureShape.new(name: 'CreatePlacementGroupRequest')
     CreatePlacementGroupResult = Shapes::StructureShape.new(name: 'CreatePlacementGroupResult')
+    CreatePublicIpv4PoolRequest = Shapes::StructureShape.new(name: 'CreatePublicIpv4PoolRequest')
+    CreatePublicIpv4PoolResult = Shapes::StructureShape.new(name: 'CreatePublicIpv4PoolResult')
     CreateReplaceRootVolumeTaskRequest = Shapes::StructureShape.new(name: 'CreateReplaceRootVolumeTaskRequest')
     CreateReplaceRootVolumeTaskResult = Shapes::StructureShape.new(name: 'CreateReplaceRootVolumeTaskResult')
     CreateReservedInstancesListingRequest = Shapes::StructureShape.new(name: 'CreateReservedInstancesListingRequest')
@@ -485,6 +527,12 @@ module Aws::EC2
     DeleteInstanceEventWindowRequest = Shapes::StructureShape.new(name: 'DeleteInstanceEventWindowRequest')
     DeleteInstanceEventWindowResult = Shapes::StructureShape.new(name: 'DeleteInstanceEventWindowResult')
     DeleteInternetGatewayRequest = Shapes::StructureShape.new(name: 'DeleteInternetGatewayRequest')
+    DeleteIpamPoolRequest = Shapes::StructureShape.new(name: 'DeleteIpamPoolRequest')
+    DeleteIpamPoolResult = Shapes::StructureShape.new(name: 'DeleteIpamPoolResult')
+    DeleteIpamRequest = Shapes::StructureShape.new(name: 'DeleteIpamRequest')
+    DeleteIpamResult = Shapes::StructureShape.new(name: 'DeleteIpamResult')
+    DeleteIpamScopeRequest = Shapes::StructureShape.new(name: 'DeleteIpamScopeRequest')
+    DeleteIpamScopeResult = Shapes::StructureShape.new(name: 'DeleteIpamScopeResult')
     DeleteKeyPairRequest = Shapes::StructureShape.new(name: 'DeleteKeyPairRequest')
     DeleteLaunchTemplateRequest = Shapes::StructureShape.new(name: 'DeleteLaunchTemplateRequest')
     DeleteLaunchTemplateResult = Shapes::StructureShape.new(name: 'DeleteLaunchTemplateResult')
@@ -504,6 +552,10 @@ module Aws::EC2
     DeleteNatGatewayResult = Shapes::StructureShape.new(name: 'DeleteNatGatewayResult')
     DeleteNetworkAclEntryRequest = Shapes::StructureShape.new(name: 'DeleteNetworkAclEntryRequest')
     DeleteNetworkAclRequest = Shapes::StructureShape.new(name: 'DeleteNetworkAclRequest')
+    DeleteNetworkInsightsAccessScopeAnalysisRequest = Shapes::StructureShape.new(name: 'DeleteNetworkInsightsAccessScopeAnalysisRequest')
+    DeleteNetworkInsightsAccessScopeAnalysisResult = Shapes::StructureShape.new(name: 'DeleteNetworkInsightsAccessScopeAnalysisResult')
+    DeleteNetworkInsightsAccessScopeRequest = Shapes::StructureShape.new(name: 'DeleteNetworkInsightsAccessScopeRequest')
+    DeleteNetworkInsightsAccessScopeResult = Shapes::StructureShape.new(name: 'DeleteNetworkInsightsAccessScopeResult')
     DeleteNetworkInsightsAnalysisRequest = Shapes::StructureShape.new(name: 'DeleteNetworkInsightsAnalysisRequest')
     DeleteNetworkInsightsAnalysisResult = Shapes::StructureShape.new(name: 'DeleteNetworkInsightsAnalysisResult')
     DeleteNetworkInsightsPathRequest = Shapes::StructureShape.new(name: 'DeleteNetworkInsightsPathRequest')
@@ -512,6 +564,8 @@ module Aws::EC2
     DeleteNetworkInterfacePermissionResult = Shapes::StructureShape.new(name: 'DeleteNetworkInterfacePermissionResult')
     DeleteNetworkInterfaceRequest = Shapes::StructureShape.new(name: 'DeleteNetworkInterfaceRequest')
     DeletePlacementGroupRequest = Shapes::StructureShape.new(name: 'DeletePlacementGroupRequest')
+    DeletePublicIpv4PoolRequest = Shapes::StructureShape.new(name: 'DeletePublicIpv4PoolRequest')
+    DeletePublicIpv4PoolResult = Shapes::StructureShape.new(name: 'DeletePublicIpv4PoolResult')
     DeleteQueuedReservedInstancesError = Shapes::StructureShape.new(name: 'DeleteQueuedReservedInstancesError')
     DeleteQueuedReservedInstancesErrorCode = Shapes::StringShape.new(name: 'DeleteQueuedReservedInstancesErrorCode')
     DeleteQueuedReservedInstancesIdList = Shapes::ListShape.new(name: 'DeleteQueuedReservedInstancesIdList')
@@ -567,6 +621,11 @@ module Aws::EC2
     DeleteVpnGatewayRequest = Shapes::StructureShape.new(name: 'DeleteVpnGatewayRequest')
     DeprovisionByoipCidrRequest = Shapes::StructureShape.new(name: 'DeprovisionByoipCidrRequest')
     DeprovisionByoipCidrResult = Shapes::StructureShape.new(name: 'DeprovisionByoipCidrResult')
+    DeprovisionIpamPoolCidrRequest = Shapes::StructureShape.new(name: 'DeprovisionIpamPoolCidrRequest')
+    DeprovisionIpamPoolCidrResult = Shapes::StructureShape.new(name: 'DeprovisionIpamPoolCidrResult')
+    DeprovisionPublicIpv4PoolCidrRequest = Shapes::StructureShape.new(name: 'DeprovisionPublicIpv4PoolCidrRequest')
+    DeprovisionPublicIpv4PoolCidrResult = Shapes::StructureShape.new(name: 'DeprovisionPublicIpv4PoolCidrResult')
+    DeprovisionedAddressSet = Shapes::ListShape.new(name: 'DeprovisionedAddressSet')
     DeregisterImageRequest = Shapes::StructureShape.new(name: 'DeregisterImageRequest')
     DeregisterInstanceEventNotificationAttributesRequest = Shapes::StructureShape.new(name: 'DeregisterInstanceEventNotificationAttributesRequest')
     DeregisterInstanceEventNotificationAttributesResult = Shapes::StructureShape.new(name: 'DeregisterInstanceEventNotificationAttributesResult')
@@ -637,6 +696,11 @@ module Aws::EC2
     DescribeExportImageTasksResult = Shapes::StructureShape.new(name: 'DescribeExportImageTasksResult')
     DescribeExportTasksRequest = Shapes::StructureShape.new(name: 'DescribeExportTasksRequest')
     DescribeExportTasksResult = Shapes::StructureShape.new(name: 'DescribeExportTasksResult')
+    DescribeFastLaunchImagesRequest = Shapes::StructureShape.new(name: 'DescribeFastLaunchImagesRequest')
+    DescribeFastLaunchImagesRequestMaxResults = Shapes::IntegerShape.new(name: 'DescribeFastLaunchImagesRequestMaxResults')
+    DescribeFastLaunchImagesResult = Shapes::StructureShape.new(name: 'DescribeFastLaunchImagesResult')
+    DescribeFastLaunchImagesSuccessItem = Shapes::StructureShape.new(name: 'DescribeFastLaunchImagesSuccessItem')
+    DescribeFastLaunchImagesSuccessSet = Shapes::ListShape.new(name: 'DescribeFastLaunchImagesSuccessSet')
     DescribeFastSnapshotRestoreSuccessItem = Shapes::StructureShape.new(name: 'DescribeFastSnapshotRestoreSuccessItem')
     DescribeFastSnapshotRestoreSuccessSet = Shapes::ListShape.new(name: 'DescribeFastSnapshotRestoreSuccessSet')
     DescribeFastSnapshotRestoresMaxResults = Shapes::IntegerShape.new(name: 'DescribeFastSnapshotRestoresMaxResults')
@@ -699,6 +763,12 @@ module Aws::EC2
     DescribeInternetGatewaysMaxResults = Shapes::IntegerShape.new(name: 'DescribeInternetGatewaysMaxResults')
     DescribeInternetGatewaysRequest = Shapes::StructureShape.new(name: 'DescribeInternetGatewaysRequest')
     DescribeInternetGatewaysResult = Shapes::StructureShape.new(name: 'DescribeInternetGatewaysResult')
+    DescribeIpamPoolsRequest = Shapes::StructureShape.new(name: 'DescribeIpamPoolsRequest')
+    DescribeIpamPoolsResult = Shapes::StructureShape.new(name: 'DescribeIpamPoolsResult')
+    DescribeIpamScopesRequest = Shapes::StructureShape.new(name: 'DescribeIpamScopesRequest')
+    DescribeIpamScopesResult = Shapes::StructureShape.new(name: 'DescribeIpamScopesResult')
+    DescribeIpamsRequest = Shapes::StructureShape.new(name: 'DescribeIpamsRequest')
+    DescribeIpamsResult = Shapes::StructureShape.new(name: 'DescribeIpamsResult')
     DescribeIpv6PoolsRequest = Shapes::StructureShape.new(name: 'DescribeIpv6PoolsRequest')
     DescribeIpv6PoolsResult = Shapes::StructureShape.new(name: 'DescribeIpv6PoolsResult')
     DescribeKeyPairsRequest = Shapes::StructureShape.new(name: 'DescribeKeyPairsRequest')
@@ -731,6 +801,10 @@ module Aws::EC2
     DescribeNetworkAclsMaxResults = Shapes::IntegerShape.new(name: 'DescribeNetworkAclsMaxResults')
     DescribeNetworkAclsRequest = Shapes::StructureShape.new(name: 'DescribeNetworkAclsRequest')
     DescribeNetworkAclsResult = Shapes::StructureShape.new(name: 'DescribeNetworkAclsResult')
+    DescribeNetworkInsightsAccessScopeAnalysesRequest = Shapes::StructureShape.new(name: 'DescribeNetworkInsightsAccessScopeAnalysesRequest')
+    DescribeNetworkInsightsAccessScopeAnalysesResult = Shapes::StructureShape.new(name: 'DescribeNetworkInsightsAccessScopeAnalysesResult')
+    DescribeNetworkInsightsAccessScopesRequest = Shapes::StructureShape.new(name: 'DescribeNetworkInsightsAccessScopesRequest')
+    DescribeNetworkInsightsAccessScopesResult = Shapes::StructureShape.new(name: 'DescribeNetworkInsightsAccessScopesResult')
     DescribeNetworkInsightsAnalysesRequest = Shapes::StructureShape.new(name: 'DescribeNetworkInsightsAnalysesRequest')
     DescribeNetworkInsightsAnalysesResult = Shapes::StructureShape.new(name: 'DescribeNetworkInsightsAnalysesResult')
     DescribeNetworkInsightsPathsRequest = Shapes::StructureShape.new(name: 'DescribeNetworkInsightsPathsRequest')
@@ -783,6 +857,9 @@ module Aws::EC2
     DescribeSecurityGroupsResult = Shapes::StructureShape.new(name: 'DescribeSecurityGroupsResult')
     DescribeSnapshotAttributeRequest = Shapes::StructureShape.new(name: 'DescribeSnapshotAttributeRequest')
     DescribeSnapshotAttributeResult = Shapes::StructureShape.new(name: 'DescribeSnapshotAttributeResult')
+    DescribeSnapshotTierStatusMaxResults = Shapes::IntegerShape.new(name: 'DescribeSnapshotTierStatusMaxResults')
+    DescribeSnapshotTierStatusRequest = Shapes::StructureShape.new(name: 'DescribeSnapshotTierStatusRequest')
+    DescribeSnapshotTierStatusResult = Shapes::StructureShape.new(name: 'DescribeSnapshotTierStatusResult')
     DescribeSnapshotsRequest = Shapes::StructureShape.new(name: 'DescribeSnapshotsRequest')
     DescribeSnapshotsResult = Shapes::StructureShape.new(name: 'DescribeSnapshotsResult')
     DescribeSpotDatafeedSubscriptionRequest = Shapes::StructureShape.new(name: 'DescribeSpotDatafeedSubscriptionRequest')
@@ -895,6 +972,8 @@ module Aws::EC2
     DirectoryServiceAuthenticationRequest = Shapes::StructureShape.new(name: 'DirectoryServiceAuthenticationRequest')
     DisableEbsEncryptionByDefaultRequest = Shapes::StructureShape.new(name: 'DisableEbsEncryptionByDefaultRequest')
     DisableEbsEncryptionByDefaultResult = Shapes::StructureShape.new(name: 'DisableEbsEncryptionByDefaultResult')
+    DisableFastLaunchRequest = Shapes::StructureShape.new(name: 'DisableFastLaunchRequest')
+    DisableFastLaunchResult = Shapes::StructureShape.new(name: 'DisableFastLaunchResult')
     DisableFastSnapshotRestoreErrorItem = Shapes::StructureShape.new(name: 'DisableFastSnapshotRestoreErrorItem')
     DisableFastSnapshotRestoreErrorSet = Shapes::ListShape.new(name: 'DisableFastSnapshotRestoreErrorSet')
     DisableFastSnapshotRestoreStateError = Shapes::StructureShape.new(name: 'DisableFastSnapshotRestoreStateError')
@@ -906,6 +985,8 @@ module Aws::EC2
     DisableFastSnapshotRestoresResult = Shapes::StructureShape.new(name: 'DisableFastSnapshotRestoresResult')
     DisableImageDeprecationRequest = Shapes::StructureShape.new(name: 'DisableImageDeprecationRequest')
     DisableImageDeprecationResult = Shapes::StructureShape.new(name: 'DisableImageDeprecationResult')
+    DisableIpamOrganizationAdminAccountRequest = Shapes::StructureShape.new(name: 'DisableIpamOrganizationAdminAccountRequest')
+    DisableIpamOrganizationAdminAccountResult = Shapes::StructureShape.new(name: 'DisableIpamOrganizationAdminAccountResult')
     DisableSerialConsoleAccessRequest = Shapes::StructureShape.new(name: 'DisableSerialConsoleAccessRequest')
     DisableSerialConsoleAccessResult = Shapes::StructureShape.new(name: 'DisableSerialConsoleAccessResult')
     DisableTransitGatewayRouteTablePropagationRequest = Shapes::StructureShape.new(name: 'DisableTransitGatewayRouteTablePropagationRequest')
@@ -991,6 +1072,8 @@ module Aws::EC2
     EnaSupport = Shapes::StringShape.new(name: 'EnaSupport')
     EnableEbsEncryptionByDefaultRequest = Shapes::StructureShape.new(name: 'EnableEbsEncryptionByDefaultRequest')
     EnableEbsEncryptionByDefaultResult = Shapes::StructureShape.new(name: 'EnableEbsEncryptionByDefaultResult')
+    EnableFastLaunchRequest = Shapes::StructureShape.new(name: 'EnableFastLaunchRequest')
+    EnableFastLaunchResult = Shapes::StructureShape.new(name: 'EnableFastLaunchResult')
     EnableFastSnapshotRestoreErrorItem = Shapes::StructureShape.new(name: 'EnableFastSnapshotRestoreErrorItem')
     EnableFastSnapshotRestoreErrorSet = Shapes::ListShape.new(name: 'EnableFastSnapshotRestoreErrorSet')
     EnableFastSnapshotRestoreStateError = Shapes::StructureShape.new(name: 'EnableFastSnapshotRestoreStateError')
@@ -1002,6 +1085,8 @@ module Aws::EC2
     EnableFastSnapshotRestoresResult = Shapes::StructureShape.new(name: 'EnableFastSnapshotRestoresResult')
     EnableImageDeprecationRequest = Shapes::StructureShape.new(name: 'EnableImageDeprecationRequest')
     EnableImageDeprecationResult = Shapes::StructureShape.new(name: 'EnableImageDeprecationResult')
+    EnableIpamOrganizationAdminAccountRequest = Shapes::StructureShape.new(name: 'EnableIpamOrganizationAdminAccountRequest')
+    EnableIpamOrganizationAdminAccountResult = Shapes::StructureShape.new(name: 'EnableIpamOrganizationAdminAccountResult')
     EnableSerialConsoleAccessRequest = Shapes::StructureShape.new(name: 'EnableSerialConsoleAccessRequest')
     EnableSerialConsoleAccessResult = Shapes::StructureShape.new(name: 'EnableSerialConsoleAccessResult')
     EnableTransitGatewayRouteTablePropagationRequest = Shapes::StructureShape.new(name: 'EnableTransitGatewayRouteTablePropagationRequest')
@@ -1023,6 +1108,8 @@ module Aws::EC2
     EventInformation = Shapes::StructureShape.new(name: 'EventInformation')
     EventType = Shapes::StringShape.new(name: 'EventType')
     ExcessCapacityTerminationPolicy = Shapes::StringShape.new(name: 'ExcessCapacityTerminationPolicy')
+    ExcludedInstanceType = Shapes::StringShape.new(name: 'ExcludedInstanceType')
+    ExcludedInstanceTypeSet = Shapes::ListShape.new(name: 'ExcludedInstanceTypeSet')
     ExecutableByStringList = Shapes::ListShape.new(name: 'ExecutableByStringList')
     Explanation = Shapes::StructureShape.new(name: 'Explanation')
     ExplanationList = Shapes::ListShape.new(name: 'ExplanationList')
@@ -1053,11 +1140,19 @@ module Aws::EC2
     FailedCapacityReservationFleetCancellationResultSet = Shapes::ListShape.new(name: 'FailedCapacityReservationFleetCancellationResultSet')
     FailedQueuedPurchaseDeletion = Shapes::StructureShape.new(name: 'FailedQueuedPurchaseDeletion')
     FailedQueuedPurchaseDeletionSet = Shapes::ListShape.new(name: 'FailedQueuedPurchaseDeletionSet')
+    FastLaunchImageIdList = Shapes::ListShape.new(name: 'FastLaunchImageIdList')
+    FastLaunchLaunchTemplateSpecificationRequest = Shapes::StructureShape.new(name: 'FastLaunchLaunchTemplateSpecificationRequest')
+    FastLaunchLaunchTemplateSpecificationResponse = Shapes::StructureShape.new(name: 'FastLaunchLaunchTemplateSpecificationResponse')
+    FastLaunchResourceType = Shapes::StringShape.new(name: 'FastLaunchResourceType')
+    FastLaunchSnapshotConfigurationRequest = Shapes::StructureShape.new(name: 'FastLaunchSnapshotConfigurationRequest')
+    FastLaunchSnapshotConfigurationResponse = Shapes::StructureShape.new(name: 'FastLaunchSnapshotConfigurationResponse')
+    FastLaunchStateCode = Shapes::StringShape.new(name: 'FastLaunchStateCode')
     FastSnapshotRestoreStateCode = Shapes::StringShape.new(name: 'FastSnapshotRestoreStateCode')
     FederatedAuthentication = Shapes::StructureShape.new(name: 'FederatedAuthentication')
     FederatedAuthenticationRequest = Shapes::StructureShape.new(name: 'FederatedAuthenticationRequest')
     Filter = Shapes::StructureShape.new(name: 'Filter')
     FilterList = Shapes::ListShape.new(name: 'FilterList')
+    FindingsFound = Shapes::StringShape.new(name: 'FindingsFound')
     FleetActivityStatus = Shapes::StringShape.new(name: 'FleetActivityStatus')
     FleetCapacityReservation = Shapes::StructureShape.new(name: 'FleetCapacityReservation')
     FleetCapacityReservationSet = Shapes::ListShape.new(name: 'FleetCapacityReservationSet')
@@ -1113,6 +1208,7 @@ module Aws::EC2
     FpgaInfo = Shapes::StructureShape.new(name: 'FpgaInfo')
     FreeTierEligibleFlag = Shapes::BooleanShape.new(name: 'FreeTierEligibleFlag')
     GVCDMaxResults = Shapes::IntegerShape.new(name: 'GVCDMaxResults')
+    GatewayAssociationState = Shapes::StringShape.new(name: 'GatewayAssociationState')
     GatewayType = Shapes::StringShape.new(name: 'GatewayType')
     GetAssociatedEnclaveCertificateIamRolesRequest = Shapes::StructureShape.new(name: 'GetAssociatedEnclaveCertificateIamRolesRequest')
     GetAssociatedEnclaveCertificateIamRolesResult = Shapes::StructureShape.new(name: 'GetAssociatedEnclaveCertificateIamRolesResult')
@@ -1140,6 +1236,17 @@ module Aws::EC2
     GetGroupsForCapacityReservationResult = Shapes::StructureShape.new(name: 'GetGroupsForCapacityReservationResult')
     GetHostReservationPurchasePreviewRequest = Shapes::StructureShape.new(name: 'GetHostReservationPurchasePreviewRequest')
     GetHostReservationPurchasePreviewResult = Shapes::StructureShape.new(name: 'GetHostReservationPurchasePreviewResult')
+    GetInstanceTypesFromInstanceRequirementsRequest = Shapes::StructureShape.new(name: 'GetInstanceTypesFromInstanceRequirementsRequest')
+    GetInstanceTypesFromInstanceRequirementsResult = Shapes::StructureShape.new(name: 'GetInstanceTypesFromInstanceRequirementsResult')
+    GetIpamAddressHistoryRequest = Shapes::StructureShape.new(name: 'GetIpamAddressHistoryRequest')
+    GetIpamAddressHistoryResult = Shapes::StructureShape.new(name: 'GetIpamAddressHistoryResult')
+    GetIpamPoolAllocationsMaxResults = Shapes::IntegerShape.new(name: 'GetIpamPoolAllocationsMaxResults')
+    GetIpamPoolAllocationsRequest = Shapes::StructureShape.new(name: 'GetIpamPoolAllocationsRequest')
+    GetIpamPoolAllocationsResult = Shapes::StructureShape.new(name: 'GetIpamPoolAllocationsResult')
+    GetIpamPoolCidrsRequest = Shapes::StructureShape.new(name: 'GetIpamPoolCidrsRequest')
+    GetIpamPoolCidrsResult = Shapes::StructureShape.new(name: 'GetIpamPoolCidrsResult')
+    GetIpamResourceCidrsRequest = Shapes::StructureShape.new(name: 'GetIpamResourceCidrsRequest')
+    GetIpamResourceCidrsResult = Shapes::StructureShape.new(name: 'GetIpamResourceCidrsResult')
     GetLaunchTemplateDataRequest = Shapes::StructureShape.new(name: 'GetLaunchTemplateDataRequest')
     GetLaunchTemplateDataResult = Shapes::StructureShape.new(name: 'GetLaunchTemplateDataResult')
     GetManagedPrefixListAssociationsMaxResults = Shapes::IntegerShape.new(name: 'GetManagedPrefixListAssociationsMaxResults')
@@ -1147,12 +1254,18 @@ module Aws::EC2
     GetManagedPrefixListAssociationsResult = Shapes::StructureShape.new(name: 'GetManagedPrefixListAssociationsResult')
     GetManagedPrefixListEntriesRequest = Shapes::StructureShape.new(name: 'GetManagedPrefixListEntriesRequest')
     GetManagedPrefixListEntriesResult = Shapes::StructureShape.new(name: 'GetManagedPrefixListEntriesResult')
+    GetNetworkInsightsAccessScopeAnalysisFindingsRequest = Shapes::StructureShape.new(name: 'GetNetworkInsightsAccessScopeAnalysisFindingsRequest')
+    GetNetworkInsightsAccessScopeAnalysisFindingsResult = Shapes::StructureShape.new(name: 'GetNetworkInsightsAccessScopeAnalysisFindingsResult')
+    GetNetworkInsightsAccessScopeContentRequest = Shapes::StructureShape.new(name: 'GetNetworkInsightsAccessScopeContentRequest')
+    GetNetworkInsightsAccessScopeContentResult = Shapes::StructureShape.new(name: 'GetNetworkInsightsAccessScopeContentResult')
     GetPasswordDataRequest = Shapes::StructureShape.new(name: 'GetPasswordDataRequest')
     GetPasswordDataResult = Shapes::StructureShape.new(name: 'GetPasswordDataResult')
     GetReservedInstancesExchangeQuoteRequest = Shapes::StructureShape.new(name: 'GetReservedInstancesExchangeQuoteRequest')
     GetReservedInstancesExchangeQuoteResult = Shapes::StructureShape.new(name: 'GetReservedInstancesExchangeQuoteResult')
     GetSerialConsoleAccessStatusRequest = Shapes::StructureShape.new(name: 'GetSerialConsoleAccessStatusRequest')
     GetSerialConsoleAccessStatusResult = Shapes::StructureShape.new(name: 'GetSerialConsoleAccessStatusResult')
+    GetSpotPlacementScoresRequest = Shapes::StructureShape.new(name: 'GetSpotPlacementScoresRequest')
+    GetSpotPlacementScoresResult = Shapes::StructureShape.new(name: 'GetSpotPlacementScoresResult')
     GetSubnetCidrReservationsMaxResults = Shapes::IntegerShape.new(name: 'GetSubnetCidrReservationsMaxResults')
     GetSubnetCidrReservationsRequest = Shapes::StructureShape.new(name: 'GetSubnetCidrReservationsRequest')
     GetSubnetCidrReservationsResult = Shapes::StructureShape.new(name: 'GetSubnetCidrReservationsResult')
@@ -1204,6 +1317,7 @@ module Aws::EC2
     HostReservationIdSet = Shapes::ListShape.new(name: 'HostReservationIdSet')
     HostReservationSet = Shapes::ListShape.new(name: 'HostReservationSet')
     HostTenancy = Shapes::StringShape.new(name: 'HostTenancy')
+    HostnameType = Shapes::StringShape.new(name: 'HostnameType')
     Hour = Shapes::IntegerShape.new(name: 'Hour')
     HttpTokensState = Shapes::StringShape.new(name: 'HttpTokensState')
     HypervisorType = Shapes::StringShape.new(name: 'HypervisorType')
@@ -1300,6 +1414,8 @@ module Aws::EC2
     InstanceEventWindowTimeRangeRequestSet = Shapes::ListShape.new(name: 'InstanceEventWindowTimeRangeRequestSet')
     InstanceExportDetails = Shapes::StructureShape.new(name: 'InstanceExportDetails')
     InstanceFamilyCreditSpecification = Shapes::StructureShape.new(name: 'InstanceFamilyCreditSpecification')
+    InstanceGeneration = Shapes::StringShape.new(name: 'InstanceGeneration')
+    InstanceGenerationSet = Shapes::ListShape.new(name: 'InstanceGenerationSet')
     InstanceHealthStatus = Shapes::StringShape.new(name: 'InstanceHealthStatus')
     InstanceId = Shapes::StringShape.new(name: 'InstanceId')
     InstanceIdList = Shapes::ListShape.new(name: 'InstanceIdList')
@@ -1325,6 +1441,7 @@ module Aws::EC2
     InstanceMetadataOptionsResponse = Shapes::StructureShape.new(name: 'InstanceMetadataOptionsResponse')
     InstanceMetadataOptionsState = Shapes::StringShape.new(name: 'InstanceMetadataOptionsState')
     InstanceMetadataProtocolState = Shapes::StringShape.new(name: 'InstanceMetadataProtocolState')
+    InstanceMetadataTagsState = Shapes::StringShape.new(name: 'InstanceMetadataTagsState')
     InstanceMonitoring = Shapes::StructureShape.new(name: 'InstanceMonitoring')
     InstanceMonitoringList = Shapes::ListShape.new(name: 'InstanceMonitoringList')
     InstanceNetworkInterface = Shapes::StructureShape.new(name: 'InstanceNetworkInterface')
@@ -1335,6 +1452,9 @@ module Aws::EC2
     InstanceNetworkInterfaceSpecificationList = Shapes::ListShape.new(name: 'InstanceNetworkInterfaceSpecificationList')
     InstancePrivateIpAddress = Shapes::StructureShape.new(name: 'InstancePrivateIpAddress')
     InstancePrivateIpAddressList = Shapes::ListShape.new(name: 'InstancePrivateIpAddressList')
+    InstanceRequirements = Shapes::StructureShape.new(name: 'InstanceRequirements')
+    InstanceRequirementsRequest = Shapes::StructureShape.new(name: 'InstanceRequirementsRequest')
+    InstanceRequirementsWithMetadataRequest = Shapes::StructureShape.new(name: 'InstanceRequirementsWithMetadataRequest')
     InstanceSpecification = Shapes::StructureShape.new(name: 'InstanceSpecification')
     InstanceState = Shapes::StructureShape.new(name: 'InstanceState')
     InstanceStateChange = Shapes::StructureShape.new(name: 'InstanceStateChange')
@@ -1355,10 +1475,13 @@ module Aws::EC2
     InstanceType = Shapes::StringShape.new(name: 'InstanceType')
     InstanceTypeHypervisor = Shapes::StringShape.new(name: 'InstanceTypeHypervisor')
     InstanceTypeInfo = Shapes::StructureShape.new(name: 'InstanceTypeInfo')
+    InstanceTypeInfoFromInstanceRequirements = Shapes::StructureShape.new(name: 'InstanceTypeInfoFromInstanceRequirements')
+    InstanceTypeInfoFromInstanceRequirementsSet = Shapes::ListShape.new(name: 'InstanceTypeInfoFromInstanceRequirementsSet')
     InstanceTypeInfoList = Shapes::ListShape.new(name: 'InstanceTypeInfoList')
     InstanceTypeList = Shapes::ListShape.new(name: 'InstanceTypeList')
     InstanceTypeOffering = Shapes::StructureShape.new(name: 'InstanceTypeOffering')
     InstanceTypeOfferingsList = Shapes::ListShape.new(name: 'InstanceTypeOfferingsList')
+    InstanceTypes = Shapes::ListShape.new(name: 'InstanceTypes')
     InstanceUsage = Shapes::StructureShape.new(name: 'InstanceUsage')
     InstanceUsageSet = Shapes::ListShape.new(name: 'InstanceUsageSet')
     Integer = Shapes::IntegerShape.new(name: 'Integer')
@@ -1380,6 +1503,47 @@ module Aws::EC2
     IpRange = Shapes::StructureShape.new(name: 'IpRange')
     IpRangeList = Shapes::ListShape.new(name: 'IpRangeList')
     IpRanges = Shapes::ListShape.new(name: 'IpRanges')
+    Ipam = Shapes::StructureShape.new(name: 'Ipam')
+    IpamAddressHistoryMaxResults = Shapes::IntegerShape.new(name: 'IpamAddressHistoryMaxResults')
+    IpamAddressHistoryRecord = Shapes::StructureShape.new(name: 'IpamAddressHistoryRecord')
+    IpamAddressHistoryRecordSet = Shapes::ListShape.new(name: 'IpamAddressHistoryRecordSet')
+    IpamAddressHistoryResourceType = Shapes::StringShape.new(name: 'IpamAddressHistoryResourceType')
+    IpamCidrAuthorizationContext = Shapes::StructureShape.new(name: 'IpamCidrAuthorizationContext')
+    IpamComplianceStatus = Shapes::StringShape.new(name: 'IpamComplianceStatus')
+    IpamId = Shapes::StringShape.new(name: 'IpamId')
+    IpamManagementState = Shapes::StringShape.new(name: 'IpamManagementState')
+    IpamMaxResults = Shapes::IntegerShape.new(name: 'IpamMaxResults')
+    IpamNetmaskLength = Shapes::IntegerShape.new(name: 'IpamNetmaskLength')
+    IpamOperatingRegion = Shapes::StructureShape.new(name: 'IpamOperatingRegion')
+    IpamOperatingRegionSet = Shapes::ListShape.new(name: 'IpamOperatingRegionSet')
+    IpamOverlapStatus = Shapes::StringShape.new(name: 'IpamOverlapStatus')
+    IpamPool = Shapes::StructureShape.new(name: 'IpamPool')
+    IpamPoolAllocation = Shapes::StructureShape.new(name: 'IpamPoolAllocation')
+    IpamPoolAllocationDisallowedCidrs = Shapes::ListShape.new(name: 'IpamPoolAllocationDisallowedCidrs')
+    IpamPoolAllocationId = Shapes::StringShape.new(name: 'IpamPoolAllocationId')
+    IpamPoolAllocationResourceType = Shapes::StringShape.new(name: 'IpamPoolAllocationResourceType')
+    IpamPoolAllocationSet = Shapes::ListShape.new(name: 'IpamPoolAllocationSet')
+    IpamPoolAwsService = Shapes::StringShape.new(name: 'IpamPoolAwsService')
+    IpamPoolCidr = Shapes::StructureShape.new(name: 'IpamPoolCidr')
+    IpamPoolCidrFailureCode = Shapes::StringShape.new(name: 'IpamPoolCidrFailureCode')
+    IpamPoolCidrFailureReason = Shapes::StructureShape.new(name: 'IpamPoolCidrFailureReason')
+    IpamPoolCidrSet = Shapes::ListShape.new(name: 'IpamPoolCidrSet')
+    IpamPoolCidrState = Shapes::StringShape.new(name: 'IpamPoolCidrState')
+    IpamPoolId = Shapes::StringShape.new(name: 'IpamPoolId')
+    IpamPoolSet = Shapes::ListShape.new(name: 'IpamPoolSet')
+    IpamPoolState = Shapes::StringShape.new(name: 'IpamPoolState')
+    IpamResourceCidr = Shapes::StructureShape.new(name: 'IpamResourceCidr')
+    IpamResourceCidrSet = Shapes::ListShape.new(name: 'IpamResourceCidrSet')
+    IpamResourceTag = Shapes::StructureShape.new(name: 'IpamResourceTag')
+    IpamResourceTagList = Shapes::ListShape.new(name: 'IpamResourceTagList')
+    IpamResourceType = Shapes::StringShape.new(name: 'IpamResourceType')
+    IpamScope = Shapes::StructureShape.new(name: 'IpamScope')
+    IpamScopeId = Shapes::StringShape.new(name: 'IpamScopeId')
+    IpamScopeSet = Shapes::ListShape.new(name: 'IpamScopeSet')
+    IpamScopeState = Shapes::StringShape.new(name: 'IpamScopeState')
+    IpamScopeType = Shapes::StringShape.new(name: 'IpamScopeType')
+    IpamSet = Shapes::ListShape.new(name: 'IpamSet')
+    IpamState = Shapes::StringShape.new(name: 'IpamState')
     Ipv4PoolEc2Id = Shapes::StringShape.new(name: 'Ipv4PoolEc2Id')
     Ipv4PrefixList = Shapes::ListShape.new(name: 'Ipv4PrefixList')
     Ipv4PrefixListResponse = Shapes::ListShape.new(name: 'Ipv4PrefixListResponse')
@@ -1460,6 +1624,7 @@ module Aws::EC2
     LaunchTemplateInstanceMetadataOptionsRequest = Shapes::StructureShape.new(name: 'LaunchTemplateInstanceMetadataOptionsRequest')
     LaunchTemplateInstanceMetadataOptionsState = Shapes::StringShape.new(name: 'LaunchTemplateInstanceMetadataOptionsState')
     LaunchTemplateInstanceMetadataProtocolIpv6 = Shapes::StringShape.new(name: 'LaunchTemplateInstanceMetadataProtocolIpv6')
+    LaunchTemplateInstanceMetadataTagsState = Shapes::StringShape.new(name: 'LaunchTemplateInstanceMetadataTagsState')
     LaunchTemplateInstanceNetworkInterfaceSpecification = Shapes::StructureShape.new(name: 'LaunchTemplateInstanceNetworkInterfaceSpecification')
     LaunchTemplateInstanceNetworkInterfaceSpecificationList = Shapes::ListShape.new(name: 'LaunchTemplateInstanceNetworkInterfaceSpecificationList')
     LaunchTemplateInstanceNetworkInterfaceSpecificationRequest = Shapes::StructureShape.new(name: 'LaunchTemplateInstanceNetworkInterfaceSpecificationRequest')
@@ -1474,6 +1639,8 @@ module Aws::EC2
     LaunchTemplateOverridesList = Shapes::ListShape.new(name: 'LaunchTemplateOverridesList')
     LaunchTemplatePlacement = Shapes::StructureShape.new(name: 'LaunchTemplatePlacement')
     LaunchTemplatePlacementRequest = Shapes::StructureShape.new(name: 'LaunchTemplatePlacementRequest')
+    LaunchTemplatePrivateDnsNameOptions = Shapes::StructureShape.new(name: 'LaunchTemplatePrivateDnsNameOptions')
+    LaunchTemplatePrivateDnsNameOptionsRequest = Shapes::StructureShape.new(name: 'LaunchTemplatePrivateDnsNameOptionsRequest')
     LaunchTemplateSet = Shapes::ListShape.new(name: 'LaunchTemplateSet')
     LaunchTemplateSpecification = Shapes::StructureShape.new(name: 'LaunchTemplateSpecification')
     LaunchTemplateSpotMarketOptions = Shapes::StructureShape.new(name: 'LaunchTemplateSpotMarketOptions')
@@ -1490,6 +1657,9 @@ module Aws::EC2
     LicenseConfigurationRequest = Shapes::StructureShape.new(name: 'LicenseConfigurationRequest')
     LicenseList = Shapes::ListShape.new(name: 'LicenseList')
     LicenseSpecificationListRequest = Shapes::ListShape.new(name: 'LicenseSpecificationListRequest')
+    ListSnapshotsInRecycleBinMaxResults = Shapes::IntegerShape.new(name: 'ListSnapshotsInRecycleBinMaxResults')
+    ListSnapshotsInRecycleBinRequest = Shapes::StructureShape.new(name: 'ListSnapshotsInRecycleBinRequest')
+    ListSnapshotsInRecycleBinResult = Shapes::StructureShape.new(name: 'ListSnapshotsInRecycleBinResult')
     ListingState = Shapes::StringShape.new(name: 'ListingState')
     ListingStatus = Shapes::StringShape.new(name: 'ListingStatus')
     LoadBalancersConfig = Shapes::StructureShape.new(name: 'LoadBalancersConfig')
@@ -1527,6 +1697,9 @@ module Aws::EC2
     LocalGatewayVirtualInterfaceId = Shapes::StringShape.new(name: 'LocalGatewayVirtualInterfaceId')
     LocalGatewayVirtualInterfaceIdSet = Shapes::ListShape.new(name: 'LocalGatewayVirtualInterfaceIdSet')
     LocalGatewayVirtualInterfaceSet = Shapes::ListShape.new(name: 'LocalGatewayVirtualInterfaceSet')
+    LocalStorage = Shapes::StringShape.new(name: 'LocalStorage')
+    LocalStorageType = Shapes::StringShape.new(name: 'LocalStorageType')
+    LocalStorageTypeSet = Shapes::ListShape.new(name: 'LocalStorageTypeSet')
     Location = Shapes::StringShape.new(name: 'Location')
     LocationType = Shapes::StringShape.new(name: 'LocationType')
     LogDestinationType = Shapes::StringShape.new(name: 'LogDestinationType')
@@ -1544,7 +1717,11 @@ module Aws::EC2
     MaximumNetworkCards = Shapes::IntegerShape.new(name: 'MaximumNetworkCards')
     MaximumThroughputInMBps = Shapes::FloatShape.new(name: 'MaximumThroughputInMBps')
     MembershipType = Shapes::StringShape.new(name: 'MembershipType')
+    MemoryGiBPerVCpu = Shapes::StructureShape.new(name: 'MemoryGiBPerVCpu')
+    MemoryGiBPerVCpuRequest = Shapes::StructureShape.new(name: 'MemoryGiBPerVCpuRequest')
     MemoryInfo = Shapes::StructureShape.new(name: 'MemoryInfo')
+    MemoryMiB = Shapes::StructureShape.new(name: 'MemoryMiB')
+    MemoryMiBRequest = Shapes::StructureShape.new(name: 'MemoryMiBRequest')
     MemorySize = Shapes::IntegerShape.new(name: 'MemorySize')
     MillisecondDateTime = Shapes::TimestampShape.new(name: 'MillisecondDateTime')
     ModifyAddressAttributeRequest = Shapes::StructureShape.new(name: 'ModifyAddressAttributeRequest')
@@ -1584,16 +1761,28 @@ module Aws::EC2
     ModifyInstanceMetadataOptionsResult = Shapes::StructureShape.new(name: 'ModifyInstanceMetadataOptionsResult')
     ModifyInstancePlacementRequest = Shapes::StructureShape.new(name: 'ModifyInstancePlacementRequest')
     ModifyInstancePlacementResult = Shapes::StructureShape.new(name: 'ModifyInstancePlacementResult')
+    ModifyIpamPoolRequest = Shapes::StructureShape.new(name: 'ModifyIpamPoolRequest')
+    ModifyIpamPoolResult = Shapes::StructureShape.new(name: 'ModifyIpamPoolResult')
+    ModifyIpamRequest = Shapes::StructureShape.new(name: 'ModifyIpamRequest')
+    ModifyIpamResourceCidrRequest = Shapes::StructureShape.new(name: 'ModifyIpamResourceCidrRequest')
+    ModifyIpamResourceCidrResult = Shapes::StructureShape.new(name: 'ModifyIpamResourceCidrResult')
+    ModifyIpamResult = Shapes::StructureShape.new(name: 'ModifyIpamResult')
+    ModifyIpamScopeRequest = Shapes::StructureShape.new(name: 'ModifyIpamScopeRequest')
+    ModifyIpamScopeResult = Shapes::StructureShape.new(name: 'ModifyIpamScopeResult')
     ModifyLaunchTemplateRequest = Shapes::StructureShape.new(name: 'ModifyLaunchTemplateRequest')
     ModifyLaunchTemplateResult = Shapes::StructureShape.new(name: 'ModifyLaunchTemplateResult')
     ModifyManagedPrefixListRequest = Shapes::StructureShape.new(name: 'ModifyManagedPrefixListRequest')
     ModifyManagedPrefixListResult = Shapes::StructureShape.new(name: 'ModifyManagedPrefixListResult')
     ModifyNetworkInterfaceAttributeRequest = Shapes::StructureShape.new(name: 'ModifyNetworkInterfaceAttributeRequest')
+    ModifyPrivateDnsNameOptionsRequest = Shapes::StructureShape.new(name: 'ModifyPrivateDnsNameOptionsRequest')
+    ModifyPrivateDnsNameOptionsResult = Shapes::StructureShape.new(name: 'ModifyPrivateDnsNameOptionsResult')
     ModifyReservedInstancesRequest = Shapes::StructureShape.new(name: 'ModifyReservedInstancesRequest')
     ModifyReservedInstancesResult = Shapes::StructureShape.new(name: 'ModifyReservedInstancesResult')
     ModifySecurityGroupRulesRequest = Shapes::StructureShape.new(name: 'ModifySecurityGroupRulesRequest')
     ModifySecurityGroupRulesResult = Shapes::StructureShape.new(name: 'ModifySecurityGroupRulesResult')
     ModifySnapshotAttributeRequest = Shapes::StructureShape.new(name: 'ModifySnapshotAttributeRequest')
+    ModifySnapshotTierRequest = Shapes::StructureShape.new(name: 'ModifySnapshotTierRequest')
+    ModifySnapshotTierResult = Shapes::StructureShape.new(name: 'ModifySnapshotTierResult')
     ModifySpotFleetRequestRequest = Shapes::StructureShape.new(name: 'ModifySpotFleetRequestRequest')
     ModifySpotFleetRequestResponse = Shapes::StructureShape.new(name: 'ModifySpotFleetRequestResponse')
     ModifySubnetAttributeRequest = Shapes::StructureShape.new(name: 'ModifySubnetAttributeRequest')
@@ -1621,6 +1810,8 @@ module Aws::EC2
     ModifyVpcEndpointResult = Shapes::StructureShape.new(name: 'ModifyVpcEndpointResult')
     ModifyVpcEndpointServiceConfigurationRequest = Shapes::StructureShape.new(name: 'ModifyVpcEndpointServiceConfigurationRequest')
     ModifyVpcEndpointServiceConfigurationResult = Shapes::StructureShape.new(name: 'ModifyVpcEndpointServiceConfigurationResult')
+    ModifyVpcEndpointServicePayerResponsibilityRequest = Shapes::StructureShape.new(name: 'ModifyVpcEndpointServicePayerResponsibilityRequest')
+    ModifyVpcEndpointServicePayerResponsibilityResult = Shapes::StructureShape.new(name: 'ModifyVpcEndpointServicePayerResponsibilityResult')
     ModifyVpcEndpointServicePermissionsRequest = Shapes::StructureShape.new(name: 'ModifyVpcEndpointServicePermissionsRequest')
     ModifyVpcEndpointServicePermissionsResult = Shapes::StructureShape.new(name: 'ModifyVpcEndpointServicePermissionsResult')
     ModifyVpcPeeringConnectionOptionsRequest = Shapes::StructureShape.new(name: 'ModifyVpcPeeringConnectionOptionsRequest')
@@ -1642,6 +1833,8 @@ module Aws::EC2
     MonitoringState = Shapes::StringShape.new(name: 'MonitoringState')
     MoveAddressToVpcRequest = Shapes::StructureShape.new(name: 'MoveAddressToVpcRequest')
     MoveAddressToVpcResult = Shapes::StructureShape.new(name: 'MoveAddressToVpcResult')
+    MoveByoipCidrToIpamRequest = Shapes::StructureShape.new(name: 'MoveByoipCidrToIpamRequest')
+    MoveByoipCidrToIpamResult = Shapes::StructureShape.new(name: 'MoveByoipCidrToIpamResult')
     MoveStatus = Shapes::StringShape.new(name: 'MoveStatus')
     MovingAddressStatus = Shapes::StructureShape.new(name: 'MovingAddressStatus')
     MovingAddressStatusSet = Shapes::ListShape.new(name: 'MovingAddressStatusSet')
@@ -1653,6 +1846,7 @@ module Aws::EC2
     NatGatewayIdStringList = Shapes::ListShape.new(name: 'NatGatewayIdStringList')
     NatGatewayList = Shapes::ListShape.new(name: 'NatGatewayList')
     NatGatewayState = Shapes::StringShape.new(name: 'NatGatewayState')
+    NetmaskLength = Shapes::IntegerShape.new(name: 'NetmaskLength')
     NetworkAcl = Shapes::StructureShape.new(name: 'NetworkAcl')
     NetworkAclAssociation = Shapes::StructureShape.new(name: 'NetworkAclAssociation')
     NetworkAclAssociationId = Shapes::StringShape.new(name: 'NetworkAclAssociationId')
@@ -1666,6 +1860,15 @@ module Aws::EC2
     NetworkCardInfo = Shapes::StructureShape.new(name: 'NetworkCardInfo')
     NetworkCardInfoList = Shapes::ListShape.new(name: 'NetworkCardInfoList')
     NetworkInfo = Shapes::StructureShape.new(name: 'NetworkInfo')
+    NetworkInsightsAccessScope = Shapes::StructureShape.new(name: 'NetworkInsightsAccessScope')
+    NetworkInsightsAccessScopeAnalysis = Shapes::StructureShape.new(name: 'NetworkInsightsAccessScopeAnalysis')
+    NetworkInsightsAccessScopeAnalysisId = Shapes::StringShape.new(name: 'NetworkInsightsAccessScopeAnalysisId')
+    NetworkInsightsAccessScopeAnalysisIdList = Shapes::ListShape.new(name: 'NetworkInsightsAccessScopeAnalysisIdList')
+    NetworkInsightsAccessScopeAnalysisList = Shapes::ListShape.new(name: 'NetworkInsightsAccessScopeAnalysisList')
+    NetworkInsightsAccessScopeContent = Shapes::StructureShape.new(name: 'NetworkInsightsAccessScopeContent')
+    NetworkInsightsAccessScopeId = Shapes::StringShape.new(name: 'NetworkInsightsAccessScopeId')
+    NetworkInsightsAccessScopeIdList = Shapes::ListShape.new(name: 'NetworkInsightsAccessScopeIdList')
+    NetworkInsightsAccessScopeList = Shapes::ListShape.new(name: 'NetworkInsightsAccessScopeList')
     NetworkInsightsAnalysis = Shapes::StructureShape.new(name: 'NetworkInsightsAnalysis')
     NetworkInsightsAnalysisId = Shapes::StringShape.new(name: 'NetworkInsightsAnalysisId')
     NetworkInsightsAnalysisIdList = Shapes::ListShape.new(name: 'NetworkInsightsAnalysisIdList')
@@ -1675,12 +1878,15 @@ module Aws::EC2
     NetworkInsightsPathId = Shapes::StringShape.new(name: 'NetworkInsightsPathId')
     NetworkInsightsPathIdList = Shapes::ListShape.new(name: 'NetworkInsightsPathIdList')
     NetworkInsightsPathList = Shapes::ListShape.new(name: 'NetworkInsightsPathList')
+    NetworkInsightsResourceId = Shapes::StringShape.new(name: 'NetworkInsightsResourceId')
     NetworkInterface = Shapes::StructureShape.new(name: 'NetworkInterface')
     NetworkInterfaceAssociation = Shapes::StructureShape.new(name: 'NetworkInterfaceAssociation')
     NetworkInterfaceAttachment = Shapes::StructureShape.new(name: 'NetworkInterfaceAttachment')
     NetworkInterfaceAttachmentChanges = Shapes::StructureShape.new(name: 'NetworkInterfaceAttachmentChanges')
     NetworkInterfaceAttachmentId = Shapes::StringShape.new(name: 'NetworkInterfaceAttachmentId')
     NetworkInterfaceAttribute = Shapes::StringShape.new(name: 'NetworkInterfaceAttribute')
+    NetworkInterfaceCount = Shapes::StructureShape.new(name: 'NetworkInterfaceCount')
+    NetworkInterfaceCountRequest = Shapes::StructureShape.new(name: 'NetworkInterfaceCountRequest')
     NetworkInterfaceCreationType = Shapes::StringShape.new(name: 'NetworkInterfaceCreationType')
     NetworkInterfaceId = Shapes::StringShape.new(name: 'NetworkInterfaceId')
     NetworkInterfaceIdList = Shapes::ListShape.new(name: 'NetworkInterfaceIdList')
@@ -1710,11 +1916,18 @@ module Aws::EC2
     OnDemandOptions = Shapes::StructureShape.new(name: 'OnDemandOptions')
     OnDemandOptionsRequest = Shapes::StructureShape.new(name: 'OnDemandOptionsRequest')
     OperationType = Shapes::StringShape.new(name: 'OperationType')
+    OrganizationArnStringList = Shapes::ListShape.new(name: 'OrganizationArnStringList')
+    OrganizationalUnitArnStringList = Shapes::ListShape.new(name: 'OrganizationalUnitArnStringList')
     OutpostArn = Shapes::StringShape.new(name: 'OutpostArn')
     OwnerStringList = Shapes::ListShape.new(name: 'OwnerStringList')
+    PacketHeaderStatement = Shapes::StructureShape.new(name: 'PacketHeaderStatement')
+    PacketHeaderStatementRequest = Shapes::StructureShape.new(name: 'PacketHeaderStatementRequest')
     PartitionLoadFrequency = Shapes::StringShape.new(name: 'PartitionLoadFrequency')
     PathComponent = Shapes::StructureShape.new(name: 'PathComponent')
     PathComponentList = Shapes::ListShape.new(name: 'PathComponentList')
+    PathStatement = Shapes::StructureShape.new(name: 'PathStatement')
+    PathStatementRequest = Shapes::StructureShape.new(name: 'PathStatementRequest')
+    PayerResponsibility = Shapes::StringShape.new(name: 'PayerResponsibility')
     PaymentOption = Shapes::StringShape.new(name: 'PaymentOption')
     PciId = Shapes::StructureShape.new(name: 'PciId')
     PeeringAttachmentStatus = Shapes::StructureShape.new(name: 'PeeringAttachmentStatus')
@@ -1748,6 +1961,7 @@ module Aws::EC2
     Phase2IntegrityAlgorithmsRequestListValue = Shapes::StructureShape.new(name: 'Phase2IntegrityAlgorithmsRequestListValue')
     Placement = Shapes::StructureShape.new(name: 'Placement')
     PlacementGroup = Shapes::StructureShape.new(name: 'PlacementGroup')
+    PlacementGroupArn = Shapes::StringShape.new(name: 'PlacementGroupArn')
     PlacementGroupId = Shapes::StringShape.new(name: 'PlacementGroupId')
     PlacementGroupIdStringList = Shapes::ListShape.new(name: 'PlacementGroupIdStringList')
     PlacementGroupInfo = Shapes::StructureShape.new(name: 'PlacementGroupInfo')
@@ -1791,6 +2005,9 @@ module Aws::EC2
     PrivateDnsDetails = Shapes::StructureShape.new(name: 'PrivateDnsDetails')
     PrivateDnsDetailsSet = Shapes::ListShape.new(name: 'PrivateDnsDetailsSet')
     PrivateDnsNameConfiguration = Shapes::StructureShape.new(name: 'PrivateDnsNameConfiguration')
+    PrivateDnsNameOptionsOnLaunch = Shapes::StructureShape.new(name: 'PrivateDnsNameOptionsOnLaunch')
+    PrivateDnsNameOptionsRequest = Shapes::StructureShape.new(name: 'PrivateDnsNameOptionsRequest')
+    PrivateDnsNameOptionsResponse = Shapes::StructureShape.new(name: 'PrivateDnsNameOptionsResponse')
     PrivateIpAddressConfigSet = Shapes::ListShape.new(name: 'PrivateIpAddressConfigSet')
     PrivateIpAddressSpecification = Shapes::StructureShape.new(name: 'PrivateIpAddressSpecification')
     PrivateIpAddressSpecificationList = Shapes::ListShape.new(name: 'PrivateIpAddressSpecificationList')
@@ -1805,9 +2022,14 @@ module Aws::EC2
     PropagatingVgw = Shapes::StructureShape.new(name: 'PropagatingVgw')
     PropagatingVgwList = Shapes::ListShape.new(name: 'PropagatingVgwList')
     Protocol = Shapes::StringShape.new(name: 'Protocol')
+    ProtocolList = Shapes::ListShape.new(name: 'ProtocolList')
     ProtocolValue = Shapes::StringShape.new(name: 'ProtocolValue')
     ProvisionByoipCidrRequest = Shapes::StructureShape.new(name: 'ProvisionByoipCidrRequest')
     ProvisionByoipCidrResult = Shapes::StructureShape.new(name: 'ProvisionByoipCidrResult')
+    ProvisionIpamPoolCidrRequest = Shapes::StructureShape.new(name: 'ProvisionIpamPoolCidrRequest')
+    ProvisionIpamPoolCidrResult = Shapes::StructureShape.new(name: 'ProvisionIpamPoolCidrResult')
+    ProvisionPublicIpv4PoolCidrRequest = Shapes::StructureShape.new(name: 'ProvisionPublicIpv4PoolCidrRequest')
+    ProvisionPublicIpv4PoolCidrResult = Shapes::StructureShape.new(name: 'ProvisionPublicIpv4PoolCidrResult')
     ProvisionedBandwidth = Shapes::StructureShape.new(name: 'ProvisionedBandwidth')
     PtrUpdateStatus = Shapes::StructureShape.new(name: 'PtrUpdateStatus')
     PublicIpAddress = Shapes::StringShape.new(name: 'PublicIpAddress')
@@ -1839,6 +2061,7 @@ module Aws::EC2
     Region = Shapes::StructureShape.new(name: 'Region')
     RegionList = Shapes::ListShape.new(name: 'RegionList')
     RegionNameStringList = Shapes::ListShape.new(name: 'RegionNameStringList')
+    RegionNames = Shapes::ListShape.new(name: 'RegionNames')
     RegisterImageRequest = Shapes::StructureShape.new(name: 'RegisterImageRequest')
     RegisterImageResult = Shapes::StructureShape.new(name: 'RegisterImageResult')
     RegisterInstanceEventNotificationAttributesRequest = Shapes::StructureShape.new(name: 'RegisterInstanceEventNotificationAttributesRequest')
@@ -1861,6 +2084,10 @@ module Aws::EC2
     ReleaseAddressRequest = Shapes::StructureShape.new(name: 'ReleaseAddressRequest')
     ReleaseHostsRequest = Shapes::StructureShape.new(name: 'ReleaseHostsRequest')
     ReleaseHostsResult = Shapes::StructureShape.new(name: 'ReleaseHostsResult')
+    ReleaseIpamPoolAllocationRequest = Shapes::StructureShape.new(name: 'ReleaseIpamPoolAllocationRequest')
+    ReleaseIpamPoolAllocationResult = Shapes::StructureShape.new(name: 'ReleaseIpamPoolAllocationResult')
+    RemoveIpamOperatingRegion = Shapes::StructureShape.new(name: 'RemoveIpamOperatingRegion')
+    RemoveIpamOperatingRegionSet = Shapes::ListShape.new(name: 'RemoveIpamOperatingRegionSet')
     RemovePrefixListEntries = Shapes::ListShape.new(name: 'RemovePrefixListEntries')
     RemovePrefixListEntry = Shapes::StructureShape.new(name: 'RemovePrefixListEntry')
     ReplaceIamInstanceProfileAssociationRequest = Shapes::StructureShape.new(name: 'ReplaceIamInstanceProfileAssociationRequest')
@@ -1885,6 +2112,8 @@ module Aws::EC2
     RequestHostIdList = Shapes::ListShape.new(name: 'RequestHostIdList')
     RequestHostIdSet = Shapes::ListShape.new(name: 'RequestHostIdSet')
     RequestInstanceTypeList = Shapes::ListShape.new(name: 'RequestInstanceTypeList')
+    RequestIpamResourceTag = Shapes::StructureShape.new(name: 'RequestIpamResourceTag')
+    RequestIpamResourceTagList = Shapes::ListShape.new(name: 'RequestIpamResourceTagList')
     RequestLaunchTemplateData = Shapes::StructureShape.new(name: 'RequestLaunchTemplateData')
     RequestSpotFleetRequest = Shapes::StructureShape.new(name: 'RequestSpotFleetRequest')
     RequestSpotFleetResponse = Shapes::StructureShape.new(name: 'RequestSpotFleetResponse')
@@ -1940,6 +2169,8 @@ module Aws::EC2
     ResourceArn = Shapes::StringShape.new(name: 'ResourceArn')
     ResourceIdList = Shapes::ListShape.new(name: 'ResourceIdList')
     ResourceList = Shapes::ListShape.new(name: 'ResourceList')
+    ResourceStatement = Shapes::StructureShape.new(name: 'ResourceStatement')
+    ResourceStatementRequest = Shapes::StructureShape.new(name: 'ResourceStatementRequest')
     ResourceType = Shapes::StringShape.new(name: 'ResourceType')
     ResponseError = Shapes::StructureShape.new(name: 'ResponseError')
     ResponseHostIdList = Shapes::ListShape.new(name: 'ResponseHostIdList')
@@ -1950,6 +2181,11 @@ module Aws::EC2
     RestoreAddressToClassicResult = Shapes::StructureShape.new(name: 'RestoreAddressToClassicResult')
     RestoreManagedPrefixListVersionRequest = Shapes::StructureShape.new(name: 'RestoreManagedPrefixListVersionRequest')
     RestoreManagedPrefixListVersionResult = Shapes::StructureShape.new(name: 'RestoreManagedPrefixListVersionResult')
+    RestoreSnapshotFromRecycleBinRequest = Shapes::StructureShape.new(name: 'RestoreSnapshotFromRecycleBinRequest')
+    RestoreSnapshotFromRecycleBinResult = Shapes::StructureShape.new(name: 'RestoreSnapshotFromRecycleBinResult')
+    RestoreSnapshotTierRequest = Shapes::StructureShape.new(name: 'RestoreSnapshotTierRequest')
+    RestoreSnapshotTierRequestTemporaryRestoreDays = Shapes::IntegerShape.new(name: 'RestoreSnapshotTierRequestTemporaryRestoreDays')
+    RestoreSnapshotTierResult = Shapes::StructureShape.new(name: 'RestoreSnapshotTierResult')
     ResultRange = Shapes::IntegerShape.new(name: 'ResultRange')
     RevokeClientVpnIngressRequest = Shapes::StructureShape.new(name: 'RevokeClientVpnIngressRequest')
     RevokeClientVpnIngressResult = Shapes::StructureShape.new(name: 'RevokeClientVpnIngressResult')
@@ -2049,9 +2285,12 @@ module Aws::EC2
     SnapshotIdStringList = Shapes::ListShape.new(name: 'SnapshotIdStringList')
     SnapshotInfo = Shapes::StructureShape.new(name: 'SnapshotInfo')
     SnapshotList = Shapes::ListShape.new(name: 'SnapshotList')
+    SnapshotRecycleBinInfo = Shapes::StructureShape.new(name: 'SnapshotRecycleBinInfo')
+    SnapshotRecycleBinInfoList = Shapes::ListShape.new(name: 'SnapshotRecycleBinInfoList')
     SnapshotSet = Shapes::ListShape.new(name: 'SnapshotSet')
     SnapshotState = Shapes::StringShape.new(name: 'SnapshotState')
     SnapshotTaskDetail = Shapes::StructureShape.new(name: 'SnapshotTaskDetail')
+    SnapshotTierStatus = Shapes::StructureShape.new(name: 'SnapshotTierStatus')
     SpotAllocationStrategy = Shapes::StringShape.new(name: 'SpotAllocationStrategy')
     SpotCapacityRebalance = Shapes::StructureShape.new(name: 'SpotCapacityRebalance')
     SpotDatafeedSubscription = Shapes::StructureShape.new(name: 'SpotDatafeedSubscription')
@@ -2078,6 +2317,10 @@ module Aws::EC2
     SpotOptions = Shapes::StructureShape.new(name: 'SpotOptions')
     SpotOptionsRequest = Shapes::StructureShape.new(name: 'SpotOptionsRequest')
     SpotPlacement = Shapes::StructureShape.new(name: 'SpotPlacement')
+    SpotPlacementScore = Shapes::StructureShape.new(name: 'SpotPlacementScore')
+    SpotPlacementScores = Shapes::ListShape.new(name: 'SpotPlacementScores')
+    SpotPlacementScoresMaxResults = Shapes::IntegerShape.new(name: 'SpotPlacementScoresMaxResults')
+    SpotPlacementScoresTargetCapacity = Shapes::IntegerShape.new(name: 'SpotPlacementScoresTargetCapacity')
     SpotPrice = Shapes::StructureShape.new(name: 'SpotPrice')
     SpotPriceHistoryList = Shapes::ListShape.new(name: 'SpotPriceHistoryList')
     StaleIpPermission = Shapes::StructureShape.new(name: 'StaleIpPermission')
@@ -2086,6 +2329,8 @@ module Aws::EC2
     StaleSecurityGroupSet = Shapes::ListShape.new(name: 'StaleSecurityGroupSet')
     StartInstancesRequest = Shapes::StructureShape.new(name: 'StartInstancesRequest')
     StartInstancesResult = Shapes::StructureShape.new(name: 'StartInstancesResult')
+    StartNetworkInsightsAccessScopeAnalysisRequest = Shapes::StructureShape.new(name: 'StartNetworkInsightsAccessScopeAnalysisRequest')
+    StartNetworkInsightsAccessScopeAnalysisResult = Shapes::StructureShape.new(name: 'StartNetworkInsightsAccessScopeAnalysisResult')
     StartNetworkInsightsAnalysisRequest = Shapes::StructureShape.new(name: 'StartNetworkInsightsAnalysisRequest')
     StartNetworkInsightsAnalysisResult = Shapes::StructureShape.new(name: 'StartNetworkInsightsAnalysisResult')
     StartVpcEndpointServicePrivateDnsVerificationRequest = Shapes::StructureShape.new(name: 'StartVpcEndpointServicePrivateDnsVerificationRequest')
@@ -2100,6 +2345,7 @@ module Aws::EC2
     StopInstancesResult = Shapes::StructureShape.new(name: 'StopInstancesResult')
     Storage = Shapes::StructureShape.new(name: 'Storage')
     StorageLocation = Shapes::StructureShape.new(name: 'StorageLocation')
+    StorageTier = Shapes::StringShape.new(name: 'StorageTier')
     StoreImageTaskResult = Shapes::StructureShape.new(name: 'StoreImageTaskResult')
     StoreImageTaskResultSet = Shapes::ListShape.new(name: 'StoreImageTaskResultSet')
     String = Shapes::StringShape.new(name: 'String')
@@ -2134,6 +2380,7 @@ module Aws::EC2
     TaggableResourceId = Shapes::StringShape.new(name: 'TaggableResourceId')
     TargetCapacitySpecification = Shapes::StructureShape.new(name: 'TargetCapacitySpecification')
     TargetCapacitySpecificationRequest = Shapes::StructureShape.new(name: 'TargetCapacitySpecificationRequest')
+    TargetCapacityUnitType = Shapes::StringShape.new(name: 'TargetCapacityUnitType')
     TargetConfiguration = Shapes::StructureShape.new(name: 'TargetConfiguration')
     TargetConfigurationRequest = Shapes::StructureShape.new(name: 'TargetConfigurationRequest')
     TargetConfigurationRequestSet = Shapes::ListShape.new(name: 'TargetConfigurationRequestSet')
@@ -2144,6 +2391,7 @@ module Aws::EC2
     TargetNetworkSet = Shapes::ListShape.new(name: 'TargetNetworkSet')
     TargetReservationValue = Shapes::StructureShape.new(name: 'TargetReservationValue')
     TargetReservationValueSet = Shapes::ListShape.new(name: 'TargetReservationValueSet')
+    TargetStorageTier = Shapes::StringShape.new(name: 'TargetStorageTier')
     TelemetryStatus = Shapes::StringShape.new(name: 'TelemetryStatus')
     Tenancy = Shapes::StringShape.new(name: 'Tenancy')
     TerminateClientVpnConnectionsRequest = Shapes::StructureShape.new(name: 'TerminateClientVpnConnectionsRequest')
@@ -2154,6 +2402,13 @@ module Aws::EC2
     TerminateInstancesResult = Shapes::StructureShape.new(name: 'TerminateInstancesResult')
     ThreadsPerCore = Shapes::IntegerShape.new(name: 'ThreadsPerCore')
     ThreadsPerCoreList = Shapes::ListShape.new(name: 'ThreadsPerCoreList')
+    ThroughResourcesStatement = Shapes::StructureShape.new(name: 'ThroughResourcesStatement')
+    ThroughResourcesStatementList = Shapes::ListShape.new(name: 'ThroughResourcesStatementList')
+    ThroughResourcesStatementRequest = Shapes::StructureShape.new(name: 'ThroughResourcesStatementRequest')
+    ThroughResourcesStatementRequestList = Shapes::ListShape.new(name: 'ThroughResourcesStatementRequestList')
+    TieringOperationStatus = Shapes::StringShape.new(name: 'TieringOperationStatus')
+    TotalLocalStorageGB = Shapes::StructureShape.new(name: 'TotalLocalStorageGB')
+    TotalLocalStorageGBRequest = Shapes::StructureShape.new(name: 'TotalLocalStorageGBRequest')
     TrafficDirection = Shapes::StringShape.new(name: 'TrafficDirection')
     TrafficMirrorFilter = Shapes::StructureShape.new(name: 'TrafficMirrorFilter')
     TrafficMirrorFilterId = Shapes::StringShape.new(name: 'TrafficMirrorFilterId')
@@ -2296,6 +2551,8 @@ module Aws::EC2
     UserIdGroupPairSet = Shapes::ListShape.new(name: 'UserIdGroupPairSet')
     UserIdStringList = Shapes::ListShape.new(name: 'UserIdStringList')
     VCpuCount = Shapes::IntegerShape.new(name: 'VCpuCount')
+    VCpuCountRange = Shapes::StructureShape.new(name: 'VCpuCountRange')
+    VCpuCountRangeRequest = Shapes::StructureShape.new(name: 'VCpuCountRangeRequest')
     VCpuInfo = Shapes::StructureShape.new(name: 'VCpuInfo')
     ValidationError = Shapes::StructureShape.new(name: 'ValidationError')
     ValidationWarning = Shapes::StructureShape.new(name: 'ValidationWarning')
@@ -2306,6 +2563,7 @@ module Aws::EC2
     VgwTelemetryList = Shapes::ListShape.new(name: 'VgwTelemetryList')
     VirtualizationType = Shapes::StringShape.new(name: 'VirtualizationType')
     VirtualizationTypeList = Shapes::ListShape.new(name: 'VirtualizationTypeList')
+    VirtualizationTypeSet = Shapes::ListShape.new(name: 'VirtualizationTypeSet')
     Volume = Shapes::StructureShape.new(name: 'Volume')
     VolumeAttachment = Shapes::StructureShape.new(name: 'VolumeAttachment')
     VolumeAttachmentList = Shapes::ListShape.new(name: 'VolumeAttachmentList')
@@ -2401,9 +2659,32 @@ module Aws::EC2
     ZoneIdStringList = Shapes::ListShape.new(name: 'ZoneIdStringList')
     ZoneNameStringList = Shapes::ListShape.new(name: 'ZoneNameStringList')
     scope = Shapes::StringShape.new(name: 'scope')
+    snapshotTierStatusSet = Shapes::ListShape.new(name: 'snapshotTierStatusSet')
     totalFpgaMemory = Shapes::IntegerShape.new(name: 'totalFpgaMemory')
     totalGpuMemory = Shapes::IntegerShape.new(name: 'totalGpuMemory')
 
+    AcceleratorCount.add_member(:min, Shapes::ShapeRef.new(shape: Integer, location_name: "min"))
+    AcceleratorCount.add_member(:max, Shapes::ShapeRef.new(shape: Integer, location_name: "max"))
+    AcceleratorCount.struct_class = Types::AcceleratorCount
+
+    AcceleratorCountRequest.add_member(:min, Shapes::ShapeRef.new(shape: Integer, location_name: "Min"))
+    AcceleratorCountRequest.add_member(:max, Shapes::ShapeRef.new(shape: Integer, location_name: "Max"))
+    AcceleratorCountRequest.struct_class = Types::AcceleratorCountRequest
+
+    AcceleratorManufacturerSet.member = Shapes::ShapeRef.new(shape: AcceleratorManufacturer, location_name: "item")
+
+    AcceleratorNameSet.member = Shapes::ShapeRef.new(shape: AcceleratorName, location_name: "item")
+
+    AcceleratorTotalMemoryMiB.add_member(:min, Shapes::ShapeRef.new(shape: Integer, location_name: "min"))
+    AcceleratorTotalMemoryMiB.add_member(:max, Shapes::ShapeRef.new(shape: Integer, location_name: "max"))
+    AcceleratorTotalMemoryMiB.struct_class = Types::AcceleratorTotalMemoryMiB
+
+    AcceleratorTotalMemoryMiBRequest.add_member(:min, Shapes::ShapeRef.new(shape: Integer, location_name: "Min"))
+    AcceleratorTotalMemoryMiBRequest.add_member(:max, Shapes::ShapeRef.new(shape: Integer, location_name: "Max"))
+    AcceleratorTotalMemoryMiBRequest.struct_class = Types::AcceleratorTotalMemoryMiBRequest
+
+    AcceleratorTypeSet.member = Shapes::ShapeRef.new(shape: AcceleratorType, location_name: "item")
+
     AcceptReservedInstancesExchangeQuoteRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     AcceptReservedInstancesExchangeQuoteRequest.add_member(:reserved_instance_ids, Shapes::ShapeRef.new(shape: ReservedInstanceIdSet, required: true, location_name: "ReservedInstanceId"))
     AcceptReservedInstancesExchangeQuoteRequest.add_member(:target_configurations, Shapes::ShapeRef.new(shape: TargetConfigurationRequestSet, location_name: "TargetConfiguration"))
@@ -2450,6 +2731,28 @@ module Aws::EC2
     AcceptVpcPeeringConnectionResult.add_member(:vpc_peering_connection, Shapes::ShapeRef.new(shape: VpcPeeringConnection, location_name: "vpcPeeringConnection"))
     AcceptVpcPeeringConnectionResult.struct_class = Types::AcceptVpcPeeringConnectionResult
 
+    AccessScopeAnalysisFinding.add_member(:network_insights_access_scope_analysis_id, Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeAnalysisId, location_name: "networkInsightsAccessScopeAnalysisId"))
+    AccessScopeAnalysisFinding.add_member(:network_insights_access_scope_id, Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeId, location_name: "networkInsightsAccessScopeId"))
+    AccessScopeAnalysisFinding.add_member(:finding_id, Shapes::ShapeRef.new(shape: String, location_name: "findingId"))
+    AccessScopeAnalysisFinding.add_member(:finding_components, Shapes::ShapeRef.new(shape: PathComponentList, location_name: "findingComponentSet"))
+    AccessScopeAnalysisFinding.struct_class = Types::AccessScopeAnalysisFinding
+
+    AccessScopeAnalysisFindingList.member = Shapes::ShapeRef.new(shape: AccessScopeAnalysisFinding, location_name: "item")
+
+    AccessScopePath.add_member(:source, Shapes::ShapeRef.new(shape: PathStatement, location_name: "source"))
+    AccessScopePath.add_member(:destination, Shapes::ShapeRef.new(shape: PathStatement, location_name: "destination"))
+    AccessScopePath.add_member(:through_resources, Shapes::ShapeRef.new(shape: ThroughResourcesStatementList, location_name: "throughResourceSet"))
+    AccessScopePath.struct_class = Types::AccessScopePath
+
+    AccessScopePathList.member = Shapes::ShapeRef.new(shape: AccessScopePath, location_name: "item")
+
+    AccessScopePathListRequest.member = Shapes::ShapeRef.new(shape: AccessScopePathRequest, location_name: "item")
+
+    AccessScopePathRequest.add_member(:source, Shapes::ShapeRef.new(shape: PathStatementRequest, location_name: "Source"))
+    AccessScopePathRequest.add_member(:destination, Shapes::ShapeRef.new(shape: PathStatementRequest, location_name: "Destination"))
+    AccessScopePathRequest.add_member(:through_resources, Shapes::ShapeRef.new(shape: ThroughResourcesStatementRequestList, location_name: "ThroughResource"))
+    AccessScopePathRequest.struct_class = Types::AccessScopePathRequest
+
     AccountAttribute.add_member(:attribute_name, Shapes::ShapeRef.new(shape: String, location_name: "attributeName"))
     AccountAttribute.add_member(:attribute_values, Shapes::ShapeRef.new(shape: AccountAttributeValueList, location_name: "attributeValueSet"))
     AccountAttribute.struct_class = Types::AccountAttribute
@@ -2471,6 +2774,11 @@ module Aws::EC2
 
     ActiveInstanceSet.member = Shapes::ShapeRef.new(shape: ActiveInstance, location_name: "item")
 
+    AddIpamOperatingRegion.add_member(:region_name, Shapes::ShapeRef.new(shape: String, location_name: "RegionName"))
+    AddIpamOperatingRegion.struct_class = Types::AddIpamOperatingRegion
+
+    AddIpamOperatingRegionSet.member = Shapes::ShapeRef.new(shape: AddIpamOperatingRegion)
+
     AddPrefixListEntries.member = Shapes::ShapeRef.new(shape: AddPrefixListEntry)
 
     AddPrefixListEntry.add_member(:cidr, Shapes::ShapeRef.new(shape: String, required: true, location_name: "Cidr"))
@@ -2542,6 +2850,19 @@ module Aws::EC2
     AllocateHostsResult.add_member(:host_ids, Shapes::ShapeRef.new(shape: ResponseHostIdList, location_name: "hostIdSet"))
     AllocateHostsResult.struct_class = Types::AllocateHostsResult
 
+    AllocateIpamPoolCidrRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    AllocateIpamPoolCidrRequest.add_member(:ipam_pool_id, Shapes::ShapeRef.new(shape: IpamPoolId, required: true, location_name: "IpamPoolId"))
+    AllocateIpamPoolCidrRequest.add_member(:cidr, Shapes::ShapeRef.new(shape: String, location_name: "Cidr"))
+    AllocateIpamPoolCidrRequest.add_member(:netmask_length, Shapes::ShapeRef.new(shape: Integer, location_name: "NetmaskLength"))
+    AllocateIpamPoolCidrRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "ClientToken", metadata: {"idempotencyToken"=>true}))
+    AllocateIpamPoolCidrRequest.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "Description"))
+    AllocateIpamPoolCidrRequest.add_member(:preview_next_cidr, Shapes::ShapeRef.new(shape: Boolean, location_name: "PreviewNextCidr"))
+    AllocateIpamPoolCidrRequest.add_member(:disallowed_cidrs, Shapes::ShapeRef.new(shape: IpamPoolAllocationDisallowedCidrs, location_name: "DisallowedCidr"))
+    AllocateIpamPoolCidrRequest.struct_class = Types::AllocateIpamPoolCidrRequest
+
+    AllocateIpamPoolCidrResult.add_member(:ipam_pool_allocation, Shapes::ShapeRef.new(shape: IpamPoolAllocation, location_name: "ipamPoolAllocation"))
+    AllocateIpamPoolCidrResult.struct_class = Types::AllocateIpamPoolCidrResult
+
     AllocationIdList.member = Shapes::ShapeRef.new(shape: AllocationId, location_name: "AllocationId")
 
     AllocationIds.member = Shapes::ShapeRef.new(shape: AllocationId, location_name: "item")
@@ -2568,6 +2889,7 @@ module Aws::EC2
 
     AnalysisComponent.add_member(:id, Shapes::ShapeRef.new(shape: String, location_name: "id"))
     AnalysisComponent.add_member(:arn, Shapes::ShapeRef.new(shape: String, location_name: "arn"))
+    AnalysisComponent.add_member(:name, Shapes::ShapeRef.new(shape: String, location_name: "name"))
     AnalysisComponent.struct_class = Types::AnalysisComponent
 
     AnalysisComponentList.member = Shapes::ShapeRef.new(shape: AnalysisComponent, location_name: "item")
@@ -2620,6 +2942,8 @@ module Aws::EC2
 
     ArchitectureTypeList.member = Shapes::ShapeRef.new(shape: ArchitectureType, location_name: "item")
 
+    ArchitectureTypeSet.member = Shapes::ShapeRef.new(shape: ArchitectureType, location_name: "item")
+
     ArnList.member = Shapes::ShapeRef.new(shape: ResourceArn, location_name: "item")
 
     AssignIpv6AddressesRequest.add_member(:ipv_6_address_count, Shapes::ShapeRef.new(shape: Integer, location_name: "ipv6AddressCount"))
@@ -2757,6 +3081,10 @@ module Aws::EC2
     AssociateVpcCidrBlockRequest.add_member(:ipv_6_cidr_block_network_border_group, Shapes::ShapeRef.new(shape: String, location_name: "Ipv6CidrBlockNetworkBorderGroup"))
     AssociateVpcCidrBlockRequest.add_member(:ipv_6_pool, Shapes::ShapeRef.new(shape: Ipv6PoolEc2Id, location_name: "Ipv6Pool"))
     AssociateVpcCidrBlockRequest.add_member(:ipv_6_cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "Ipv6CidrBlock"))
+    AssociateVpcCidrBlockRequest.add_member(:ipv_4_ipam_pool_id, Shapes::ShapeRef.new(shape: IpamPoolId, location_name: "Ipv4IpamPoolId"))
+    AssociateVpcCidrBlockRequest.add_member(:ipv_4_netmask_length, Shapes::ShapeRef.new(shape: NetmaskLength, location_name: "Ipv4NetmaskLength"))
+    AssociateVpcCidrBlockRequest.add_member(:ipv_6_ipam_pool_id, Shapes::ShapeRef.new(shape: IpamPoolId, location_name: "Ipv6IpamPoolId"))
+    AssociateVpcCidrBlockRequest.add_member(:ipv_6_netmask_length, Shapes::ShapeRef.new(shape: NetmaskLength, location_name: "Ipv6NetmaskLength"))
     AssociateVpcCidrBlockRequest.struct_class = Types::AssociateVpcCidrBlockRequest
 
     AssociateVpcCidrBlockResult.add_member(:ipv_6_cidr_block_association, Shapes::ShapeRef.new(shape: VpcIpv6CidrBlockAssociation, location_name: "ipv6CidrBlockAssociation"))
@@ -2920,6 +3248,14 @@ module Aws::EC2
 
     AvailableInstanceCapacityList.member = Shapes::ShapeRef.new(shape: InstanceCapacity, location_name: "item")
 
+    BaselineEbsBandwidthMbps.add_member(:min, Shapes::ShapeRef.new(shape: Integer, location_name: "min"))
+    BaselineEbsBandwidthMbps.add_member(:max, Shapes::ShapeRef.new(shape: Integer, location_name: "max"))
+    BaselineEbsBandwidthMbps.struct_class = Types::BaselineEbsBandwidthMbps
+
+    BaselineEbsBandwidthMbpsRequest.add_member(:min, Shapes::ShapeRef.new(shape: Integer, location_name: "Min"))
+    BaselineEbsBandwidthMbpsRequest.add_member(:max, Shapes::ShapeRef.new(shape: Integer, location_name: "Max"))
+    BaselineEbsBandwidthMbpsRequest.struct_class = Types::BaselineEbsBandwidthMbpsRequest
+
     BillingProductList.member = Shapes::ShapeRef.new(shape: String, location_name: "item")
 
     BlobAttributeValue.add_member(:value, Shapes::ShapeRef.new(shape: Blob, location_name: "value"))
@@ -3081,6 +3417,7 @@ module Aws::EC2
     CapacityReservation.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
     CapacityReservation.add_member(:outpost_arn, Shapes::ShapeRef.new(shape: OutpostArn, location_name: "outpostArn"))
     CapacityReservation.add_member(:capacity_reservation_fleet_id, Shapes::ShapeRef.new(shape: String, location_name: "capacityReservationFleetId"))
+    CapacityReservation.add_member(:placement_group_arn, Shapes::ShapeRef.new(shape: PlacementGroupArn, location_name: "placementGroupArn"))
     CapacityReservation.struct_class = Types::CapacityReservation
 
     CapacityReservationFleet.add_member(:capacity_reservation_fleet_id, Shapes::ShapeRef.new(shape: CapacityReservationFleetId, location_name: "capacityReservationFleetId"))
@@ -3207,6 +3544,14 @@ module Aws::EC2
     ClientData.add_member(:upload_start, Shapes::ShapeRef.new(shape: DateTime, location_name: "UploadStart"))
     ClientData.struct_class = Types::ClientData
 
+    ClientLoginBannerOptions.add_member(:enabled, Shapes::ShapeRef.new(shape: Boolean, location_name: "Enabled"))
+    ClientLoginBannerOptions.add_member(:banner_text, Shapes::ShapeRef.new(shape: String, location_name: "BannerText"))
+    ClientLoginBannerOptions.struct_class = Types::ClientLoginBannerOptions
+
+    ClientLoginBannerResponseOptions.add_member(:enabled, Shapes::ShapeRef.new(shape: Boolean, location_name: "enabled"))
+    ClientLoginBannerResponseOptions.add_member(:banner_text, Shapes::ShapeRef.new(shape: String, location_name: "bannerText"))
+    ClientLoginBannerResponseOptions.struct_class = Types::ClientLoginBannerResponseOptions
+
     ClientVpnAuthentication.add_member(:type, Shapes::ShapeRef.new(shape: ClientVpnAuthenticationType, location_name: "type"))
     ClientVpnAuthentication.add_member(:active_directory, Shapes::ShapeRef.new(shape: DirectoryServiceAuthentication, location_name: "activeDirectory"))
     ClientVpnAuthentication.add_member(:mutual_authentication, Shapes::ShapeRef.new(shape: CertificateAuthentication, location_name: "mutualAuthentication"))
@@ -3270,6 +3615,8 @@ module Aws::EC2
     ClientVpnEndpoint.add_member(:vpc_id, Shapes::ShapeRef.new(shape: VpcId, location_name: "vpcId"))
     ClientVpnEndpoint.add_member(:self_service_portal_url, Shapes::ShapeRef.new(shape: String, location_name: "selfServicePortalUrl"))
     ClientVpnEndpoint.add_member(:client_connect_options, Shapes::ShapeRef.new(shape: ClientConnectResponseOptions, location_name: "clientConnectOptions"))
+    ClientVpnEndpoint.add_member(:session_timeout_hours, Shapes::ShapeRef.new(shape: Integer, location_name: "sessionTimeoutHours"))
+    ClientVpnEndpoint.add_member(:client_login_banner_options, Shapes::ShapeRef.new(shape: ClientLoginBannerResponseOptions, location_name: "clientLoginBannerOptions"))
     ClientVpnEndpoint.struct_class = Types::ClientVpnEndpoint
 
     ClientVpnEndpointAttributeStatus.add_member(:code, Shapes::ShapeRef.new(shape: ClientVpnEndpointAttributeStatusCode, location_name: "code"))
@@ -3404,6 +3751,8 @@ module Aws::EC2
 
     CoreCountList.member = Shapes::ShapeRef.new(shape: CoreCount, location_name: "item")
 
+    CpuManufacturerSet.member = Shapes::ShapeRef.new(shape: CpuManufacturer, location_name: "item")
+
     CpuOptions.add_member(:core_count, Shapes::ShapeRef.new(shape: Integer, location_name: "coreCount"))
     CpuOptions.add_member(:threads_per_core, Shapes::ShapeRef.new(shape: Integer, location_name: "threadsPerCore"))
     CpuOptions.struct_class = Types::CpuOptions
@@ -3451,6 +3800,7 @@ module Aws::EC2
     CreateCapacityReservationRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecifications"))
     CreateCapacityReservationRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     CreateCapacityReservationRequest.add_member(:outpost_arn, Shapes::ShapeRef.new(shape: OutpostArn, location_name: "OutpostArn"))
+    CreateCapacityReservationRequest.add_member(:placement_group_arn, Shapes::ShapeRef.new(shape: PlacementGroupArn, location_name: "PlacementGroupArn"))
     CreateCapacityReservationRequest.struct_class = Types::CreateCapacityReservationRequest
 
     CreateCapacityReservationResult.add_member(:capacity_reservation, Shapes::ShapeRef.new(shape: CapacityReservation, location_name: "capacityReservation"))
@@ -3481,6 +3831,8 @@ module Aws::EC2
     CreateClientVpnEndpointRequest.add_member(:vpc_id, Shapes::ShapeRef.new(shape: VpcId, location_name: "VpcId"))
     CreateClientVpnEndpointRequest.add_member(:self_service_portal, Shapes::ShapeRef.new(shape: SelfServicePortal, location_name: "SelfServicePortal"))
     CreateClientVpnEndpointRequest.add_member(:client_connect_options, Shapes::ShapeRef.new(shape: ClientConnectOptions, location_name: "ClientConnectOptions"))
+    CreateClientVpnEndpointRequest.add_member(:session_timeout_hours, Shapes::ShapeRef.new(shape: Integer, location_name: "SessionTimeoutHours"))
+    CreateClientVpnEndpointRequest.add_member(:client_login_banner_options, Shapes::ShapeRef.new(shape: ClientLoginBannerOptions, location_name: "ClientLoginBannerOptions"))
     CreateClientVpnEndpointRequest.struct_class = Types::CreateClientVpnEndpointRequest
 
     CreateClientVpnEndpointResult.add_member(:client_vpn_endpoint_id, Shapes::ShapeRef.new(shape: String, location_name: "clientVpnEndpointId"))
@@ -3513,6 +3865,7 @@ module Aws::EC2
 
     CreateDefaultSubnetRequest.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, required: true, 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.struct_class = Types::CreateDefaultSubnetRequest
 
     CreateDefaultSubnetResult.add_member(:subnet, Shapes::ShapeRef.new(shape: Subnet, location_name: "subnet"))
@@ -3652,6 +4005,46 @@ module Aws::EC2
     CreateInternetGatewayResult.add_member(:internet_gateway, Shapes::ShapeRef.new(shape: InternetGateway, location_name: "internetGateway"))
     CreateInternetGatewayResult.struct_class = Types::CreateInternetGatewayResult
 
+    CreateIpamPoolRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    CreateIpamPoolRequest.add_member(:ipam_scope_id, Shapes::ShapeRef.new(shape: IpamScopeId, required: true, location_name: "IpamScopeId"))
+    CreateIpamPoolRequest.add_member(:locale, Shapes::ShapeRef.new(shape: String, location_name: "Locale"))
+    CreateIpamPoolRequest.add_member(:source_ipam_pool_id, Shapes::ShapeRef.new(shape: IpamPoolId, location_name: "SourceIpamPoolId"))
+    CreateIpamPoolRequest.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "Description"))
+    CreateIpamPoolRequest.add_member(:address_family, Shapes::ShapeRef.new(shape: AddressFamily, location_name: "AddressFamily"))
+    CreateIpamPoolRequest.add_member(:auto_import, Shapes::ShapeRef.new(shape: Boolean, location_name: "AutoImport"))
+    CreateIpamPoolRequest.add_member(:publicly_advertisable, Shapes::ShapeRef.new(shape: Boolean, location_name: "PubliclyAdvertisable"))
+    CreateIpamPoolRequest.add_member(:allocation_min_netmask_length, Shapes::ShapeRef.new(shape: IpamNetmaskLength, location_name: "AllocationMinNetmaskLength"))
+    CreateIpamPoolRequest.add_member(:allocation_max_netmask_length, Shapes::ShapeRef.new(shape: IpamNetmaskLength, location_name: "AllocationMaxNetmaskLength"))
+    CreateIpamPoolRequest.add_member(:allocation_default_netmask_length, Shapes::ShapeRef.new(shape: IpamNetmaskLength, location_name: "AllocationDefaultNetmaskLength"))
+    CreateIpamPoolRequest.add_member(:allocation_resource_tags, Shapes::ShapeRef.new(shape: RequestIpamResourceTagList, location_name: "AllocationResourceTag"))
+    CreateIpamPoolRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
+    CreateIpamPoolRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "ClientToken", metadata: {"idempotencyToken"=>true}))
+    CreateIpamPoolRequest.add_member(:aws_service, Shapes::ShapeRef.new(shape: IpamPoolAwsService, location_name: "AwsService"))
+    CreateIpamPoolRequest.struct_class = Types::CreateIpamPoolRequest
+
+    CreateIpamPoolResult.add_member(:ipam_pool, Shapes::ShapeRef.new(shape: IpamPool, location_name: "ipamPool"))
+    CreateIpamPoolResult.struct_class = Types::CreateIpamPoolResult
+
+    CreateIpamRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    CreateIpamRequest.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "Description"))
+    CreateIpamRequest.add_member(:operating_regions, Shapes::ShapeRef.new(shape: AddIpamOperatingRegionSet, location_name: "OperatingRegion"))
+    CreateIpamRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
+    CreateIpamRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "ClientToken", metadata: {"idempotencyToken"=>true}))
+    CreateIpamRequest.struct_class = Types::CreateIpamRequest
+
+    CreateIpamResult.add_member(:ipam, Shapes::ShapeRef.new(shape: Ipam, location_name: "ipam"))
+    CreateIpamResult.struct_class = Types::CreateIpamResult
+
+    CreateIpamScopeRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    CreateIpamScopeRequest.add_member(:ipam_id, Shapes::ShapeRef.new(shape: IpamId, required: true, location_name: "IpamId"))
+    CreateIpamScopeRequest.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "Description"))
+    CreateIpamScopeRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
+    CreateIpamScopeRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "ClientToken", metadata: {"idempotencyToken"=>true}))
+    CreateIpamScopeRequest.struct_class = Types::CreateIpamScopeRequest
+
+    CreateIpamScopeResult.add_member(:ipam_scope, Shapes::ShapeRef.new(shape: IpamScope, location_name: "ipamScope"))
+    CreateIpamScopeResult.struct_class = Types::CreateIpamScopeResult
+
     CreateKeyPairRequest.add_member(:key_name, Shapes::ShapeRef.new(shape: String, required: true, location_name: "KeyName"))
     CreateKeyPairRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     CreateKeyPairRequest.add_member(:key_type, Shapes::ShapeRef.new(shape: KeyType, location_name: "KeyType"))
@@ -3745,10 +4138,21 @@ module Aws::EC2
     CreateNetworkAclResult.add_member(:network_acl, Shapes::ShapeRef.new(shape: NetworkAcl, location_name: "networkAcl"))
     CreateNetworkAclResult.struct_class = Types::CreateNetworkAclResult
 
+    CreateNetworkInsightsAccessScopeRequest.add_member(:match_paths, Shapes::ShapeRef.new(shape: AccessScopePathListRequest, location_name: "MatchPath"))
+    CreateNetworkInsightsAccessScopeRequest.add_member(:exclude_paths, Shapes::ShapeRef.new(shape: AccessScopePathListRequest, location_name: "ExcludePath"))
+    CreateNetworkInsightsAccessScopeRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, required: true, location_name: "ClientToken", metadata: {"idempotencyToken"=>true}))
+    CreateNetworkInsightsAccessScopeRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
+    CreateNetworkInsightsAccessScopeRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    CreateNetworkInsightsAccessScopeRequest.struct_class = Types::CreateNetworkInsightsAccessScopeRequest
+
+    CreateNetworkInsightsAccessScopeResult.add_member(:network_insights_access_scope, Shapes::ShapeRef.new(shape: NetworkInsightsAccessScope, location_name: "networkInsightsAccessScope"))
+    CreateNetworkInsightsAccessScopeResult.add_member(:network_insights_access_scope_content, Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeContent, location_name: "networkInsightsAccessScopeContent"))
+    CreateNetworkInsightsAccessScopeResult.struct_class = Types::CreateNetworkInsightsAccessScopeResult
+
     CreateNetworkInsightsPathRequest.add_member(:source_ip, Shapes::ShapeRef.new(shape: IpAddress, location_name: "SourceIp"))
     CreateNetworkInsightsPathRequest.add_member(:destination_ip, Shapes::ShapeRef.new(shape: IpAddress, location_name: "DestinationIp"))
-    CreateNetworkInsightsPathRequest.add_member(:source, Shapes::ShapeRef.new(shape: String, required: true, location_name: "Source"))
-    CreateNetworkInsightsPathRequest.add_member(:destination, Shapes::ShapeRef.new(shape: String, required: true, location_name: "Destination"))
+    CreateNetworkInsightsPathRequest.add_member(:source, Shapes::ShapeRef.new(shape: NetworkInsightsResourceId, required: true, location_name: "Source"))
+    CreateNetworkInsightsPathRequest.add_member(:destination, Shapes::ShapeRef.new(shape: NetworkInsightsResourceId, required: true, location_name: "Destination"))
     CreateNetworkInsightsPathRequest.add_member(:protocol, Shapes::ShapeRef.new(shape: Protocol, required: true, location_name: "Protocol"))
     CreateNetworkInsightsPathRequest.add_member(:destination_port, Shapes::ShapeRef.new(shape: Port, location_name: "DestinationPort"))
     CreateNetworkInsightsPathRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
@@ -3801,6 +4205,13 @@ module Aws::EC2
     CreatePlacementGroupResult.add_member(:placement_group, Shapes::ShapeRef.new(shape: PlacementGroup, location_name: "placementGroup"))
     CreatePlacementGroupResult.struct_class = Types::CreatePlacementGroupResult
 
+    CreatePublicIpv4PoolRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    CreatePublicIpv4PoolRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
+    CreatePublicIpv4PoolRequest.struct_class = Types::CreatePublicIpv4PoolRequest
+
+    CreatePublicIpv4PoolResult.add_member(:pool_id, Shapes::ShapeRef.new(shape: Ipv4PoolEc2Id, location_name: "poolId"))
+    CreatePublicIpv4PoolResult.struct_class = Types::CreatePublicIpv4PoolResult
+
     CreateReplaceRootVolumeTaskRequest.add_member(:instance_id, Shapes::ShapeRef.new(shape: InstanceId, required: true, location_name: "InstanceId"))
     CreateReplaceRootVolumeTaskRequest.add_member(:snapshot_id, Shapes::ShapeRef.new(shape: SnapshotId, location_name: "SnapshotId"))
     CreateReplaceRootVolumeTaskRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "ClientToken", metadata: {"idempotencyToken"=>true}))
@@ -3845,6 +4256,7 @@ module Aws::EC2
     CreateRouteRequest.add_member(:network_interface_id, Shapes::ShapeRef.new(shape: NetworkInterfaceId, location_name: "networkInterfaceId"))
     CreateRouteRequest.add_member(:route_table_id, Shapes::ShapeRef.new(shape: RouteTableId, required: true, location_name: "routeTableId"))
     CreateRouteRequest.add_member(:vpc_peering_connection_id, Shapes::ShapeRef.new(shape: VpcPeeringConnectionId, location_name: "vpcPeeringConnectionId"))
+    CreateRouteRequest.add_member(:core_network_arn, Shapes::ShapeRef.new(shape: CoreNetworkArn, location_name: "CoreNetworkArn"))
     CreateRouteRequest.struct_class = Types::CreateRouteRequest
 
     CreateRouteResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
@@ -3918,11 +4330,12 @@ module Aws::EC2
     CreateSubnetRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
     CreateSubnetRequest.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "AvailabilityZone"))
     CreateSubnetRequest.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: String, location_name: "AvailabilityZoneId"))
-    CreateSubnetRequest.add_member(:cidr_block, Shapes::ShapeRef.new(shape: String, required: true, location_name: "CidrBlock"))
+    CreateSubnetRequest.add_member(:cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "CidrBlock"))
     CreateSubnetRequest.add_member(:ipv_6_cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "Ipv6CidrBlock"))
     CreateSubnetRequest.add_member(:outpost_arn, Shapes::ShapeRef.new(shape: String, location_name: "OutpostArn"))
     CreateSubnetRequest.add_member(:vpc_id, Shapes::ShapeRef.new(shape: VpcId, required: true, location_name: "VpcId"))
     CreateSubnetRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
+    CreateSubnetRequest.add_member(:ipv_6_native, Shapes::ShapeRef.new(shape: Boolean, location_name: "Ipv6Native"))
     CreateSubnetRequest.struct_class = Types::CreateSubnetRequest
 
     CreateSubnetResult.add_member(:subnet, Shapes::ShapeRef.new(shape: Subnet, location_name: "subnet"))
@@ -4169,10 +4582,14 @@ module Aws::EC2
     CreateVpcPeeringConnectionResult.add_member(:vpc_peering_connection, Shapes::ShapeRef.new(shape: VpcPeeringConnection, location_name: "vpcPeeringConnection"))
     CreateVpcPeeringConnectionResult.struct_class = Types::CreateVpcPeeringConnectionResult
 
-    CreateVpcRequest.add_member(:cidr_block, Shapes::ShapeRef.new(shape: String, required: true, location_name: "CidrBlock"))
+    CreateVpcRequest.add_member(:cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "CidrBlock"))
     CreateVpcRequest.add_member(:amazon_provided_ipv_6_cidr_block, Shapes::ShapeRef.new(shape: Boolean, location_name: "amazonProvidedIpv6CidrBlock"))
     CreateVpcRequest.add_member(:ipv_6_pool, Shapes::ShapeRef.new(shape: Ipv6PoolEc2Id, location_name: "Ipv6Pool"))
     CreateVpcRequest.add_member(:ipv_6_cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "Ipv6CidrBlock"))
+    CreateVpcRequest.add_member(:ipv_4_ipam_pool_id, Shapes::ShapeRef.new(shape: IpamPoolId, location_name: "Ipv4IpamPoolId"))
+    CreateVpcRequest.add_member(:ipv_4_netmask_length, Shapes::ShapeRef.new(shape: NetmaskLength, location_name: "Ipv4NetmaskLength"))
+    CreateVpcRequest.add_member(:ipv_6_ipam_pool_id, Shapes::ShapeRef.new(shape: IpamPoolId, location_name: "Ipv6IpamPoolId"))
+    CreateVpcRequest.add_member(:ipv_6_netmask_length, Shapes::ShapeRef.new(shape: NetmaskLength, location_name: "Ipv6NetmaskLength"))
     CreateVpcRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     CreateVpcRequest.add_member(:instance_tenancy, Shapes::ShapeRef.new(shape: Tenancy, location_name: "instanceTenancy"))
     CreateVpcRequest.add_member(:ipv_6_cidr_block_network_border_group, Shapes::ShapeRef.new(shape: String, location_name: "Ipv6CidrBlockNetworkBorderGroup"))
@@ -4320,6 +4737,27 @@ module Aws::EC2
     DeleteInternetGatewayRequest.add_member(:internet_gateway_id, Shapes::ShapeRef.new(shape: InternetGatewayId, required: true, location_name: "internetGatewayId"))
     DeleteInternetGatewayRequest.struct_class = Types::DeleteInternetGatewayRequest
 
+    DeleteIpamPoolRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DeleteIpamPoolRequest.add_member(:ipam_pool_id, Shapes::ShapeRef.new(shape: IpamPoolId, required: true, location_name: "IpamPoolId"))
+    DeleteIpamPoolRequest.struct_class = Types::DeleteIpamPoolRequest
+
+    DeleteIpamPoolResult.add_member(:ipam_pool, Shapes::ShapeRef.new(shape: IpamPool, location_name: "ipamPool"))
+    DeleteIpamPoolResult.struct_class = Types::DeleteIpamPoolResult
+
+    DeleteIpamRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DeleteIpamRequest.add_member(:ipam_id, Shapes::ShapeRef.new(shape: IpamId, required: true, location_name: "IpamId"))
+    DeleteIpamRequest.struct_class = Types::DeleteIpamRequest
+
+    DeleteIpamResult.add_member(:ipam, Shapes::ShapeRef.new(shape: Ipam, location_name: "ipam"))
+    DeleteIpamResult.struct_class = Types::DeleteIpamResult
+
+    DeleteIpamScopeRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DeleteIpamScopeRequest.add_member(:ipam_scope_id, Shapes::ShapeRef.new(shape: IpamScopeId, required: true, location_name: "IpamScopeId"))
+    DeleteIpamScopeRequest.struct_class = Types::DeleteIpamScopeRequest
+
+    DeleteIpamScopeResult.add_member(:ipam_scope, Shapes::ShapeRef.new(shape: IpamScope, location_name: "ipamScope"))
+    DeleteIpamScopeResult.struct_class = Types::DeleteIpamScopeResult
+
     DeleteKeyPairRequest.add_member(:key_name, Shapes::ShapeRef.new(shape: KeyPairName, location_name: "KeyName"))
     DeleteKeyPairRequest.add_member(:key_pair_id, Shapes::ShapeRef.new(shape: KeyPairId, location_name: "KeyPairId"))
     DeleteKeyPairRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
@@ -4397,6 +4835,20 @@ module Aws::EC2
     DeleteNetworkAclRequest.add_member(:network_acl_id, Shapes::ShapeRef.new(shape: NetworkAclId, required: true, location_name: "networkAclId"))
     DeleteNetworkAclRequest.struct_class = Types::DeleteNetworkAclRequest
 
+    DeleteNetworkInsightsAccessScopeAnalysisRequest.add_member(:network_insights_access_scope_analysis_id, Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeAnalysisId, required: true, location_name: "NetworkInsightsAccessScopeAnalysisId"))
+    DeleteNetworkInsightsAccessScopeAnalysisRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DeleteNetworkInsightsAccessScopeAnalysisRequest.struct_class = Types::DeleteNetworkInsightsAccessScopeAnalysisRequest
+
+    DeleteNetworkInsightsAccessScopeAnalysisResult.add_member(:network_insights_access_scope_analysis_id, Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeAnalysisId, location_name: "networkInsightsAccessScopeAnalysisId"))
+    DeleteNetworkInsightsAccessScopeAnalysisResult.struct_class = Types::DeleteNetworkInsightsAccessScopeAnalysisResult
+
+    DeleteNetworkInsightsAccessScopeRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DeleteNetworkInsightsAccessScopeRequest.add_member(:network_insights_access_scope_id, Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeId, required: true, location_name: "NetworkInsightsAccessScopeId"))
+    DeleteNetworkInsightsAccessScopeRequest.struct_class = Types::DeleteNetworkInsightsAccessScopeRequest
+
+    DeleteNetworkInsightsAccessScopeResult.add_member(:network_insights_access_scope_id, Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeId, location_name: "networkInsightsAccessScopeId"))
+    DeleteNetworkInsightsAccessScopeResult.struct_class = Types::DeleteNetworkInsightsAccessScopeResult
+
     DeleteNetworkInsightsAnalysisRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     DeleteNetworkInsightsAnalysisRequest.add_member(:network_insights_analysis_id, Shapes::ShapeRef.new(shape: NetworkInsightsAnalysisId, required: true, location_name: "NetworkInsightsAnalysisId"))
     DeleteNetworkInsightsAnalysisRequest.struct_class = Types::DeleteNetworkInsightsAnalysisRequest
@@ -4427,6 +4879,13 @@ module Aws::EC2
     DeletePlacementGroupRequest.add_member(:group_name, Shapes::ShapeRef.new(shape: PlacementGroupName, required: true, location_name: "groupName"))
     DeletePlacementGroupRequest.struct_class = Types::DeletePlacementGroupRequest
 
+    DeletePublicIpv4PoolRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DeletePublicIpv4PoolRequest.add_member(:pool_id, Shapes::ShapeRef.new(shape: Ipv4PoolEc2Id, required: true, location_name: "PoolId"))
+    DeletePublicIpv4PoolRequest.struct_class = Types::DeletePublicIpv4PoolRequest
+
+    DeletePublicIpv4PoolResult.add_member(:return_value, Shapes::ShapeRef.new(shape: Boolean, location_name: "returnValue"))
+    DeletePublicIpv4PoolResult.struct_class = Types::DeletePublicIpv4PoolResult
+
     DeleteQueuedReservedInstancesError.add_member(:code, Shapes::ShapeRef.new(shape: DeleteQueuedReservedInstancesErrorCode, location_name: "code"))
     DeleteQueuedReservedInstancesError.add_member(:message, Shapes::ShapeRef.new(shape: String, location_name: "message"))
     DeleteQueuedReservedInstancesError.struct_class = Types::DeleteQueuedReservedInstancesError
@@ -4628,6 +5087,25 @@ module Aws::EC2
     DeprovisionByoipCidrResult.add_member(:byoip_cidr, Shapes::ShapeRef.new(shape: ByoipCidr, location_name: "byoipCidr"))
     DeprovisionByoipCidrResult.struct_class = Types::DeprovisionByoipCidrResult
 
+    DeprovisionIpamPoolCidrRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DeprovisionIpamPoolCidrRequest.add_member(:ipam_pool_id, Shapes::ShapeRef.new(shape: IpamPoolId, required: true, location_name: "IpamPoolId"))
+    DeprovisionIpamPoolCidrRequest.add_member(:cidr, Shapes::ShapeRef.new(shape: String, location_name: "Cidr"))
+    DeprovisionIpamPoolCidrRequest.struct_class = Types::DeprovisionIpamPoolCidrRequest
+
+    DeprovisionIpamPoolCidrResult.add_member(:ipam_pool_cidr, Shapes::ShapeRef.new(shape: IpamPoolCidr, location_name: "ipamPoolCidr"))
+    DeprovisionIpamPoolCidrResult.struct_class = Types::DeprovisionIpamPoolCidrResult
+
+    DeprovisionPublicIpv4PoolCidrRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DeprovisionPublicIpv4PoolCidrRequest.add_member(:pool_id, Shapes::ShapeRef.new(shape: Ipv4PoolEc2Id, required: true, location_name: "PoolId"))
+    DeprovisionPublicIpv4PoolCidrRequest.add_member(:cidr, Shapes::ShapeRef.new(shape: String, required: true, location_name: "Cidr"))
+    DeprovisionPublicIpv4PoolCidrRequest.struct_class = Types::DeprovisionPublicIpv4PoolCidrRequest
+
+    DeprovisionPublicIpv4PoolCidrResult.add_member(:pool_id, Shapes::ShapeRef.new(shape: Ipv4PoolEc2Id, location_name: "poolId"))
+    DeprovisionPublicIpv4PoolCidrResult.add_member(:deprovisioned_addresses, Shapes::ShapeRef.new(shape: DeprovisionedAddressSet, location_name: "deprovisionedAddressSet"))
+    DeprovisionPublicIpv4PoolCidrResult.struct_class = Types::DeprovisionPublicIpv4PoolCidrResult
+
+    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(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DeregisterImageRequest.struct_class = Types::DeregisterImageRequest
@@ -4902,6 +5380,30 @@ module Aws::EC2
     DescribeExportTasksResult.add_member(:export_tasks, Shapes::ShapeRef.new(shape: ExportTaskList, location_name: "exportTaskSet"))
     DescribeExportTasksResult.struct_class = Types::DescribeExportTasksResult
 
+    DescribeFastLaunchImagesRequest.add_member(:image_ids, Shapes::ShapeRef.new(shape: FastLaunchImageIdList, location_name: "ImageId"))
+    DescribeFastLaunchImagesRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
+    DescribeFastLaunchImagesRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: DescribeFastLaunchImagesRequestMaxResults, location_name: "MaxResults"))
+    DescribeFastLaunchImagesRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextToken"))
+    DescribeFastLaunchImagesRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DescribeFastLaunchImagesRequest.struct_class = Types::DescribeFastLaunchImagesRequest
+
+    DescribeFastLaunchImagesResult.add_member(:fast_launch_images, Shapes::ShapeRef.new(shape: DescribeFastLaunchImagesSuccessSet, location_name: "fastLaunchImageSet"))
+    DescribeFastLaunchImagesResult.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "nextToken"))
+    DescribeFastLaunchImagesResult.struct_class = Types::DescribeFastLaunchImagesResult
+
+    DescribeFastLaunchImagesSuccessItem.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, location_name: "imageId"))
+    DescribeFastLaunchImagesSuccessItem.add_member(:resource_type, Shapes::ShapeRef.new(shape: FastLaunchResourceType, location_name: "resourceType"))
+    DescribeFastLaunchImagesSuccessItem.add_member(:snapshot_configuration, Shapes::ShapeRef.new(shape: FastLaunchSnapshotConfigurationResponse, location_name: "snapshotConfiguration"))
+    DescribeFastLaunchImagesSuccessItem.add_member(:launch_template, Shapes::ShapeRef.new(shape: FastLaunchLaunchTemplateSpecificationResponse, location_name: "launchTemplate"))
+    DescribeFastLaunchImagesSuccessItem.add_member(:max_parallel_launches, Shapes::ShapeRef.new(shape: Integer, location_name: "maxParallelLaunches"))
+    DescribeFastLaunchImagesSuccessItem.add_member(:owner_id, Shapes::ShapeRef.new(shape: String, location_name: "ownerId"))
+    DescribeFastLaunchImagesSuccessItem.add_member(:state, Shapes::ShapeRef.new(shape: FastLaunchStateCode, location_name: "state"))
+    DescribeFastLaunchImagesSuccessItem.add_member(:state_transition_reason, Shapes::ShapeRef.new(shape: String, location_name: "stateTransitionReason"))
+    DescribeFastLaunchImagesSuccessItem.add_member(:state_transition_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "stateTransitionTime"))
+    DescribeFastLaunchImagesSuccessItem.struct_class = Types::DescribeFastLaunchImagesSuccessItem
+
+    DescribeFastLaunchImagesSuccessSet.member = Shapes::ShapeRef.new(shape: DescribeFastLaunchImagesSuccessItem, location_name: "item")
+
     DescribeFastSnapshotRestoreSuccessItem.add_member(:snapshot_id, Shapes::ShapeRef.new(shape: String, location_name: "snapshotId"))
     DescribeFastSnapshotRestoreSuccessItem.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZone"))
     DescribeFastSnapshotRestoreSuccessItem.add_member(:state, Shapes::ShapeRef.new(shape: FastSnapshotRestoreStateCode, location_name: "state"))
@@ -5195,6 +5697,39 @@ module Aws::EC2
     DescribeInternetGatewaysResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
     DescribeInternetGatewaysResult.struct_class = Types::DescribeInternetGatewaysResult
 
+    DescribeIpamPoolsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DescribeIpamPoolsRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
+    DescribeIpamPoolsRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: IpamMaxResults, location_name: "MaxResults"))
+    DescribeIpamPoolsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextToken"))
+    DescribeIpamPoolsRequest.add_member(:ipam_pool_ids, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "IpamPoolId"))
+    DescribeIpamPoolsRequest.struct_class = Types::DescribeIpamPoolsRequest
+
+    DescribeIpamPoolsResult.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "nextToken"))
+    DescribeIpamPoolsResult.add_member(:ipam_pools, Shapes::ShapeRef.new(shape: IpamPoolSet, location_name: "ipamPoolSet"))
+    DescribeIpamPoolsResult.struct_class = Types::DescribeIpamPoolsResult
+
+    DescribeIpamScopesRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DescribeIpamScopesRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
+    DescribeIpamScopesRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: IpamMaxResults, location_name: "MaxResults"))
+    DescribeIpamScopesRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextToken"))
+    DescribeIpamScopesRequest.add_member(:ipam_scope_ids, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "IpamScopeId"))
+    DescribeIpamScopesRequest.struct_class = Types::DescribeIpamScopesRequest
+
+    DescribeIpamScopesResult.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "nextToken"))
+    DescribeIpamScopesResult.add_member(:ipam_scopes, Shapes::ShapeRef.new(shape: IpamScopeSet, location_name: "ipamScopeSet"))
+    DescribeIpamScopesResult.struct_class = Types::DescribeIpamScopesResult
+
+    DescribeIpamsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DescribeIpamsRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
+    DescribeIpamsRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: IpamMaxResults, location_name: "MaxResults"))
+    DescribeIpamsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextToken"))
+    DescribeIpamsRequest.add_member(:ipam_ids, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "IpamId"))
+    DescribeIpamsRequest.struct_class = Types::DescribeIpamsRequest
+
+    DescribeIpamsResult.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "nextToken"))
+    DescribeIpamsResult.add_member(:ipams, Shapes::ShapeRef.new(shape: IpamSet, location_name: "ipamSet"))
+    DescribeIpamsResult.struct_class = Types::DescribeIpamsResult
+
     DescribeIpv6PoolsRequest.add_member(:pool_ids, Shapes::ShapeRef.new(shape: Ipv6PoolIdList, location_name: "PoolId"))
     DescribeIpv6PoolsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextToken"))
     DescribeIpv6PoolsRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: Ipv6PoolMaxResults, location_name: "MaxResults"))
@@ -5352,6 +5887,31 @@ module Aws::EC2
     DescribeNetworkAclsResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
     DescribeNetworkAclsResult.struct_class = Types::DescribeNetworkAclsResult
 
+    DescribeNetworkInsightsAccessScopeAnalysesRequest.add_member(:network_insights_access_scope_analysis_ids, Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeAnalysisIdList, location_name: "NetworkInsightsAccessScopeAnalysisId"))
+    DescribeNetworkInsightsAccessScopeAnalysesRequest.add_member(:network_insights_access_scope_id, Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeId, location_name: "NetworkInsightsAccessScopeId"))
+    DescribeNetworkInsightsAccessScopeAnalysesRequest.add_member(:analysis_start_time_begin, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "AnalysisStartTimeBegin"))
+    DescribeNetworkInsightsAccessScopeAnalysesRequest.add_member(:analysis_start_time_end, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "AnalysisStartTimeEnd"))
+    DescribeNetworkInsightsAccessScopeAnalysesRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
+    DescribeNetworkInsightsAccessScopeAnalysesRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: NetworkInsightsMaxResults, location_name: "MaxResults"))
+    DescribeNetworkInsightsAccessScopeAnalysesRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DescribeNetworkInsightsAccessScopeAnalysesRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextToken"))
+    DescribeNetworkInsightsAccessScopeAnalysesRequest.struct_class = Types::DescribeNetworkInsightsAccessScopeAnalysesRequest
+
+    DescribeNetworkInsightsAccessScopeAnalysesResult.add_member(:network_insights_access_scope_analyses, Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeAnalysisList, location_name: "networkInsightsAccessScopeAnalysisSet"))
+    DescribeNetworkInsightsAccessScopeAnalysesResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
+    DescribeNetworkInsightsAccessScopeAnalysesResult.struct_class = Types::DescribeNetworkInsightsAccessScopeAnalysesResult
+
+    DescribeNetworkInsightsAccessScopesRequest.add_member(:network_insights_access_scope_ids, Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeIdList, location_name: "NetworkInsightsAccessScopeId"))
+    DescribeNetworkInsightsAccessScopesRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
+    DescribeNetworkInsightsAccessScopesRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: NetworkInsightsMaxResults, location_name: "MaxResults"))
+    DescribeNetworkInsightsAccessScopesRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DescribeNetworkInsightsAccessScopesRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextToken"))
+    DescribeNetworkInsightsAccessScopesRequest.struct_class = Types::DescribeNetworkInsightsAccessScopesRequest
+
+    DescribeNetworkInsightsAccessScopesResult.add_member(:network_insights_access_scopes, Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeList, location_name: "networkInsightsAccessScopeSet"))
+    DescribeNetworkInsightsAccessScopesResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
+    DescribeNetworkInsightsAccessScopesResult.struct_class = Types::DescribeNetworkInsightsAccessScopesResult
+
     DescribeNetworkInsightsAnalysesRequest.add_member(:network_insights_analysis_ids, Shapes::ShapeRef.new(shape: NetworkInsightsAnalysisIdList, location_name: "NetworkInsightsAnalysisId"))
     DescribeNetworkInsightsAnalysesRequest.add_member(:network_insights_path_id, Shapes::ShapeRef.new(shape: NetworkInsightsPathId, location_name: "NetworkInsightsPathId"))
     DescribeNetworkInsightsAnalysesRequest.add_member(:analysis_start_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "AnalysisStartTime"))
@@ -5595,6 +6155,16 @@ module Aws::EC2
     DescribeSnapshotAttributeResult.add_member(:snapshot_id, Shapes::ShapeRef.new(shape: String, location_name: "snapshotId"))
     DescribeSnapshotAttributeResult.struct_class = Types::DescribeSnapshotAttributeResult
 
+    DescribeSnapshotTierStatusRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
+    DescribeSnapshotTierStatusRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DescribeSnapshotTierStatusRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
+    DescribeSnapshotTierStatusRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: DescribeSnapshotTierStatusMaxResults, location_name: "MaxResults"))
+    DescribeSnapshotTierStatusRequest.struct_class = Types::DescribeSnapshotTierStatusRequest
+
+    DescribeSnapshotTierStatusResult.add_member(:snapshot_tier_statuses, Shapes::ShapeRef.new(shape: snapshotTierStatusSet, location_name: "snapshotTierStatusSet"))
+    DescribeSnapshotTierStatusResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
+    DescribeSnapshotTierStatusResult.struct_class = Types::DescribeSnapshotTierStatusResult
+
     DescribeSnapshotsRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
     DescribeSnapshotsRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: Integer, location_name: "MaxResults"))
     DescribeSnapshotsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
@@ -6094,6 +6664,22 @@ module Aws::EC2
     DisableEbsEncryptionByDefaultResult.add_member(:ebs_encryption_by_default, Shapes::ShapeRef.new(shape: Boolean, location_name: "ebsEncryptionByDefault"))
     DisableEbsEncryptionByDefaultResult.struct_class = Types::DisableEbsEncryptionByDefaultResult
 
+    DisableFastLaunchRequest.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, required: true, location_name: "ImageId"))
+    DisableFastLaunchRequest.add_member(:force, Shapes::ShapeRef.new(shape: Boolean, location_name: "Force"))
+    DisableFastLaunchRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DisableFastLaunchRequest.struct_class = Types::DisableFastLaunchRequest
+
+    DisableFastLaunchResult.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, location_name: "imageId"))
+    DisableFastLaunchResult.add_member(:resource_type, Shapes::ShapeRef.new(shape: FastLaunchResourceType, location_name: "resourceType"))
+    DisableFastLaunchResult.add_member(:snapshot_configuration, Shapes::ShapeRef.new(shape: FastLaunchSnapshotConfigurationResponse, location_name: "snapshotConfiguration"))
+    DisableFastLaunchResult.add_member(:launch_template, Shapes::ShapeRef.new(shape: FastLaunchLaunchTemplateSpecificationResponse, location_name: "launchTemplate"))
+    DisableFastLaunchResult.add_member(:max_parallel_launches, Shapes::ShapeRef.new(shape: Integer, location_name: "maxParallelLaunches"))
+    DisableFastLaunchResult.add_member(:owner_id, Shapes::ShapeRef.new(shape: String, location_name: "ownerId"))
+    DisableFastLaunchResult.add_member(:state, Shapes::ShapeRef.new(shape: FastLaunchStateCode, location_name: "state"))
+    DisableFastLaunchResult.add_member(:state_transition_reason, Shapes::ShapeRef.new(shape: String, location_name: "stateTransitionReason"))
+    DisableFastLaunchResult.add_member(:state_transition_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "stateTransitionTime"))
+    DisableFastLaunchResult.struct_class = Types::DisableFastLaunchResult
+
     DisableFastSnapshotRestoreErrorItem.add_member(:snapshot_id, Shapes::ShapeRef.new(shape: String, location_name: "snapshotId"))
     DisableFastSnapshotRestoreErrorItem.add_member(:fast_snapshot_restore_state_errors, Shapes::ShapeRef.new(shape: DisableFastSnapshotRestoreStateErrorSet, location_name: "fastSnapshotRestoreStateErrorSet"))
     DisableFastSnapshotRestoreErrorItem.struct_class = Types::DisableFastSnapshotRestoreErrorItem
@@ -6141,6 +6727,13 @@ module Aws::EC2
     DisableImageDeprecationResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
     DisableImageDeprecationResult.struct_class = Types::DisableImageDeprecationResult
 
+    DisableIpamOrganizationAdminAccountRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DisableIpamOrganizationAdminAccountRequest.add_member(:delegated_admin_account_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "DelegatedAdminAccountId"))
+    DisableIpamOrganizationAdminAccountRequest.struct_class = Types::DisableIpamOrganizationAdminAccountRequest
+
+    DisableIpamOrganizationAdminAccountResult.add_member(:success, Shapes::ShapeRef.new(shape: Boolean, location_name: "success"))
+    DisableIpamOrganizationAdminAccountResult.struct_class = Types::DisableIpamOrganizationAdminAccountResult
+
     DisableSerialConsoleAccessRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     DisableSerialConsoleAccessRequest.struct_class = Types::DisableSerialConsoleAccessRequest
 
@@ -6340,7 +6933,7 @@ module Aws::EC2
 
     EgressOnlyInternetGatewayList.member = Shapes::ShapeRef.new(shape: EgressOnlyInternetGateway, location_name: "item")
 
-    ElasticGpuAssociation.add_member(:elastic_gpu_id, Shapes::ShapeRef.new(shape: String, location_name: "elasticGpuId"))
+    ElasticGpuAssociation.add_member(:elastic_gpu_id, Shapes::ShapeRef.new(shape: ElasticGpuId, location_name: "elasticGpuId"))
     ElasticGpuAssociation.add_member(:elastic_gpu_association_id, Shapes::ShapeRef.new(shape: String, location_name: "elasticGpuAssociationId"))
     ElasticGpuAssociation.add_member(:elastic_gpu_association_state, Shapes::ShapeRef.new(shape: String, location_name: "elasticGpuAssociationState"))
     ElasticGpuAssociation.add_member(:elastic_gpu_association_time, Shapes::ShapeRef.new(shape: String, location_name: "elasticGpuAssociationTime"))
@@ -6396,6 +6989,25 @@ module Aws::EC2
     EnableEbsEncryptionByDefaultResult.add_member(:ebs_encryption_by_default, Shapes::ShapeRef.new(shape: Boolean, location_name: "ebsEncryptionByDefault"))
     EnableEbsEncryptionByDefaultResult.struct_class = Types::EnableEbsEncryptionByDefaultResult
 
+    EnableFastLaunchRequest.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, required: true, location_name: "ImageId"))
+    EnableFastLaunchRequest.add_member(:resource_type, Shapes::ShapeRef.new(shape: String, location_name: "ResourceType"))
+    EnableFastLaunchRequest.add_member(:snapshot_configuration, Shapes::ShapeRef.new(shape: FastLaunchSnapshotConfigurationRequest, location_name: "SnapshotConfiguration"))
+    EnableFastLaunchRequest.add_member(:launch_template, Shapes::ShapeRef.new(shape: FastLaunchLaunchTemplateSpecificationRequest, location_name: "LaunchTemplate"))
+    EnableFastLaunchRequest.add_member(:max_parallel_launches, Shapes::ShapeRef.new(shape: Integer, location_name: "MaxParallelLaunches"))
+    EnableFastLaunchRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    EnableFastLaunchRequest.struct_class = Types::EnableFastLaunchRequest
+
+    EnableFastLaunchResult.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, location_name: "imageId"))
+    EnableFastLaunchResult.add_member(:resource_type, Shapes::ShapeRef.new(shape: FastLaunchResourceType, location_name: "resourceType"))
+    EnableFastLaunchResult.add_member(:snapshot_configuration, Shapes::ShapeRef.new(shape: FastLaunchSnapshotConfigurationResponse, location_name: "snapshotConfiguration"))
+    EnableFastLaunchResult.add_member(:launch_template, Shapes::ShapeRef.new(shape: FastLaunchLaunchTemplateSpecificationResponse, location_name: "launchTemplate"))
+    EnableFastLaunchResult.add_member(:max_parallel_launches, Shapes::ShapeRef.new(shape: Integer, location_name: "maxParallelLaunches"))
+    EnableFastLaunchResult.add_member(:owner_id, Shapes::ShapeRef.new(shape: String, location_name: "ownerId"))
+    EnableFastLaunchResult.add_member(:state, Shapes::ShapeRef.new(shape: FastLaunchStateCode, location_name: "state"))
+    EnableFastLaunchResult.add_member(:state_transition_reason, Shapes::ShapeRef.new(shape: String, location_name: "stateTransitionReason"))
+    EnableFastLaunchResult.add_member(:state_transition_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "stateTransitionTime"))
+    EnableFastLaunchResult.struct_class = Types::EnableFastLaunchResult
+
     EnableFastSnapshotRestoreErrorItem.add_member(:snapshot_id, Shapes::ShapeRef.new(shape: String, location_name: "snapshotId"))
     EnableFastSnapshotRestoreErrorItem.add_member(:fast_snapshot_restore_state_errors, Shapes::ShapeRef.new(shape: EnableFastSnapshotRestoreStateErrorSet, location_name: "fastSnapshotRestoreStateErrorSet"))
     EnableFastSnapshotRestoreErrorItem.struct_class = Types::EnableFastSnapshotRestoreErrorItem
@@ -6444,6 +7056,13 @@ module Aws::EC2
     EnableImageDeprecationResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
     EnableImageDeprecationResult.struct_class = Types::EnableImageDeprecationResult
 
+    EnableIpamOrganizationAdminAccountRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    EnableIpamOrganizationAdminAccountRequest.add_member(:delegated_admin_account_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "DelegatedAdminAccountId"))
+    EnableIpamOrganizationAdminAccountRequest.struct_class = Types::EnableIpamOrganizationAdminAccountRequest
+
+    EnableIpamOrganizationAdminAccountResult.add_member(:success, Shapes::ShapeRef.new(shape: Boolean, location_name: "success"))
+    EnableIpamOrganizationAdminAccountResult.struct_class = Types::EnableIpamOrganizationAdminAccountResult
+
     EnableSerialConsoleAccessRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     EnableSerialConsoleAccessRequest.struct_class = Types::EnableSerialConsoleAccessRequest
 
@@ -6495,6 +7114,8 @@ module Aws::EC2
     EventInformation.add_member(:instance_id, Shapes::ShapeRef.new(shape: String, location_name: "instanceId"))
     EventInformation.struct_class = Types::EventInformation
 
+    ExcludedInstanceTypeSet.member = Shapes::ShapeRef.new(shape: ExcludedInstanceType, location_name: "item")
+
     ExecutableByStringList.member = Shapes::ShapeRef.new(shape: String, location_name: "ExecutableBy")
 
     Explanation.add_member(:acl, Shapes::ShapeRef.new(shape: AnalysisComponent, location_name: "acl"))
@@ -6651,6 +7272,24 @@ module Aws::EC2
 
     FailedQueuedPurchaseDeletionSet.member = Shapes::ShapeRef.new(shape: FailedQueuedPurchaseDeletion, location_name: "item")
 
+    FastLaunchImageIdList.member = Shapes::ShapeRef.new(shape: ImageId, location_name: "ImageId")
+
+    FastLaunchLaunchTemplateSpecificationRequest.add_member(:launch_template_id, Shapes::ShapeRef.new(shape: LaunchTemplateId, location_name: "LaunchTemplateId"))
+    FastLaunchLaunchTemplateSpecificationRequest.add_member(:launch_template_name, Shapes::ShapeRef.new(shape: String, location_name: "LaunchTemplateName"))
+    FastLaunchLaunchTemplateSpecificationRequest.add_member(:version, Shapes::ShapeRef.new(shape: String, required: true, location_name: "Version"))
+    FastLaunchLaunchTemplateSpecificationRequest.struct_class = Types::FastLaunchLaunchTemplateSpecificationRequest
+
+    FastLaunchLaunchTemplateSpecificationResponse.add_member(:launch_template_id, Shapes::ShapeRef.new(shape: LaunchTemplateId, location_name: "launchTemplateId"))
+    FastLaunchLaunchTemplateSpecificationResponse.add_member(:launch_template_name, Shapes::ShapeRef.new(shape: String, location_name: "launchTemplateName"))
+    FastLaunchLaunchTemplateSpecificationResponse.add_member(:version, Shapes::ShapeRef.new(shape: String, location_name: "version"))
+    FastLaunchLaunchTemplateSpecificationResponse.struct_class = Types::FastLaunchLaunchTemplateSpecificationResponse
+
+    FastLaunchSnapshotConfigurationRequest.add_member(:target_resource_count, Shapes::ShapeRef.new(shape: Integer, location_name: "TargetResourceCount"))
+    FastLaunchSnapshotConfigurationRequest.struct_class = Types::FastLaunchSnapshotConfigurationRequest
+
+    FastLaunchSnapshotConfigurationResponse.add_member(:target_resource_count, Shapes::ShapeRef.new(shape: Integer, location_name: "targetResourceCount"))
+    FastLaunchSnapshotConfigurationResponse.struct_class = Types::FastLaunchSnapshotConfigurationResponse
+
     FederatedAuthentication.add_member(:saml_provider_arn, Shapes::ShapeRef.new(shape: String, location_name: "samlProviderArn"))
     FederatedAuthentication.add_member(:self_service_saml_provider_arn, Shapes::ShapeRef.new(shape: String, location_name: "selfServiceSamlProviderArn"))
     FederatedAuthentication.struct_class = Types::FederatedAuthentication
@@ -6724,6 +7363,7 @@ module Aws::EC2
     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"))
+    FleetLaunchTemplateOverrides.add_member(:instance_requirements, Shapes::ShapeRef.new(shape: InstanceRequirements, location_name: "instanceRequirements"))
     FleetLaunchTemplateOverrides.struct_class = Types::FleetLaunchTemplateOverrides
 
     FleetLaunchTemplateOverridesList.member = Shapes::ShapeRef.new(shape: FleetLaunchTemplateOverrides, location_name: "item")
@@ -6737,6 +7377,7 @@ module Aws::EC2
     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"))
+    FleetLaunchTemplateOverridesRequest.add_member(:instance_requirements, Shapes::ShapeRef.new(shape: InstanceRequirementsRequest, location_name: "InstanceRequirements"))
     FleetLaunchTemplateOverridesRequest.struct_class = Types::FleetLaunchTemplateOverridesRequest
 
     FleetLaunchTemplateSpecification.add_member(:launch_template_id, Shapes::ShapeRef.new(shape: String, location_name: "launchTemplateId"))
@@ -6752,9 +7393,11 @@ module Aws::EC2
     FleetSet.member = Shapes::ShapeRef.new(shape: FleetData, location_name: "item")
 
     FleetSpotCapacityRebalance.add_member(:replacement_strategy, Shapes::ShapeRef.new(shape: FleetReplacementStrategy, location_name: "replacementStrategy"))
+    FleetSpotCapacityRebalance.add_member(:termination_delay, Shapes::ShapeRef.new(shape: Integer, location_name: "terminationDelay"))
     FleetSpotCapacityRebalance.struct_class = Types::FleetSpotCapacityRebalance
 
     FleetSpotCapacityRebalanceRequest.add_member(:replacement_strategy, Shapes::ShapeRef.new(shape: FleetReplacementStrategy, location_name: "ReplacementStrategy"))
+    FleetSpotCapacityRebalanceRequest.add_member(:termination_delay, Shapes::ShapeRef.new(shape: Integer, location_name: "TerminationDelay"))
     FleetSpotCapacityRebalanceRequest.struct_class = Types::FleetSpotCapacityRebalanceRequest
 
     FleetSpotMaintenanceStrategies.add_member(:capacity_rebalance, Shapes::ShapeRef.new(shape: FleetSpotCapacityRebalance, location_name: "capacityRebalance"))
@@ -6944,6 +7587,71 @@ module Aws::EC2
     GetHostReservationPurchasePreviewResult.add_member(:total_upfront_price, Shapes::ShapeRef.new(shape: String, location_name: "totalUpfrontPrice"))
     GetHostReservationPurchasePreviewResult.struct_class = Types::GetHostReservationPurchasePreviewResult
 
+    GetInstanceTypesFromInstanceRequirementsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    GetInstanceTypesFromInstanceRequirementsRequest.add_member(:architecture_types, Shapes::ShapeRef.new(shape: ArchitectureTypeSet, required: true, location_name: "ArchitectureType"))
+    GetInstanceTypesFromInstanceRequirementsRequest.add_member(:virtualization_types, Shapes::ShapeRef.new(shape: VirtualizationTypeSet, required: true, location_name: "VirtualizationType"))
+    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.struct_class = Types::GetInstanceTypesFromInstanceRequirementsRequest
+
+    GetInstanceTypesFromInstanceRequirementsResult.add_member(:instance_types, Shapes::ShapeRef.new(shape: InstanceTypeInfoFromInstanceRequirementsSet, location_name: "instanceTypeSet"))
+    GetInstanceTypesFromInstanceRequirementsResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
+    GetInstanceTypesFromInstanceRequirementsResult.struct_class = Types::GetInstanceTypesFromInstanceRequirementsResult
+
+    GetIpamAddressHistoryRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    GetIpamAddressHistoryRequest.add_member(:cidr, Shapes::ShapeRef.new(shape: String, required: true, location_name: "Cidr"))
+    GetIpamAddressHistoryRequest.add_member(:ipam_scope_id, Shapes::ShapeRef.new(shape: IpamScopeId, required: true, location_name: "IpamScopeId"))
+    GetIpamAddressHistoryRequest.add_member(:vpc_id, Shapes::ShapeRef.new(shape: String, location_name: "VpcId"))
+    GetIpamAddressHistoryRequest.add_member(:start_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "StartTime"))
+    GetIpamAddressHistoryRequest.add_member(:end_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "EndTime"))
+    GetIpamAddressHistoryRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: IpamAddressHistoryMaxResults, location_name: "MaxResults"))
+    GetIpamAddressHistoryRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextToken"))
+    GetIpamAddressHistoryRequest.struct_class = Types::GetIpamAddressHistoryRequest
+
+    GetIpamAddressHistoryResult.add_member(:history_records, Shapes::ShapeRef.new(shape: IpamAddressHistoryRecordSet, location_name: "historyRecordSet"))
+    GetIpamAddressHistoryResult.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "nextToken"))
+    GetIpamAddressHistoryResult.struct_class = Types::GetIpamAddressHistoryResult
+
+    GetIpamPoolAllocationsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    GetIpamPoolAllocationsRequest.add_member(:ipam_pool_id, Shapes::ShapeRef.new(shape: IpamPoolId, required: true, location_name: "IpamPoolId"))
+    GetIpamPoolAllocationsRequest.add_member(:ipam_pool_allocation_id, Shapes::ShapeRef.new(shape: IpamPoolAllocationId, location_name: "IpamPoolAllocationId"))
+    GetIpamPoolAllocationsRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
+    GetIpamPoolAllocationsRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: GetIpamPoolAllocationsMaxResults, location_name: "MaxResults"))
+    GetIpamPoolAllocationsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextToken"))
+    GetIpamPoolAllocationsRequest.struct_class = Types::GetIpamPoolAllocationsRequest
+
+    GetIpamPoolAllocationsResult.add_member(:ipam_pool_allocations, Shapes::ShapeRef.new(shape: IpamPoolAllocationSet, location_name: "ipamPoolAllocationSet"))
+    GetIpamPoolAllocationsResult.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "nextToken"))
+    GetIpamPoolAllocationsResult.struct_class = Types::GetIpamPoolAllocationsResult
+
+    GetIpamPoolCidrsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    GetIpamPoolCidrsRequest.add_member(:ipam_pool_id, Shapes::ShapeRef.new(shape: IpamPoolId, required: true, location_name: "IpamPoolId"))
+    GetIpamPoolCidrsRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
+    GetIpamPoolCidrsRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: IpamMaxResults, location_name: "MaxResults"))
+    GetIpamPoolCidrsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextToken"))
+    GetIpamPoolCidrsRequest.struct_class = Types::GetIpamPoolCidrsRequest
+
+    GetIpamPoolCidrsResult.add_member(:ipam_pool_cidrs, Shapes::ShapeRef.new(shape: IpamPoolCidrSet, location_name: "ipamPoolCidrSet"))
+    GetIpamPoolCidrsResult.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "nextToken"))
+    GetIpamPoolCidrsResult.struct_class = Types::GetIpamPoolCidrsResult
+
+    GetIpamResourceCidrsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    GetIpamResourceCidrsRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
+    GetIpamResourceCidrsRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: IpamMaxResults, location_name: "MaxResults"))
+    GetIpamResourceCidrsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextToken"))
+    GetIpamResourceCidrsRequest.add_member(:ipam_scope_id, Shapes::ShapeRef.new(shape: IpamScopeId, required: true, location_name: "IpamScopeId"))
+    GetIpamResourceCidrsRequest.add_member(:ipam_pool_id, Shapes::ShapeRef.new(shape: IpamPoolId, location_name: "IpamPoolId"))
+    GetIpamResourceCidrsRequest.add_member(:resource_id, Shapes::ShapeRef.new(shape: String, location_name: "ResourceId"))
+    GetIpamResourceCidrsRequest.add_member(:resource_type, Shapes::ShapeRef.new(shape: IpamResourceType, location_name: "ResourceType"))
+    GetIpamResourceCidrsRequest.add_member(:resource_tag, Shapes::ShapeRef.new(shape: RequestIpamResourceTag, location_name: "ResourceTag"))
+    GetIpamResourceCidrsRequest.add_member(:resource_owner, Shapes::ShapeRef.new(shape: String, location_name: "ResourceOwner"))
+    GetIpamResourceCidrsRequest.struct_class = Types::GetIpamResourceCidrsRequest
+
+    GetIpamResourceCidrsResult.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "nextToken"))
+    GetIpamResourceCidrsResult.add_member(:ipam_resource_cidrs, Shapes::ShapeRef.new(shape: IpamResourceCidrSet, location_name: "ipamResourceCidrSet"))
+    GetIpamResourceCidrsResult.struct_class = Types::GetIpamResourceCidrsResult
+
     GetLaunchTemplateDataRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     GetLaunchTemplateDataRequest.add_member(:instance_id, Shapes::ShapeRef.new(shape: InstanceId, required: true, location_name: "InstanceId"))
     GetLaunchTemplateDataRequest.struct_class = Types::GetLaunchTemplateDataRequest
@@ -6972,6 +7680,25 @@ module Aws::EC2
     GetManagedPrefixListEntriesResult.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "nextToken"))
     GetManagedPrefixListEntriesResult.struct_class = Types::GetManagedPrefixListEntriesResult
 
+    GetNetworkInsightsAccessScopeAnalysisFindingsRequest.add_member(:network_insights_access_scope_analysis_id, Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeAnalysisId, required: true, location_name: "NetworkInsightsAccessScopeAnalysisId"))
+    GetNetworkInsightsAccessScopeAnalysisFindingsRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: NetworkInsightsMaxResults, location_name: "MaxResults"))
+    GetNetworkInsightsAccessScopeAnalysisFindingsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextToken"))
+    GetNetworkInsightsAccessScopeAnalysisFindingsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    GetNetworkInsightsAccessScopeAnalysisFindingsRequest.struct_class = Types::GetNetworkInsightsAccessScopeAnalysisFindingsRequest
+
+    GetNetworkInsightsAccessScopeAnalysisFindingsResult.add_member(:network_insights_access_scope_analysis_id, Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeAnalysisId, location_name: "networkInsightsAccessScopeAnalysisId"))
+    GetNetworkInsightsAccessScopeAnalysisFindingsResult.add_member(:analysis_status, Shapes::ShapeRef.new(shape: AnalysisStatus, location_name: "analysisStatus"))
+    GetNetworkInsightsAccessScopeAnalysisFindingsResult.add_member(:analysis_findings, Shapes::ShapeRef.new(shape: AccessScopeAnalysisFindingList, location_name: "analysisFindingSet"))
+    GetNetworkInsightsAccessScopeAnalysisFindingsResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
+    GetNetworkInsightsAccessScopeAnalysisFindingsResult.struct_class = Types::GetNetworkInsightsAccessScopeAnalysisFindingsResult
+
+    GetNetworkInsightsAccessScopeContentRequest.add_member(:network_insights_access_scope_id, Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeId, required: true, location_name: "NetworkInsightsAccessScopeId"))
+    GetNetworkInsightsAccessScopeContentRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    GetNetworkInsightsAccessScopeContentRequest.struct_class = Types::GetNetworkInsightsAccessScopeContentRequest
+
+    GetNetworkInsightsAccessScopeContentResult.add_member(:network_insights_access_scope_content, Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeContent, location_name: "networkInsightsAccessScopeContent"))
+    GetNetworkInsightsAccessScopeContentResult.struct_class = Types::GetNetworkInsightsAccessScopeContentResult
+
     GetPasswordDataRequest.add_member(:instance_id, Shapes::ShapeRef.new(shape: InstanceId, required: true, location_name: "InstanceId"))
     GetPasswordDataRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     GetPasswordDataRequest.struct_class = Types::GetPasswordDataRequest
@@ -7003,6 +7730,21 @@ module Aws::EC2
     GetSerialConsoleAccessStatusResult.add_member(:serial_console_access_enabled, Shapes::ShapeRef.new(shape: Boolean, location_name: "serialConsoleAccessEnabled"))
     GetSerialConsoleAccessStatusResult.struct_class = Types::GetSerialConsoleAccessStatusResult
 
+    GetSpotPlacementScoresRequest.add_member(:instance_types, Shapes::ShapeRef.new(shape: InstanceTypes, location_name: "InstanceType"))
+    GetSpotPlacementScoresRequest.add_member(:target_capacity, Shapes::ShapeRef.new(shape: SpotPlacementScoresTargetCapacity, required: true, location_name: "TargetCapacity"))
+    GetSpotPlacementScoresRequest.add_member(:target_capacity_unit_type, Shapes::ShapeRef.new(shape: TargetCapacityUnitType, location_name: "TargetCapacityUnitType"))
+    GetSpotPlacementScoresRequest.add_member(:single_availability_zone, Shapes::ShapeRef.new(shape: Boolean, location_name: "SingleAvailabilityZone"))
+    GetSpotPlacementScoresRequest.add_member(:region_names, Shapes::ShapeRef.new(shape: RegionNames, location_name: "RegionName"))
+    GetSpotPlacementScoresRequest.add_member(:instance_requirements_with_metadata, Shapes::ShapeRef.new(shape: InstanceRequirementsWithMetadataRequest, location_name: "InstanceRequirementsWithMetadata"))
+    GetSpotPlacementScoresRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    GetSpotPlacementScoresRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: SpotPlacementScoresMaxResults, location_name: "MaxResults"))
+    GetSpotPlacementScoresRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
+    GetSpotPlacementScoresRequest.struct_class = Types::GetSpotPlacementScoresRequest
+
+    GetSpotPlacementScoresResult.add_member(:spot_placement_scores, Shapes::ShapeRef.new(shape: SpotPlacementScores, location_name: "spotPlacementScoreSet"))
+    GetSpotPlacementScoresResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
+    GetSpotPlacementScoresResult.struct_class = Types::GetSpotPlacementScoresResult
+
     GetSubnetCidrReservationsRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
     GetSubnetCidrReservationsRequest.add_member(:subnet_id, Shapes::ShapeRef.new(shape: SubnetId, required: true, location_name: "SubnetId"))
     GetSubnetCidrReservationsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
@@ -7169,7 +7911,7 @@ module Aws::EC2
     HostOffering.add_member(:duration, Shapes::ShapeRef.new(shape: Integer, location_name: "duration"))
     HostOffering.add_member(:hourly_price, Shapes::ShapeRef.new(shape: String, location_name: "hourlyPrice"))
     HostOffering.add_member(:instance_family, Shapes::ShapeRef.new(shape: String, location_name: "instanceFamily"))
-    HostOffering.add_member(:offering_id, Shapes::ShapeRef.new(shape: String, location_name: "offeringId"))
+    HostOffering.add_member(:offering_id, Shapes::ShapeRef.new(shape: OfferingId, location_name: "offeringId"))
     HostOffering.add_member(:payment_option, Shapes::ShapeRef.new(shape: PaymentOption, location_name: "paymentOption"))
     HostOffering.add_member(:upfront_price, Shapes::ShapeRef.new(shape: String, location_name: "upfrontPrice"))
     HostOffering.struct_class = Types::HostOffering
@@ -7188,10 +7930,10 @@ module Aws::EC2
     HostReservation.add_member(:duration, Shapes::ShapeRef.new(shape: Integer, location_name: "duration"))
     HostReservation.add_member(:end, Shapes::ShapeRef.new(shape: DateTime, location_name: "end"))
     HostReservation.add_member(:host_id_set, Shapes::ShapeRef.new(shape: ResponseHostIdSet, location_name: "hostIdSet"))
-    HostReservation.add_member(:host_reservation_id, Shapes::ShapeRef.new(shape: String, location_name: "hostReservationId"))
+    HostReservation.add_member(:host_reservation_id, Shapes::ShapeRef.new(shape: HostReservationId, location_name: "hostReservationId"))
     HostReservation.add_member(:hourly_price, Shapes::ShapeRef.new(shape: String, location_name: "hourlyPrice"))
     HostReservation.add_member(:instance_family, Shapes::ShapeRef.new(shape: String, location_name: "instanceFamily"))
-    HostReservation.add_member(:offering_id, Shapes::ShapeRef.new(shape: String, location_name: "offeringId"))
+    HostReservation.add_member(:offering_id, Shapes::ShapeRef.new(shape: OfferingId, location_name: "offeringId"))
     HostReservation.add_member(:payment_option, Shapes::ShapeRef.new(shape: PaymentOption, location_name: "paymentOption"))
     HostReservation.add_member(:start, Shapes::ShapeRef.new(shape: DateTime, location_name: "start"))
     HostReservation.add_member(:state, Shapes::ShapeRef.new(shape: ReservationState, location_name: "state"))
@@ -7535,6 +8277,8 @@ module Aws::EC2
     Instance.add_member(:platform_details, Shapes::ShapeRef.new(shape: String, location_name: "platformDetails"))
     Instance.add_member(:usage_operation, Shapes::ShapeRef.new(shape: String, location_name: "usageOperation"))
     Instance.add_member(:usage_operation_update_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "usageOperationUpdateTime"))
+    Instance.add_member(:private_dns_name_options, Shapes::ShapeRef.new(shape: PrivateDnsNameOptionsResponse, location_name: "privateDnsNameOptions"))
+    Instance.add_member(:ipv_6_address, Shapes::ShapeRef.new(shape: String, location_name: "ipv6Address"))
     Instance.struct_class = Types::Instance
 
     InstanceAttribute.add_member(:groups, Shapes::ShapeRef.new(shape: GroupIdentifierList, location_name: "groupSet"))
@@ -7648,6 +8392,8 @@ module Aws::EC2
     InstanceFamilyCreditSpecification.add_member(:cpu_credits, Shapes::ShapeRef.new(shape: String, location_name: "cpuCredits"))
     InstanceFamilyCreditSpecification.struct_class = Types::InstanceFamilyCreditSpecification
 
+    InstanceGenerationSet.member = Shapes::ShapeRef.new(shape: InstanceGeneration, location_name: "item")
+
     InstanceIdList.member = Shapes::ShapeRef.new(shape: InstanceId, location_name: "item")
 
     InstanceIdSet.member = Shapes::ShapeRef.new(shape: InstanceId, location_name: "item")
@@ -7686,6 +8432,7 @@ module Aws::EC2
     InstanceMetadataOptionsRequest.add_member(:http_put_response_hop_limit, Shapes::ShapeRef.new(shape: Integer, location_name: "HttpPutResponseHopLimit"))
     InstanceMetadataOptionsRequest.add_member(:http_endpoint, Shapes::ShapeRef.new(shape: InstanceMetadataEndpointState, location_name: "HttpEndpoint"))
     InstanceMetadataOptionsRequest.add_member(:http_protocol_ipv_6, Shapes::ShapeRef.new(shape: InstanceMetadataProtocolState, location_name: "HttpProtocolIpv6"))
+    InstanceMetadataOptionsRequest.add_member(:instance_metadata_tags, Shapes::ShapeRef.new(shape: InstanceMetadataTagsState, location_name: "InstanceMetadataTags"))
     InstanceMetadataOptionsRequest.struct_class = Types::InstanceMetadataOptionsRequest
 
     InstanceMetadataOptionsResponse.add_member(:state, Shapes::ShapeRef.new(shape: InstanceMetadataOptionsState, location_name: "state"))
@@ -7693,6 +8440,7 @@ module Aws::EC2
     InstanceMetadataOptionsResponse.add_member(:http_put_response_hop_limit, Shapes::ShapeRef.new(shape: Integer, location_name: "httpPutResponseHopLimit"))
     InstanceMetadataOptionsResponse.add_member(:http_endpoint, Shapes::ShapeRef.new(shape: InstanceMetadataEndpointState, location_name: "httpEndpoint"))
     InstanceMetadataOptionsResponse.add_member(:http_protocol_ipv_6, Shapes::ShapeRef.new(shape: InstanceMetadataProtocolState, location_name: "httpProtocolIpv6"))
+    InstanceMetadataOptionsResponse.add_member(:instance_metadata_tags, Shapes::ShapeRef.new(shape: InstanceMetadataTagsState, location_name: "instanceMetadataTags"))
     InstanceMetadataOptionsResponse.struct_class = Types::InstanceMetadataOptionsResponse
 
     InstanceMonitoring.add_member(:instance_id, Shapes::ShapeRef.new(shape: String, location_name: "instanceId"))
@@ -7722,6 +8470,7 @@ module Aws::EC2
     InstanceNetworkInterface.struct_class = Types::InstanceNetworkInterface
 
     InstanceNetworkInterfaceAssociation.add_member(:carrier_ip, Shapes::ShapeRef.new(shape: String, location_name: "carrierIp"))
+    InstanceNetworkInterfaceAssociation.add_member(:customer_owned_ip, Shapes::ShapeRef.new(shape: String, location_name: "customerOwnedIp"))
     InstanceNetworkInterfaceAssociation.add_member(:ip_owner_id, Shapes::ShapeRef.new(shape: String, location_name: "ipOwnerId"))
     InstanceNetworkInterfaceAssociation.add_member(:public_dns_name, Shapes::ShapeRef.new(shape: String, location_name: "publicDnsName"))
     InstanceNetworkInterfaceAssociation.add_member(:public_ip, Shapes::ShapeRef.new(shape: String, location_name: "publicIp"))
@@ -7768,6 +8517,57 @@ module Aws::EC2
 
     InstancePrivateIpAddressList.member = Shapes::ShapeRef.new(shape: InstancePrivateIpAddress, location_name: "item")
 
+    InstanceRequirements.add_member(:v_cpu_count, Shapes::ShapeRef.new(shape: VCpuCountRange, location_name: "vCpuCount"))
+    InstanceRequirements.add_member(:memory_mi_b, Shapes::ShapeRef.new(shape: MemoryMiB, location_name: "memoryMiB"))
+    InstanceRequirements.add_member(:cpu_manufacturers, Shapes::ShapeRef.new(shape: CpuManufacturerSet, location_name: "cpuManufacturerSet"))
+    InstanceRequirements.add_member(:memory_gi_b_per_v_cpu, Shapes::ShapeRef.new(shape: MemoryGiBPerVCpu, location_name: "memoryGiBPerVCpu"))
+    InstanceRequirements.add_member(:excluded_instance_types, Shapes::ShapeRef.new(shape: ExcludedInstanceTypeSet, location_name: "excludedInstanceTypeSet"))
+    InstanceRequirements.add_member(:instance_generations, Shapes::ShapeRef.new(shape: InstanceGenerationSet, location_name: "instanceGenerationSet"))
+    InstanceRequirements.add_member(:spot_max_price_percentage_over_lowest_price, Shapes::ShapeRef.new(shape: Integer, location_name: "spotMaxPricePercentageOverLowestPrice"))
+    InstanceRequirements.add_member(:on_demand_max_price_percentage_over_lowest_price, Shapes::ShapeRef.new(shape: Integer, location_name: "onDemandMaxPricePercentageOverLowestPrice"))
+    InstanceRequirements.add_member(:bare_metal, Shapes::ShapeRef.new(shape: BareMetal, location_name: "bareMetal"))
+    InstanceRequirements.add_member(:burstable_performance, Shapes::ShapeRef.new(shape: BurstablePerformance, location_name: "burstablePerformance"))
+    InstanceRequirements.add_member(:require_hibernate_support, Shapes::ShapeRef.new(shape: Boolean, location_name: "requireHibernateSupport"))
+    InstanceRequirements.add_member(:network_interface_count, Shapes::ShapeRef.new(shape: NetworkInterfaceCount, location_name: "networkInterfaceCount"))
+    InstanceRequirements.add_member(:local_storage, Shapes::ShapeRef.new(shape: LocalStorage, location_name: "localStorage"))
+    InstanceRequirements.add_member(:local_storage_types, Shapes::ShapeRef.new(shape: LocalStorageTypeSet, location_name: "localStorageTypeSet"))
+    InstanceRequirements.add_member(:total_local_storage_gb, Shapes::ShapeRef.new(shape: TotalLocalStorageGB, location_name: "totalLocalStorageGB"))
+    InstanceRequirements.add_member(:baseline_ebs_bandwidth_mbps, Shapes::ShapeRef.new(shape: BaselineEbsBandwidthMbps, location_name: "baselineEbsBandwidthMbps"))
+    InstanceRequirements.add_member(:accelerator_types, Shapes::ShapeRef.new(shape: AcceleratorTypeSet, location_name: "acceleratorTypeSet"))
+    InstanceRequirements.add_member(:accelerator_count, Shapes::ShapeRef.new(shape: AcceleratorCount, location_name: "acceleratorCount"))
+    InstanceRequirements.add_member(:accelerator_manufacturers, Shapes::ShapeRef.new(shape: AcceleratorManufacturerSet, location_name: "acceleratorManufacturerSet"))
+    InstanceRequirements.add_member(:accelerator_names, Shapes::ShapeRef.new(shape: AcceleratorNameSet, location_name: "acceleratorNameSet"))
+    InstanceRequirements.add_member(:accelerator_total_memory_mi_b, Shapes::ShapeRef.new(shape: AcceleratorTotalMemoryMiB, location_name: "acceleratorTotalMemoryMiB"))
+    InstanceRequirements.struct_class = Types::InstanceRequirements
+
+    InstanceRequirementsRequest.add_member(:v_cpu_count, Shapes::ShapeRef.new(shape: VCpuCountRangeRequest, required: true, location_name: "VCpuCount"))
+    InstanceRequirementsRequest.add_member(:memory_mi_b, Shapes::ShapeRef.new(shape: MemoryMiBRequest, required: true, location_name: "MemoryMiB"))
+    InstanceRequirementsRequest.add_member(:cpu_manufacturers, Shapes::ShapeRef.new(shape: CpuManufacturerSet, location_name: "CpuManufacturer"))
+    InstanceRequirementsRequest.add_member(:memory_gi_b_per_v_cpu, Shapes::ShapeRef.new(shape: MemoryGiBPerVCpuRequest, location_name: "MemoryGiBPerVCpu"))
+    InstanceRequirementsRequest.add_member(:excluded_instance_types, Shapes::ShapeRef.new(shape: ExcludedInstanceTypeSet, location_name: "ExcludedInstanceType"))
+    InstanceRequirementsRequest.add_member(:instance_generations, Shapes::ShapeRef.new(shape: InstanceGenerationSet, location_name: "InstanceGeneration"))
+    InstanceRequirementsRequest.add_member(:spot_max_price_percentage_over_lowest_price, Shapes::ShapeRef.new(shape: Integer, location_name: "SpotMaxPricePercentageOverLowestPrice"))
+    InstanceRequirementsRequest.add_member(:on_demand_max_price_percentage_over_lowest_price, Shapes::ShapeRef.new(shape: Integer, location_name: "OnDemandMaxPricePercentageOverLowestPrice"))
+    InstanceRequirementsRequest.add_member(:bare_metal, Shapes::ShapeRef.new(shape: BareMetal, location_name: "BareMetal"))
+    InstanceRequirementsRequest.add_member(:burstable_performance, Shapes::ShapeRef.new(shape: BurstablePerformance, location_name: "BurstablePerformance"))
+    InstanceRequirementsRequest.add_member(:require_hibernate_support, Shapes::ShapeRef.new(shape: Boolean, location_name: "RequireHibernateSupport"))
+    InstanceRequirementsRequest.add_member(:network_interface_count, Shapes::ShapeRef.new(shape: NetworkInterfaceCountRequest, location_name: "NetworkInterfaceCount"))
+    InstanceRequirementsRequest.add_member(:local_storage, Shapes::ShapeRef.new(shape: LocalStorage, location_name: "LocalStorage"))
+    InstanceRequirementsRequest.add_member(:local_storage_types, Shapes::ShapeRef.new(shape: LocalStorageTypeSet, location_name: "LocalStorageType"))
+    InstanceRequirementsRequest.add_member(:total_local_storage_gb, Shapes::ShapeRef.new(shape: TotalLocalStorageGBRequest, location_name: "TotalLocalStorageGB"))
+    InstanceRequirementsRequest.add_member(:baseline_ebs_bandwidth_mbps, Shapes::ShapeRef.new(shape: BaselineEbsBandwidthMbpsRequest, location_name: "BaselineEbsBandwidthMbps"))
+    InstanceRequirementsRequest.add_member(:accelerator_types, Shapes::ShapeRef.new(shape: AcceleratorTypeSet, location_name: "AcceleratorType"))
+    InstanceRequirementsRequest.add_member(:accelerator_count, Shapes::ShapeRef.new(shape: AcceleratorCountRequest, location_name: "AcceleratorCount"))
+    InstanceRequirementsRequest.add_member(:accelerator_manufacturers, Shapes::ShapeRef.new(shape: AcceleratorManufacturerSet, location_name: "AcceleratorManufacturer"))
+    InstanceRequirementsRequest.add_member(:accelerator_names, Shapes::ShapeRef.new(shape: AcceleratorNameSet, location_name: "AcceleratorName"))
+    InstanceRequirementsRequest.add_member(:accelerator_total_memory_mi_b, Shapes::ShapeRef.new(shape: AcceleratorTotalMemoryMiBRequest, location_name: "AcceleratorTotalMemoryMiB"))
+    InstanceRequirementsRequest.struct_class = Types::InstanceRequirementsRequest
+
+    InstanceRequirementsWithMetadataRequest.add_member(:architecture_types, Shapes::ShapeRef.new(shape: ArchitectureTypeSet, location_name: "ArchitectureType"))
+    InstanceRequirementsWithMetadataRequest.add_member(:virtualization_types, Shapes::ShapeRef.new(shape: VirtualizationTypeSet, location_name: "VirtualizationType"))
+    InstanceRequirementsWithMetadataRequest.add_member(:instance_requirements, Shapes::ShapeRef.new(shape: InstanceRequirementsRequest, location_name: "InstanceRequirements"))
+    InstanceRequirementsWithMetadataRequest.struct_class = Types::InstanceRequirementsWithMetadataRequest
+
     InstanceSpecification.add_member(:instance_id, Shapes::ShapeRef.new(shape: InstanceId, location_name: "InstanceId"))
     InstanceSpecification.add_member(:exclude_boot_volume, Shapes::ShapeRef.new(shape: Boolean, location_name: "ExcludeBootVolume"))
     InstanceSpecification.struct_class = Types::InstanceSpecification
@@ -7853,6 +8653,11 @@ module Aws::EC2
     InstanceTypeInfo.add_member(:supported_boot_modes, Shapes::ShapeRef.new(shape: BootModeTypeList, location_name: "supportedBootModes"))
     InstanceTypeInfo.struct_class = Types::InstanceTypeInfo
 
+    InstanceTypeInfoFromInstanceRequirements.add_member(:instance_type, Shapes::ShapeRef.new(shape: String, location_name: "instanceType"))
+    InstanceTypeInfoFromInstanceRequirements.struct_class = Types::InstanceTypeInfoFromInstanceRequirements
+
+    InstanceTypeInfoFromInstanceRequirementsSet.member = Shapes::ShapeRef.new(shape: InstanceTypeInfoFromInstanceRequirements, location_name: "item")
+
     InstanceTypeInfoList.member = Shapes::ShapeRef.new(shape: InstanceTypeInfo, location_name: "item")
 
     InstanceTypeList.member = Shapes::ShapeRef.new(shape: InstanceType)
@@ -7864,6 +8669,8 @@ module Aws::EC2
 
     InstanceTypeOfferingsList.member = Shapes::ShapeRef.new(shape: InstanceTypeOffering, location_name: "item")
 
+    InstanceTypes.member = Shapes::ShapeRef.new(shape: String)
+
     InstanceUsage.add_member(:account_id, Shapes::ShapeRef.new(shape: String, location_name: "accountId"))
     InstanceUsage.add_member(:used_instance_count, Shapes::ShapeRef.new(shape: Integer, location_name: "usedInstanceCount"))
     InstanceUsage.struct_class = Types::InstanceUsage
@@ -7912,6 +8719,135 @@ module Aws::EC2
 
     IpRanges.member = Shapes::ShapeRef.new(shape: String, location_name: "item")
 
+    Ipam.add_member(:owner_id, Shapes::ShapeRef.new(shape: String, location_name: "ownerId"))
+    Ipam.add_member(:ipam_id, Shapes::ShapeRef.new(shape: IpamId, location_name: "ipamId"))
+    Ipam.add_member(:ipam_arn, Shapes::ShapeRef.new(shape: ResourceArn, location_name: "ipamArn"))
+    Ipam.add_member(:ipam_region, Shapes::ShapeRef.new(shape: String, location_name: "ipamRegion"))
+    Ipam.add_member(:public_default_scope_id, Shapes::ShapeRef.new(shape: IpamScopeId, location_name: "publicDefaultScopeId"))
+    Ipam.add_member(:private_default_scope_id, Shapes::ShapeRef.new(shape: IpamScopeId, location_name: "privateDefaultScopeId"))
+    Ipam.add_member(:scope_count, Shapes::ShapeRef.new(shape: Integer, location_name: "scopeCount"))
+    Ipam.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
+    Ipam.add_member(:operating_regions, Shapes::ShapeRef.new(shape: IpamOperatingRegionSet, location_name: "operatingRegionSet"))
+    Ipam.add_member(:state, Shapes::ShapeRef.new(shape: IpamState, location_name: "state"))
+    Ipam.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
+    Ipam.struct_class = Types::Ipam
+
+    IpamAddressHistoryRecord.add_member(:resource_owner_id, Shapes::ShapeRef.new(shape: String, location_name: "resourceOwnerId"))
+    IpamAddressHistoryRecord.add_member(:resource_region, Shapes::ShapeRef.new(shape: String, location_name: "resourceRegion"))
+    IpamAddressHistoryRecord.add_member(:resource_type, Shapes::ShapeRef.new(shape: IpamAddressHistoryResourceType, location_name: "resourceType"))
+    IpamAddressHistoryRecord.add_member(:resource_id, Shapes::ShapeRef.new(shape: String, location_name: "resourceId"))
+    IpamAddressHistoryRecord.add_member(:resource_cidr, Shapes::ShapeRef.new(shape: String, location_name: "resourceCidr"))
+    IpamAddressHistoryRecord.add_member(:resource_name, Shapes::ShapeRef.new(shape: String, location_name: "resourceName"))
+    IpamAddressHistoryRecord.add_member(:resource_compliance_status, Shapes::ShapeRef.new(shape: IpamComplianceStatus, location_name: "resourceComplianceStatus"))
+    IpamAddressHistoryRecord.add_member(:resource_overlap_status, Shapes::ShapeRef.new(shape: IpamOverlapStatus, location_name: "resourceOverlapStatus"))
+    IpamAddressHistoryRecord.add_member(:vpc_id, Shapes::ShapeRef.new(shape: String, location_name: "vpcId"))
+    IpamAddressHistoryRecord.add_member(:sampled_start_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "sampledStartTime"))
+    IpamAddressHistoryRecord.add_member(:sampled_end_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "sampledEndTime"))
+    IpamAddressHistoryRecord.struct_class = Types::IpamAddressHistoryRecord
+
+    IpamAddressHistoryRecordSet.member = Shapes::ShapeRef.new(shape: IpamAddressHistoryRecord, location_name: "item")
+
+    IpamCidrAuthorizationContext.add_member(:message, Shapes::ShapeRef.new(shape: String, location_name: "Message"))
+    IpamCidrAuthorizationContext.add_member(:signature, Shapes::ShapeRef.new(shape: String, location_name: "Signature"))
+    IpamCidrAuthorizationContext.struct_class = Types::IpamCidrAuthorizationContext
+
+    IpamOperatingRegion.add_member(:region_name, Shapes::ShapeRef.new(shape: String, location_name: "regionName"))
+    IpamOperatingRegion.struct_class = Types::IpamOperatingRegion
+
+    IpamOperatingRegionSet.member = Shapes::ShapeRef.new(shape: IpamOperatingRegion, location_name: "item")
+
+    IpamPool.add_member(:owner_id, Shapes::ShapeRef.new(shape: String, location_name: "ownerId"))
+    IpamPool.add_member(:ipam_pool_id, Shapes::ShapeRef.new(shape: IpamPoolId, location_name: "ipamPoolId"))
+    IpamPool.add_member(:source_ipam_pool_id, Shapes::ShapeRef.new(shape: IpamPoolId, location_name: "sourceIpamPoolId"))
+    IpamPool.add_member(:ipam_pool_arn, Shapes::ShapeRef.new(shape: ResourceArn, location_name: "ipamPoolArn"))
+    IpamPool.add_member(:ipam_scope_arn, Shapes::ShapeRef.new(shape: ResourceArn, location_name: "ipamScopeArn"))
+    IpamPool.add_member(:ipam_scope_type, Shapes::ShapeRef.new(shape: IpamScopeType, location_name: "ipamScopeType"))
+    IpamPool.add_member(:ipam_arn, Shapes::ShapeRef.new(shape: ResourceArn, location_name: "ipamArn"))
+    IpamPool.add_member(:ipam_region, Shapes::ShapeRef.new(shape: String, location_name: "ipamRegion"))
+    IpamPool.add_member(:locale, Shapes::ShapeRef.new(shape: String, location_name: "locale"))
+    IpamPool.add_member(:pool_depth, Shapes::ShapeRef.new(shape: Integer, location_name: "poolDepth"))
+    IpamPool.add_member(:state, Shapes::ShapeRef.new(shape: IpamPoolState, location_name: "state"))
+    IpamPool.add_member(:state_message, Shapes::ShapeRef.new(shape: String, location_name: "stateMessage"))
+    IpamPool.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
+    IpamPool.add_member(:auto_import, Shapes::ShapeRef.new(shape: Boolean, location_name: "autoImport"))
+    IpamPool.add_member(:publicly_advertisable, Shapes::ShapeRef.new(shape: Boolean, location_name: "publiclyAdvertisable"))
+    IpamPool.add_member(:address_family, Shapes::ShapeRef.new(shape: AddressFamily, location_name: "addressFamily"))
+    IpamPool.add_member(:allocation_min_netmask_length, Shapes::ShapeRef.new(shape: IpamNetmaskLength, location_name: "allocationMinNetmaskLength"))
+    IpamPool.add_member(:allocation_max_netmask_length, Shapes::ShapeRef.new(shape: IpamNetmaskLength, location_name: "allocationMaxNetmaskLength"))
+    IpamPool.add_member(:allocation_default_netmask_length, Shapes::ShapeRef.new(shape: IpamNetmaskLength, location_name: "allocationDefaultNetmaskLength"))
+    IpamPool.add_member(:allocation_resource_tags, Shapes::ShapeRef.new(shape: IpamResourceTagList, location_name: "allocationResourceTagSet"))
+    IpamPool.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
+    IpamPool.add_member(:aws_service, Shapes::ShapeRef.new(shape: IpamPoolAwsService, location_name: "awsService"))
+    IpamPool.struct_class = Types::IpamPool
+
+    IpamPoolAllocation.add_member(:cidr, Shapes::ShapeRef.new(shape: String, location_name: "cidr"))
+    IpamPoolAllocation.add_member(:ipam_pool_allocation_id, Shapes::ShapeRef.new(shape: IpamPoolAllocationId, location_name: "ipamPoolAllocationId"))
+    IpamPoolAllocation.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
+    IpamPoolAllocation.add_member(:resource_id, Shapes::ShapeRef.new(shape: String, location_name: "resourceId"))
+    IpamPoolAllocation.add_member(:resource_type, Shapes::ShapeRef.new(shape: IpamPoolAllocationResourceType, location_name: "resourceType"))
+    IpamPoolAllocation.add_member(:resource_region, Shapes::ShapeRef.new(shape: String, location_name: "resourceRegion"))
+    IpamPoolAllocation.add_member(:resource_owner, Shapes::ShapeRef.new(shape: String, location_name: "resourceOwner"))
+    IpamPoolAllocation.struct_class = Types::IpamPoolAllocation
+
+    IpamPoolAllocationDisallowedCidrs.member = Shapes::ShapeRef.new(shape: String, location_name: "item")
+
+    IpamPoolAllocationSet.member = Shapes::ShapeRef.new(shape: IpamPoolAllocation, location_name: "item")
+
+    IpamPoolCidr.add_member(:cidr, Shapes::ShapeRef.new(shape: String, location_name: "cidr"))
+    IpamPoolCidr.add_member(:state, Shapes::ShapeRef.new(shape: IpamPoolCidrState, location_name: "state"))
+    IpamPoolCidr.add_member(:failure_reason, Shapes::ShapeRef.new(shape: IpamPoolCidrFailureReason, location_name: "failureReason"))
+    IpamPoolCidr.struct_class = Types::IpamPoolCidr
+
+    IpamPoolCidrFailureReason.add_member(:code, Shapes::ShapeRef.new(shape: IpamPoolCidrFailureCode, location_name: "code"))
+    IpamPoolCidrFailureReason.add_member(:message, Shapes::ShapeRef.new(shape: String, location_name: "message"))
+    IpamPoolCidrFailureReason.struct_class = Types::IpamPoolCidrFailureReason
+
+    IpamPoolCidrSet.member = Shapes::ShapeRef.new(shape: IpamPoolCidr, location_name: "item")
+
+    IpamPoolSet.member = Shapes::ShapeRef.new(shape: IpamPool, location_name: "item")
+
+    IpamResourceCidr.add_member(:ipam_id, Shapes::ShapeRef.new(shape: IpamId, location_name: "ipamId"))
+    IpamResourceCidr.add_member(:ipam_scope_id, Shapes::ShapeRef.new(shape: IpamScopeId, location_name: "ipamScopeId"))
+    IpamResourceCidr.add_member(:ipam_pool_id, Shapes::ShapeRef.new(shape: IpamPoolId, location_name: "ipamPoolId"))
+    IpamResourceCidr.add_member(:resource_region, Shapes::ShapeRef.new(shape: String, location_name: "resourceRegion"))
+    IpamResourceCidr.add_member(:resource_owner_id, Shapes::ShapeRef.new(shape: String, location_name: "resourceOwnerId"))
+    IpamResourceCidr.add_member(:resource_id, Shapes::ShapeRef.new(shape: String, location_name: "resourceId"))
+    IpamResourceCidr.add_member(:resource_name, Shapes::ShapeRef.new(shape: String, location_name: "resourceName"))
+    IpamResourceCidr.add_member(:resource_cidr, Shapes::ShapeRef.new(shape: String, location_name: "resourceCidr"))
+    IpamResourceCidr.add_member(:resource_type, Shapes::ShapeRef.new(shape: IpamResourceType, location_name: "resourceType"))
+    IpamResourceCidr.add_member(:resource_tags, Shapes::ShapeRef.new(shape: IpamResourceTagList, location_name: "resourceTagSet"))
+    IpamResourceCidr.add_member(:ip_usage, Shapes::ShapeRef.new(shape: BoxedDouble, location_name: "ipUsage"))
+    IpamResourceCidr.add_member(:compliance_status, Shapes::ShapeRef.new(shape: IpamComplianceStatus, location_name: "complianceStatus"))
+    IpamResourceCidr.add_member(:management_state, Shapes::ShapeRef.new(shape: IpamManagementState, location_name: "managementState"))
+    IpamResourceCidr.add_member(:overlap_status, Shapes::ShapeRef.new(shape: IpamOverlapStatus, location_name: "overlapStatus"))
+    IpamResourceCidr.add_member(:vpc_id, Shapes::ShapeRef.new(shape: String, location_name: "vpcId"))
+    IpamResourceCidr.struct_class = Types::IpamResourceCidr
+
+    IpamResourceCidrSet.member = Shapes::ShapeRef.new(shape: IpamResourceCidr, location_name: "item")
+
+    IpamResourceTag.add_member(:key, Shapes::ShapeRef.new(shape: String, location_name: "key"))
+    IpamResourceTag.add_member(:value, Shapes::ShapeRef.new(shape: String, location_name: "value"))
+    IpamResourceTag.struct_class = Types::IpamResourceTag
+
+    IpamResourceTagList.member = Shapes::ShapeRef.new(shape: IpamResourceTag, location_name: "item")
+
+    IpamScope.add_member(:owner_id, Shapes::ShapeRef.new(shape: String, location_name: "ownerId"))
+    IpamScope.add_member(:ipam_scope_id, Shapes::ShapeRef.new(shape: IpamScopeId, location_name: "ipamScopeId"))
+    IpamScope.add_member(:ipam_scope_arn, Shapes::ShapeRef.new(shape: ResourceArn, location_name: "ipamScopeArn"))
+    IpamScope.add_member(:ipam_arn, Shapes::ShapeRef.new(shape: ResourceArn, location_name: "ipamArn"))
+    IpamScope.add_member(:ipam_region, Shapes::ShapeRef.new(shape: String, location_name: "ipamRegion"))
+    IpamScope.add_member(:ipam_scope_type, Shapes::ShapeRef.new(shape: IpamScopeType, location_name: "ipamScopeType"))
+    IpamScope.add_member(:is_default, Shapes::ShapeRef.new(shape: Boolean, location_name: "isDefault"))
+    IpamScope.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
+    IpamScope.add_member(:pool_count, Shapes::ShapeRef.new(shape: Integer, location_name: "poolCount"))
+    IpamScope.add_member(:state, Shapes::ShapeRef.new(shape: IpamScopeState, location_name: "state"))
+    IpamScope.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
+    IpamScope.struct_class = Types::IpamScope
+
+    IpamScopeSet.member = Shapes::ShapeRef.new(shape: IpamScope, location_name: "item")
+
+    IpamSet.member = Shapes::ShapeRef.new(shape: Ipam, location_name: "item")
+
     Ipv4PrefixList.member = Shapes::ShapeRef.new(shape: Ipv4PrefixSpecificationRequest, location_name: "item")
 
     Ipv4PrefixListResponse.member = Shapes::ShapeRef.new(shape: Ipv4PrefixSpecificationResponse, location_name: "item")
@@ -7997,6 +8933,8 @@ module Aws::EC2
 
     LaunchPermission.add_member(:group, Shapes::ShapeRef.new(shape: PermissionGroup, location_name: "group"))
     LaunchPermission.add_member(:user_id, Shapes::ShapeRef.new(shape: String, location_name: "userId"))
+    LaunchPermission.add_member(:organization_arn, Shapes::ShapeRef.new(shape: String, location_name: "organizationArn"))
+    LaunchPermission.add_member(:organizational_unit_arn, Shapes::ShapeRef.new(shape: String, location_name: "organizationalUnitArn"))
     LaunchPermission.struct_class = Types::LaunchPermission
 
     LaunchPermissionList.member = Shapes::ShapeRef.new(shape: LaunchPermission, location_name: "item")
@@ -8142,12 +9080,14 @@ module Aws::EC2
     LaunchTemplateInstanceMetadataOptions.add_member(:http_put_response_hop_limit, Shapes::ShapeRef.new(shape: Integer, location_name: "httpPutResponseHopLimit"))
     LaunchTemplateInstanceMetadataOptions.add_member(:http_endpoint, Shapes::ShapeRef.new(shape: LaunchTemplateInstanceMetadataEndpointState, location_name: "httpEndpoint"))
     LaunchTemplateInstanceMetadataOptions.add_member(:http_protocol_ipv_6, Shapes::ShapeRef.new(shape: LaunchTemplateInstanceMetadataProtocolIpv6, location_name: "httpProtocolIpv6"))
+    LaunchTemplateInstanceMetadataOptions.add_member(:instance_metadata_tags, Shapes::ShapeRef.new(shape: LaunchTemplateInstanceMetadataTagsState, location_name: "instanceMetadataTags"))
     LaunchTemplateInstanceMetadataOptions.struct_class = Types::LaunchTemplateInstanceMetadataOptions
 
     LaunchTemplateInstanceMetadataOptionsRequest.add_member(:http_tokens, Shapes::ShapeRef.new(shape: LaunchTemplateHttpTokensState, location_name: "HttpTokens"))
     LaunchTemplateInstanceMetadataOptionsRequest.add_member(:http_put_response_hop_limit, Shapes::ShapeRef.new(shape: Integer, location_name: "HttpPutResponseHopLimit"))
     LaunchTemplateInstanceMetadataOptionsRequest.add_member(:http_endpoint, Shapes::ShapeRef.new(shape: LaunchTemplateInstanceMetadataEndpointState, location_name: "HttpEndpoint"))
     LaunchTemplateInstanceMetadataOptionsRequest.add_member(:http_protocol_ipv_6, Shapes::ShapeRef.new(shape: LaunchTemplateInstanceMetadataProtocolIpv6, location_name: "HttpProtocolIpv6"))
+    LaunchTemplateInstanceMetadataOptionsRequest.add_member(:instance_metadata_tags, Shapes::ShapeRef.new(shape: LaunchTemplateInstanceMetadataTagsState, location_name: "InstanceMetadataTags"))
     LaunchTemplateInstanceMetadataOptionsRequest.struct_class = Types::LaunchTemplateInstanceMetadataOptionsRequest
 
     LaunchTemplateInstanceNetworkInterfaceSpecification.add_member(:associate_carrier_ip_address, Shapes::ShapeRef.new(shape: Boolean, location_name: "associateCarrierIpAddress"))
@@ -8214,6 +9154,7 @@ module Aws::EC2
     LaunchTemplateOverrides.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZone"))
     LaunchTemplateOverrides.add_member(:weighted_capacity, Shapes::ShapeRef.new(shape: Double, location_name: "weightedCapacity"))
     LaunchTemplateOverrides.add_member(:priority, Shapes::ShapeRef.new(shape: Double, location_name: "priority"))
+    LaunchTemplateOverrides.add_member(:instance_requirements, Shapes::ShapeRef.new(shape: InstanceRequirements, location_name: "instanceRequirements"))
     LaunchTemplateOverrides.struct_class = Types::LaunchTemplateOverrides
 
     LaunchTemplateOverridesList.member = Shapes::ShapeRef.new(shape: LaunchTemplateOverrides, location_name: "item")
@@ -8238,6 +9179,16 @@ module Aws::EC2
     LaunchTemplatePlacementRequest.add_member(:partition_number, Shapes::ShapeRef.new(shape: Integer, location_name: "PartitionNumber"))
     LaunchTemplatePlacementRequest.struct_class = Types::LaunchTemplatePlacementRequest
 
+    LaunchTemplatePrivateDnsNameOptions.add_member(:hostname_type, Shapes::ShapeRef.new(shape: HostnameType, location_name: "hostnameType"))
+    LaunchTemplatePrivateDnsNameOptions.add_member(:enable_resource_name_dns_a_record, Shapes::ShapeRef.new(shape: Boolean, location_name: "enableResourceNameDnsARecord"))
+    LaunchTemplatePrivateDnsNameOptions.add_member(:enable_resource_name_dns_aaaa_record, Shapes::ShapeRef.new(shape: Boolean, location_name: "enableResourceNameDnsAAAARecord"))
+    LaunchTemplatePrivateDnsNameOptions.struct_class = Types::LaunchTemplatePrivateDnsNameOptions
+
+    LaunchTemplatePrivateDnsNameOptionsRequest.add_member(:hostname_type, Shapes::ShapeRef.new(shape: HostnameType, location_name: "HostnameType"))
+    LaunchTemplatePrivateDnsNameOptionsRequest.add_member(:enable_resource_name_dns_a_record, Shapes::ShapeRef.new(shape: Boolean, location_name: "EnableResourceNameDnsARecord"))
+    LaunchTemplatePrivateDnsNameOptionsRequest.add_member(:enable_resource_name_dns_aaaa_record, Shapes::ShapeRef.new(shape: Boolean, location_name: "EnableResourceNameDnsAAAARecord"))
+    LaunchTemplatePrivateDnsNameOptionsRequest.struct_class = Types::LaunchTemplatePrivateDnsNameOptionsRequest
+
     LaunchTemplateSet.member = Shapes::ShapeRef.new(shape: LaunchTemplate, location_name: "item")
 
     LaunchTemplateSpecification.add_member(:launch_template_id, Shapes::ShapeRef.new(shape: LaunchTemplateId, location_name: "LaunchTemplateId"))
@@ -8299,6 +9250,16 @@ module Aws::EC2
 
     LicenseSpecificationListRequest.member = Shapes::ShapeRef.new(shape: LicenseConfigurationRequest, location_name: "item")
 
+    ListSnapshotsInRecycleBinRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: ListSnapshotsInRecycleBinMaxResults, location_name: "MaxResults"))
+    ListSnapshotsInRecycleBinRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
+    ListSnapshotsInRecycleBinRequest.add_member(:snapshot_ids, Shapes::ShapeRef.new(shape: SnapshotIdStringList, location_name: "SnapshotId"))
+    ListSnapshotsInRecycleBinRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    ListSnapshotsInRecycleBinRequest.struct_class = Types::ListSnapshotsInRecycleBinRequest
+
+    ListSnapshotsInRecycleBinResult.add_member(:snapshots, Shapes::ShapeRef.new(shape: SnapshotRecycleBinInfoList, location_name: "snapshotSet"))
+    ListSnapshotsInRecycleBinResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
+    ListSnapshotsInRecycleBinResult.struct_class = Types::ListSnapshotsInRecycleBinResult
+
     LoadBalancersConfig.add_member(:classic_load_balancers_config, Shapes::ShapeRef.new(shape: ClassicLoadBalancersConfig, location_name: "classicLoadBalancersConfig"))
     LoadBalancersConfig.add_member(:target_groups_config, Shapes::ShapeRef.new(shape: TargetGroupsConfig, location_name: "targetGroupsConfig"))
     LoadBalancersConfig.struct_class = Types::LoadBalancersConfig
@@ -8408,6 +9369,8 @@ module Aws::EC2
 
     LocalGatewayVirtualInterfaceSet.member = Shapes::ShapeRef.new(shape: LocalGatewayVirtualInterface, location_name: "item")
 
+    LocalStorageTypeSet.member = Shapes::ShapeRef.new(shape: LocalStorageType, location_name: "item")
+
     ManagedPrefixList.add_member(:prefix_list_id, Shapes::ShapeRef.new(shape: PrefixListResourceId, location_name: "prefixListId"))
     ManagedPrefixList.add_member(:address_family, Shapes::ShapeRef.new(shape: String, location_name: "addressFamily"))
     ManagedPrefixList.add_member(:state, Shapes::ShapeRef.new(shape: PrefixListState, location_name: "state"))
@@ -8422,9 +9385,25 @@ module Aws::EC2
 
     ManagedPrefixListSet.member = Shapes::ShapeRef.new(shape: ManagedPrefixList, location_name: "item")
 
+    MemoryGiBPerVCpu.add_member(:min, Shapes::ShapeRef.new(shape: Double, location_name: "min"))
+    MemoryGiBPerVCpu.add_member(:max, Shapes::ShapeRef.new(shape: Double, location_name: "max"))
+    MemoryGiBPerVCpu.struct_class = Types::MemoryGiBPerVCpu
+
+    MemoryGiBPerVCpuRequest.add_member(:min, Shapes::ShapeRef.new(shape: Double, location_name: "Min"))
+    MemoryGiBPerVCpuRequest.add_member(:max, Shapes::ShapeRef.new(shape: Double, location_name: "Max"))
+    MemoryGiBPerVCpuRequest.struct_class = Types::MemoryGiBPerVCpuRequest
+
     MemoryInfo.add_member(:size_in_mi_b, Shapes::ShapeRef.new(shape: MemorySize, location_name: "sizeInMiB"))
     MemoryInfo.struct_class = Types::MemoryInfo
 
+    MemoryMiB.add_member(:min, Shapes::ShapeRef.new(shape: Integer, location_name: "min"))
+    MemoryMiB.add_member(:max, Shapes::ShapeRef.new(shape: Integer, location_name: "max"))
+    MemoryMiB.struct_class = Types::MemoryMiB
+
+    MemoryMiBRequest.add_member(:min, Shapes::ShapeRef.new(shape: Integer, required: true, location_name: "Min"))
+    MemoryMiBRequest.add_member(:max, Shapes::ShapeRef.new(shape: Integer, location_name: "Max"))
+    MemoryMiBRequest.struct_class = Types::MemoryMiBRequest
+
     ModifyAddressAttributeRequest.add_member(:allocation_id, Shapes::ShapeRef.new(shape: AllocationId, required: true, location_name: "AllocationId"))
     ModifyAddressAttributeRequest.add_member(:domain_name, Shapes::ShapeRef.new(shape: String, location_name: "DomainName"))
     ModifyAddressAttributeRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
@@ -8457,6 +9436,7 @@ module Aws::EC2
     ModifyCapacityReservationRequest.add_member(:end_date_type, Shapes::ShapeRef.new(shape: EndDateType, location_name: "EndDateType"))
     ModifyCapacityReservationRequest.add_member(:accept, Shapes::ShapeRef.new(shape: Boolean, location_name: "Accept"))
     ModifyCapacityReservationRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    ModifyCapacityReservationRequest.add_member(:additional_info, Shapes::ShapeRef.new(shape: String, location_name: "AdditionalInfo"))
     ModifyCapacityReservationRequest.struct_class = Types::ModifyCapacityReservationRequest
 
     ModifyCapacityReservationResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
@@ -8474,6 +9454,8 @@ module Aws::EC2
     ModifyClientVpnEndpointRequest.add_member(:vpc_id, Shapes::ShapeRef.new(shape: VpcId, location_name: "VpcId"))
     ModifyClientVpnEndpointRequest.add_member(:self_service_portal, Shapes::ShapeRef.new(shape: SelfServicePortal, location_name: "SelfServicePortal"))
     ModifyClientVpnEndpointRequest.add_member(:client_connect_options, Shapes::ShapeRef.new(shape: ClientConnectOptions, location_name: "ClientConnectOptions"))
+    ModifyClientVpnEndpointRequest.add_member(:session_timeout_hours, Shapes::ShapeRef.new(shape: Integer, location_name: "SessionTimeoutHours"))
+    ModifyClientVpnEndpointRequest.add_member(:client_login_banner_options, Shapes::ShapeRef.new(shape: ClientLoginBannerOptions, location_name: "ClientLoginBannerOptions"))
     ModifyClientVpnEndpointRequest.struct_class = Types::ModifyClientVpnEndpointRequest
 
     ModifyClientVpnEndpointResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
@@ -8550,6 +9532,8 @@ module Aws::EC2
     ModifyImageAttributeRequest.add_member(:user_ids, Shapes::ShapeRef.new(shape: UserIdStringList, location_name: "UserId"))
     ModifyImageAttributeRequest.add_member(:value, Shapes::ShapeRef.new(shape: String, location_name: "Value"))
     ModifyImageAttributeRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
+    ModifyImageAttributeRequest.add_member(:organization_arns, Shapes::ShapeRef.new(shape: OrganizationArnStringList, location_name: "OrganizationArn"))
+    ModifyImageAttributeRequest.add_member(:organizational_unit_arns, Shapes::ShapeRef.new(shape: OrganizationalUnitArnStringList, location_name: "OrganizationalUnitArn"))
     ModifyImageAttributeRequest.struct_class = Types::ModifyImageAttributeRequest
 
     ModifyInstanceAttributeRequest.add_member(:source_dest_check, Shapes::ShapeRef.new(shape: AttributeBooleanValue, location_name: "SourceDestCheck"))
@@ -8612,6 +9596,7 @@ module Aws::EC2
     ModifyInstanceMetadataOptionsRequest.add_member(:http_endpoint, Shapes::ShapeRef.new(shape: InstanceMetadataEndpointState, location_name: "HttpEndpoint"))
     ModifyInstanceMetadataOptionsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     ModifyInstanceMetadataOptionsRequest.add_member(:http_protocol_ipv_6, Shapes::ShapeRef.new(shape: InstanceMetadataProtocolState, location_name: "HttpProtocolIpv6"))
+    ModifyInstanceMetadataOptionsRequest.add_member(:instance_metadata_tags, Shapes::ShapeRef.new(shape: InstanceMetadataTagsState, location_name: "InstanceMetadataTags"))
     ModifyInstanceMetadataOptionsRequest.struct_class = Types::ModifyInstanceMetadataOptionsRequest
 
     ModifyInstanceMetadataOptionsResult.add_member(:instance_id, Shapes::ShapeRef.new(shape: String, location_name: "instanceId"))
@@ -8630,6 +9615,51 @@ module Aws::EC2
     ModifyInstancePlacementResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
     ModifyInstancePlacementResult.struct_class = Types::ModifyInstancePlacementResult
 
+    ModifyIpamPoolRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    ModifyIpamPoolRequest.add_member(:ipam_pool_id, Shapes::ShapeRef.new(shape: IpamPoolId, required: true, location_name: "IpamPoolId"))
+    ModifyIpamPoolRequest.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "Description"))
+    ModifyIpamPoolRequest.add_member(:auto_import, Shapes::ShapeRef.new(shape: Boolean, location_name: "AutoImport"))
+    ModifyIpamPoolRequest.add_member(:allocation_min_netmask_length, Shapes::ShapeRef.new(shape: IpamNetmaskLength, location_name: "AllocationMinNetmaskLength"))
+    ModifyIpamPoolRequest.add_member(:allocation_max_netmask_length, Shapes::ShapeRef.new(shape: IpamNetmaskLength, location_name: "AllocationMaxNetmaskLength"))
+    ModifyIpamPoolRequest.add_member(:allocation_default_netmask_length, Shapes::ShapeRef.new(shape: IpamNetmaskLength, location_name: "AllocationDefaultNetmaskLength"))
+    ModifyIpamPoolRequest.add_member(:clear_allocation_default_netmask_length, Shapes::ShapeRef.new(shape: Boolean, location_name: "ClearAllocationDefaultNetmaskLength"))
+    ModifyIpamPoolRequest.add_member(:add_allocation_resource_tags, Shapes::ShapeRef.new(shape: RequestIpamResourceTagList, location_name: "AddAllocationResourceTag"))
+    ModifyIpamPoolRequest.add_member(:remove_allocation_resource_tags, Shapes::ShapeRef.new(shape: RequestIpamResourceTagList, location_name: "RemoveAllocationResourceTag"))
+    ModifyIpamPoolRequest.struct_class = Types::ModifyIpamPoolRequest
+
+    ModifyIpamPoolResult.add_member(:ipam_pool, Shapes::ShapeRef.new(shape: IpamPool, location_name: "ipamPool"))
+    ModifyIpamPoolResult.struct_class = Types::ModifyIpamPoolResult
+
+    ModifyIpamRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    ModifyIpamRequest.add_member(:ipam_id, Shapes::ShapeRef.new(shape: IpamId, required: true, location_name: "IpamId"))
+    ModifyIpamRequest.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "Description"))
+    ModifyIpamRequest.add_member(:add_operating_regions, Shapes::ShapeRef.new(shape: AddIpamOperatingRegionSet, location_name: "AddOperatingRegion"))
+    ModifyIpamRequest.add_member(:remove_operating_regions, Shapes::ShapeRef.new(shape: RemoveIpamOperatingRegionSet, location_name: "RemoveOperatingRegion"))
+    ModifyIpamRequest.struct_class = Types::ModifyIpamRequest
+
+    ModifyIpamResourceCidrRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    ModifyIpamResourceCidrRequest.add_member(:resource_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "ResourceId"))
+    ModifyIpamResourceCidrRequest.add_member(:resource_cidr, Shapes::ShapeRef.new(shape: String, required: true, location_name: "ResourceCidr"))
+    ModifyIpamResourceCidrRequest.add_member(:resource_region, Shapes::ShapeRef.new(shape: String, required: true, location_name: "ResourceRegion"))
+    ModifyIpamResourceCidrRequest.add_member(:current_ipam_scope_id, Shapes::ShapeRef.new(shape: IpamScopeId, required: true, location_name: "CurrentIpamScopeId"))
+    ModifyIpamResourceCidrRequest.add_member(:destination_ipam_scope_id, Shapes::ShapeRef.new(shape: IpamScopeId, location_name: "DestinationIpamScopeId"))
+    ModifyIpamResourceCidrRequest.add_member(:monitored, Shapes::ShapeRef.new(shape: Boolean, required: true, location_name: "Monitored"))
+    ModifyIpamResourceCidrRequest.struct_class = Types::ModifyIpamResourceCidrRequest
+
+    ModifyIpamResourceCidrResult.add_member(:ipam_resource_cidr, Shapes::ShapeRef.new(shape: IpamResourceCidr, location_name: "ipamResourceCidr"))
+    ModifyIpamResourceCidrResult.struct_class = Types::ModifyIpamResourceCidrResult
+
+    ModifyIpamResult.add_member(:ipam, Shapes::ShapeRef.new(shape: Ipam, location_name: "ipam"))
+    ModifyIpamResult.struct_class = Types::ModifyIpamResult
+
+    ModifyIpamScopeRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    ModifyIpamScopeRequest.add_member(:ipam_scope_id, Shapes::ShapeRef.new(shape: IpamScopeId, required: true, location_name: "IpamScopeId"))
+    ModifyIpamScopeRequest.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "Description"))
+    ModifyIpamScopeRequest.struct_class = Types::ModifyIpamScopeRequest
+
+    ModifyIpamScopeResult.add_member(:ipam_scope, Shapes::ShapeRef.new(shape: IpamScope, location_name: "ipamScope"))
+    ModifyIpamScopeResult.struct_class = Types::ModifyIpamScopeResult
+
     ModifyLaunchTemplateRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     ModifyLaunchTemplateRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "ClientToken"))
     ModifyLaunchTemplateRequest.add_member(:launch_template_id, Shapes::ShapeRef.new(shape: LaunchTemplateId, location_name: "LaunchTemplateId"))
@@ -8660,6 +9690,16 @@ module Aws::EC2
     ModifyNetworkInterfaceAttributeRequest.add_member(:source_dest_check, Shapes::ShapeRef.new(shape: AttributeBooleanValue, location_name: "sourceDestCheck"))
     ModifyNetworkInterfaceAttributeRequest.struct_class = Types::ModifyNetworkInterfaceAttributeRequest
 
+    ModifyPrivateDnsNameOptionsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    ModifyPrivateDnsNameOptionsRequest.add_member(:instance_id, Shapes::ShapeRef.new(shape: InstanceId, location_name: "InstanceId"))
+    ModifyPrivateDnsNameOptionsRequest.add_member(:private_dns_hostname_type, Shapes::ShapeRef.new(shape: HostnameType, location_name: "PrivateDnsHostnameType"))
+    ModifyPrivateDnsNameOptionsRequest.add_member(:enable_resource_name_dns_a_record, Shapes::ShapeRef.new(shape: Boolean, location_name: "EnableResourceNameDnsARecord"))
+    ModifyPrivateDnsNameOptionsRequest.add_member(:enable_resource_name_dns_aaaa_record, Shapes::ShapeRef.new(shape: Boolean, location_name: "EnableResourceNameDnsAAAARecord"))
+    ModifyPrivateDnsNameOptionsRequest.struct_class = Types::ModifyPrivateDnsNameOptionsRequest
+
+    ModifyPrivateDnsNameOptionsResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
+    ModifyPrivateDnsNameOptionsResult.struct_class = Types::ModifyPrivateDnsNameOptionsResult
+
     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"))
@@ -8685,6 +9725,15 @@ module Aws::EC2
     ModifySnapshotAttributeRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     ModifySnapshotAttributeRequest.struct_class = Types::ModifySnapshotAttributeRequest
 
+    ModifySnapshotTierRequest.add_member(:snapshot_id, Shapes::ShapeRef.new(shape: SnapshotId, required: true, location_name: "SnapshotId"))
+    ModifySnapshotTierRequest.add_member(:storage_tier, Shapes::ShapeRef.new(shape: TargetStorageTier, location_name: "StorageTier"))
+    ModifySnapshotTierRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    ModifySnapshotTierRequest.struct_class = Types::ModifySnapshotTierRequest
+
+    ModifySnapshotTierResult.add_member(:snapshot_id, Shapes::ShapeRef.new(shape: String, location_name: "snapshotId"))
+    ModifySnapshotTierResult.add_member(:tiering_start_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "tieringStartTime"))
+    ModifySnapshotTierResult.struct_class = Types::ModifySnapshotTierResult
+
     ModifySpotFleetRequestRequest.add_member(:excess_capacity_termination_policy, Shapes::ShapeRef.new(shape: ExcessCapacityTerminationPolicy, location_name: "excessCapacityTerminationPolicy"))
     ModifySpotFleetRequestRequest.add_member(:launch_template_configs, Shapes::ShapeRef.new(shape: LaunchTemplateConfigList, location_name: "LaunchTemplateConfig"))
     ModifySpotFleetRequestRequest.add_member(:spot_fleet_request_id, Shapes::ShapeRef.new(shape: SpotFleetRequestId, required: true, location_name: "spotFleetRequestId"))
@@ -8701,6 +9750,12 @@ module Aws::EC2
     ModifySubnetAttributeRequest.add_member(:subnet_id, Shapes::ShapeRef.new(shape: SubnetId, required: true, location_name: "subnetId"))
     ModifySubnetAttributeRequest.add_member(:map_customer_owned_ip_on_launch, Shapes::ShapeRef.new(shape: AttributeBooleanValue, location_name: "MapCustomerOwnedIpOnLaunch"))
     ModifySubnetAttributeRequest.add_member(:customer_owned_ipv_4_pool, Shapes::ShapeRef.new(shape: CoipPoolId, location_name: "CustomerOwnedIpv4Pool"))
+    ModifySubnetAttributeRequest.add_member(:enable_dns_64, Shapes::ShapeRef.new(shape: AttributeBooleanValue, location_name: "EnableDns64"))
+    ModifySubnetAttributeRequest.add_member(:private_dns_hostname_type_on_launch, Shapes::ShapeRef.new(shape: HostnameType, location_name: "PrivateDnsHostnameTypeOnLaunch"))
+    ModifySubnetAttributeRequest.add_member(:enable_resource_name_dns_a_record_on_launch, Shapes::ShapeRef.new(shape: AttributeBooleanValue, location_name: "EnableResourceNameDnsARecordOnLaunch"))
+    ModifySubnetAttributeRequest.add_member(:enable_resource_name_dns_aaaa_record_on_launch, Shapes::ShapeRef.new(shape: AttributeBooleanValue, location_name: "EnableResourceNameDnsAAAARecordOnLaunch"))
+    ModifySubnetAttributeRequest.add_member(:enable_lni_at_device_index, Shapes::ShapeRef.new(shape: Integer, location_name: "EnableLniAtDeviceIndex"))
+    ModifySubnetAttributeRequest.add_member(:disable_lni_at_device_index, Shapes::ShapeRef.new(shape: AttributeBooleanValue, location_name: "DisableLniAtDeviceIndex"))
     ModifySubnetAttributeRequest.struct_class = Types::ModifySubnetAttributeRequest
 
     ModifyTrafficMirrorFilterNetworkServicesRequest.add_member(:traffic_mirror_filter_id, Shapes::ShapeRef.new(shape: TrafficMirrorFilterId, required: true, location_name: "TrafficMirrorFilterId"))
@@ -8849,6 +9904,14 @@ module Aws::EC2
     ModifyVpcEndpointServiceConfigurationResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
     ModifyVpcEndpointServiceConfigurationResult.struct_class = Types::ModifyVpcEndpointServiceConfigurationResult
 
+    ModifyVpcEndpointServicePayerResponsibilityRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    ModifyVpcEndpointServicePayerResponsibilityRequest.add_member(:service_id, Shapes::ShapeRef.new(shape: VpcEndpointServiceId, required: true, location_name: "ServiceId"))
+    ModifyVpcEndpointServicePayerResponsibilityRequest.add_member(:payer_responsibility, Shapes::ShapeRef.new(shape: PayerResponsibility, required: true, location_name: "PayerResponsibility"))
+    ModifyVpcEndpointServicePayerResponsibilityRequest.struct_class = Types::ModifyVpcEndpointServicePayerResponsibilityRequest
+
+    ModifyVpcEndpointServicePayerResponsibilityResult.add_member(:return_value, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
+    ModifyVpcEndpointServicePayerResponsibilityResult.struct_class = Types::ModifyVpcEndpointServicePayerResponsibilityResult
+
     ModifyVpcEndpointServicePermissionsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     ModifyVpcEndpointServicePermissionsRequest.add_member(:service_id, Shapes::ShapeRef.new(shape: VpcEndpointServiceId, required: true, location_name: "ServiceId"))
     ModifyVpcEndpointServicePermissionsRequest.add_member(:add_allowed_principals, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "AddAllowedPrincipals"))
@@ -8952,6 +10015,15 @@ module Aws::EC2
     MoveAddressToVpcResult.add_member(:status, Shapes::ShapeRef.new(shape: Status, location_name: "status"))
     MoveAddressToVpcResult.struct_class = Types::MoveAddressToVpcResult
 
+    MoveByoipCidrToIpamRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    MoveByoipCidrToIpamRequest.add_member(:cidr, Shapes::ShapeRef.new(shape: String, required: true, location_name: "Cidr"))
+    MoveByoipCidrToIpamRequest.add_member(:ipam_pool_id, Shapes::ShapeRef.new(shape: IpamPoolId, required: true, location_name: "IpamPoolId"))
+    MoveByoipCidrToIpamRequest.add_member(:ipam_pool_owner, Shapes::ShapeRef.new(shape: String, required: true, location_name: "IpamPoolOwner"))
+    MoveByoipCidrToIpamRequest.struct_class = Types::MoveByoipCidrToIpamRequest
+
+    MoveByoipCidrToIpamResult.add_member(:byoip_cidr, Shapes::ShapeRef.new(shape: ByoipCidr, location_name: "byoipCidr"))
+    MoveByoipCidrToIpamResult.struct_class = Types::MoveByoipCidrToIpamResult
+
     MovingAddressStatus.add_member(:move_status, Shapes::ShapeRef.new(shape: MoveStatus, location_name: "moveStatus"))
     MovingAddressStatus.add_member(:public_ip, Shapes::ShapeRef.new(shape: String, location_name: "publicIp"))
     MovingAddressStatus.struct_class = Types::MovingAddressStatus
@@ -9037,6 +10109,39 @@ module Aws::EC2
     NetworkInfo.add_member(:encryption_in_transit_supported, Shapes::ShapeRef.new(shape: EncryptionInTransitSupported, location_name: "encryptionInTransitSupported"))
     NetworkInfo.struct_class = Types::NetworkInfo
 
+    NetworkInsightsAccessScope.add_member(:network_insights_access_scope_id, Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeId, location_name: "networkInsightsAccessScopeId"))
+    NetworkInsightsAccessScope.add_member(:network_insights_access_scope_arn, Shapes::ShapeRef.new(shape: ResourceArn, location_name: "networkInsightsAccessScopeArn"))
+    NetworkInsightsAccessScope.add_member(:created_date, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "createdDate"))
+    NetworkInsightsAccessScope.add_member(:updated_date, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "updatedDate"))
+    NetworkInsightsAccessScope.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
+    NetworkInsightsAccessScope.struct_class = Types::NetworkInsightsAccessScope
+
+    NetworkInsightsAccessScopeAnalysis.add_member(:network_insights_access_scope_analysis_id, Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeAnalysisId, location_name: "networkInsightsAccessScopeAnalysisId"))
+    NetworkInsightsAccessScopeAnalysis.add_member(:network_insights_access_scope_analysis_arn, Shapes::ShapeRef.new(shape: ResourceArn, location_name: "networkInsightsAccessScopeAnalysisArn"))
+    NetworkInsightsAccessScopeAnalysis.add_member(:network_insights_access_scope_id, Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeId, location_name: "networkInsightsAccessScopeId"))
+    NetworkInsightsAccessScopeAnalysis.add_member(:status, Shapes::ShapeRef.new(shape: AnalysisStatus, location_name: "status"))
+    NetworkInsightsAccessScopeAnalysis.add_member(:status_message, Shapes::ShapeRef.new(shape: String, location_name: "statusMessage"))
+    NetworkInsightsAccessScopeAnalysis.add_member(:warning_message, Shapes::ShapeRef.new(shape: String, location_name: "warningMessage"))
+    NetworkInsightsAccessScopeAnalysis.add_member(:start_date, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "startDate"))
+    NetworkInsightsAccessScopeAnalysis.add_member(:end_date, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "endDate"))
+    NetworkInsightsAccessScopeAnalysis.add_member(:findings_found, Shapes::ShapeRef.new(shape: FindingsFound, location_name: "findingsFound"))
+    NetworkInsightsAccessScopeAnalysis.add_member(:analyzed_eni_count, Shapes::ShapeRef.new(shape: Integer, location_name: "analyzedEniCount"))
+    NetworkInsightsAccessScopeAnalysis.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
+    NetworkInsightsAccessScopeAnalysis.struct_class = Types::NetworkInsightsAccessScopeAnalysis
+
+    NetworkInsightsAccessScopeAnalysisIdList.member = Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeAnalysisId, location_name: "item")
+
+    NetworkInsightsAccessScopeAnalysisList.member = Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeAnalysis, location_name: "item")
+
+    NetworkInsightsAccessScopeContent.add_member(:network_insights_access_scope_id, Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeId, location_name: "networkInsightsAccessScopeId"))
+    NetworkInsightsAccessScopeContent.add_member(:match_paths, Shapes::ShapeRef.new(shape: AccessScopePathList, location_name: "matchPathSet"))
+    NetworkInsightsAccessScopeContent.add_member(:exclude_paths, Shapes::ShapeRef.new(shape: AccessScopePathList, location_name: "excludePathSet"))
+    NetworkInsightsAccessScopeContent.struct_class = Types::NetworkInsightsAccessScopeContent
+
+    NetworkInsightsAccessScopeIdList.member = Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeId, location_name: "item")
+
+    NetworkInsightsAccessScopeList.member = Shapes::ShapeRef.new(shape: NetworkInsightsAccessScope, location_name: "item")
+
     NetworkInsightsAnalysis.add_member(:network_insights_analysis_id, Shapes::ShapeRef.new(shape: NetworkInsightsAnalysisId, location_name: "networkInsightsAnalysisId"))
     NetworkInsightsAnalysis.add_member(:network_insights_analysis_arn, Shapes::ShapeRef.new(shape: ResourceArn, location_name: "networkInsightsAnalysisArn"))
     NetworkInsightsAnalysis.add_member(:network_insights_path_id, Shapes::ShapeRef.new(shape: NetworkInsightsPathId, location_name: "networkInsightsPathId"))
@@ -9044,6 +10149,7 @@ module Aws::EC2
     NetworkInsightsAnalysis.add_member(:start_date, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "startDate"))
     NetworkInsightsAnalysis.add_member(:status, Shapes::ShapeRef.new(shape: AnalysisStatus, location_name: "status"))
     NetworkInsightsAnalysis.add_member(:status_message, Shapes::ShapeRef.new(shape: String, location_name: "statusMessage"))
+    NetworkInsightsAnalysis.add_member(:warning_message, Shapes::ShapeRef.new(shape: String, location_name: "warningMessage"))
     NetworkInsightsAnalysis.add_member(:network_path_found, Shapes::ShapeRef.new(shape: Boolean, location_name: "networkPathFound"))
     NetworkInsightsAnalysis.add_member(:forward_path_components, Shapes::ShapeRef.new(shape: PathComponentList, location_name: "forwardPathComponentSet"))
     NetworkInsightsAnalysis.add_member(:return_path_components, Shapes::ShapeRef.new(shape: PathComponentList, location_name: "returnPathComponentSet"))
@@ -9095,6 +10201,9 @@ module Aws::EC2
     NetworkInterface.add_member(:subnet_id, Shapes::ShapeRef.new(shape: String, location_name: "subnetId"))
     NetworkInterface.add_member(:tag_set, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
     NetworkInterface.add_member(:vpc_id, Shapes::ShapeRef.new(shape: String, location_name: "vpcId"))
+    NetworkInterface.add_member(:deny_all_igw_traffic, Shapes::ShapeRef.new(shape: Boolean, location_name: "denyAllIgwTraffic"))
+    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.struct_class = Types::NetworkInterface
 
     NetworkInterfaceAssociation.add_member(:allocation_id, Shapes::ShapeRef.new(shape: String, location_name: "allocationId"))
@@ -9120,6 +10229,14 @@ module Aws::EC2
     NetworkInterfaceAttachmentChanges.add_member(:delete_on_termination, Shapes::ShapeRef.new(shape: Boolean, location_name: "deleteOnTermination"))
     NetworkInterfaceAttachmentChanges.struct_class = Types::NetworkInterfaceAttachmentChanges
 
+    NetworkInterfaceCount.add_member(:min, Shapes::ShapeRef.new(shape: Integer, location_name: "min"))
+    NetworkInterfaceCount.add_member(:max, Shapes::ShapeRef.new(shape: Integer, location_name: "max"))
+    NetworkInterfaceCount.struct_class = Types::NetworkInterfaceCount
+
+    NetworkInterfaceCountRequest.add_member(:min, Shapes::ShapeRef.new(shape: Integer, location_name: "Min"))
+    NetworkInterfaceCountRequest.add_member(:max, Shapes::ShapeRef.new(shape: Integer, location_name: "Max"))
+    NetworkInterfaceCountRequest.struct_class = Types::NetworkInterfaceCountRequest
+
     NetworkInterfaceIdList.member = Shapes::ShapeRef.new(shape: NetworkInterfaceId, location_name: "item")
 
     NetworkInterfaceIpv6Address.add_member(:ipv_6_address, Shapes::ShapeRef.new(shape: String, location_name: "ipv6Address"))
@@ -9179,10 +10296,33 @@ module Aws::EC2
     OnDemandOptionsRequest.add_member(:max_total_price, Shapes::ShapeRef.new(shape: String, location_name: "MaxTotalPrice"))
     OnDemandOptionsRequest.struct_class = Types::OnDemandOptionsRequest
 
+    OrganizationArnStringList.member = Shapes::ShapeRef.new(shape: String, location_name: "OrganizationArn")
+
+    OrganizationalUnitArnStringList.member = Shapes::ShapeRef.new(shape: String, location_name: "OrganizationalUnitArn")
+
     OwnerStringList.member = Shapes::ShapeRef.new(shape: String, location_name: "Owner")
 
+    PacketHeaderStatement.add_member(:source_addresses, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "sourceAddressSet"))
+    PacketHeaderStatement.add_member(:destination_addresses, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "destinationAddressSet"))
+    PacketHeaderStatement.add_member(:source_ports, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "sourcePortSet"))
+    PacketHeaderStatement.add_member(:destination_ports, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "destinationPortSet"))
+    PacketHeaderStatement.add_member(:source_prefix_lists, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "sourcePrefixListSet"))
+    PacketHeaderStatement.add_member(:destination_prefix_lists, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "destinationPrefixListSet"))
+    PacketHeaderStatement.add_member(:protocols, Shapes::ShapeRef.new(shape: ProtocolList, location_name: "protocolSet"))
+    PacketHeaderStatement.struct_class = Types::PacketHeaderStatement
+
+    PacketHeaderStatementRequest.add_member(:source_addresses, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "SourceAddress"))
+    PacketHeaderStatementRequest.add_member(:destination_addresses, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "DestinationAddress"))
+    PacketHeaderStatementRequest.add_member(:source_ports, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "SourcePort"))
+    PacketHeaderStatementRequest.add_member(:destination_ports, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "DestinationPort"))
+    PacketHeaderStatementRequest.add_member(:source_prefix_lists, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "SourcePrefixList"))
+    PacketHeaderStatementRequest.add_member(:destination_prefix_lists, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "DestinationPrefixList"))
+    PacketHeaderStatementRequest.add_member(:protocols, Shapes::ShapeRef.new(shape: ProtocolList, location_name: "Protocol"))
+    PacketHeaderStatementRequest.struct_class = Types::PacketHeaderStatementRequest
+
     PathComponent.add_member(:sequence_number, Shapes::ShapeRef.new(shape: Integer, location_name: "sequenceNumber"))
     PathComponent.add_member(:acl_rule, Shapes::ShapeRef.new(shape: AnalysisAclRule, location_name: "aclRule"))
+    PathComponent.add_member(:attached_to, Shapes::ShapeRef.new(shape: AnalysisComponent, location_name: "attachedTo"))
     PathComponent.add_member(:component, Shapes::ShapeRef.new(shape: AnalysisComponent, location_name: "component"))
     PathComponent.add_member(:destination_vpc, Shapes::ShapeRef.new(shape: AnalysisComponent, location_name: "destinationVpc"))
     PathComponent.add_member(:outbound_header, Shapes::ShapeRef.new(shape: AnalysisPacketHeader, location_name: "outboundHeader"))
@@ -9196,6 +10336,14 @@ module Aws::EC2
 
     PathComponentList.member = Shapes::ShapeRef.new(shape: PathComponent, location_name: "item")
 
+    PathStatement.add_member(:packet_header_statement, Shapes::ShapeRef.new(shape: PacketHeaderStatement, location_name: "packetHeaderStatement"))
+    PathStatement.add_member(:resource_statement, Shapes::ShapeRef.new(shape: ResourceStatement, location_name: "resourceStatement"))
+    PathStatement.struct_class = Types::PathStatement
+
+    PathStatementRequest.add_member(:packet_header_statement, Shapes::ShapeRef.new(shape: PacketHeaderStatementRequest, location_name: "PacketHeaderStatement"))
+    PathStatementRequest.add_member(:resource_statement, Shapes::ShapeRef.new(shape: ResourceStatementRequest, location_name: "ResourceStatement"))
+    PathStatementRequest.struct_class = Types::PathStatementRequest
+
     PciId.add_member(:device_id, Shapes::ShapeRef.new(shape: String, location_name: "DeviceId"))
     PciId.add_member(:vendor_id, Shapes::ShapeRef.new(shape: String, location_name: "VendorId"))
     PciId.add_member(:subsystem_id, Shapes::ShapeRef.new(shape: String, location_name: "SubsystemId"))
@@ -9297,6 +10445,7 @@ module Aws::EC2
     PlacementGroup.add_member(:partition_count, Shapes::ShapeRef.new(shape: Integer, location_name: "partitionCount"))
     PlacementGroup.add_member(:group_id, Shapes::ShapeRef.new(shape: String, location_name: "groupId"))
     PlacementGroup.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
+    PlacementGroup.add_member(:group_arn, Shapes::ShapeRef.new(shape: String, location_name: "groupArn"))
     PlacementGroup.struct_class = Types::PlacementGroup
 
     PlacementGroupIdStringList.member = Shapes::ShapeRef.new(shape: PlacementGroupId, location_name: "GroupId")
@@ -9391,6 +10540,21 @@ module Aws::EC2
     PrivateDnsNameConfiguration.add_member(:name, Shapes::ShapeRef.new(shape: String, location_name: "name"))
     PrivateDnsNameConfiguration.struct_class = Types::PrivateDnsNameConfiguration
 
+    PrivateDnsNameOptionsOnLaunch.add_member(:hostname_type, Shapes::ShapeRef.new(shape: HostnameType, location_name: "hostnameType"))
+    PrivateDnsNameOptionsOnLaunch.add_member(:enable_resource_name_dns_a_record, Shapes::ShapeRef.new(shape: Boolean, location_name: "enableResourceNameDnsARecord"))
+    PrivateDnsNameOptionsOnLaunch.add_member(:enable_resource_name_dns_aaaa_record, Shapes::ShapeRef.new(shape: Boolean, location_name: "enableResourceNameDnsAAAARecord"))
+    PrivateDnsNameOptionsOnLaunch.struct_class = Types::PrivateDnsNameOptionsOnLaunch
+
+    PrivateDnsNameOptionsRequest.add_member(:hostname_type, Shapes::ShapeRef.new(shape: HostnameType, location_name: "HostnameType"))
+    PrivateDnsNameOptionsRequest.add_member(:enable_resource_name_dns_a_record, Shapes::ShapeRef.new(shape: Boolean, location_name: "EnableResourceNameDnsARecord"))
+    PrivateDnsNameOptionsRequest.add_member(:enable_resource_name_dns_aaaa_record, Shapes::ShapeRef.new(shape: Boolean, location_name: "EnableResourceNameDnsAAAARecord"))
+    PrivateDnsNameOptionsRequest.struct_class = Types::PrivateDnsNameOptionsRequest
+
+    PrivateDnsNameOptionsResponse.add_member(:hostname_type, Shapes::ShapeRef.new(shape: HostnameType, location_name: "hostnameType"))
+    PrivateDnsNameOptionsResponse.add_member(:enable_resource_name_dns_a_record, Shapes::ShapeRef.new(shape: Boolean, location_name: "enableResourceNameDnsARecord"))
+    PrivateDnsNameOptionsResponse.add_member(:enable_resource_name_dns_aaaa_record, Shapes::ShapeRef.new(shape: Boolean, location_name: "enableResourceNameDnsAAAARecord"))
+    PrivateDnsNameOptionsResponse.struct_class = Types::PrivateDnsNameOptionsResponse
+
     PrivateIpAddressConfigSet.member = Shapes::ShapeRef.new(shape: ScheduledInstancesPrivateIpAddressConfig, location_name: "PrivateIpAddressConfigSet")
 
     PrivateIpAddressSpecification.add_member(:primary, Shapes::ShapeRef.new(shape: Boolean, location_name: "primary"))
@@ -9420,6 +10584,8 @@ module Aws::EC2
 
     PropagatingVgwList.member = Shapes::ShapeRef.new(shape: PropagatingVgw, location_name: "item")
 
+    ProtocolList.member = Shapes::ShapeRef.new(shape: Protocol, location_name: "item")
+
     ProvisionByoipCidrRequest.add_member(:cidr, Shapes::ShapeRef.new(shape: String, required: true, location_name: "Cidr"))
     ProvisionByoipCidrRequest.add_member(:cidr_authorization_context, Shapes::ShapeRef.new(shape: CidrAuthorizationContext, location_name: "CidrAuthorizationContext"))
     ProvisionByoipCidrRequest.add_member(:publicly_advertisable, Shapes::ShapeRef.new(shape: Boolean, location_name: "PubliclyAdvertisable"))
@@ -9432,6 +10598,25 @@ module Aws::EC2
     ProvisionByoipCidrResult.add_member(:byoip_cidr, Shapes::ShapeRef.new(shape: ByoipCidr, location_name: "byoipCidr"))
     ProvisionByoipCidrResult.struct_class = Types::ProvisionByoipCidrResult
 
+    ProvisionIpamPoolCidrRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    ProvisionIpamPoolCidrRequest.add_member(:ipam_pool_id, Shapes::ShapeRef.new(shape: IpamPoolId, required: true, location_name: "IpamPoolId"))
+    ProvisionIpamPoolCidrRequest.add_member(:cidr, Shapes::ShapeRef.new(shape: String, location_name: "Cidr"))
+    ProvisionIpamPoolCidrRequest.add_member(:cidr_authorization_context, Shapes::ShapeRef.new(shape: IpamCidrAuthorizationContext, location_name: "CidrAuthorizationContext"))
+    ProvisionIpamPoolCidrRequest.struct_class = Types::ProvisionIpamPoolCidrRequest
+
+    ProvisionIpamPoolCidrResult.add_member(:ipam_pool_cidr, Shapes::ShapeRef.new(shape: IpamPoolCidr, location_name: "ipamPoolCidr"))
+    ProvisionIpamPoolCidrResult.struct_class = Types::ProvisionIpamPoolCidrResult
+
+    ProvisionPublicIpv4PoolCidrRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    ProvisionPublicIpv4PoolCidrRequest.add_member(:ipam_pool_id, Shapes::ShapeRef.new(shape: IpamPoolId, required: true, location_name: "IpamPoolId"))
+    ProvisionPublicIpv4PoolCidrRequest.add_member(:pool_id, Shapes::ShapeRef.new(shape: Ipv4PoolEc2Id, required: true, location_name: "PoolId"))
+    ProvisionPublicIpv4PoolCidrRequest.add_member(:netmask_length, Shapes::ShapeRef.new(shape: Integer, required: true, location_name: "NetmaskLength"))
+    ProvisionPublicIpv4PoolCidrRequest.struct_class = Types::ProvisionPublicIpv4PoolCidrRequest
+
+    ProvisionPublicIpv4PoolCidrResult.add_member(:pool_id, Shapes::ShapeRef.new(shape: Ipv4PoolEc2Id, location_name: "poolId"))
+    ProvisionPublicIpv4PoolCidrResult.add_member(:pool_address_range, Shapes::ShapeRef.new(shape: PublicIpv4PoolRange, location_name: "poolAddressRange"))
+    ProvisionPublicIpv4PoolCidrResult.struct_class = Types::ProvisionPublicIpv4PoolCidrResult
+
     ProvisionedBandwidth.add_member(:provision_time, Shapes::ShapeRef.new(shape: DateTime, location_name: "provisionTime"))
     ProvisionedBandwidth.add_member(:provisioned, Shapes::ShapeRef.new(shape: String, location_name: "provisioned"))
     ProvisionedBandwidth.add_member(:request_time, Shapes::ShapeRef.new(shape: DateTime, location_name: "requestTime"))
@@ -9470,7 +10655,7 @@ module Aws::EC2
     Purchase.add_member(:currency_code, Shapes::ShapeRef.new(shape: CurrencyCodeValues, location_name: "currencyCode"))
     Purchase.add_member(:duration, Shapes::ShapeRef.new(shape: Integer, location_name: "duration"))
     Purchase.add_member(:host_id_set, Shapes::ShapeRef.new(shape: ResponseHostIdSet, location_name: "hostIdSet"))
-    Purchase.add_member(:host_reservation_id, Shapes::ShapeRef.new(shape: String, location_name: "hostReservationId"))
+    Purchase.add_member(:host_reservation_id, Shapes::ShapeRef.new(shape: HostReservationId, location_name: "hostReservationId"))
     Purchase.add_member(:hourly_price, Shapes::ShapeRef.new(shape: String, location_name: "hourlyPrice"))
     Purchase.add_member(:instance_family, Shapes::ShapeRef.new(shape: String, location_name: "instanceFamily"))
     Purchase.add_member(:payment_option, Shapes::ShapeRef.new(shape: PaymentOption, location_name: "paymentOption"))
@@ -9548,6 +10733,8 @@ module Aws::EC2
 
     RegionNameStringList.member = Shapes::ShapeRef.new(shape: String, location_name: "RegionName")
 
+    RegionNames.member = Shapes::ShapeRef.new(shape: String)
+
     RegisterImageRequest.add_member(:image_location, Shapes::ShapeRef.new(shape: String, location_name: "ImageLocation"))
     RegisterImageRequest.add_member(:architecture, Shapes::ShapeRef.new(shape: ArchitectureValues, location_name: "architecture"))
     RegisterImageRequest.add_member(:block_device_mappings, Shapes::ShapeRef.new(shape: BlockDeviceMappingRequestList, location_name: "BlockDeviceMapping"))
@@ -9647,6 +10834,20 @@ module Aws::EC2
     ReleaseHostsResult.add_member(:unsuccessful, Shapes::ShapeRef.new(shape: UnsuccessfulItemList, location_name: "unsuccessful"))
     ReleaseHostsResult.struct_class = Types::ReleaseHostsResult
 
+    ReleaseIpamPoolAllocationRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    ReleaseIpamPoolAllocationRequest.add_member(:ipam_pool_id, Shapes::ShapeRef.new(shape: IpamPoolId, required: true, location_name: "IpamPoolId"))
+    ReleaseIpamPoolAllocationRequest.add_member(:cidr, Shapes::ShapeRef.new(shape: String, required: true, location_name: "Cidr"))
+    ReleaseIpamPoolAllocationRequest.add_member(:ipam_pool_allocation_id, Shapes::ShapeRef.new(shape: IpamPoolAllocationId, location_name: "IpamPoolAllocationId"))
+    ReleaseIpamPoolAllocationRequest.struct_class = Types::ReleaseIpamPoolAllocationRequest
+
+    ReleaseIpamPoolAllocationResult.add_member(:success, Shapes::ShapeRef.new(shape: Boolean, location_name: "success"))
+    ReleaseIpamPoolAllocationResult.struct_class = Types::ReleaseIpamPoolAllocationResult
+
+    RemoveIpamOperatingRegion.add_member(:region_name, Shapes::ShapeRef.new(shape: String, location_name: "RegionName"))
+    RemoveIpamOperatingRegion.struct_class = Types::RemoveIpamOperatingRegion
+
+    RemoveIpamOperatingRegionSet.member = Shapes::ShapeRef.new(shape: RemoveIpamOperatingRegion)
+
     RemovePrefixListEntries.member = Shapes::ShapeRef.new(shape: RemovePrefixListEntry)
 
     RemovePrefixListEntry.add_member(:cidr, Shapes::ShapeRef.new(shape: String, required: true, location_name: "Cidr"))
@@ -9707,6 +10908,7 @@ module Aws::EC2
     ReplaceRouteRequest.add_member(:network_interface_id, Shapes::ShapeRef.new(shape: NetworkInterfaceId, location_name: "networkInterfaceId"))
     ReplaceRouteRequest.add_member(:route_table_id, Shapes::ShapeRef.new(shape: RouteTableId, required: true, location_name: "routeTableId"))
     ReplaceRouteRequest.add_member(:vpc_peering_connection_id, Shapes::ShapeRef.new(shape: VpcPeeringConnectionId, location_name: "vpcPeeringConnectionId"))
+    ReplaceRouteRequest.add_member(:core_network_arn, Shapes::ShapeRef.new(shape: CoreNetworkArn, location_name: "CoreNetworkArn"))
     ReplaceRouteRequest.struct_class = Types::ReplaceRouteRequest
 
     ReplaceRouteTableAssociationRequest.add_member(:association_id, Shapes::ShapeRef.new(shape: RouteTableAssociationId, required: true, location_name: "associationId"))
@@ -9743,6 +10945,12 @@ module Aws::EC2
 
     RequestInstanceTypeList.member = Shapes::ShapeRef.new(shape: InstanceType)
 
+    RequestIpamResourceTag.add_member(:key, Shapes::ShapeRef.new(shape: String, location_name: "Key"))
+    RequestIpamResourceTag.add_member(:value, Shapes::ShapeRef.new(shape: String, location_name: "Value"))
+    RequestIpamResourceTag.struct_class = Types::RequestIpamResourceTag
+
+    RequestIpamResourceTagList.member = Shapes::ShapeRef.new(shape: RequestIpamResourceTag, location_name: "item")
+
     RequestLaunchTemplateData.add_member(:kernel_id, Shapes::ShapeRef.new(shape: KernelId, location_name: "KernelId"))
     RequestLaunchTemplateData.add_member(:ebs_optimized, Shapes::ShapeRef.new(shape: Boolean, location_name: "EbsOptimized"))
     RequestLaunchTemplateData.add_member(:iam_instance_profile, Shapes::ShapeRef.new(shape: LaunchTemplateIamInstanceProfileSpecificationRequest, location_name: "IamInstanceProfile"))
@@ -9770,6 +10978,8 @@ module Aws::EC2
     RequestLaunchTemplateData.add_member(:hibernation_options, Shapes::ShapeRef.new(shape: LaunchTemplateHibernationOptionsRequest, location_name: "HibernationOptions"))
     RequestLaunchTemplateData.add_member(:metadata_options, Shapes::ShapeRef.new(shape: LaunchTemplateInstanceMetadataOptionsRequest, location_name: "MetadataOptions"))
     RequestLaunchTemplateData.add_member(:enclave_options, Shapes::ShapeRef.new(shape: LaunchTemplateEnclaveOptionsRequest, location_name: "EnclaveOptions"))
+    RequestLaunchTemplateData.add_member(:instance_requirements, Shapes::ShapeRef.new(shape: InstanceRequirementsRequest, location_name: "InstanceRequirements"))
+    RequestLaunchTemplateData.add_member(:private_dns_name_options, Shapes::ShapeRef.new(shape: LaunchTemplatePrivateDnsNameOptionsRequest, location_name: "PrivateDnsNameOptions"))
     RequestLaunchTemplateData.struct_class = Types::RequestLaunchTemplateData
 
     RequestSpotFleetRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
@@ -9996,6 +11206,14 @@ module Aws::EC2
 
     ResourceList.member = Shapes::ShapeRef.new(shape: String, location_name: "item")
 
+    ResourceStatement.add_member(:resources, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "resourceSet"))
+    ResourceStatement.add_member(:resource_types, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "resourceTypeSet"))
+    ResourceStatement.struct_class = Types::ResourceStatement
+
+    ResourceStatementRequest.add_member(:resources, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "Resource"))
+    ResourceStatementRequest.add_member(:resource_types, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "ResourceType"))
+    ResourceStatementRequest.struct_class = Types::ResourceStatementRequest
+
     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
@@ -10031,6 +11249,8 @@ module Aws::EC2
     ResponseLaunchTemplateData.add_member(:hibernation_options, Shapes::ShapeRef.new(shape: LaunchTemplateHibernationOptions, location_name: "hibernationOptions"))
     ResponseLaunchTemplateData.add_member(:metadata_options, Shapes::ShapeRef.new(shape: LaunchTemplateInstanceMetadataOptions, location_name: "metadataOptions"))
     ResponseLaunchTemplateData.add_member(:enclave_options, Shapes::ShapeRef.new(shape: LaunchTemplateEnclaveOptions, location_name: "enclaveOptions"))
+    ResponseLaunchTemplateData.add_member(:instance_requirements, Shapes::ShapeRef.new(shape: InstanceRequirements, location_name: "instanceRequirements"))
+    ResponseLaunchTemplateData.add_member(:private_dns_name_options, Shapes::ShapeRef.new(shape: LaunchTemplatePrivateDnsNameOptions, location_name: "privateDnsNameOptions"))
     ResponseLaunchTemplateData.struct_class = Types::ResponseLaunchTemplateData
 
     RestorableByStringList.member = Shapes::ShapeRef.new(shape: String)
@@ -10052,6 +11272,34 @@ module Aws::EC2
     RestoreManagedPrefixListVersionResult.add_member(:prefix_list, Shapes::ShapeRef.new(shape: ManagedPrefixList, location_name: "prefixList"))
     RestoreManagedPrefixListVersionResult.struct_class = Types::RestoreManagedPrefixListVersionResult
 
+    RestoreSnapshotFromRecycleBinRequest.add_member(:snapshot_id, Shapes::ShapeRef.new(shape: SnapshotId, required: true, location_name: "SnapshotId"))
+    RestoreSnapshotFromRecycleBinRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    RestoreSnapshotFromRecycleBinRequest.struct_class = Types::RestoreSnapshotFromRecycleBinRequest
+
+    RestoreSnapshotFromRecycleBinResult.add_member(:snapshot_id, Shapes::ShapeRef.new(shape: String, location_name: "snapshotId"))
+    RestoreSnapshotFromRecycleBinResult.add_member(:outpost_arn, Shapes::ShapeRef.new(shape: String, location_name: "outpostArn"))
+    RestoreSnapshotFromRecycleBinResult.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
+    RestoreSnapshotFromRecycleBinResult.add_member(:encrypted, Shapes::ShapeRef.new(shape: Boolean, location_name: "encrypted"))
+    RestoreSnapshotFromRecycleBinResult.add_member(:owner_id, Shapes::ShapeRef.new(shape: String, location_name: "ownerId"))
+    RestoreSnapshotFromRecycleBinResult.add_member(:progress, Shapes::ShapeRef.new(shape: String, location_name: "progress"))
+    RestoreSnapshotFromRecycleBinResult.add_member(:start_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "startTime"))
+    RestoreSnapshotFromRecycleBinResult.add_member(:state, Shapes::ShapeRef.new(shape: SnapshotState, location_name: "status"))
+    RestoreSnapshotFromRecycleBinResult.add_member(:volume_id, Shapes::ShapeRef.new(shape: String, location_name: "volumeId"))
+    RestoreSnapshotFromRecycleBinResult.add_member(:volume_size, Shapes::ShapeRef.new(shape: Integer, location_name: "volumeSize"))
+    RestoreSnapshotFromRecycleBinResult.struct_class = Types::RestoreSnapshotFromRecycleBinResult
+
+    RestoreSnapshotTierRequest.add_member(:snapshot_id, Shapes::ShapeRef.new(shape: SnapshotId, required: true, location_name: "SnapshotId"))
+    RestoreSnapshotTierRequest.add_member(:temporary_restore_days, Shapes::ShapeRef.new(shape: RestoreSnapshotTierRequestTemporaryRestoreDays, location_name: "TemporaryRestoreDays"))
+    RestoreSnapshotTierRequest.add_member(:permanent_restore, Shapes::ShapeRef.new(shape: Boolean, location_name: "PermanentRestore"))
+    RestoreSnapshotTierRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    RestoreSnapshotTierRequest.struct_class = Types::RestoreSnapshotTierRequest
+
+    RestoreSnapshotTierResult.add_member(:snapshot_id, Shapes::ShapeRef.new(shape: String, location_name: "snapshotId"))
+    RestoreSnapshotTierResult.add_member(:restore_start_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "restoreStartTime"))
+    RestoreSnapshotTierResult.add_member(:restore_duration, Shapes::ShapeRef.new(shape: Integer, location_name: "restoreDuration"))
+    RestoreSnapshotTierResult.add_member(:is_permanent_restore, Shapes::ShapeRef.new(shape: Boolean, location_name: "isPermanentRestore"))
+    RestoreSnapshotTierResult.struct_class = Types::RestoreSnapshotTierResult
+
     RevokeClientVpnIngressRequest.add_member(:client_vpn_endpoint_id, Shapes::ShapeRef.new(shape: ClientVpnEndpointId, required: true, location_name: "ClientVpnEndpointId"))
     RevokeClientVpnIngressRequest.add_member(:target_network_cidr, Shapes::ShapeRef.new(shape: String, required: true, location_name: "TargetNetworkCidr"))
     RevokeClientVpnIngressRequest.add_member(:access_group_id, Shapes::ShapeRef.new(shape: String, location_name: "AccessGroupId"))
@@ -10112,6 +11360,7 @@ module Aws::EC2
     Route.add_member(:origin, Shapes::ShapeRef.new(shape: RouteOrigin, location_name: "origin"))
     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.struct_class = Types::Route
 
     RouteList.member = Shapes::ShapeRef.new(shape: Route, location_name: "item")
@@ -10183,6 +11432,7 @@ module Aws::EC2
     RunInstancesRequest.add_member(:license_specifications, Shapes::ShapeRef.new(shape: LicenseSpecificationListRequest, location_name: "LicenseSpecification"))
     RunInstancesRequest.add_member(:metadata_options, Shapes::ShapeRef.new(shape: InstanceMetadataOptionsRequest, location_name: "MetadataOptions"))
     RunInstancesRequest.add_member(:enclave_options, Shapes::ShapeRef.new(shape: EnclaveOptionsRequest, location_name: "EnclaveOptions"))
+    RunInstancesRequest.add_member(:private_dns_name_options, Shapes::ShapeRef.new(shape: PrivateDnsNameOptionsRequest, location_name: "PrivateDnsNameOptions"))
     RunInstancesRequest.struct_class = Types::RunInstancesRequest
 
     RunScheduledInstancesRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "ClientToken", metadata: {"idempotencyToken"=>true}))
@@ -10446,6 +11696,7 @@ module Aws::EC2
     ServiceConfiguration.add_member(:base_endpoint_dns_names, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "baseEndpointDnsNameSet"))
     ServiceConfiguration.add_member(:private_dns_name, Shapes::ShapeRef.new(shape: String, location_name: "privateDnsName"))
     ServiceConfiguration.add_member(:private_dns_name_configuration, Shapes::ShapeRef.new(shape: PrivateDnsNameConfiguration, location_name: "privateDnsNameConfiguration"))
+    ServiceConfiguration.add_member(:payer_responsibility, Shapes::ShapeRef.new(shape: PayerResponsibility, location_name: "payerResponsibility"))
     ServiceConfiguration.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
     ServiceConfiguration.struct_class = Types::ServiceConfiguration
 
@@ -10462,6 +11713,7 @@ module Aws::EC2
     ServiceDetail.add_member(:vpc_endpoint_policy_supported, Shapes::ShapeRef.new(shape: Boolean, location_name: "vpcEndpointPolicySupported"))
     ServiceDetail.add_member(:acceptance_required, Shapes::ShapeRef.new(shape: Boolean, location_name: "acceptanceRequired"))
     ServiceDetail.add_member(:manages_vpc_endpoints, Shapes::ShapeRef.new(shape: Boolean, location_name: "managesVpcEndpoints"))
+    ServiceDetail.add_member(:payer_responsibility, Shapes::ShapeRef.new(shape: PayerResponsibility, location_name: "payerResponsibility"))
     ServiceDetail.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
     ServiceDetail.add_member(:private_dns_name_verification_state, Shapes::ShapeRef.new(shape: DnsNameState, location_name: "privateDnsNameVerificationState"))
     ServiceDetail.struct_class = Types::ServiceDetail
@@ -10496,6 +11748,8 @@ module Aws::EC2
     Snapshot.add_member(:owner_alias, Shapes::ShapeRef.new(shape: String, location_name: "ownerAlias"))
     Snapshot.add_member(:outpost_arn, Shapes::ShapeRef.new(shape: String, location_name: "outpostArn"))
     Snapshot.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
+    Snapshot.add_member(:storage_tier, Shapes::ShapeRef.new(shape: StorageTier, location_name: "storageTier"))
+    Snapshot.add_member(:restore_expiry_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "restoreExpiryTime"))
     Snapshot.struct_class = Types::Snapshot
 
     SnapshotDetail.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
@@ -10535,6 +11789,15 @@ module Aws::EC2
 
     SnapshotList.member = Shapes::ShapeRef.new(shape: Snapshot, location_name: "item")
 
+    SnapshotRecycleBinInfo.add_member(:snapshot_id, Shapes::ShapeRef.new(shape: String, location_name: "snapshotId"))
+    SnapshotRecycleBinInfo.add_member(:recycle_bin_enter_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "recycleBinEnterTime"))
+    SnapshotRecycleBinInfo.add_member(:recycle_bin_exit_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "recycleBinExitTime"))
+    SnapshotRecycleBinInfo.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
+    SnapshotRecycleBinInfo.add_member(:volume_id, Shapes::ShapeRef.new(shape: String, location_name: "volumeId"))
+    SnapshotRecycleBinInfo.struct_class = Types::SnapshotRecycleBinInfo
+
+    SnapshotRecycleBinInfoList.member = Shapes::ShapeRef.new(shape: SnapshotRecycleBinInfo, location_name: "item")
+
     SnapshotSet.member = Shapes::ShapeRef.new(shape: SnapshotInfo, location_name: "item")
 
     SnapshotTaskDetail.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
@@ -10550,7 +11813,22 @@ module Aws::EC2
     SnapshotTaskDetail.add_member(:user_bucket, Shapes::ShapeRef.new(shape: UserBucketDetails, location_name: "userBucket"))
     SnapshotTaskDetail.struct_class = Types::SnapshotTaskDetail
 
+    SnapshotTierStatus.add_member(:snapshot_id, Shapes::ShapeRef.new(shape: SnapshotId, location_name: "snapshotId"))
+    SnapshotTierStatus.add_member(:volume_id, Shapes::ShapeRef.new(shape: VolumeId, location_name: "volumeId"))
+    SnapshotTierStatus.add_member(:status, Shapes::ShapeRef.new(shape: SnapshotState, location_name: "status"))
+    SnapshotTierStatus.add_member(:owner_id, Shapes::ShapeRef.new(shape: String, location_name: "ownerId"))
+    SnapshotTierStatus.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
+    SnapshotTierStatus.add_member(:storage_tier, Shapes::ShapeRef.new(shape: StorageTier, location_name: "storageTier"))
+    SnapshotTierStatus.add_member(:last_tiering_start_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "lastTieringStartTime"))
+    SnapshotTierStatus.add_member(:last_tiering_progress, Shapes::ShapeRef.new(shape: Integer, location_name: "lastTieringProgress"))
+    SnapshotTierStatus.add_member(:last_tiering_operation_status, Shapes::ShapeRef.new(shape: TieringOperationStatus, location_name: "lastTieringOperationStatus"))
+    SnapshotTierStatus.add_member(:last_tiering_operation_status_detail, Shapes::ShapeRef.new(shape: String, location_name: "lastTieringOperationStatusDetail"))
+    SnapshotTierStatus.add_member(:archival_complete_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "archivalCompleteTime"))
+    SnapshotTierStatus.add_member(:restore_expiry_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "restoreExpiryTime"))
+    SnapshotTierStatus.struct_class = Types::SnapshotTierStatus
+
     SpotCapacityRebalance.add_member(:replacement_strategy, Shapes::ShapeRef.new(shape: ReplacementStrategy, location_name: "replacementStrategy"))
+    SpotCapacityRebalance.add_member(:termination_delay, Shapes::ShapeRef.new(shape: Integer, location_name: "terminationDelay"))
     SpotCapacityRebalance.struct_class = Types::SpotCapacityRebalance
 
     SpotDatafeedSubscription.add_member(:bucket, Shapes::ShapeRef.new(shape: String, location_name: "bucket"))
@@ -10578,6 +11856,7 @@ module Aws::EC2
     SpotFleetLaunchSpecification.add_member(:user_data, Shapes::ShapeRef.new(shape: String, location_name: "userData"))
     SpotFleetLaunchSpecification.add_member(:weighted_capacity, Shapes::ShapeRef.new(shape: Double, location_name: "weightedCapacity"))
     SpotFleetLaunchSpecification.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: SpotFleetTagSpecificationList, location_name: "tagSpecificationSet"))
+    SpotFleetLaunchSpecification.add_member(:instance_requirements, Shapes::ShapeRef.new(shape: InstanceRequirements, location_name: "instanceRequirements"))
     SpotFleetLaunchSpecification.struct_class = Types::SpotFleetLaunchSpecification
 
     SpotFleetMonitoring.add_member(:enabled, Shapes::ShapeRef.new(shape: Boolean, location_name: "enabled"))
@@ -10615,6 +11894,7 @@ module Aws::EC2
     SpotFleetRequestConfigData.add_member(:load_balancers_config, Shapes::ShapeRef.new(shape: LoadBalancersConfig, location_name: "loadBalancersConfig"))
     SpotFleetRequestConfigData.add_member(:instance_pools_to_use_count, Shapes::ShapeRef.new(shape: Integer, location_name: "instancePoolsToUseCount"))
     SpotFleetRequestConfigData.add_member(:context, Shapes::ShapeRef.new(shape: String, location_name: "context"))
+    SpotFleetRequestConfigData.add_member(:target_capacity_unit_type, Shapes::ShapeRef.new(shape: TargetCapacityUnitType, location_name: "targetCapacityUnitType"))
     SpotFleetRequestConfigData.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
     SpotFleetRequestConfigData.struct_class = Types::SpotFleetRequestConfigData
 
@@ -10697,6 +11977,13 @@ module Aws::EC2
     SpotPlacement.add_member(:tenancy, Shapes::ShapeRef.new(shape: Tenancy, location_name: "tenancy"))
     SpotPlacement.struct_class = Types::SpotPlacement
 
+    SpotPlacementScore.add_member(:region, Shapes::ShapeRef.new(shape: String, location_name: "region"))
+    SpotPlacementScore.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZoneId"))
+    SpotPlacementScore.add_member(:score, Shapes::ShapeRef.new(shape: Integer, location_name: "score"))
+    SpotPlacementScore.struct_class = Types::SpotPlacementScore
+
+    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(:instance_type, Shapes::ShapeRef.new(shape: InstanceType, location_name: "instanceType"))
     SpotPrice.add_member(:product_description, Shapes::ShapeRef.new(shape: RIProductDescription, location_name: "productDescription"))
@@ -10734,6 +12021,15 @@ module Aws::EC2
     StartInstancesResult.add_member(:starting_instances, Shapes::ShapeRef.new(shape: InstanceStateChangeList, location_name: "instancesSet"))
     StartInstancesResult.struct_class = Types::StartInstancesResult
 
+    StartNetworkInsightsAccessScopeAnalysisRequest.add_member(:network_insights_access_scope_id, Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeId, required: true, location_name: "NetworkInsightsAccessScopeId"))
+    StartNetworkInsightsAccessScopeAnalysisRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    StartNetworkInsightsAccessScopeAnalysisRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
+    StartNetworkInsightsAccessScopeAnalysisRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, required: true, location_name: "ClientToken", metadata: {"idempotencyToken"=>true}))
+    StartNetworkInsightsAccessScopeAnalysisRequest.struct_class = Types::StartNetworkInsightsAccessScopeAnalysisRequest
+
+    StartNetworkInsightsAccessScopeAnalysisResult.add_member(:network_insights_access_scope_analysis, Shapes::ShapeRef.new(shape: NetworkInsightsAccessScopeAnalysis, location_name: "networkInsightsAccessScopeAnalysis"))
+    StartNetworkInsightsAccessScopeAnalysisResult.struct_class = Types::StartNetworkInsightsAccessScopeAnalysisResult
+
     StartNetworkInsightsAnalysisRequest.add_member(:network_insights_path_id, Shapes::ShapeRef.new(shape: NetworkInsightsPathId, required: true, location_name: "NetworkInsightsPathId"))
     StartNetworkInsightsAnalysisRequest.add_member(:filter_in_arns, Shapes::ShapeRef.new(shape: ArnList, location_name: "FilterInArn"))
     StartNetworkInsightsAnalysisRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
@@ -10789,6 +12085,7 @@ module Aws::EC2
     Subnet.add_member(:available_ip_address_count, Shapes::ShapeRef.new(shape: Integer, location_name: "availableIpAddressCount"))
     Subnet.add_member(:cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "cidrBlock"))
     Subnet.add_member(:default_for_az, Shapes::ShapeRef.new(shape: Boolean, location_name: "defaultForAz"))
+    Subnet.add_member(:enable_lni_at_device_index, Shapes::ShapeRef.new(shape: Integer, location_name: "enableLniAtDeviceIndex"))
     Subnet.add_member(:map_public_ip_on_launch, Shapes::ShapeRef.new(shape: Boolean, location_name: "mapPublicIpOnLaunch"))
     Subnet.add_member(:map_customer_owned_ip_on_launch, Shapes::ShapeRef.new(shape: Boolean, location_name: "mapCustomerOwnedIpOnLaunch"))
     Subnet.add_member(:customer_owned_ipv_4_pool, Shapes::ShapeRef.new(shape: CoipPoolId, location_name: "customerOwnedIpv4Pool"))
@@ -10801,6 +12098,9 @@ module Aws::EC2
     Subnet.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
     Subnet.add_member(:subnet_arn, Shapes::ShapeRef.new(shape: String, location_name: "subnetArn"))
     Subnet.add_member(:outpost_arn, Shapes::ShapeRef.new(shape: String, location_name: "outpostArn"))
+    Subnet.add_member(:enable_dns_64, Shapes::ShapeRef.new(shape: Boolean, location_name: "enableDns64"))
+    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.struct_class = Types::Subnet
 
     SubnetAssociation.add_member(:subnet_id, Shapes::ShapeRef.new(shape: String, location_name: "subnetId"))
@@ -10869,12 +12169,14 @@ module Aws::EC2
     TargetCapacitySpecification.add_member(:on_demand_target_capacity, Shapes::ShapeRef.new(shape: Integer, location_name: "onDemandTargetCapacity"))
     TargetCapacitySpecification.add_member(:spot_target_capacity, Shapes::ShapeRef.new(shape: Integer, location_name: "spotTargetCapacity"))
     TargetCapacitySpecification.add_member(:default_target_capacity_type, Shapes::ShapeRef.new(shape: DefaultTargetCapacityType, location_name: "defaultTargetCapacityType"))
+    TargetCapacitySpecification.add_member(:target_capacity_unit_type, Shapes::ShapeRef.new(shape: TargetCapacityUnitType, location_name: "targetCapacityUnitType"))
     TargetCapacitySpecification.struct_class = Types::TargetCapacitySpecification
 
     TargetCapacitySpecificationRequest.add_member(:total_target_capacity, Shapes::ShapeRef.new(shape: Integer, required: true, location_name: "TotalTargetCapacity"))
     TargetCapacitySpecificationRequest.add_member(:on_demand_target_capacity, Shapes::ShapeRef.new(shape: Integer, location_name: "OnDemandTargetCapacity"))
     TargetCapacitySpecificationRequest.add_member(:spot_target_capacity, Shapes::ShapeRef.new(shape: Integer, location_name: "SpotTargetCapacity"))
     TargetCapacitySpecificationRequest.add_member(:default_target_capacity_type, Shapes::ShapeRef.new(shape: DefaultTargetCapacityType, location_name: "DefaultTargetCapacityType"))
+    TargetCapacitySpecificationRequest.add_member(:target_capacity_unit_type, Shapes::ShapeRef.new(shape: TargetCapacityUnitType, location_name: "TargetCapacityUnitType"))
     TargetCapacitySpecificationRequest.struct_class = Types::TargetCapacitySpecificationRequest
 
     TargetConfiguration.add_member(:instance_count, Shapes::ShapeRef.new(shape: Integer, location_name: "instanceCount"))
@@ -10938,6 +12240,24 @@ module Aws::EC2
 
     ThreadsPerCoreList.member = Shapes::ShapeRef.new(shape: ThreadsPerCore, location_name: "item")
 
+    ThroughResourcesStatement.add_member(:resource_statement, Shapes::ShapeRef.new(shape: ResourceStatement, location_name: "resourceStatement"))
+    ThroughResourcesStatement.struct_class = Types::ThroughResourcesStatement
+
+    ThroughResourcesStatementList.member = Shapes::ShapeRef.new(shape: ThroughResourcesStatement, location_name: "item")
+
+    ThroughResourcesStatementRequest.add_member(:resource_statement, Shapes::ShapeRef.new(shape: ResourceStatementRequest, location_name: "ResourceStatement"))
+    ThroughResourcesStatementRequest.struct_class = Types::ThroughResourcesStatementRequest
+
+    ThroughResourcesStatementRequestList.member = Shapes::ShapeRef.new(shape: ThroughResourcesStatementRequest, location_name: "item")
+
+    TotalLocalStorageGB.add_member(:min, Shapes::ShapeRef.new(shape: Double, location_name: "min"))
+    TotalLocalStorageGB.add_member(:max, Shapes::ShapeRef.new(shape: Double, location_name: "max"))
+    TotalLocalStorageGB.struct_class = Types::TotalLocalStorageGB
+
+    TotalLocalStorageGBRequest.add_member(:min, Shapes::ShapeRef.new(shape: Double, location_name: "Min"))
+    TotalLocalStorageGBRequest.add_member(:max, Shapes::ShapeRef.new(shape: Double, location_name: "Max"))
+    TotalLocalStorageGBRequest.struct_class = Types::TotalLocalStorageGBRequest
+
     TrafficMirrorFilter.add_member(:traffic_mirror_filter_id, Shapes::ShapeRef.new(shape: String, location_name: "trafficMirrorFilterId"))
     TrafficMirrorFilter.add_member(:ingress_filter_rules, Shapes::ShapeRef.new(shape: TrafficMirrorFilterRuleList, location_name: "ingressFilterRuleSet"))
     TrafficMirrorFilter.add_member(:egress_filter_rules, Shapes::ShapeRef.new(shape: TrafficMirrorFilterRuleList, location_name: "egressFilterRuleSet"))
@@ -11425,6 +12745,14 @@ module Aws::EC2
 
     UserIdStringList.member = Shapes::ShapeRef.new(shape: String, location_name: "UserId")
 
+    VCpuCountRange.add_member(:min, Shapes::ShapeRef.new(shape: Integer, location_name: "min"))
+    VCpuCountRange.add_member(:max, Shapes::ShapeRef.new(shape: Integer, location_name: "max"))
+    VCpuCountRange.struct_class = Types::VCpuCountRange
+
+    VCpuCountRangeRequest.add_member(:min, Shapes::ShapeRef.new(shape: Integer, required: true, location_name: "Min"))
+    VCpuCountRangeRequest.add_member(:max, Shapes::ShapeRef.new(shape: Integer, location_name: "Max"))
+    VCpuCountRangeRequest.struct_class = Types::VCpuCountRangeRequest
+
     VCpuInfo.add_member(:default_v_cpus, Shapes::ShapeRef.new(shape: VCpuCount, location_name: "defaultVCpus"))
     VCpuInfo.add_member(:default_cores, Shapes::ShapeRef.new(shape: CoreCount, location_name: "defaultCores"))
     VCpuInfo.add_member(:default_threads_per_core, Shapes::ShapeRef.new(shape: ThreadsPerCore, location_name: "defaultThreadsPerCore"))
@@ -11455,6 +12783,8 @@ module Aws::EC2
 
     VirtualizationTypeList.member = Shapes::ShapeRef.new(shape: VirtualizationType, location_name: "item")
 
+    VirtualizationTypeSet.member = Shapes::ShapeRef.new(shape: VirtualizationType, location_name: "item")
+
     Volume.add_member(:attachments, Shapes::ShapeRef.new(shape: VolumeAttachmentList, location_name: "attachmentSet"))
     Volume.add_member(:availability_zone, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZone"))
     Volume.add_member(:create_time, Shapes::ShapeRef.new(shape: DateTime, location_name: "createTime"))
@@ -11687,6 +13017,9 @@ module Aws::EC2
     VpnConnection.add_member(:vpn_connection_id, Shapes::ShapeRef.new(shape: String, location_name: "vpnConnectionId"))
     VpnConnection.add_member(:vpn_gateway_id, Shapes::ShapeRef.new(shape: String, location_name: "vpnGatewayId"))
     VpnConnection.add_member(:transit_gateway_id, Shapes::ShapeRef.new(shape: String, location_name: "transitGatewayId"))
+    VpnConnection.add_member(:core_network_arn, Shapes::ShapeRef.new(shape: String, location_name: "coreNetworkArn"))
+    VpnConnection.add_member(:core_network_attachment_arn, Shapes::ShapeRef.new(shape: String, location_name: "coreNetworkAttachmentArn"))
+    VpnConnection.add_member(:gateway_association_state, Shapes::ShapeRef.new(shape: GatewayAssociationState, location_name: "gatewayAssociationState"))
     VpnConnection.add_member(:options, Shapes::ShapeRef.new(shape: VpnConnectionOptions, location_name: "options"))
     VpnConnection.add_member(:routes, Shapes::ShapeRef.new(shape: VpnStaticRouteList, location_name: "routes"))
     VpnConnection.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
@@ -11778,6 +13111,8 @@ module Aws::EC2
 
     ZoneNameStringList.member = Shapes::ShapeRef.new(shape: String, location_name: "ZoneName")
 
+    snapshotTierStatusSet.member = Shapes::ShapeRef.new(shape: SnapshotTierStatus, location_name: "item")
+
 
     # @api private
     API = Seahorse::Model::Api.new.tap do |api|
@@ -11868,6 +13203,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: AllocateHostsResult)
       end)
 
+      api.add_operation(:allocate_ipam_pool_cidr, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "AllocateIpamPoolCidr"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: AllocateIpamPoolCidrRequest)
+        o.output = Shapes::ShapeRef.new(shape: AllocateIpamPoolCidrResult)
+      end)
+
       api.add_operation(:apply_security_groups_to_client_vpn_target_network, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ApplySecurityGroupsToClientVpnTargetNetwork"
         o.http_method = "POST"
@@ -12300,6 +13643,30 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: CreateInternetGatewayResult)
       end)
 
+      api.add_operation(:create_ipam, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "CreateIpam"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: CreateIpamRequest)
+        o.output = Shapes::ShapeRef.new(shape: CreateIpamResult)
+      end)
+
+      api.add_operation(:create_ipam_pool, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "CreateIpamPool"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: CreateIpamPoolRequest)
+        o.output = Shapes::ShapeRef.new(shape: CreateIpamPoolResult)
+      end)
+
+      api.add_operation(:create_ipam_scope, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "CreateIpamScope"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: CreateIpamScopeRequest)
+        o.output = Shapes::ShapeRef.new(shape: CreateIpamScopeResult)
+      end)
+
       api.add_operation(:create_key_pair, Seahorse::Model::Operation.new.tap do |o|
         o.name = "CreateKeyPair"
         o.http_method = "POST"
@@ -12372,6 +13739,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
 
+      api.add_operation(:create_network_insights_access_scope, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "CreateNetworkInsightsAccessScope"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: CreateNetworkInsightsAccessScopeRequest)
+        o.output = Shapes::ShapeRef.new(shape: CreateNetworkInsightsAccessScopeResult)
+      end)
+
       api.add_operation(:create_network_insights_path, Seahorse::Model::Operation.new.tap do |o|
         o.name = "CreateNetworkInsightsPath"
         o.http_method = "POST"
@@ -12404,6 +13779,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: CreatePlacementGroupResult)
       end)
 
+      api.add_operation(:create_public_ipv_4_pool, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "CreatePublicIpv4Pool"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: CreatePublicIpv4PoolRequest)
+        o.output = Shapes::ShapeRef.new(shape: CreatePublicIpv4PoolResult)
+      end)
+
       api.add_operation(:create_replace_root_volume_task, Seahorse::Model::Operation.new.tap do |o|
         o.name = "CreateReplaceRootVolumeTask"
         o.http_method = "POST"
@@ -12772,6 +14155,30 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
 
+      api.add_operation(:delete_ipam, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DeleteIpam"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DeleteIpamRequest)
+        o.output = Shapes::ShapeRef.new(shape: DeleteIpamResult)
+      end)
+
+      api.add_operation(:delete_ipam_pool, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DeleteIpamPool"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DeleteIpamPoolRequest)
+        o.output = Shapes::ShapeRef.new(shape: DeleteIpamPoolResult)
+      end)
+
+      api.add_operation(:delete_ipam_scope, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DeleteIpamScope"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DeleteIpamScopeRequest)
+        o.output = Shapes::ShapeRef.new(shape: DeleteIpamScopeResult)
+      end)
+
       api.add_operation(:delete_key_pair, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteKeyPair"
         o.http_method = "POST"
@@ -12844,6 +14251,22 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
 
+      api.add_operation(:delete_network_insights_access_scope, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DeleteNetworkInsightsAccessScope"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DeleteNetworkInsightsAccessScopeRequest)
+        o.output = Shapes::ShapeRef.new(shape: DeleteNetworkInsightsAccessScopeResult)
+      end)
+
+      api.add_operation(:delete_network_insights_access_scope_analysis, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DeleteNetworkInsightsAccessScopeAnalysis"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DeleteNetworkInsightsAccessScopeAnalysisRequest)
+        o.output = Shapes::ShapeRef.new(shape: DeleteNetworkInsightsAccessScopeAnalysisResult)
+      end)
+
       api.add_operation(:delete_network_insights_analysis, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteNetworkInsightsAnalysis"
         o.http_method = "POST"
@@ -12884,6 +14307,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
 
+      api.add_operation(:delete_public_ipv_4_pool, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DeletePublicIpv4Pool"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DeletePublicIpv4PoolRequest)
+        o.output = Shapes::ShapeRef.new(shape: DeletePublicIpv4PoolResult)
+      end)
+
       api.add_operation(:delete_queued_reserved_instances, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeleteQueuedReservedInstances"
         o.http_method = "POST"
@@ -13140,6 +14571,22 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: DeprovisionByoipCidrResult)
       end)
 
+      api.add_operation(:deprovision_ipam_pool_cidr, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DeprovisionIpamPoolCidr"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DeprovisionIpamPoolCidrRequest)
+        o.output = Shapes::ShapeRef.new(shape: DeprovisionIpamPoolCidrResult)
+      end)
+
+      api.add_operation(:deprovision_public_ipv_4_pool_cidr, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DeprovisionPublicIpv4PoolCidr"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DeprovisionPublicIpv4PoolCidrRequest)
+        o.output = Shapes::ShapeRef.new(shape: DeprovisionPublicIpv4PoolCidrResult)
+      end)
+
       api.add_operation(:deregister_image, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DeregisterImage"
         o.http_method = "POST"
@@ -13454,6 +14901,20 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: DescribeExportTasksResult)
       end)
 
+      api.add_operation(:describe_fast_launch_images, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeFastLaunchImages"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeFastLaunchImagesRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribeFastLaunchImagesResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
       api.add_operation(:describe_fast_snapshot_restores, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DescribeFastSnapshotRestores"
         o.http_method = "POST"
@@ -13764,6 +15225,48 @@ module Aws::EC2
         )
       end)
 
+      api.add_operation(:describe_ipam_pools, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeIpamPools"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeIpamPoolsRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribeIpamPoolsResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
+      api.add_operation(:describe_ipam_scopes, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeIpamScopes"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeIpamScopesRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribeIpamScopesResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
+      api.add_operation(:describe_ipams, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeIpams"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeIpamsRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribeIpamsResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
       api.add_operation(:describe_ipv_6_pools, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DescribeIpv6Pools"
         o.http_method = "POST"
@@ -13954,6 +15457,34 @@ module Aws::EC2
         )
       end)
 
+      api.add_operation(:describe_network_insights_access_scope_analyses, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeNetworkInsightsAccessScopeAnalyses"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeNetworkInsightsAccessScopeAnalysesRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribeNetworkInsightsAccessScopeAnalysesResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
+      api.add_operation(:describe_network_insights_access_scopes, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeNetworkInsightsAccessScopes"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeNetworkInsightsAccessScopesRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribeNetworkInsightsAccessScopesResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
       api.add_operation(:describe_network_insights_analyses, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DescribeNetworkInsightsAnalyses"
         o.http_method = "POST"
@@ -14219,6 +15750,20 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: DescribeSnapshotAttributeResult)
       end)
 
+      api.add_operation(:describe_snapshot_tier_status, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeSnapshotTierStatus"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeSnapshotTierStatusRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribeSnapshotTierStatusResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
       api.add_operation(:describe_snapshots, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DescribeSnapshots"
         o.http_method = "POST"
@@ -14773,6 +16318,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: DisableEbsEncryptionByDefaultResult)
       end)
 
+      api.add_operation(:disable_fast_launch, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DisableFastLaunch"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DisableFastLaunchRequest)
+        o.output = Shapes::ShapeRef.new(shape: DisableFastLaunchResult)
+      end)
+
       api.add_operation(:disable_fast_snapshot_restores, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DisableFastSnapshotRestores"
         o.http_method = "POST"
@@ -14789,6 +16342,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: DisableImageDeprecationResult)
       end)
 
+      api.add_operation(:disable_ipam_organization_admin_account, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DisableIpamOrganizationAdminAccount"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DisableIpamOrganizationAdminAccountRequest)
+        o.output = Shapes::ShapeRef.new(shape: DisableIpamOrganizationAdminAccountResult)
+      end)
+
       api.add_operation(:disable_serial_console_access, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DisableSerialConsoleAccess"
         o.http_method = "POST"
@@ -14925,6 +16486,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: EnableEbsEncryptionByDefaultResult)
       end)
 
+      api.add_operation(:enable_fast_launch, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "EnableFastLaunch"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: EnableFastLaunchRequest)
+        o.output = Shapes::ShapeRef.new(shape: EnableFastLaunchResult)
+      end)
+
       api.add_operation(:enable_fast_snapshot_restores, Seahorse::Model::Operation.new.tap do |o|
         o.name = "EnableFastSnapshotRestores"
         o.http_method = "POST"
@@ -14941,6 +16510,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: EnableImageDeprecationResult)
       end)
 
+      api.add_operation(:enable_ipam_organization_admin_account, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "EnableIpamOrganizationAdminAccount"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: EnableIpamOrganizationAdminAccountRequest)
+        o.output = Shapes::ShapeRef.new(shape: EnableIpamOrganizationAdminAccountResult)
+      end)
+
       api.add_operation(:enable_serial_console_access, Seahorse::Model::Operation.new.tap do |o|
         o.name = "EnableSerialConsoleAccess"
         o.http_method = "POST"
@@ -15129,6 +16706,76 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: GetHostReservationPurchasePreviewResult)
       end)
 
+      api.add_operation(:get_instance_types_from_instance_requirements, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetInstanceTypesFromInstanceRequirements"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: GetInstanceTypesFromInstanceRequirementsRequest)
+        o.output = Shapes::ShapeRef.new(shape: GetInstanceTypesFromInstanceRequirementsResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
+      api.add_operation(:get_ipam_address_history, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetIpamAddressHistory"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: GetIpamAddressHistoryRequest)
+        o.output = Shapes::ShapeRef.new(shape: GetIpamAddressHistoryResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
+      api.add_operation(:get_ipam_pool_allocations, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetIpamPoolAllocations"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: GetIpamPoolAllocationsRequest)
+        o.output = Shapes::ShapeRef.new(shape: GetIpamPoolAllocationsResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
+      api.add_operation(:get_ipam_pool_cidrs, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetIpamPoolCidrs"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: GetIpamPoolCidrsRequest)
+        o.output = Shapes::ShapeRef.new(shape: GetIpamPoolCidrsResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
+      api.add_operation(:get_ipam_resource_cidrs, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetIpamResourceCidrs"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: GetIpamResourceCidrsRequest)
+        o.output = Shapes::ShapeRef.new(shape: GetIpamResourceCidrsResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
       api.add_operation(:get_launch_template_data, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetLaunchTemplateData"
         o.http_method = "POST"
@@ -15165,6 +16812,22 @@ module Aws::EC2
         )
       end)
 
+      api.add_operation(:get_network_insights_access_scope_analysis_findings, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetNetworkInsightsAccessScopeAnalysisFindings"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: GetNetworkInsightsAccessScopeAnalysisFindingsRequest)
+        o.output = Shapes::ShapeRef.new(shape: GetNetworkInsightsAccessScopeAnalysisFindingsResult)
+      end)
+
+      api.add_operation(:get_network_insights_access_scope_content, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetNetworkInsightsAccessScopeContent"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: GetNetworkInsightsAccessScopeContentRequest)
+        o.output = Shapes::ShapeRef.new(shape: GetNetworkInsightsAccessScopeContentResult)
+      end)
+
       api.add_operation(:get_password_data, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetPasswordData"
         o.http_method = "POST"
@@ -15189,6 +16852,20 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: GetSerialConsoleAccessStatusResult)
       end)
 
+      api.add_operation(:get_spot_placement_scores, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetSpotPlacementScores"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: GetSpotPlacementScoresRequest)
+        o.output = Shapes::ShapeRef.new(shape: GetSpotPlacementScoresResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
       api.add_operation(:get_subnet_cidr_reservations, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetSubnetCidrReservations"
         o.http_method = "POST"
@@ -15337,6 +17014,20 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: ImportVolumeResult)
       end)
 
+      api.add_operation(:list_snapshots_in_recycle_bin, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ListSnapshotsInRecycleBin"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ListSnapshotsInRecycleBinRequest)
+        o.output = Shapes::ShapeRef.new(shape: ListSnapshotsInRecycleBinResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
       api.add_operation(:modify_address_attribute, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ModifyAddressAttribute"
         o.http_method = "POST"
@@ -15497,6 +17188,38 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: ModifyInstancePlacementResult)
       end)
 
+      api.add_operation(:modify_ipam, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ModifyIpam"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ModifyIpamRequest)
+        o.output = Shapes::ShapeRef.new(shape: ModifyIpamResult)
+      end)
+
+      api.add_operation(:modify_ipam_pool, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ModifyIpamPool"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ModifyIpamPoolRequest)
+        o.output = Shapes::ShapeRef.new(shape: ModifyIpamPoolResult)
+      end)
+
+      api.add_operation(:modify_ipam_resource_cidr, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ModifyIpamResourceCidr"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ModifyIpamResourceCidrRequest)
+        o.output = Shapes::ShapeRef.new(shape: ModifyIpamResourceCidrResult)
+      end)
+
+      api.add_operation(:modify_ipam_scope, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ModifyIpamScope"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ModifyIpamScopeRequest)
+        o.output = Shapes::ShapeRef.new(shape: ModifyIpamScopeResult)
+      end)
+
       api.add_operation(:modify_launch_template, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ModifyLaunchTemplate"
         o.http_method = "POST"
@@ -15521,6 +17244,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
 
+      api.add_operation(:modify_private_dns_name_options, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ModifyPrivateDnsNameOptions"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ModifyPrivateDnsNameOptionsRequest)
+        o.output = Shapes::ShapeRef.new(shape: ModifyPrivateDnsNameOptionsResult)
+      end)
+
       api.add_operation(:modify_reserved_instances, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ModifyReservedInstances"
         o.http_method = "POST"
@@ -15545,6 +17276,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
       end)
 
+      api.add_operation(:modify_snapshot_tier, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ModifySnapshotTier"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ModifySnapshotTierRequest)
+        o.output = Shapes::ShapeRef.new(shape: ModifySnapshotTierResult)
+      end)
+
       api.add_operation(:modify_spot_fleet_request, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ModifySpotFleetRequest"
         o.http_method = "POST"
@@ -15657,6 +17396,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: ModifyVpcEndpointServiceConfigurationResult)
       end)
 
+      api.add_operation(:modify_vpc_endpoint_service_payer_responsibility, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ModifyVpcEndpointServicePayerResponsibility"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ModifyVpcEndpointServicePayerResponsibilityRequest)
+        o.output = Shapes::ShapeRef.new(shape: ModifyVpcEndpointServicePayerResponsibilityResult)
+      end)
+
       api.add_operation(:modify_vpc_endpoint_service_permissions, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ModifyVpcEndpointServicePermissions"
         o.http_method = "POST"
@@ -15729,6 +17476,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: MoveAddressToVpcResult)
       end)
 
+      api.add_operation(:move_byoip_cidr_to_ipam, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "MoveByoipCidrToIpam"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: MoveByoipCidrToIpamRequest)
+        o.output = Shapes::ShapeRef.new(shape: MoveByoipCidrToIpamResult)
+      end)
+
       api.add_operation(:provision_byoip_cidr, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ProvisionByoipCidr"
         o.http_method = "POST"
@@ -15737,6 +17492,22 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: ProvisionByoipCidrResult)
       end)
 
+      api.add_operation(:provision_ipam_pool_cidr, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ProvisionIpamPoolCidr"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ProvisionIpamPoolCidrRequest)
+        o.output = Shapes::ShapeRef.new(shape: ProvisionIpamPoolCidrResult)
+      end)
+
+      api.add_operation(:provision_public_ipv_4_pool_cidr, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ProvisionPublicIpv4PoolCidr"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ProvisionPublicIpv4PoolCidrRequest)
+        o.output = Shapes::ShapeRef.new(shape: ProvisionPublicIpv4PoolCidrResult)
+      end)
+
       api.add_operation(:purchase_host_reservation, Seahorse::Model::Operation.new.tap do |o|
         o.name = "PurchaseHostReservation"
         o.http_method = "POST"
@@ -15857,6 +17628,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: ReleaseHostsResult)
       end)
 
+      api.add_operation(:release_ipam_pool_allocation, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "ReleaseIpamPoolAllocation"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: ReleaseIpamPoolAllocationRequest)
+        o.output = Shapes::ShapeRef.new(shape: ReleaseIpamPoolAllocationResult)
+      end)
+
       api.add_operation(:replace_iam_instance_profile_association, Seahorse::Model::Operation.new.tap do |o|
         o.name = "ReplaceIamInstanceProfileAssociation"
         o.http_method = "POST"
@@ -16001,6 +17780,22 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: RestoreManagedPrefixListVersionResult)
       end)
 
+      api.add_operation(:restore_snapshot_from_recycle_bin, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "RestoreSnapshotFromRecycleBin"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: RestoreSnapshotFromRecycleBinRequest)
+        o.output = Shapes::ShapeRef.new(shape: RestoreSnapshotFromRecycleBinResult)
+      end)
+
+      api.add_operation(:restore_snapshot_tier, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "RestoreSnapshotTier"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: RestoreSnapshotTierRequest)
+        o.output = Shapes::ShapeRef.new(shape: RestoreSnapshotTierResult)
+      end)
+
       api.add_operation(:revoke_client_vpn_ingress, Seahorse::Model::Operation.new.tap do |o|
         o.name = "RevokeClientVpnIngress"
         o.http_method = "POST"
@@ -16093,6 +17888,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: StartInstancesResult)
       end)
 
+      api.add_operation(:start_network_insights_access_scope_analysis, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "StartNetworkInsightsAccessScopeAnalysis"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: StartNetworkInsightsAccessScopeAnalysisRequest)
+        o.output = Shapes::ShapeRef.new(shape: StartNetworkInsightsAccessScopeAnalysisResult)
+      end)
+
       api.add_operation(:start_network_insights_analysis, Seahorse::Model::Operation.new.tap do |o|
         o.name = "StartNetworkInsightsAnalysis"
         o.http_method = "POST"