aws-sdk-ec2 1.257.0 → 1.261.0

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

@@ -1292,6 +1292,7 @@ module Aws::EC2
     InstanceMetadataOptionsRequest = Shapes::StructureShape.new(name: 'InstanceMetadataOptionsRequest')
     InstanceMetadataOptionsResponse = Shapes::StructureShape.new(name: 'InstanceMetadataOptionsResponse')
     InstanceMetadataOptionsState = Shapes::StringShape.new(name: 'InstanceMetadataOptionsState')
+    InstanceMetadataProtocolState = Shapes::StringShape.new(name: 'InstanceMetadataProtocolState')
     InstanceMonitoring = Shapes::StructureShape.new(name: 'InstanceMonitoring')
     InstanceMonitoringList = Shapes::ListShape.new(name: 'InstanceMonitoringList')
     InstanceNetworkInterface = Shapes::StructureShape.new(name: 'InstanceNetworkInterface')
@@ -1424,6 +1425,7 @@ module Aws::EC2
     LaunchTemplateInstanceMetadataOptions = Shapes::StructureShape.new(name: 'LaunchTemplateInstanceMetadataOptions')
     LaunchTemplateInstanceMetadataOptionsRequest = Shapes::StructureShape.new(name: 'LaunchTemplateInstanceMetadataOptionsRequest')
     LaunchTemplateInstanceMetadataOptionsState = Shapes::StringShape.new(name: 'LaunchTemplateInstanceMetadataOptionsState')
+    LaunchTemplateInstanceMetadataProtocolIpv6 = Shapes::StringShape.new(name: 'LaunchTemplateInstanceMetadataProtocolIpv6')
     LaunchTemplateInstanceNetworkInterfaceSpecification = Shapes::StructureShape.new(name: 'LaunchTemplateInstanceNetworkInterfaceSpecification')
     LaunchTemplateInstanceNetworkInterfaceSpecificationList = Shapes::ListShape.new(name: 'LaunchTemplateInstanceNetworkInterfaceSpecificationList')
     LaunchTemplateInstanceNetworkInterfaceSpecificationRequest = Shapes::StructureShape.new(name: 'LaunchTemplateInstanceNetworkInterfaceSpecificationRequest')
@@ -4062,7 +4064,6 @@ 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(: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"))
@@ -4070,6 +4071,7 @@ module Aws::EC2
     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"))
     CreateVpcRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
+    CreateVpcRequest.add_member(:cidr_block, Shapes::ShapeRef.new(shape: String, required: true, location_name: "CidrBlock"))
     CreateVpcRequest.struct_class = Types::CreateVpcRequest
 
     CreateVpcResult.add_member(:vpc, Shapes::ShapeRef.new(shape: Vpc, location_name: "vpc"))
@@ -7163,6 +7165,7 @@ module Aws::EC2
     ImportImageRequest.add_member(:license_specifications, Shapes::ShapeRef.new(shape: ImportImageLicenseSpecificationListRequest, location_name: "LicenseSpecifications"))
     ImportImageRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
     ImportImageRequest.add_member(:usage_operation, Shapes::ShapeRef.new(shape: String, location_name: "UsageOperation"))
+    ImportImageRequest.add_member(:boot_mode, Shapes::ShapeRef.new(shape: BootModeValues, location_name: "BootMode"))
     ImportImageRequest.struct_class = Types::ImportImageRequest
 
     ImportImageResult.add_member(:architecture, Shapes::ShapeRef.new(shape: String, location_name: "architecture"))
@@ -7199,6 +7202,7 @@ module Aws::EC2
     ImportImageTask.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
     ImportImageTask.add_member(:license_specifications, Shapes::ShapeRef.new(shape: ImportImageLicenseSpecificationListResponse, location_name: "licenseSpecifications"))
     ImportImageTask.add_member(:usage_operation, Shapes::ShapeRef.new(shape: String, location_name: "usageOperation"))
+    ImportImageTask.add_member(:boot_mode, Shapes::ShapeRef.new(shape: BootModeValues, location_name: "bootMode"))
     ImportImageTask.struct_class = Types::ImportImageTask
 
     ImportImageTaskList.member = Shapes::ShapeRef.new(shape: ImportImageTask, location_name: "item")
@@ -7512,12 +7516,14 @@ module Aws::EC2
     InstanceMetadataOptionsRequest.add_member(:http_tokens, Shapes::ShapeRef.new(shape: HttpTokensState, location_name: "HttpTokens"))
     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.struct_class = Types::InstanceMetadataOptionsRequest
 
     InstanceMetadataOptionsResponse.add_member(:state, Shapes::ShapeRef.new(shape: InstanceMetadataOptionsState, location_name: "state"))
     InstanceMetadataOptionsResponse.add_member(:http_tokens, Shapes::ShapeRef.new(shape: HttpTokensState, location_name: "httpTokens"))
     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.struct_class = Types::InstanceMetadataOptionsResponse
 
     InstanceMonitoring.add_member(:instance_id, Shapes::ShapeRef.new(shape: String, location_name: "instanceId"))
@@ -7965,11 +7971,13 @@ module Aws::EC2
     LaunchTemplateInstanceMetadataOptions.add_member(:http_tokens, Shapes::ShapeRef.new(shape: LaunchTemplateHttpTokensState, location_name: "httpTokens"))
     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.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.struct_class = Types::LaunchTemplateInstanceMetadataOptionsRequest
 
     LaunchTemplateInstanceNetworkInterfaceSpecification.add_member(:associate_carrier_ip_address, Shapes::ShapeRef.new(shape: Boolean, location_name: "associateCarrierIpAddress"))
@@ -8423,6 +8431,7 @@ module Aws::EC2
     ModifyInstanceMetadataOptionsRequest.add_member(:http_put_response_hop_limit, Shapes::ShapeRef.new(shape: Integer, location_name: "HttpPutResponseHopLimit"))
     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.struct_class = Types::ModifyInstanceMetadataOptionsRequest
 
     ModifyInstanceMetadataOptionsResult.add_member(:instance_id, Shapes::ShapeRef.new(shape: String, location_name: "instanceId"))
@@ -8457,6 +8466,7 @@ module Aws::EC2
     ModifyManagedPrefixListRequest.add_member(:prefix_list_name, Shapes::ShapeRef.new(shape: String, location_name: "PrefixListName"))
     ModifyManagedPrefixListRequest.add_member(:add_entries, Shapes::ShapeRef.new(shape: AddPrefixListEntries, location_name: "AddEntry"))
     ModifyManagedPrefixListRequest.add_member(:remove_entries, Shapes::ShapeRef.new(shape: RemovePrefixListEntries, location_name: "RemoveEntry"))
+    ModifyManagedPrefixListRequest.add_member(:max_entries, Shapes::ShapeRef.new(shape: Integer, location_name: "MaxEntries"))
     ModifyManagedPrefixListRequest.struct_class = Types::ModifyManagedPrefixListRequest
 
     ModifyManagedPrefixListResult.add_member(:prefix_list, Shapes::ShapeRef.new(shape: ManagedPrefixList, location_name: "prefixList"))

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

@@ -108,15 +108,13 @@ module Aws::EC2
       data[:private_ip_addresses]
     end
 
-    # The IPv4 Prefix Delegation prefixes that are assigned to the network
-    # interface.
+    # The IPv4 prefixes that are assigned to the network interface.
     # @return [Array<Types::Ipv4PrefixSpecification>]
     def ipv_4_prefixes
       data[:ipv_4_prefixes]
     end
 
-    # The IPv6 Prefix Delegation prefixes that are assigned to the network
-    # interface.
+    # The IPv6 prefixes that are assigned to the network interface.
     # @return [Array<Types::Ipv6PrefixSpecification>]
     def ipv_6_prefixes
       data[:ipv_6_prefixes]
@@ -326,11 +324,10 @@ module Aws::EC2
     #   interface. You can't specify this parameter when also specifying
     #   private IP addresses.
     # @option options [Array<String>] :ipv_4_prefixes
-    #   One or more IPv4 Prefix Delegation prefixes assigned to the network
-    #   interface. You cannot use this option if you use the `Ipv4PrefixCount`
-    #   option.
+    #   One or more IPv4 prefixes assigned to the network interface. You
+    #   cannot use this option if you use the `Ipv4PrefixCount` option.
     # @option options [Integer] :ipv_4_prefix_count
-    #   The number of IPv4 Prefix Delegation prefixes that AWS automatically
+    #   The number of IPv4 prefixes that Amazon Web Services automatically
     #   assigns to the network interface. You cannot use this option if you
     #   use the `Ipv4 Prefixes` option.
     # @return [Types::AssignPrivateIpAddressesResult]
@@ -607,8 +604,7 @@ module Aws::EC2
     #   interface. You can specify this option multiple times to unassign more
     #   than one IP address.
     # @option options [Array<String>] :ipv_4_prefixes
-    #   The IPv4 Prefix Delegation prefixes to unassign from the network
-    #   interface.
+    #   The IPv4 prefixes to unassign from the network interface.
     # @return [EmptyStructure]
     def unassign_private_ip_addresses(options = {})
       options = options.merge(network_interface_id: @id)

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

@@ -242,6 +242,7 @@ module Aws::EC2
     #       http_tokens: "optional", # accepts optional, required
     #       http_put_response_hop_limit: 1,
     #       http_endpoint: "disabled", # accepts disabled, enabled
+    #       http_protocol_ipv_6: "disabled", # accepts disabled, enabled
     #     },
     #     enclave_options: {
     #       enabled: false,
@@ -829,19 +830,17 @@ module Aws::EC2
     #
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI
     # @option options [Array<Types::Ipv4PrefixSpecificationRequest>] :ipv_4_prefixes
-    #   One or moreIPv4 Prefix Delegation prefixes assigned to the network
-    #   interface. You cannot use this option if you use the `Ipv4PrefixCount`
-    #   option.
+    #   One or more IPv4 prefixes assigned to the network interface. You
+    #   cannot use this option if you use the `Ipv4PrefixCount` option.
     # @option options [Integer] :ipv_4_prefix_count
-    #   The number of IPv4 Prefix Delegation prefixes that AWS automatically
+    #   The number of IPv4 prefixes that Amazon Web Services automatically
     #   assigns to the network interface. You cannot use this option if you
     #   use the `Ipv4 Prefixes` option.
     # @option options [Array<Types::Ipv6PrefixSpecificationRequest>] :ipv_6_prefixes
-    #   One or moreIPv6 Prefix Delegation prefixes assigned to the network
-    #   interface. You cannot use this option if you use the `Ipv6PrefixCount`
-    #   option.
+    #   One or more IPv6 prefixes assigned to the network interface. You
+    #   cannot use this option if you use the `Ipv6PrefixCount` option.
     # @option options [Integer] :ipv_6_prefix_count
-    #   The number of IPv6 Prefix Delegation prefixes that AWS automatically
+    #   The number of IPv6 prefixes that Amazon Web Services automatically
     #   assigns to the network interface. You cannot use this option if you
     #   use the `Ipv6Prefixes` option.
     # @option options [String] :interface_type
@@ -1406,7 +1405,6 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   vpc = ec2.create_vpc({
-    #     cidr_block: "String", # required
     #     amazon_provided_ipv_6_cidr_block: false,
     #     ipv_6_pool: "Ipv6PoolEc2Id",
     #     ipv_6_cidr_block: "String",
@@ -1424,13 +1422,9 @@ module Aws::EC2
     #         ],
     #       },
     #     ],
+    #     cidr_block: "String", # required
     #   })
     # @param [Hash] options ({})
-    # @option options [required, String] :cidr_block
-    #   The IPv4 network range for the VPC, in CIDR notation. For example,
-    #   `10.0.0.0/16`. We modify the specified CIDR block to its canonical
-    #   form; for example, if you specify `100.68.0.18/18`, we modify it to
-    #   `100.68.0.0/18`.
     # @option options [Boolean] :amazon_provided_ipv_6_cidr_block
     #   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
@@ -1468,6 +1462,11 @@ module Aws::EC2
     #   parameter.
     # @option options [Array<Types::TagSpecification>] :tag_specifications
     #   The tags to assign to the VPC.
+    # @option options [required, String] :cidr_block
+    #   The IPv4 network range for the VPC, in CIDR notation. For example,
+    #   `10.0.0.0/16`. We modify the specified CIDR block to its canonical
+    #   form; for example, if you specify `100.68.0.18/18`, we modify it to
+    #   `100.68.0.0/18`.
     # @return [Vpc]
     def create_vpc(options = {})
       resp = @client.create_vpc(options)

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

@@ -436,6 +436,7 @@ module Aws::EC2
     #       http_tokens: "optional", # accepts optional, required
     #       http_put_response_hop_limit: 1,
     #       http_endpoint: "disabled", # accepts disabled, enabled
+    #       http_protocol_ipv_6: "disabled", # accepts disabled, enabled
     #     },
     #     enclave_options: {
     #       enabled: false,
@@ -843,19 +844,17 @@ module Aws::EC2
     #
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-eni.html#AvailableIpPerENI
     # @option options [Array<Types::Ipv4PrefixSpecificationRequest>] :ipv_4_prefixes
-    #   One or moreIPv4 Prefix Delegation prefixes assigned to the network
-    #   interface. You cannot use this option if you use the `Ipv4PrefixCount`
-    #   option.
+    #   One or more IPv4 prefixes assigned to the network interface. You
+    #   cannot use this option if you use the `Ipv4PrefixCount` option.
     # @option options [Integer] :ipv_4_prefix_count
-    #   The number of IPv4 Prefix Delegation prefixes that AWS automatically
+    #   The number of IPv4 prefixes that Amazon Web Services automatically
     #   assigns to the network interface. You cannot use this option if you
     #   use the `Ipv4 Prefixes` option.
     # @option options [Array<Types::Ipv6PrefixSpecificationRequest>] :ipv_6_prefixes
-    #   One or moreIPv6 Prefix Delegation prefixes assigned to the network
-    #   interface. You cannot use this option if you use the `Ipv6PrefixCount`
-    #   option.
+    #   One or more IPv6 prefixes assigned to the network interface. You
+    #   cannot use this option if you use the `Ipv6PrefixCount` option.
     # @option options [Integer] :ipv_6_prefix_count
-    #   The number of IPv6 Prefix Delegation prefixes that AWS automatically
+    #   The number of IPv6 prefixes that Amazon Web Services automatically
     #   assigns to the network interface. You cannot use this option if you
     #   use the `Ipv6Prefixes` option.
     # @option options [String] :interface_type

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

@@ -1186,15 +1186,14 @@ module Aws::EC2
     #   @return [Array<String>]
     #
     # @!attribute [rw] ipv_6_prefix_count
-    #   The number of IPv6 Prefix Delegation prefixes that AWS automatically
+    #   The number of IPv6 prefixes that Amazon Web Services automatically
     #   assigns to the network interface. You cannot use this option if you
     #   use the `Ipv6Prefixes` option.
     #   @return [Integer]
     #
     # @!attribute [rw] ipv_6_prefixes
-    #   One or more IPv6 Prefix Delegation prefixes assigned to the network
-    #   interface. You cannot use this option if you use the
-    #   `Ipv6PrefixCount` option.
+    #   One or more IPv6 prefixes assigned to the network interface. You
+    #   cannot use this option if you use the `Ipv6PrefixCount` option.
     #   @return [Array<String>]
     #
     # @!attribute [rw] network_interface_id
@@ -1220,8 +1219,7 @@ module Aws::EC2
     #   @return [Array<String>]
     #
     # @!attribute [rw] assigned_ipv_6_prefixes
-    #   The IPv6 Prefix Delegation prefixes that are assigned to the network
-    #   interface.
+    #   The IPv6 prefixes that are assigned to the network interface.
     #   @return [Array<String>]
     #
     # @!attribute [rw] network_interface_id
@@ -1278,13 +1276,12 @@ module Aws::EC2
     #   @return [Integer]
     #
     # @!attribute [rw] ipv_4_prefixes
-    #   One or more IPv4 Prefix Delegation prefixes assigned to the network
-    #   interface. You cannot use this option if you use the
-    #   `Ipv4PrefixCount` option.
+    #   One or more IPv4 prefixes assigned to the network interface. You
+    #   cannot use this option if you use the `Ipv4PrefixCount` option.
     #   @return [Array<String>]
     #
     # @!attribute [rw] ipv_4_prefix_count
-    #   The number of IPv4 Prefix Delegation prefixes that AWS automatically
+    #   The number of IPv4 prefixes that Amazon Web Services automatically
     #   assigns to the network interface. You cannot use this option if you
     #   use the `Ipv4 Prefixes` option.
     #   @return [Integer]
@@ -1311,8 +1308,7 @@ module Aws::EC2
     #   @return [Array<Types::AssignedPrivateIpAddress>]
     #
     # @!attribute [rw] assigned_ipv_4_prefixes
-    #   The IPv4 Prefix Delegation prefixes that are assigned to the network
-    #   interface.
+    #   The IPv4 prefixes that are assigned to the network interface.
     #   @return [Array<Types::Ipv4PrefixSpecification>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/AssignPrivateIpAddressesResult AWS API Documentation
@@ -7676,6 +7672,7 @@ module Aws::EC2
     #             http_tokens: "optional", # accepts optional, required
     #             http_put_response_hop_limit: 1,
     #             http_endpoint: "disabled", # accepts disabled, enabled
+    #             http_protocol_ipv_6: "disabled", # accepts disabled, enabled
     #           },
     #           enclave_options: {
     #             enabled: false,
@@ -7915,6 +7912,7 @@ module Aws::EC2
     #             http_tokens: "optional", # accepts optional, required
     #             http_put_response_hop_limit: 1,
     #             http_endpoint: "disabled", # accepts disabled, enabled
+    #             http_protocol_ipv_6: "disabled", # accepts disabled, enabled
     #           },
     #           enclave_options: {
     #             enabled: false,
@@ -8749,25 +8747,23 @@ module Aws::EC2
     #   @return [Integer]
     #
     # @!attribute [rw] ipv_4_prefixes
-    #   One or moreIPv4 Prefix Delegation prefixes assigned to the network
-    #   interface. You cannot use this option if you use the
-    #   `Ipv4PrefixCount` option.
+    #   One or more IPv4 prefixes assigned to the network interface. You
+    #   cannot use this option if you use the `Ipv4PrefixCount` option.
     #   @return [Array<Types::Ipv4PrefixSpecificationRequest>]
     #
     # @!attribute [rw] ipv_4_prefix_count
-    #   The number of IPv4 Prefix Delegation prefixes that AWS automatically
+    #   The number of IPv4 prefixes that Amazon Web Services automatically
     #   assigns to the network interface. You cannot use this option if you
     #   use the `Ipv4 Prefixes` option.
     #   @return [Integer]
     #
     # @!attribute [rw] ipv_6_prefixes
-    #   One or moreIPv6 Prefix Delegation prefixes assigned to the network
-    #   interface. You cannot use this option if you use the
-    #   `Ipv6PrefixCount` option.
+    #   One or more IPv6 prefixes assigned to the network interface. You
+    #   cannot use this option if you use the `Ipv6PrefixCount` option.
     #   @return [Array<Types::Ipv6PrefixSpecificationRequest>]
     #
     # @!attribute [rw] ipv_6_prefix_count
-    #   The number of IPv6 Prefix Delegation prefixes that AWS automatically
+    #   The number of IPv6 prefixes that Amazon Web Services automatically
     #   assigns to the network interface. You cannot use this option if you
     #   use the `Ipv6Prefixes` option.
     #   @return [Integer]
@@ -10520,7 +10516,7 @@ module Aws::EC2
     #
     # @!attribute [rw] transport_transit_gateway_attachment_id
     #   The ID of the transit gateway attachment. You can specify a VPC
-    #   attachment or a AWS Direct Connect attachment.
+    #   attachment or Amazon Web Services Direct Connect attachment.
     #   @return [String]
     #
     # @!attribute [rw] options
@@ -10717,7 +10713,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] peer_account_id
-    #   The AWS account ID of the owner of the peer transit gateway.
+    #   The ID of the Amazon Web Services account that owns the peer transit
+    #   gateway.
     #   @return [String]
     #
     # @!attribute [rw] peer_region
@@ -11809,7 +11806,6 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         cidr_block: "String", # required
     #         amazon_provided_ipv_6_cidr_block: false,
     #         ipv_6_pool: "Ipv6PoolEc2Id",
     #         ipv_6_cidr_block: "String",
@@ -11827,15 +11823,9 @@ module Aws::EC2
     #             ],
     #           },
     #         ],
+    #         cidr_block: "String", # required
     #       }
     #
-    # @!attribute [rw] cidr_block
-    #   The IPv4 network range for the VPC, in CIDR notation. For example,
-    #   `10.0.0.0/16`. We modify the specified CIDR block to its canonical
-    #   form; for example, if you specify `100.68.0.18/18`, we modify it to
-    #   `100.68.0.0/18`.
-    #   @return [String]
-    #
     # @!attribute [rw] amazon_provided_ipv_6_cidr_block
     #   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
@@ -11888,17 +11878,24 @@ module Aws::EC2
     #   The tags to assign to the VPC.
     #   @return [Array<Types::TagSpecification>]
     #
+    # @!attribute [rw] cidr_block
+    #   The IPv4 network range for the VPC, in CIDR notation. For example,
+    #   `10.0.0.0/16`. We modify the specified CIDR block to its canonical
+    #   form; for example, if you specify `100.68.0.18/18`, we modify it to
+    #   `100.68.0.0/18`.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateVpcRequest AWS API Documentation
     #
     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,
-      :tag_specifications)
+      :tag_specifications,
+      :cidr_block)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -24050,8 +24047,8 @@ module Aws::EC2
     #
     #   * `resource-id` - The ID of the resource.
     #
-    #   * `resource-owner-id` - The ID of the AWS account that owns the
-    #     resource.
+    #   * `resource-owner-id` - The ID of the Amazon Web Services account
+    #     that owns the resource.
     #
     #   * `resource-type` - The resource type. Valid values are `vpc` \|
     #     `vpn` \| `direct-connect-gateway` \| `peering` \| `connect`.
@@ -24065,8 +24062,8 @@ module Aws::EC2
     #
     #   * `transit-gateway-id` - The ID of the transit gateway.
     #
-    #   * `transit-gateway-owner-id` - The ID of the AWS account that owns
-    #     the transit gateway.
+    #   * `transit-gateway-owner-id` - The ID of the Amazon Web Services
+    #     account that owns the transit gateway.
     #   @return [Array<Types::Filter>]
     #
     # @!attribute [rw] max_results
@@ -24385,10 +24382,10 @@ module Aws::EC2
     #   * `transit-gateway-attachment-id` - The ID of the transit gateway
     #     attachment.
     #
-    #   * `local-owner-id` - The ID of your AWS account.
+    #   * `local-owner-id` - The ID of your Amazon Web Services account.
     #
-    #   * `remote-owner-id` - The ID of the AWS account in the remote Region
-    #     that owns the transit gateway.
+    #   * `remote-owner-id` - The ID of the Amazon Web Services account in
+    #     the remote Region that owns the transit gateway.
     #
     #   * `state` - The state of the peering attachment. Valid values are
     #     `available` \| `deleted` \| `deleting` \| `failed` \| `failing` \|
@@ -24674,8 +24671,8 @@ module Aws::EC2
     #   * `options.vpn-ecmp-support` - Indicates whether Equal Cost
     #     Multipath Protocol support is enabled (`enable` \| `disable`).
     #
-    #   * `owner-id` - The ID of the AWS account that owns the transit
-    #     gateway.
+    #   * `owner-id` - The ID of the Amazon Web Services account that owns
+    #     the transit gateway.
     #
     #   * `state` - The state of the transit gateway (`available` \|
     #     `deleted` \| `deleting` \| `modifying` \| `pending`).
@@ -27499,7 +27496,7 @@ module Aws::EC2
     #       }
     #
     # @!attribute [rw] association_id
-    #   The ID ofthe association
+    #   The ID of the association
     #   @return [String]
     #
     # @!attribute [rw] client_token
@@ -33418,6 +33415,7 @@ module Aws::EC2
     #           },
     #         ],
     #         usage_operation: "String",
+    #         boot_mode: "legacy-bios", # accepts legacy-bios, uefi
     #       }
     #
     # @!attribute [rw] architecture
@@ -33556,6 +33554,10 @@ module Aws::EC2
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/billing-info-fields.html
     #   @return [String]
     #
+    # @!attribute [rw] boot_mode
+    #   The boot mode of the virtual machine.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImportImageRequest AWS API Documentation
     #
     class ImportImageRequest < Struct.new(
@@ -33573,7 +33575,8 @@ module Aws::EC2
       :role_name,
       :license_specifications,
       :tag_specifications,
-      :usage_operation)
+      :usage_operation,
+      :boot_mode)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -33739,6 +33742,10 @@ module Aws::EC2
     #   The usage operation value.
     #   @return [String]
     #
+    # @!attribute [rw] boot_mode
+    #   The boot mode of the virtual machine.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImportImageTask AWS API Documentation
     #
     class ImportImageTask < Struct.new(
@@ -33757,7 +33764,8 @@ module Aws::EC2
       :status_message,
       :tags,
       :license_specifications,
-      :usage_operation)
+      :usage_operation,
+      :boot_mode)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -35381,6 +35389,7 @@ module Aws::EC2
     #         http_tokens: "optional", # accepts optional, required
     #         http_put_response_hop_limit: 1,
     #         http_endpoint: "disabled", # accepts disabled, enabled
+    #         http_protocol_ipv_6: "disabled", # accepts disabled, enabled
     #       }
     #
     # @!attribute [rw] http_tokens
@@ -35422,12 +35431,18 @@ module Aws::EC2
     #    </note>
     #   @return [String]
     #
+    # @!attribute [rw] http_protocol_ipv_6
+    #   Enables or disables the IPv6 endpoint for the instance metadata
+    #   service.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/InstanceMetadataOptionsRequest AWS API Documentation
     #
     class InstanceMetadataOptionsRequest < Struct.new(
       :http_tokens,
       :http_put_response_hop_limit,
-      :http_endpoint)
+      :http_endpoint,
+      :http_protocol_ipv_6)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -35483,13 +35498,19 @@ module Aws::EC2
     #    </note>
     #   @return [String]
     #
+    # @!attribute [rw] http_protocol_ipv_6
+    #   Whether or not the IPv6 endpoint for the instance metadata service
+    #   is enabled or disabled.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/InstanceMetadataOptionsResponse AWS API Documentation
     #
     class InstanceMetadataOptionsResponse < Struct.new(
       :state,
       :http_tokens,
       :http_put_response_hop_limit,
-      :http_endpoint)
+      :http_endpoint,
+      :http_protocol_ipv_6)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -35856,6 +35877,16 @@ module Aws::EC2
     #   The index of the network card. Some instance types support multiple
     #   network cards. The primary network interface must be assigned to
     #   network card index 0. The default is network card index 0.
+    #
+    #   If you are using [RequestSpotInstances][1] to create Spot Instances,
+    #   omit this parameter because you can’t specify the network card index
+    #   when using this API. To specify the network card index, use
+    #   [RunInstances][2].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestSpotInstances.html
+    #   [2]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html
     #   @return [Integer]
     #
     # @!attribute [rw] ipv_4_prefixes
@@ -36623,15 +36654,16 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Describes an IPv4 Prefix Delegation.
+    # Describes an IPv4 prefix.
     #
     # @!attribute [rw] ipv_4_prefix
-    #   The IPv4 Prefix Delegation prefix. For information, see [Prefix
-    #   Delegation][1] in the *Amazon Elastic Compute Cloud User Guide*.
+    #   The IPv4 prefix. For information, see [ Assigning prefixes to Amazon
+    #   EC2 network interfaces][1] in the *Amazon Elastic Compute Cloud User
+    #   Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-prefix-delegation
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-prefix-eni.html
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/Ipv4PrefixSpecification AWS API Documentation
@@ -36642,7 +36674,7 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Describes the IPv4 Prefix Delegation option for a network interface.
+    # Describes the IPv4 prefix option for a network interface.
     #
     # @note When making an API call, you may pass Ipv4PrefixSpecificationRequest
     #   data as a hash:
@@ -36652,12 +36684,13 @@ module Aws::EC2
     #       }
     #
     # @!attribute [rw] ipv_4_prefix
-    #   The IPv4 Prefix Delegation prefix. For information, see [Prefix
-    #   Delegation][1] in the *Amazon Elastic Compute Cloud User Guide*.
+    #   The IPv4 prefix. For information, see [ Assigning prefixes to Amazon
+    #   EC2 network interfaces][1] in the *Amazon Elastic Compute Cloud User
+    #   Guide*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-prefix-delegation
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-prefix-eni.html
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/Ipv4PrefixSpecificationRequest AWS API Documentation
@@ -36746,10 +36779,10 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Describes the IPv6 Prefix Delegation.
+    # Describes the IPv6 prefix.
     #
     # @!attribute [rw] ipv_6_prefix
-    #   The IPv6 Prefix Delegation prefix.
+    #   The IPv6 prefix.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/Ipv6PrefixSpecification AWS API Documentation
@@ -36760,7 +36793,7 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Describes the IPv4 Prefix Delegation option for a network interface.
+    # Describes the IPv4 prefix option for a network interface.
     #
     # @note When making an API call, you may pass Ipv6PrefixSpecificationRequest
     #   data as a hash:
@@ -36770,7 +36803,7 @@ module Aws::EC2
     #       }
     #
     # @!attribute [rw] ipv_6_prefix
-    #   The IPv6 Prefix Delegation prefix.
+    #   The IPv6 prefix.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/Ipv6PrefixSpecificationRequest AWS API Documentation
@@ -37875,13 +37908,21 @@ module Aws::EC2
     #    </note>
     #   @return [String]
     #
+    # @!attribute [rw] http_protocol_ipv_6
+    #   Enables or disables the IPv6 endpoint for the instance metadata
+    #   service.
+    #
+    #   Default: `disabled`
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/LaunchTemplateInstanceMetadataOptions AWS API Documentation
     #
     class LaunchTemplateInstanceMetadataOptions < Struct.new(
       :state,
       :http_tokens,
       :http_put_response_hop_limit,
-      :http_endpoint)
+      :http_endpoint,
+      :http_protocol_ipv_6)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -37901,6 +37942,7 @@ module Aws::EC2
     #         http_tokens: "optional", # accepts optional, required
     #         http_put_response_hop_limit: 1,
     #         http_endpoint: "disabled", # accepts disabled, enabled
+    #         http_protocol_ipv_6: "disabled", # accepts disabled, enabled
     #       }
     #
     # @!attribute [rw] http_tokens
@@ -37942,12 +37984,20 @@ module Aws::EC2
     #    </note>
     #   @return [String]
     #
+    # @!attribute [rw] http_protocol_ipv_6
+    #   Enables or disables the IPv6 endpoint for the instance metadata
+    #   service.
+    #
+    #   Default: `disabled`
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/LaunchTemplateInstanceMetadataOptionsRequest AWS API Documentation
     #
     class LaunchTemplateInstanceMetadataOptionsRequest < Struct.new(
       :http_tokens,
       :http_put_response_hop_limit,
-      :http_endpoint)
+      :http_endpoint,
+      :http_protocol_ipv_6)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -38028,22 +38078,20 @@ module Aws::EC2
     #   @return [Integer]
     #
     # @!attribute [rw] ipv_4_prefixes
-    #   One or more IPv4 delegated prefixes assigned to the network
-    #   interface.
+    #   One or more IPv4 prefixes assigned to the network interface.
     #   @return [Array<Types::Ipv4PrefixSpecificationResponse>]
     #
     # @!attribute [rw] ipv_4_prefix_count
-    #   The number of IPv4 delegated prefixes that AWS automatically
+    #   The number of IPv4 prefixes that Amazon Web Services automatically
     #   assigned to the network interface.
     #   @return [Integer]
     #
     # @!attribute [rw] ipv_6_prefixes
-    #   One or more IPv6 delegated prefixes assigned to the network
-    #   interface.
+    #   One or more IPv6 prefixes assigned to the network interface.
     #   @return [Array<Types::Ipv6PrefixSpecificationResponse>]
     #
     # @!attribute [rw] ipv_6_prefix_count
-    #   The number of IPv6 delegated prefixes that AWS automatically
+    #   The number of IPv6 prefixes that Amazon Web Services automatically
     #   assigned to the network interface.
     #   @return [Integer]
     #
@@ -38209,26 +38257,24 @@ module Aws::EC2
     #   @return [Integer]
     #
     # @!attribute [rw] ipv_4_prefixes
-    #   One or more IPv4 delegated prefixes to be assigned to the network
-    #   interface. You cannot use this option if you use the
-    #   `Ipv4PrefixCount` option.
+    #   One or more IPv4 prefixes to be assigned to the network interface.
+    #   You cannot use this option if you use the `Ipv4PrefixCount` option.
     #   @return [Array<Types::Ipv4PrefixSpecificationRequest>]
     #
     # @!attribute [rw] ipv_4_prefix_count
-    #   The number of IPv4 delegated prefixes to be automatically assigned
-    #   to the network interface. You cannot use this option if you use the
+    #   The number of IPv4 prefixes to be automatically assigned to the
+    #   network interface. You cannot use this option if you use the
     #   `Ipv4Prefix` option.
     #   @return [Integer]
     #
     # @!attribute [rw] ipv_6_prefixes
-    #   One or more IPv6 delegated prefixes to be assigned to the network
-    #   interface. You cannot use this option if you use the
-    #   `Ipv6PrefixCount` option.
+    #   One or more IPv6 prefixes to be assigned to the network interface.
+    #   You cannot use this option if you use the `Ipv6PrefixCount` option.
     #   @return [Array<Types::Ipv6PrefixSpecificationRequest>]
     #
     # @!attribute [rw] ipv_6_prefix_count
-    #   The number of IPv6 delegated prefixes to be automatically assigned
-    #   to the network interface. You cannot use this option if you use the
+    #   The number of IPv6 prefixes to be automatically assigned to the
+    #   network interface. You cannot use this option if you use the
     #   `Ipv6Prefix` option.
     #   @return [Integer]
     #
@@ -40672,6 +40718,7 @@ module Aws::EC2
     #         http_put_response_hop_limit: 1,
     #         http_endpoint: "disabled", # accepts disabled, enabled
     #         dry_run: false,
+    #         http_protocol_ipv_6: "disabled", # accepts disabled, enabled
     #       }
     #
     # @!attribute [rw] instance_id
@@ -40723,6 +40770,11 @@ module Aws::EC2
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     #   @return [Boolean]
     #
+    # @!attribute [rw] http_protocol_ipv_6
+    #   Enables or disables the IPv6 endpoint for the instance metadata
+    #   service.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ModifyInstanceMetadataOptionsRequest AWS API Documentation
     #
     class ModifyInstanceMetadataOptionsRequest < Struct.new(
@@ -40730,7 +40782,8 @@ module Aws::EC2
       :http_tokens,
       :http_put_response_hop_limit,
       :http_endpoint,
-      :dry_run)
+      :dry_run,
+      :http_protocol_ipv_6)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -40913,6 +40966,7 @@ module Aws::EC2
     #             cidr: "String", # required
     #           },
     #         ],
+    #         max_entries: 1,
     #       }
     #
     # @!attribute [rw] dry_run
@@ -40942,6 +40996,12 @@ module Aws::EC2
     #   One or more entries to remove from the prefix list.
     #   @return [Array<Types::RemovePrefixListEntry>]
     #
+    # @!attribute [rw] max_entries
+    #   The maximum number of entries for the prefix list. You cannot modify
+    #   the entries of a prefix list and modify the size of a prefix list at
+    #   the same time.
+    #   @return [Integer]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ModifyManagedPrefixListRequest AWS API Documentation
     #
     class ModifyManagedPrefixListRequest < Struct.new(
@@ -40950,7 +41010,8 @@ module Aws::EC2
       :current_version,
       :prefix_list_name,
       :add_entries,
-      :remove_entries)
+      :remove_entries,
+      :max_entries)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -41871,10 +41932,6 @@ module Aws::EC2
     #
     # @!attribute [rw] options
     #   The new VPC attachment options.
-    #
-    #   <note markdown="1"> You cannot modify the IPv6 options.
-    #
-    #    </note>
     #   @return [Types::ModifyTransitGatewayVpcAttachmentRequestOptions]
     #
     # @!attribute [rw] dry_run
@@ -43782,13 +43839,11 @@ module Aws::EC2
     #   @return [Array<Types::NetworkInterfacePrivateIpAddress>]
     #
     # @!attribute [rw] ipv_4_prefixes
-    #   The IPv4 Prefix Delegation prefixes that are assigned to the network
-    #   interface.
+    #   The IPv4 prefixes that are assigned to the network interface.
     #   @return [Array<Types::Ipv4PrefixSpecification>]
     #
     # @!attribute [rw] ipv_6_prefixes
-    #   The IPv6 Prefix Delegation prefixes that are assigned to the network
-    #   interface.
+    #   The IPv6 prefixes that are assigned to the network interface.
     #   @return [Array<Types::Ipv6PrefixSpecification>]
     #
     # @!attribute [rw] requester_id
@@ -44414,7 +44469,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] owner_id
-    #   The AWS account ID of the owner of the transit gateway.
+    #   The ID of the Amazon Web Services account that owns the transit
+    #   gateway.
     #   @return [String]
     #
     # @!attribute [rw] region
@@ -47322,6 +47378,7 @@ module Aws::EC2
     #           http_tokens: "optional", # accepts optional, required
     #           http_put_response_hop_limit: 1,
     #           http_endpoint: "disabled", # accepts disabled, enabled
+    #           http_protocol_ipv_6: "disabled", # accepts disabled, enabled
     #         },
     #         enclave_options: {
     #           enabled: false,
@@ -47433,14 +47490,22 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] user_data
-    #   The Base64-encoded user data to make available to the instance. For
-    #   more information, see [Running Commands on Your Linux Instance at
-    #   Launch][1] (Linux) and [Adding User Data][2] (Windows).
+    #   The user data to make available to the instance. You must provide
+    #   base64-encoded text. User data is limited to 16 KB. For more
+    #   information, see [Running Commands on Your Linux Instance at
+    #   Launch][1] (Linux) or [Adding User Data][2] (Windows).
+    #
+    #   If you are creating the launch template for use with Batch, the user
+    #   data must be provided in the [ MIME multi-part archive format][3].
+    #   For more information, see [Amazon EC2 user data in launch
+    #   templates][4] in the *Batch User Guide*.
     #
     #
     #
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/user-data.html
     #   [2]: https://docs.aws.amazon.com/AWSEC2/latest/WindowsGuide/ec2-instance-metadata.html#instancedata-add-user-data
+    #   [3]: https://cloudinit.readthedocs.io/en/latest/topics/format.html#mime-multi-part-archive
+    #   [4]: https://docs.aws.amazon.com/batch/latest/userguide/launch-templates.html
     #   @return [String]
     #
     # @!attribute [rw] tag_specifications
@@ -50084,6 +50149,7 @@ module Aws::EC2
     #           http_tokens: "optional", # accepts optional, required
     #           http_put_response_hop_limit: 1,
     #           http_endpoint: "disabled", # accepts disabled, enabled
+    #           http_protocol_ipv_6: "disabled", # accepts disabled, enabled
     #         },
     #         enclave_options: {
     #           enabled: false,
@@ -51626,10 +51692,6 @@ module Aws::EC2
     #   * `source-type` - The source type. Valid values are `igmp` \|
     #     `static`.
     #
-    #   * `state` - The state of the subnet association. Valid values are
-    #     `associated` \| `associated` \| `disassociated` \|
-    #     `disassociating`.
-    #
     #   * `subnet-id` - The ID of the subnet.
     #
     #   * `transit-gateway-attachment-id` - The id of the transit gateway
@@ -55680,7 +55742,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] owner_id
-    #   The ID of the AWS account ID that owns the transit gateway.
+    #   The ID of the Amazon Web Services account that owns the transit
+    #   gateway.
     #   @return [String]
     #
     # @!attribute [rw] description
@@ -55761,11 +55824,12 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] transit_gateway_owner_id
-    #   The ID of the AWS account that owns the transit gateway.
+    #   The ID of the Amazon Web Services account that owns the transit
+    #   gateway.
     #   @return [String]
     #
     # @!attribute [rw] resource_owner_id
-    #   The ID of the AWS account that owns the resource.
+    #   The ID of the Amazon Web Services account that owns the resource.
     #   @return [String]
     #
     # @!attribute [rw] resource_type
@@ -56101,8 +56165,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] owner_id
-    #   The ID of the AWS account that owns the transit gateway multiicast
-    #   domain.
+    #   The ID of the Amazon Web Services account that owns the transit
+    #   gateway multicast domain.
     #   @return [String]
     #
     # @!attribute [rw] options
@@ -56152,8 +56216,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] resource_owner_id
-    #   The ID of the AWS account that owns the transit gateway multicast
-    #   domain association resource.
+    #   The ID of the Amazon Web Services account that owns the transit
+    #   gateway multicast domain association resource.
     #   @return [String]
     #
     # @!attribute [rw] subnet
@@ -56191,7 +56255,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] resource_owner_id
-    #   The ID of the AWS account that owns the resource.
+    #   The ID of the Amazon Web Services account that owns the resource.
     #   @return [String]
     #
     # @!attribute [rw] subnets
@@ -56261,8 +56325,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] resource_owner_id
-    #   The ID of the AWS account that owns the transit gateway multicast
-    #   domain group resource.
+    #   The ID of the Amazon Web Services account that owns the transit
+    #   gateway multicast domain group resource.
     #   @return [String]
     #
     # @!attribute [rw] network_interface_id
@@ -56814,7 +56878,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] vpc_owner_id
-    #   The ID of the AWS account that owns the VPC.
+    #   The ID of the Amazon Web Services account that owns the VPC.
     #   @return [String]
     #
     # @!attribute [rw] state
@@ -56878,6 +56942,11 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # <note markdown="1"> Currently available in **limited preview only**. If you are interested
+    # in using this feature, contact your account manager.
+    #
+    #  </note>
+    #
     # Information about an association between a branch network interface
     # with a trunk network interface.
     #
@@ -56906,7 +56975,7 @@ module Aws::EC2
     #   @return [Integer]
     #
     # @!attribute [rw] tags
-    #   The tags.
+    #   The tags for the trunk interface association.
     #   @return [Array<Types::Tag>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/TrunkInterfaceAssociation AWS API Documentation
@@ -57053,8 +57122,7 @@ module Aws::EC2
     #   @return [Array<String>]
     #
     # @!attribute [rw] ipv_6_prefixes
-    #   One or moreIPv6 Prefix Delegation prefixes to unassign from the
-    #   network interface.
+    #   One or more IPv6 prefixes to unassign from the network interface.
     #   @return [Array<String>]
     #
     # @!attribute [rw] network_interface_id
@@ -57081,8 +57149,8 @@ module Aws::EC2
     #   @return [Array<String>]
     #
     # @!attribute [rw] unassigned_ipv_6_prefixes
-    #   The IPv4 Prefix Delegation prefixes that have been unassigned from
-    #   the network interface.
+    #   The IPv4 prefixes that have been unassigned from the network
+    #   interface.
     #   @return [Array<String>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/UnassignIpv6AddressesResult AWS API Documentation
@@ -57117,8 +57185,7 @@ module Aws::EC2
     #   @return [Array<String>]
     #
     # @!attribute [rw] ipv_4_prefixes
-    #   The IPv4 Prefix Delegation prefixes to unassign from the network
-    #   interface.
+    #   The IPv4 prefixes to unassign from the network interface.
     #   @return [Array<String>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/UnassignPrivateIpAddressesRequest AWS API Documentation