aws-sdk-ec2 1.135.0 → 1.140.0

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

@@ -565,6 +565,8 @@ module Aws::EC2
     DescribeInternetGatewaysMaxResults = Shapes::IntegerShape.new(name: 'DescribeInternetGatewaysMaxResults')
     DescribeInternetGatewaysRequest = Shapes::StructureShape.new(name: 'DescribeInternetGatewaysRequest')
     DescribeInternetGatewaysResult = Shapes::StructureShape.new(name: 'DescribeInternetGatewaysResult')
+    DescribeIpv6PoolsRequest = Shapes::StructureShape.new(name: 'DescribeIpv6PoolsRequest')
+    DescribeIpv6PoolsResult = Shapes::StructureShape.new(name: 'DescribeIpv6PoolsResult')
     DescribeKeyPairsRequest = Shapes::StructureShape.new(name: 'DescribeKeyPairsRequest')
     DescribeKeyPairsResult = Shapes::StructureShape.new(name: 'DescribeKeyPairsResult')
     DescribeLaunchTemplateVersionsRequest = Shapes::StructureShape.new(name: 'DescribeLaunchTemplateVersionsRequest')
@@ -907,6 +909,8 @@ module Aws::EC2
     FpgaInfo = Shapes::StructureShape.new(name: 'FpgaInfo')
     FreeTierEligibleFlag = Shapes::BooleanShape.new(name: 'FreeTierEligibleFlag')
     GatewayType = Shapes::StringShape.new(name: 'GatewayType')
+    GetAssociatedIpv6PoolCidrsRequest = Shapes::StructureShape.new(name: 'GetAssociatedIpv6PoolCidrsRequest')
+    GetAssociatedIpv6PoolCidrsResult = Shapes::StructureShape.new(name: 'GetAssociatedIpv6PoolCidrsResult')
     GetCapacityReservationUsageRequest = Shapes::StructureShape.new(name: 'GetCapacityReservationUsageRequest')
     GetCapacityReservationUsageRequestMaxResults = Shapes::IntegerShape.new(name: 'GetCapacityReservationUsageRequestMaxResults')
     GetCapacityReservationUsageResult = Shapes::StructureShape.new(name: 'GetCapacityReservationUsageResult')
@@ -1111,9 +1115,14 @@ module Aws::EC2
     IpRanges = Shapes::ListShape.new(name: 'IpRanges')
     Ipv6Address = Shapes::StringShape.new(name: 'Ipv6Address')
     Ipv6AddressList = Shapes::ListShape.new(name: 'Ipv6AddressList')
+    Ipv6CidrAssociation = Shapes::StructureShape.new(name: 'Ipv6CidrAssociation')
+    Ipv6CidrAssociationSet = Shapes::ListShape.new(name: 'Ipv6CidrAssociationSet')
     Ipv6CidrBlock = Shapes::StructureShape.new(name: 'Ipv6CidrBlock')
     Ipv6CidrBlockSet = Shapes::ListShape.new(name: 'Ipv6CidrBlockSet')
     Ipv6Flag = Shapes::BooleanShape.new(name: 'Ipv6Flag')
+    Ipv6Pool = Shapes::StructureShape.new(name: 'Ipv6Pool')
+    Ipv6PoolMaxResults = Shapes::IntegerShape.new(name: 'Ipv6PoolMaxResults')
+    Ipv6PoolSet = Shapes::ListShape.new(name: 'Ipv6PoolSet')
     Ipv6Range = Shapes::StructureShape.new(name: 'Ipv6Range')
     Ipv6RangeList = Shapes::ListShape.new(name: 'Ipv6RangeList')
     Ipv6SupportValue = Shapes::StringShape.new(name: 'Ipv6SupportValue')
@@ -1410,6 +1419,8 @@ module Aws::EC2
     PlacementResponse = Shapes::StructureShape.new(name: 'PlacementResponse')
     PlacementStrategy = Shapes::StringShape.new(name: 'PlacementStrategy')
     PlatformValues = Shapes::StringShape.new(name: 'PlatformValues')
+    PoolCidrBlock = Shapes::StructureShape.new(name: 'PoolCidrBlock')
+    PoolCidrBlocksSet = Shapes::ListShape.new(name: 'PoolCidrBlocksSet')
     PoolMaxResults = Shapes::IntegerShape.new(name: 'PoolMaxResults')
     PortRange = Shapes::StructureShape.new(name: 'PortRange')
     PrefixList = Shapes::StructureShape.new(name: 'PrefixList')
@@ -2154,6 +2165,8 @@ module Aws::EC2
     AssociateVpcCidrBlockRequest.add_member(:amazon_provided_ipv_6_cidr_block, Shapes::ShapeRef.new(shape: Boolean, location_name: "amazonProvidedIpv6CidrBlock"))
     AssociateVpcCidrBlockRequest.add_member(:cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "CidrBlock"))
     AssociateVpcCidrBlockRequest.add_member(:vpc_id, Shapes::ShapeRef.new(shape: VpcId, required: true, location_name: "vpcId"))
+    AssociateVpcCidrBlockRequest.add_member(:ipv_6_pool, Shapes::ShapeRef.new(shape: String, location_name: "Ipv6Pool"))
+    AssociateVpcCidrBlockRequest.add_member(:ipv_6_cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "Ipv6CidrBlock"))
     AssociateVpcCidrBlockRequest.add_member(:ipv_6_cidr_block_network_border_group, Shapes::ShapeRef.new(shape: String, location_name: "Ipv6CidrBlockNetworkBorderGroup"))
     AssociateVpcCidrBlockRequest.struct_class = Types::AssociateVpcCidrBlockRequest
 
@@ -2827,6 +2840,7 @@ module Aws::EC2
     CreateFlowLogsRequest.add_member(:log_destination_type, Shapes::ShapeRef.new(shape: LogDestinationType, location_name: "LogDestinationType"))
     CreateFlowLogsRequest.add_member(:log_destination, Shapes::ShapeRef.new(shape: String, location_name: "LogDestination"))
     CreateFlowLogsRequest.add_member(:log_format, Shapes::ShapeRef.new(shape: String, location_name: "LogFormat"))
+    CreateFlowLogsRequest.add_member(:max_aggregation_interval, Shapes::ShapeRef.new(shape: Integer, location_name: "MaxAggregationInterval"))
     CreateFlowLogsRequest.struct_class = Types::CreateFlowLogsRequest
 
     CreateFlowLogsResult.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "clientToken"))
@@ -3220,6 +3234,7 @@ module Aws::EC2
     CreateVpcEndpointRequest.add_member(:security_group_ids, Shapes::ShapeRef.new(shape: ValueStringList, location_name: "SecurityGroupId"))
     CreateVpcEndpointRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "ClientToken"))
     CreateVpcEndpointRequest.add_member(:private_dns_enabled, Shapes::ShapeRef.new(shape: Boolean, location_name: "PrivateDnsEnabled"))
+    CreateVpcEndpointRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
     CreateVpcEndpointRequest.struct_class = Types::CreateVpcEndpointRequest
 
     CreateVpcEndpointResult.add_member(:vpc_endpoint, Shapes::ShapeRef.new(shape: VpcEndpoint, location_name: "vpcEndpoint"))
@@ -3231,6 +3246,7 @@ module Aws::EC2
     CreateVpcEndpointServiceConfigurationRequest.add_member(:private_dns_name, Shapes::ShapeRef.new(shape: String, location_name: "PrivateDnsName"))
     CreateVpcEndpointServiceConfigurationRequest.add_member(:network_load_balancer_arns, Shapes::ShapeRef.new(shape: ValueStringList, required: true, location_name: "NetworkLoadBalancerArn"))
     CreateVpcEndpointServiceConfigurationRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "ClientToken"))
+    CreateVpcEndpointServiceConfigurationRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
     CreateVpcEndpointServiceConfigurationRequest.struct_class = Types::CreateVpcEndpointServiceConfigurationRequest
 
     CreateVpcEndpointServiceConfigurationResult.add_member(:service_configuration, Shapes::ShapeRef.new(shape: ServiceConfiguration, location_name: "serviceConfiguration"))
@@ -3249,6 +3265,8 @@ module Aws::EC2
 
     CreateVpcRequest.add_member(:cidr_block, Shapes::ShapeRef.new(shape: String, required: true, 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: String, location_name: "Ipv6Pool"))
+    CreateVpcRequest.add_member(:ipv_6_cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "Ipv6CidrBlock"))
     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"))
@@ -4136,6 +4154,17 @@ module Aws::EC2
     DescribeInternetGatewaysResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
     DescribeInternetGatewaysResult.struct_class = Types::DescribeInternetGatewaysResult
 
+    DescribeIpv6PoolsRequest.add_member(:pool_ids, Shapes::ShapeRef.new(shape: ValueStringList, 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"))
+    DescribeIpv6PoolsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DescribeIpv6PoolsRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
+    DescribeIpv6PoolsRequest.struct_class = Types::DescribeIpv6PoolsRequest
+
+    DescribeIpv6PoolsResult.add_member(:ipv_6_pools, Shapes::ShapeRef.new(shape: Ipv6PoolSet, location_name: "ipv6PoolSet"))
+    DescribeIpv6PoolsResult.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "nextToken"))
+    DescribeIpv6PoolsResult.struct_class = Types::DescribeIpv6PoolsResult
+
     DescribeKeyPairsRequest.add_member(:filters, Shapes::ShapeRef.new(shape: FilterList, location_name: "Filter"))
     DescribeKeyPairsRequest.add_member(:key_names, Shapes::ShapeRef.new(shape: KeyNameStringList, location_name: "KeyName"))
     DescribeKeyPairsRequest.add_member(:key_pair_ids, Shapes::ShapeRef.new(shape: KeyPairIdStringList, location_name: "KeyPairId"))
@@ -5420,6 +5449,7 @@ module Aws::EC2
     FlowLog.add_member(:log_destination_type, Shapes::ShapeRef.new(shape: LogDestinationType, location_name: "logDestinationType"))
     FlowLog.add_member(:log_destination, Shapes::ShapeRef.new(shape: String, location_name: "logDestination"))
     FlowLog.add_member(:log_format, Shapes::ShapeRef.new(shape: String, location_name: "logFormat"))
+    FlowLog.add_member(:max_aggregation_interval, Shapes::ShapeRef.new(shape: Integer, location_name: "maxAggregationInterval"))
     FlowLog.struct_class = Types::FlowLog
 
     FlowLogSet.member = Shapes::ShapeRef.new(shape: FlowLog, location_name: "item")
@@ -5471,6 +5501,16 @@ module Aws::EC2
     FpgaInfo.add_member(:total_fpga_memory_in_mi_b, Shapes::ShapeRef.new(shape: totalFpgaMemory, location_name: "totalFpgaMemoryInMiB"))
     FpgaInfo.struct_class = Types::FpgaInfo
 
+    GetAssociatedIpv6PoolCidrsRequest.add_member(:pool_id, Shapes::ShapeRef.new(shape: String, required: true, location_name: "PoolId"))
+    GetAssociatedIpv6PoolCidrsRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: NextToken, location_name: "NextToken"))
+    GetAssociatedIpv6PoolCidrsRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: Ipv6PoolMaxResults, location_name: "MaxResults"))
+    GetAssociatedIpv6PoolCidrsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    GetAssociatedIpv6PoolCidrsRequest.struct_class = Types::GetAssociatedIpv6PoolCidrsRequest
+
+    GetAssociatedIpv6PoolCidrsResult.add_member(:ipv_6_cidr_associations, Shapes::ShapeRef.new(shape: Ipv6CidrAssociationSet, location_name: "ipv6CidrAssociationSet"))
+    GetAssociatedIpv6PoolCidrsResult.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "nextToken"))
+    GetAssociatedIpv6PoolCidrsResult.struct_class = Types::GetAssociatedIpv6PoolCidrsResult
+
     GetCapacityReservationUsageRequest.add_member(:capacity_reservation_id, Shapes::ShapeRef.new(shape: CapacityReservationId, required: true, location_name: "CapacityReservationId"))
     GetCapacityReservationUsageRequest.add_member(:next_token, Shapes::ShapeRef.new(shape: String, location_name: "NextToken"))
     GetCapacityReservationUsageRequest.add_member(:max_results, Shapes::ShapeRef.new(shape: GetCapacityReservationUsageRequestMaxResults, location_name: "MaxResults"))
@@ -5784,6 +5824,8 @@ module Aws::EC2
     Image.add_member(:kernel_id, Shapes::ShapeRef.new(shape: String, location_name: "kernelId"))
     Image.add_member(:owner_id, Shapes::ShapeRef.new(shape: String, location_name: "imageOwnerId"))
     Image.add_member(:platform, Shapes::ShapeRef.new(shape: PlatformValues, location_name: "platform"))
+    Image.add_member(:platform_details, Shapes::ShapeRef.new(shape: String, location_name: "platformDetails"))
+    Image.add_member(:usage_operation, Shapes::ShapeRef.new(shape: String, location_name: "usageOperation"))
     Image.add_member(:product_codes, Shapes::ShapeRef.new(shape: ProductCodeList, location_name: "productCodes"))
     Image.add_member(:ramdisk_id, Shapes::ShapeRef.new(shape: String, location_name: "ramdiskId"))
     Image.add_member(:state, Shapes::ShapeRef.new(shape: ImageState, location_name: "imageState"))
@@ -6328,11 +6370,25 @@ module Aws::EC2
 
     Ipv6AddressList.member = Shapes::ShapeRef.new(shape: String, location_name: "item")
 
+    Ipv6CidrAssociation.add_member(:ipv_6_cidr, Shapes::ShapeRef.new(shape: String, location_name: "ipv6Cidr"))
+    Ipv6CidrAssociation.add_member(:associated_resource, Shapes::ShapeRef.new(shape: String, location_name: "associatedResource"))
+    Ipv6CidrAssociation.struct_class = Types::Ipv6CidrAssociation
+
+    Ipv6CidrAssociationSet.member = Shapes::ShapeRef.new(shape: Ipv6CidrAssociation, location_name: "item")
+
     Ipv6CidrBlock.add_member(:ipv_6_cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "ipv6CidrBlock"))
     Ipv6CidrBlock.struct_class = Types::Ipv6CidrBlock
 
     Ipv6CidrBlockSet.member = Shapes::ShapeRef.new(shape: Ipv6CidrBlock, location_name: "item")
 
+    Ipv6Pool.add_member(:pool_id, Shapes::ShapeRef.new(shape: String, location_name: "poolId"))
+    Ipv6Pool.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
+    Ipv6Pool.add_member(:pool_cidr_blocks, Shapes::ShapeRef.new(shape: PoolCidrBlocksSet, location_name: "poolCidrBlockSet"))
+    Ipv6Pool.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
+    Ipv6Pool.struct_class = Types::Ipv6Pool
+
+    Ipv6PoolSet.member = Shapes::ShapeRef.new(shape: Ipv6Pool, location_name: "item")
+
     Ipv6Range.add_member(:cidr_ipv_6, Shapes::ShapeRef.new(shape: String, location_name: "cidrIpv6"))
     Ipv6Range.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "description"))
     Ipv6Range.struct_class = Types::Ipv6Range
@@ -7441,6 +7497,11 @@ module Aws::EC2
     PlacementResponse.add_member(:group_name, Shapes::ShapeRef.new(shape: String, location_name: "groupName"))
     PlacementResponse.struct_class = Types::PlacementResponse
 
+    PoolCidrBlock.add_member(:cidr, Shapes::ShapeRef.new(shape: String, location_name: "poolCidrBlock"))
+    PoolCidrBlock.struct_class = Types::PoolCidrBlock
+
+    PoolCidrBlocksSet.member = Shapes::ShapeRef.new(shape: PoolCidrBlock, location_name: "item")
+
     PortRange.add_member(:from, Shapes::ShapeRef.new(shape: Integer, location_name: "from"))
     PortRange.add_member(:to, Shapes::ShapeRef.new(shape: Integer, location_name: "to"))
     PortRange.struct_class = Types::PortRange
@@ -7524,6 +7585,7 @@ module Aws::EC2
 
     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"))
     ProvisionByoipCidrRequest.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "Description"))
     ProvisionByoipCidrRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     ProvisionByoipCidrRequest.struct_class = Types::ProvisionByoipCidrRequest
@@ -9390,6 +9452,7 @@ module Aws::EC2
     VpcIpv6CidrBlockAssociation.add_member(:association_id, Shapes::ShapeRef.new(shape: String, location_name: "associationId"))
     VpcIpv6CidrBlockAssociation.add_member(:ipv_6_cidr_block, Shapes::ShapeRef.new(shape: String, location_name: "ipv6CidrBlock"))
     VpcIpv6CidrBlockAssociation.add_member(:ipv_6_cidr_block_state, Shapes::ShapeRef.new(shape: VpcCidrBlockState, location_name: "ipv6CidrBlockState"))
+    VpcIpv6CidrBlockAssociation.add_member(:ipv_6_pool, Shapes::ShapeRef.new(shape: String, location_name: "ipv6Pool"))
     VpcIpv6CidrBlockAssociation.add_member(:network_border_group, Shapes::ShapeRef.new(shape: String, location_name: "networkBorderGroup"))
     VpcIpv6CidrBlockAssociation.struct_class = Types::VpcIpv6CidrBlockAssociation
 
@@ -11191,6 +11254,20 @@ module Aws::EC2
         )
       end)
 
+      api.add_operation(:describe_ipv_6_pools, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DescribeIpv6Pools"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DescribeIpv6PoolsRequest)
+        o.output = Shapes::ShapeRef.new(shape: DescribeIpv6PoolsResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
       api.add_operation(:describe_key_pairs, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DescribeKeyPairs"
         o.http_method = "POST"
@@ -12204,6 +12281,20 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: ExportTransitGatewayRoutesResult)
       end)
 
+      api.add_operation(:get_associated_ipv_6_pool_cidrs, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetAssociatedIpv6PoolCidrs"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: GetAssociatedIpv6PoolCidrsRequest)
+        o.output = Shapes::ShapeRef.new(shape: GetAssociatedIpv6PoolCidrsResult)
+        o[:pager] = Aws::Pager.new(
+          limit_key: "max_results",
+          tokens: {
+            "next_token" => "next_token"
+          }
+        )
+      end)
+
       api.add_operation(:get_capacity_reservation_usage, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetCapacityReservationUsage"
         o.http_method = "POST"

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

@@ -84,6 +84,33 @@ module Aws::EC2
       data[:platform]
     end
 
+    # The platform details associated with the billing code of the AMI. For
+    # more information, see [AMI Billing Information][1] in the *Amazon
+    # Elastic Compute Cloud User Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/billing-info.html
+    # @return [String]
+    def platform_details
+      data[:platform_details]
+    end
+
+    # The operation of the Amazon EC2 instance and the billing code
+    # associated with the AMI. `usageOperation` corresponds to the
+    # [lineitem/Operation][1] column on your AWS Cost and Usage Report. For
+    # more information, see [AMI Billing Information][2] in the *Amazon
+    # Elastic Compute Cloud User Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/cur/latest/userguide/Lineitem-columns.html#Lineitem-details-O-Operation
+    # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/billing-info.html
+    # @return [String]
+    def usage_operation
+      data[:usage_operation]
+    end
+
     # Any product codes associated with the AMI.
     # @return [Array<Types::ProductCode>]
     def product_codes

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

@@ -1037,6 +1037,8 @@ module Aws::EC2
     #   vpc = ec2.create_vpc({
     #     cidr_block: "String", # required
     #     amazon_provided_ipv_6_cidr_block: false,
+    #     ipv_6_pool: "String",
+    #     ipv_6_cidr_block: "String",
     #     dry_run: false,
     #     instance_tenancy: "default", # accepts default, dedicated, host
     #     ipv_6_cidr_block_network_border_group: "String",
@@ -1049,6 +1051,14 @@ module Aws::EC2
     #   Requests an Amazon-provided IPv6 CIDR block with a /56 prefix length
     #   for the VPC. You cannot specify the range of IP addresses, or the size
     #   of the CIDR block.
+    # @option options [String] :ipv_6_pool
+    #   The ID of an IPv6 address pool from which to allocate the IPv6 CIDR
+    #   block.
+    # @option options [String] :ipv_6_cidr_block
+    #   The IPv6 CIDR block from the IPv6 address pool. You must also specify
+    #   `Ipv6Pool` in the request.
+    #
+    #   To let Amazon choose the IPv6 CIDR block for you, omit this parameter.
     # @option options [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -3193,6 +3203,9 @@ module Aws::EC2
     #   * `ipv6-cidr-block-association.ipv6-cidr-block` - An IPv6 CIDR block
     #     associated with the VPC.
     #
+    #   * `ipv6-cidr-block-association.ipv6-pool` - The ID of the IPv6 address
+    #     pool from which the IPv6 CIDR block is allocated.
+    #
     #   * `ipv6-cidr-block-association.association-id` - The association ID
     #     for an IPv6 CIDR block associated with the VPC.
     #

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

@@ -370,9 +370,9 @@ module Aws::EC2
     #       }
     #
     # @!attribute [rw] cidr
-    #   The IPv4 address range, in CIDR notation. This must be the exact
-    #   range that you provisioned. You can't advertise only a portion of
-    #   the provisioned range.
+    #   The address range, in CIDR notation. This must be the exact range
+    #   that you provisioned. You can't advertise only a portion of the
+    #   provisioned range.
     #   @return [String]
     #
     # @!attribute [rw] dry_run
@@ -1263,6 +1263,8 @@ module Aws::EC2
     #         amazon_provided_ipv_6_cidr_block: false,
     #         cidr_block: "String",
     #         vpc_id: "VpcId", # required
+    #         ipv_6_pool: "String",
+    #         ipv_6_cidr_block: "String",
     #         ipv_6_cidr_block_network_border_group: "String",
     #       }
     #
@@ -1280,6 +1282,19 @@ module Aws::EC2
     #   The ID of the VPC.
     #   @return [String]
     #
+    # @!attribute [rw] ipv_6_pool
+    #   The ID of an IPv6 address pool from which to allocate the IPv6 CIDR
+    #   block.
+    #   @return [String]
+    #
+    # @!attribute [rw] ipv_6_cidr_block
+    #   An IPv6 CIDR block from the IPv6 address pool. You must also specify
+    #   `Ipv6Pool` in the request.
+    #
+    #   To let Amazon choose the IPv6 CIDR block for you, omit this
+    #   parameter.
+    #   @return [String]
+    #
     # @!attribute [rw] ipv_6_cidr_block_network_border_group
     #   The name of the location from which we advertise the IPV6 CIDR
     #   block. Use this parameter to limit the CiDR block to this location.
@@ -1297,6 +1312,8 @@ module Aws::EC2
       :amazon_provided_ipv_6_cidr_block,
       :cidr_block,
       :vpc_id,
+      :ipv_6_pool,
+      :ipv_6_cidr_block,
       :ipv_6_cidr_block_network_border_group)
       include Aws::Structure
     end
@@ -2320,7 +2337,7 @@ module Aws::EC2
     # your AWS resources through bring your own IP addresses (BYOIP).
     #
     # @!attribute [rw] cidr
-    #   The public IPv4 address range, in CIDR notation.
+    #   The address range, in CIDR notation.
     #   @return [String]
     #
     # @!attribute [rw] description
@@ -5383,6 +5400,7 @@ module Aws::EC2
     #         log_destination_type: "cloud-watch-logs", # accepts cloud-watch-logs, s3
     #         log_destination: "String",
     #         log_format: "String",
+    #         max_aggregation_interval: 1,
     #       }
     #
     # @!attribute [rw] dry_run
@@ -5489,6 +5507,22 @@ module Aws::EC2
     #   [1]: https://docs.aws.amazon.com/vpc/latest/userguide/flow-logs.html#flow-log-records
     #   @return [String]
     #
+    # @!attribute [rw] max_aggregation_interval
+    #   The maximum interval of time during which a flow of packets is
+    #   captured and aggregated into a flow log record. You can specify 60
+    #   seconds (1 minute) or 600 seconds (10 minutes).
+    #
+    #   For network interfaces attached to [Nitro-based instances][1], the
+    #   aggregation interval is always 60 seconds, regardless of the value
+    #   that you specify.
+    #
+    #   Default: 600
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html#ec2-nitro-instances
+    #   @return [Integer]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateFlowLogsRequest AWS API Documentation
     #
     class CreateFlowLogsRequest < Struct.new(
@@ -5501,7 +5535,8 @@ module Aws::EC2
       :traffic_type,
       :log_destination_type,
       :log_destination,
-      :log_format)
+      :log_format,
+      :max_aggregation_interval)
       include Aws::Structure
     end
 
@@ -8493,6 +8528,17 @@ module Aws::EC2
     #         security_group_ids: ["String"],
     #         client_token: "String",
     #         private_dns_enabled: false,
+    #         tag_specifications: [
+    #           {
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #             tags: [
+    #               {
+    #                 key: "String",
+    #                 value: "String",
+    #               },
+    #             ],
+    #           },
+    #         ],
     #       }
     #
     # @!attribute [rw] dry_run
@@ -8566,6 +8612,10 @@ module Aws::EC2
     #   Default: `true`
     #   @return [Boolean]
     #
+    # @!attribute [rw] tag_specifications
+    #   The tags to associate with the endpoint.
+    #   @return [Array<Types::TagSpecification>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateVpcEndpointRequest AWS API Documentation
     #
     class CreateVpcEndpointRequest < Struct.new(
@@ -8578,7 +8628,8 @@ module Aws::EC2
       :subnet_ids,
       :security_group_ids,
       :client_token,
-      :private_dns_enabled)
+      :private_dns_enabled,
+      :tag_specifications)
       include Aws::Structure
     end
 
@@ -8610,6 +8661,17 @@ module Aws::EC2
     #         private_dns_name: "String",
     #         network_load_balancer_arns: ["String"], # required
     #         client_token: "String",
+    #         tag_specifications: [
+    #           {
+    #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, elastic-ip, fleet, fpga-image, host-reservation, image, instance, internet-gateway, key-pair, launch-template, natgateway, network-acl, network-interface, placement-group, reserved-instances, route-table, security-group, snapshot, spot-fleet-request, spot-instances-request, subnet, traffic-mirror-filter, traffic-mirror-session, traffic-mirror-target, transit-gateway, transit-gateway-attachment, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway
+    #             tags: [
+    #               {
+    #                 key: "String",
+    #                 value: "String",
+    #               },
+    #             ],
+    #           },
+    #         ],
     #       }
     #
     # @!attribute [rw] dry_run
@@ -8644,6 +8706,10 @@ module Aws::EC2
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html
     #   @return [String]
     #
+    # @!attribute [rw] tag_specifications
+    #   The tags to associate with the service.
+    #   @return [Array<Types::TagSpecification>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateVpcEndpointServiceConfigurationRequest AWS API Documentation
     #
     class CreateVpcEndpointServiceConfigurationRequest < Struct.new(
@@ -8651,7 +8717,8 @@ module Aws::EC2
       :acceptance_required,
       :private_dns_name,
       :network_load_balancer_arns,
-      :client_token)
+      :client_token,
+      :tag_specifications)
       include Aws::Structure
     end
 
@@ -8741,6 +8808,8 @@ module Aws::EC2
     #       {
     #         cidr_block: "String", # required
     #         amazon_provided_ipv_6_cidr_block: false,
+    #         ipv_6_pool: "String",
+    #         ipv_6_cidr_block: "String",
     #         dry_run: false,
     #         instance_tenancy: "default", # accepts default, dedicated, host
     #         ipv_6_cidr_block_network_border_group: "String",
@@ -8757,6 +8826,19 @@ module Aws::EC2
     #   size of the CIDR block.
     #   @return [Boolean]
     #
+    # @!attribute [rw] ipv_6_pool
+    #   The ID of an IPv6 address pool from which to allocate the IPv6 CIDR
+    #   block.
+    #   @return [String]
+    #
+    # @!attribute [rw] ipv_6_cidr_block
+    #   The IPv6 CIDR block from the IPv6 address pool. You must also
+    #   specify `Ipv6Pool` in the request.
+    #
+    #   To let Amazon choose the IPv6 CIDR block for you, omit this
+    #   parameter.
+    #   @return [String]
+    #
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -8791,6 +8873,8 @@ module Aws::EC2
     class CreateVpcRequest < Struct.new(
       :cidr_block,
       :amazon_provided_ipv_6_cidr_block,
+      :ipv_6_pool,
+      :ipv_6_cidr_block,
       :dry_run,
       :instance_tenancy,
       :ipv_6_cidr_block_network_border_group)
@@ -10952,9 +11036,8 @@ module Aws::EC2
     #       }
     #
     # @!attribute [rw] cidr
-    #   The public IPv4 address range, in CIDR notation. The prefix must be
-    #   the same prefix that you specified when you provisioned the address
-    #   range.
+    #   The address range, in CIDR notation. The prefix must be the same
+    #   prefix that you specified when you provisioned the address range.
     #   @return [String]
     #
     # @!attribute [rw] dry_run
@@ -14986,6 +15069,85 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass DescribeIpv6PoolsRequest
+    #   data as a hash:
+    #
+    #       {
+    #         pool_ids: ["String"],
+    #         next_token: "NextToken",
+    #         max_results: 1,
+    #         dry_run: false,
+    #         filters: [
+    #           {
+    #             name: "String",
+    #             values: ["String"],
+    #           },
+    #         ],
+    #       }
+    #
+    # @!attribute [rw] pool_ids
+    #   The IDs of the IPv6 address pools.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] next_token
+    #   The token for the next page of results.
+    #   @return [String]
+    #
+    # @!attribute [rw] max_results
+    #   The maximum number of results to return with a single call. To
+    #   retrieve the remaining results, make another call with the returned
+    #   `nextToken` value.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] filters
+    #   One or more filters.
+    #
+    #   * `tag`\:&lt;key&gt; - The key/value combination of a tag assigned
+    #     to the resource. Use the tag key in the filter name and the tag
+    #     value as the filter value. For example, to find all resources that
+    #     have a tag with the key `Owner` and the value `TeamA`, specify
+    #     `tag:Owner` for the filter name and `TeamA` for the filter value.
+    #
+    #   * `tag-key` - The key of a tag assigned to the resource. Use this
+    #     filter to find all resources assigned a tag with a specific key,
+    #     regardless of the tag value.
+    #   @return [Array<Types::Filter>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeIpv6PoolsRequest AWS API Documentation
+    #
+    class DescribeIpv6PoolsRequest < Struct.new(
+      :pool_ids,
+      :next_token,
+      :max_results,
+      :dry_run,
+      :filters)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] ipv_6_pools
+    #   Information about the IPv6 address pools.
+    #   @return [Array<Types::Ipv6Pool>]
+    #
+    # @!attribute [rw] next_token
+    #   The token to use to retrieve the next page of results. This value is
+    #   `null` when there are no more results to return.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeIpv6PoolsResult AWS API Documentation
+    #
+    class DescribeIpv6PoolsResult < Struct.new(
+      :ipv_6_pools,
+      :next_token)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass DescribeKeyPairsRequest
     #   data as a hash:
     #
@@ -20618,6 +20780,9 @@ module Aws::EC2
     #   * `ipv6-cidr-block-association.ipv6-cidr-block` - An IPv6 CIDR block
     #     associated with the VPC.
     #
+    #   * `ipv6-cidr-block-association.ipv6-pool` - The ID of the IPv6
+    #     address pool from which the IPv6 CIDR block is allocated.
+    #
     #   * `ipv6-cidr-block-association.association-id` - The association ID
     #     for an IPv6 CIDR block associated with the VPC.
     #
@@ -23973,6 +24138,19 @@ module Aws::EC2
     #   The format of the flow log record.
     #   @return [String]
     #
+    # @!attribute [rw] max_aggregation_interval
+    #   The maximum interval of time, in seconds, during which a flow of
+    #   packets is captured and aggregated into a flow log record.
+    #
+    #   For network interfaces attached to [Nitro-based instances][1], the
+    #   aggregation interval is always 60 seconds (1 minute), regardless of
+    #   the specified value.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html#ec2-nitro-instances
+    #   @return [Integer]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/FlowLog AWS API Documentation
     #
     class FlowLog < Struct.new(
@@ -23987,7 +24165,8 @@ module Aws::EC2
       :traffic_type,
       :log_destination_type,
       :log_destination,
-      :log_format)
+      :log_format,
+      :max_aggregation_interval)
       include Aws::Structure
     end
 
@@ -24194,6 +24373,64 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass GetAssociatedIpv6PoolCidrsRequest
+    #   data as a hash:
+    #
+    #       {
+    #         pool_id: "String", # required
+    #         next_token: "NextToken",
+    #         max_results: 1,
+    #         dry_run: false,
+    #       }
+    #
+    # @!attribute [rw] pool_id
+    #   The ID of the IPv6 address pool.
+    #   @return [String]
+    #
+    # @!attribute [rw] next_token
+    #   The token for the next page of results.
+    #   @return [String]
+    #
+    # @!attribute [rw] max_results
+    #   The maximum number of results to return with a single call. To
+    #   retrieve the remaining results, make another call with the returned
+    #   `nextToken` value.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/GetAssociatedIpv6PoolCidrsRequest AWS API Documentation
+    #
+    class GetAssociatedIpv6PoolCidrsRequest < Struct.new(
+      :pool_id,
+      :next_token,
+      :max_results,
+      :dry_run)
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] ipv_6_cidr_associations
+    #   Information about the IPv6 CIDR block associations.
+    #   @return [Array<Types::Ipv6CidrAssociation>]
+    #
+    # @!attribute [rw] next_token
+    #   The token to use to retrieve the next page of results. This value is
+    #   `null` when there are no more results to return.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/GetAssociatedIpv6PoolCidrsResult AWS API Documentation
+    #
+    class GetAssociatedIpv6PoolCidrsResult < Struct.new(
+      :ipv_6_cidr_associations,
+      :next_token)
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass GetCapacityReservationUsageRequest
     #   data as a hash:
     #
@@ -25846,6 +26083,29 @@ module Aws::EC2
     #   blank.
     #   @return [String]
     #
+    # @!attribute [rw] platform_details
+    #   The platform details associated with the billing code of the AMI.
+    #   For more information, see [AMI Billing Information][1] in the
+    #   *Amazon Elastic Compute Cloud User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/billing-info.html
+    #   @return [String]
+    #
+    # @!attribute [rw] usage_operation
+    #   The operation of the Amazon EC2 instance and the billing code
+    #   associated with the AMI. `usageOperation` corresponds to the
+    #   [lineitem/Operation][1] column on your AWS Cost and Usage Report.
+    #   For more information, see [AMI Billing Information][2] in the
+    #   *Amazon Elastic Compute Cloud User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/cur/latest/userguide/Lineitem-columns.html#Lineitem-details-O-Operation
+    #   [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/billing-info.html
+    #   @return [String]
+    #
     # @!attribute [rw] product_codes
     #   Any product codes associated with the AMI.
     #   @return [Array<Types::ProductCode>]
@@ -25924,6 +26184,8 @@ module Aws::EC2
       :kernel_id,
       :owner_id,
       :platform,
+      :platform_details,
+      :usage_operation,
       :product_codes,
       :ramdisk_id,
       :state,
@@ -28796,6 +29058,24 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Describes an IPv6 CIDR block association.
+    #
+    # @!attribute [rw] ipv_6_cidr
+    #   The IPv6 CIDR block.
+    #   @return [String]
+    #
+    # @!attribute [rw] associated_resource
+    #   The resource that's associated with the IPv6 CIDR block.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/Ipv6CidrAssociation AWS API Documentation
+    #
+    class Ipv6CidrAssociation < Struct.new(
+      :ipv_6_cidr,
+      :associated_resource)
+      include Aws::Structure
+    end
+
     # Describes an IPv6 CIDR block.
     #
     # @!attribute [rw] ipv_6_cidr_block
@@ -28809,6 +29089,34 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Describes an IPv6 address pool.
+    #
+    # @!attribute [rw] pool_id
+    #   The ID of the address pool.
+    #   @return [String]
+    #
+    # @!attribute [rw] description
+    #   The description for the address pool.
+    #   @return [String]
+    #
+    # @!attribute [rw] pool_cidr_blocks
+    #   The CIDR blocks for the address pool.
+    #   @return [Array<Types::PoolCidrBlock>]
+    #
+    # @!attribute [rw] tags
+    #   Any tags for the address pool.
+    #   @return [Array<Types::Tag>]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/Ipv6Pool AWS API Documentation
+    #
+    class Ipv6Pool < Struct.new(
+      :pool_id,
+      :description,
+      :pool_cidr_blocks,
+      :tags)
+      include Aws::Structure
+    end
+
     # \[EC2-VPC only\] Describes an IPv6 range.
     #
     # @note When making an API call, you may pass Ipv6Range
@@ -35147,6 +35455,19 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Describes a CIDR block for an address pool.
+    #
+    # @!attribute [rw] cidr
+    #   The CIDR block.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/PoolCidrBlock AWS API Documentation
+    #
+    class PoolCidrBlock < Struct.new(
+      :cidr)
+      include Aws::Structure
+    end
+
     # Describes a range of ports.
     #
     # @note When making an API call, you may pass PortRange
@@ -35463,13 +35784,15 @@ module Aws::EC2
     #           message: "String", # required
     #           signature: "String", # required
     #         },
+    #         publicly_advertisable: false,
     #         description: "String",
     #         dry_run: false,
     #       }
     #
     # @!attribute [rw] cidr
-    #   The public IPv4 address range, in CIDR notation. The most specific
-    #   prefix that you can specify is /24. The address range cannot overlap
+    #   The public IPv4 or IPv6 address range, in CIDR notation. The most
+    #   specific IPv4 prefix that you can specify is /24. The most specific
+    #   IPv6 prefix you can specify is /56. The address range cannot overlap
     #   with another address range that you've brought to this or another
     #   Region.
     #   @return [String]
@@ -35479,6 +35802,13 @@ module Aws::EC2
     #   specified IP address range to Amazon using BYOIP.
     #   @return [Types::CidrAuthorizationContext]
     #
+    # @!attribute [rw] publicly_advertisable
+    #   (IPv6 only) Indicate whether the address range will be publicly
+    #   advertised to the internet.
+    #
+    #   Default: true
+    #   @return [Boolean]
+    #
     # @!attribute [rw] description
     #   A description for the address range and the address pool.
     #   @return [String]
@@ -35495,13 +35825,14 @@ module Aws::EC2
     class ProvisionByoipCidrRequest < Struct.new(
       :cidr,
       :cidr_authorization_context,
+      :publicly_advertisable,
       :description,
       :dry_run)
       include Aws::Structure
     end
 
     # @!attribute [rw] byoip_cidr
-    #   Information about the address pool.
+    #   Information about the address range.
     #   @return [Types::ByoipCidr]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ProvisionByoipCidrResult AWS API Documentation
@@ -35580,10 +35911,10 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Describes an address pool.
+    # Describes an IPv4 address pool.
     #
     # @!attribute [rw] pool_id
-    #   The ID of the IPv4 address pool.
+    #   The ID of the address pool.
     #   @return [String]
     #
     # @!attribute [rw] description
@@ -46426,6 +46757,11 @@ module Aws::EC2
     #   Information about the state of the CIDR block.
     #   @return [Types::VpcCidrBlockState]
     #
+    # @!attribute [rw] ipv_6_pool
+    #   The ID of the IPv6 address pool from which the IPv6 CIDR block is
+    #   allocated.
+    #   @return [String]
+    #
     # @!attribute [rw] network_border_group
     #   The name of the location from which we advertise the IPV6 CIDR
     #   block.
@@ -46437,6 +46773,7 @@ module Aws::EC2
       :association_id,
       :ipv_6_cidr_block,
       :ipv_6_cidr_block_state,
+      :ipv_6_pool,
       :network_border_group)
       include Aws::Structure
     end
@@ -47040,7 +47377,7 @@ module Aws::EC2
     #       }
     #
     # @!attribute [rw] cidr
-    #   The public IPv4 address range, in CIDR notation.
+    #   The address range, in CIDR notation.
     #   @return [String]
     #
     # @!attribute [rw] dry_run