aws-sdk-ec2 1.138.0 → 1.143.0

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

@@ -302,6 +302,49 @@ module Aws::EC2
       Tag::Collection.new([batch], size: batch.size)
     end
 
+    # @example Request syntax with placeholder values
+    #
+    #   tag = network_acl.delete_tags({
+    #     dry_run: false,
+    #     tags: [
+    #       {
+    #         key: "String",
+    #         value: "String",
+    #       },
+    #     ],
+    #   })
+    # @param [Hash] options ({})
+    # @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.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    # @option options [Array<Types::Tag>] :tags
+    #   The tags to delete. Specify a tag key and an optional tag value to
+    #   delete specific tags. If you specify a tag key without a tag value, we
+    #   delete any tag with this key regardless of its value. If you specify a
+    #   tag key with an empty string as the tag value, we delete the tag only
+    #   if its value is an empty string.
+    #
+    #   If you omit this parameter, we delete all user-defined tags for the
+    #   specified resources. We do not delete AWS-generated tags (tags that
+    #   have the `aws:` prefix).
+    # @return [Tag::Collection]
+    def delete_tags(options = {})
+      batch = []
+      options = Aws::Util.deep_merge(options, resources: [@id])
+      resp = @client.delete_tags(options)
+      options[:tags].each do |t|
+        batch << Tag.new(
+          resource_id: @id,
+          key: t[:key],
+          value: t[:value],
+          client: @client
+        )
+      end
+      Tag::Collection.new([batch], size: batch.size)
+    end
+
     # @example Request syntax with placeholder values
     #
     #   network_acl.delete({

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

@@ -370,6 +370,49 @@ module Aws::EC2
       Tag::Collection.new([batch], size: batch.size)
     end
 
+    # @example Request syntax with placeholder values
+    #
+    #   tag = network_interface.delete_tags({
+    #     dry_run: false,
+    #     tags: [
+    #       {
+    #         key: "String",
+    #         value: "String",
+    #       },
+    #     ],
+    #   })
+    # @param [Hash] options ({})
+    # @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.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    # @option options [Array<Types::Tag>] :tags
+    #   The tags to delete. Specify a tag key and an optional tag value to
+    #   delete specific tags. If you specify a tag key without a tag value, we
+    #   delete any tag with this key regardless of its value. If you specify a
+    #   tag key with an empty string as the tag value, we delete the tag only
+    #   if its value is an empty string.
+    #
+    #   If you omit this parameter, we delete all user-defined tags for the
+    #   specified resources. We do not delete AWS-generated tags (tags that
+    #   have the `aws:` prefix).
+    # @return [Tag::Collection]
+    def delete_tags(options = {})
+      batch = []
+      options = Aws::Util.deep_merge(options, resources: [@id])
+      resp = @client.delete_tags(options)
+      options[:tags].each do |t|
+        batch << Tag.new(
+          resource_id: @id,
+          key: t[:key],
+          value: t[:value],
+          client: @client
+        )
+      end
+      Tag::Collection.new([batch], size: batch.size)
+    end
+
     # @example Request syntax with placeholder values
     #
     #   network_interface.delete({

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

@@ -909,6 +909,45 @@ module Aws::EC2
       resp.data
     end
 
+    # @example Request syntax with placeholder values
+    #
+    #   ec2.delete_tags({
+    #     dry_run: false,
+    #     resources: ["String"], # required
+    #     tags: [
+    #       {
+    #         key: "String",
+    #         value: "String",
+    #       },
+    #     ],
+    #   })
+    # @param [Hash] options ({})
+    # @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.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    # @option options [required, Array<String>] :resources
+    #   The IDs of the resources, separated by spaces.
+    #
+    #   Constraints: Up to 1000 resource IDs. We recommend breaking up this
+    #   request into smaller batches.
+    # @option options [Array<Types::Tag>] :tags
+    #   The tags to delete. Specify a tag key and an optional tag value to
+    #   delete specific tags. If you specify a tag key without a tag value, we
+    #   delete any tag with this key regardless of its value. If you specify a
+    #   tag key with an empty string as the tag value, we delete the tag only
+    #   if its value is an empty string.
+    #
+    #   If you omit this parameter, we delete all user-defined tags for the
+    #   specified resources. We do not delete AWS-generated tags (tags that
+    #   have the `aws:` prefix).
+    # @return [EmptyStructure]
+    def delete_tags(options = {})
+      resp = @client.delete_tags(options)
+      resp.data
+    end
+
     # @example Request syntax with placeholder values
     #
     #   volume = ec2.create_volume({
@@ -932,6 +971,7 @@ module Aws::EC2
     #         ],
     #       },
     #     ],
+    #     multi_attach_enabled: false,
     #   })
     # @param [Hash] options ({})
     # @option options [required, String] :availability_zone
@@ -990,7 +1030,8 @@ module Aws::EC2
     # @option options [String] :outpost_arn
     #   The Amazon Resource Name (ARN) of the Outpost.
     # @option options [Integer] :size
-    #   The size of the volume, in GiBs.
+    #   The size of the volume, in GiBs. You must specify either a snapshot ID
+    #   or a volume size.
     #
     #   Constraints: 1-16,384 for `gp2`, 4-16,384 for `io1`, 500-16,384 for
     #   `st1`, 500-16,384 for `sc1`, and 1-1,024 for `standard`. If you
@@ -999,16 +1040,9 @@ module Aws::EC2
     #
     #   Default: If you're creating the volume from a snapshot and don't
     #   specify a volume size, the default is the snapshot size.
-    #
-    #   <note markdown="1"> At least one of Size or SnapshotId is required.
-    #
-    #    </note>
     # @option options [String] :snapshot_id
-    #   The snapshot from which to create the volume.
-    #
-    #   <note markdown="1"> At least one of Size or SnapshotId are required.
-    #
-    #    </note>
+    #   The snapshot from which to create the volume. You must specify either
+    #   a snapshot ID or a volume size.
     # @option options [String] :volume_type
     #   The volume type. This can be `gp2` for General Purpose SSD, `io1` for
     #   Provisioned IOPS SSD, `st1` for Throughput Optimized HDD, `sc1` for
@@ -1022,6 +1056,17 @@ module Aws::EC2
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @option options [Array<Types::TagSpecification>] :tag_specifications
     #   The tags to apply to the volume during creation.
+    # @option options [Boolean] :multi_attach_enabled
+    #   Specifies whether to enable Amazon EBS Multi-Attach. If you enable
+    #   Multi-Attach, you can attach the volume to up to 16 [Nitro-based
+    #   instances][1] in the same Availability Zone. For more information, see
+    #   [ Amazon EBS Multi-Attach][2] in the *Amazon Elastic Compute Cloud
+    #   User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html#ec2-nitro-instances
+    #   [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-volumes-multi.html
     # @return [Volume]
     def create_volume(options = {})
       resp = @client.create_volume(options)
@@ -2909,7 +2954,7 @@ module Aws::EC2
     #         values: ["String"],
     #       },
     #     ],
-    #     volume_ids: ["String"],
+    #     volume_ids: ["VolumeId"],
     #     dry_run: false,
     #   })
     # @param [Hash] options ({})
@@ -2939,6 +2984,13 @@ module Aws::EC2
     #   * `encrypted` - Indicates whether the volume is encrypted (`true` \|
     #     `false`)
     #
+    #   * `multi-attach-enabled` - Indicates whether the volume is enabled for
+    #     Multi-Attach (`true` \| `false`)
+    #
+    #   * `fast-restored` - Indicates whether the volume was created from a
+    #     snapshot that is enabled for fast snapshot restore (`true` \|
+    #     `false`).
+    #
     #   * `size` - The size of the volume, in GiB.
     #
     #   * `snapshot-id` - The snapshot from which the volume was created.

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

@@ -309,6 +309,49 @@ module Aws::EC2
       Tag::Collection.new([batch], size: batch.size)
     end
 
+    # @example Request syntax with placeholder values
+    #
+    #   tag = route_table.delete_tags({
+    #     dry_run: false,
+    #     tags: [
+    #       {
+    #         key: "String",
+    #         value: "String",
+    #       },
+    #     ],
+    #   })
+    # @param [Hash] options ({})
+    # @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.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    # @option options [Array<Types::Tag>] :tags
+    #   The tags to delete. Specify a tag key and an optional tag value to
+    #   delete specific tags. If you specify a tag key without a tag value, we
+    #   delete any tag with this key regardless of its value. If you specify a
+    #   tag key with an empty string as the tag value, we delete the tag only
+    #   if its value is an empty string.
+    #
+    #   If you omit this parameter, we delete all user-defined tags for the
+    #   specified resources. We do not delete AWS-generated tags (tags that
+    #   have the `aws:` prefix).
+    # @return [Tag::Collection]
+    def delete_tags(options = {})
+      batch = []
+      options = Aws::Util.deep_merge(options, resources: [@id])
+      resp = @client.delete_tags(options)
+      options[:tags].each do |t|
+        batch << Tag.new(
+          resource_id: @id,
+          key: t[:key],
+          value: t[:value],
+          client: @client
+        )
+      end
+      Tag::Collection.new([batch], size: batch.size)
+    end
+
     # @example Request syntax with placeholder values
     #
     #   route_table.delete({

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

@@ -439,6 +439,49 @@ module Aws::EC2
       Tag::Collection.new([batch], size: batch.size)
     end
 
+    # @example Request syntax with placeholder values
+    #
+    #   tag = security_group.delete_tags({
+    #     dry_run: false,
+    #     tags: [
+    #       {
+    #         key: "String",
+    #         value: "String",
+    #       },
+    #     ],
+    #   })
+    # @param [Hash] options ({})
+    # @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.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    # @option options [Array<Types::Tag>] :tags
+    #   The tags to delete. Specify a tag key and an optional tag value to
+    #   delete specific tags. If you specify a tag key without a tag value, we
+    #   delete any tag with this key regardless of its value. If you specify a
+    #   tag key with an empty string as the tag value, we delete the tag only
+    #   if its value is an empty string.
+    #
+    #   If you omit this parameter, we delete all user-defined tags for the
+    #   specified resources. We do not delete AWS-generated tags (tags that
+    #   have the `aws:` prefix).
+    # @return [Tag::Collection]
+    def delete_tags(options = {})
+      batch = []
+      options = Aws::Util.deep_merge(options, resources: [@id])
+      resp = @client.delete_tags(options)
+      options[:tags].each do |t|
+        batch << Tag.new(
+          resource_id: @id,
+          key: t[:key],
+          value: t[:value],
+          client: @client
+        )
+      end
+      Tag::Collection.new([batch], size: batch.size)
+    end
+
     # @example Request syntax with placeholder values
     #
     #   security_group.delete({

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

@@ -417,6 +417,49 @@ module Aws::EC2
       Tag::Collection.new([batch], size: batch.size)
     end
 
+    # @example Request syntax with placeholder values
+    #
+    #   tag = snapshot.delete_tags({
+    #     dry_run: false,
+    #     tags: [
+    #       {
+    #         key: "String",
+    #         value: "String",
+    #       },
+    #     ],
+    #   })
+    # @param [Hash] options ({})
+    # @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.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    # @option options [Array<Types::Tag>] :tags
+    #   The tags to delete. Specify a tag key and an optional tag value to
+    #   delete specific tags. If you specify a tag key without a tag value, we
+    #   delete any tag with this key regardless of its value. If you specify a
+    #   tag key with an empty string as the tag value, we delete the tag only
+    #   if its value is an empty string.
+    #
+    #   If you omit this parameter, we delete all user-defined tags for the
+    #   specified resources. We do not delete AWS-generated tags (tags that
+    #   have the `aws:` prefix).
+    # @return [Tag::Collection]
+    def delete_tags(options = {})
+      batch = []
+      options = Aws::Util.deep_merge(options, resources: [@id])
+      resp = @client.delete_tags(options)
+      options[:tags].each do |t|
+        batch << Tag.new(
+          resource_id: @id,
+          key: t[:key],
+          value: t[:value],
+          client: @client
+        )
+      end
+      Tag::Collection.new([batch], size: batch.size)
+    end
+
     # @example Request syntax with placeholder values
     #
     #   snapshot.delete({

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

@@ -810,6 +810,49 @@ module Aws::EC2
       Tag::Collection.new([batch], size: batch.size)
     end
 
+    # @example Request syntax with placeholder values
+    #
+    #   tag = subnet.delete_tags({
+    #     dry_run: false,
+    #     tags: [
+    #       {
+    #         key: "String",
+    #         value: "String",
+    #       },
+    #     ],
+    #   })
+    # @param [Hash] options ({})
+    # @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.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    # @option options [Array<Types::Tag>] :tags
+    #   The tags to delete. Specify a tag key and an optional tag value to
+    #   delete specific tags. If you specify a tag key without a tag value, we
+    #   delete any tag with this key regardless of its value. If you specify a
+    #   tag key with an empty string as the tag value, we delete the tag only
+    #   if its value is an empty string.
+    #
+    #   If you omit this parameter, we delete all user-defined tags for the
+    #   specified resources. We do not delete AWS-generated tags (tags that
+    #   have the `aws:` prefix).
+    # @return [Tag::Collection]
+    def delete_tags(options = {})
+      batch = []
+      options = Aws::Util.deep_merge(options, resources: [@id])
+      resp = @client.delete_tags(options)
+      options[:tags].each do |t|
+        batch << Tag.new(
+          resource_id: @id,
+          key: t[:key],
+          value: t[:value],
+          client: @client
+        )
+      end
+      Tag::Collection.new([batch], size: batch.size)
+    end
+
     # @example Request syntax with placeholder values
     #
     #   subnet.delete({

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

@@ -5512,9 +5512,9 @@ module Aws::EC2
     #   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.
+    #   When a network interface is attached to a [Nitro-based instance][1],
+    #   the aggregation interval is always 60 seconds or less, regardless of
+    #   the value that you specify.
     #
     #   Default: 600
     #
@@ -8310,6 +8310,7 @@ module Aws::EC2
     #             ],
     #           },
     #         ],
+    #         multi_attach_enabled: false,
     #       }
     #
     # @!attribute [rw] availability_zone
@@ -8379,7 +8380,8 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] size
-    #   The size of the volume, in GiBs.
+    #   The size of the volume, in GiBs. You must specify either a snapshot
+    #   ID or a volume size.
     #
     #   Constraints: 1-16,384 for `gp2`, 4-16,384 for `io1`, 500-16,384 for
     #   `st1`, 500-16,384 for `sc1`, and 1-1,024 for `standard`. If you
@@ -8388,18 +8390,11 @@ module Aws::EC2
     #
     #   Default: If you're creating the volume from a snapshot and don't
     #   specify a volume size, the default is the snapshot size.
-    #
-    #   <note markdown="1"> At least one of Size or SnapshotId is required.
-    #
-    #    </note>
     #   @return [Integer]
     #
     # @!attribute [rw] snapshot_id
-    #   The snapshot from which to create the volume.
-    #
-    #   <note markdown="1"> At least one of Size or SnapshotId are required.
-    #
-    #    </note>
+    #   The snapshot from which to create the volume. You must specify
+    #   either a snapshot ID or a volume size.
     #   @return [String]
     #
     # @!attribute [rw] volume_type
@@ -8421,6 +8416,19 @@ module Aws::EC2
     #   The tags to apply to the volume during creation.
     #   @return [Array<Types::TagSpecification>]
     #
+    # @!attribute [rw] multi_attach_enabled
+    #   Specifies whether to enable Amazon EBS Multi-Attach. If you enable
+    #   Multi-Attach, you can attach the volume to up to 16 [Nitro-based
+    #   instances][1] in the same Availability Zone. For more information,
+    #   see [ Amazon EBS Multi-Attach][2] in the *Amazon Elastic Compute
+    #   Cloud User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html#ec2-nitro-instances
+    #   [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-volumes-multi.html
+    #   @return [Boolean]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateVolumeRequest AWS API Documentation
     #
     class CreateVolumeRequest < Struct.new(
@@ -8433,7 +8441,8 @@ module Aws::EC2
       :snapshot_id,
       :volume_type,
       :dry_run,
-      :tag_specifications)
+      :tag_specifications,
+      :multi_attach_enabled)
       include Aws::Structure
     end
 
@@ -8528,6 +8537,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
@@ -8601,6 +8621,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(
@@ -8613,7 +8637,8 @@ module Aws::EC2
       :subnet_ids,
       :security_group_ids,
       :client_token,
-      :private_dns_enabled)
+      :private_dns_enabled,
+      :tag_specifications)
       include Aws::Structure
     end
 
@@ -8645,6 +8670,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
@@ -8679,6 +8715,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(
@@ -8686,7 +8726,8 @@ module Aws::EC2
       :acceptance_required,
       :private_dns_name,
       :network_load_balancer_arns,
-      :client_token)
+      :client_token,
+      :tag_specifications)
       include Aws::Structure
     end
 
@@ -16619,6 +16660,12 @@ module Aws::EC2
     #         pool_ids: ["String"],
     #         next_token: "NextToken",
     #         max_results: 1,
+    #         filters: [
+    #           {
+    #             name: "String",
+    #             values: ["String"],
+    #           },
+    #         ],
     #       }
     #
     # @!attribute [rw] pool_ids
@@ -16635,12 +16682,27 @@ module Aws::EC2
     #   `nextToken` value.
     #   @return [Integer]
     #
+    # @!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/DescribePublicIpv4PoolsRequest AWS API Documentation
     #
     class DescribePublicIpv4PoolsRequest < Struct.new(
       :pool_ids,
       :next_token,
-      :max_results)
+      :max_results,
+      :filters)
       include Aws::Structure
     end
 
@@ -19551,7 +19613,7 @@ module Aws::EC2
     #
     #       {
     #         attribute: "autoEnableIO", # required, accepts autoEnableIO, productCodes
-    #         volume_id: "String", # required
+    #         volume_id: "VolumeId", # required
     #         dry_run: false,
     #       }
     #
@@ -19612,7 +19674,7 @@ module Aws::EC2
     #         ],
     #         max_results: 1,
     #         next_token: "String",
-    #         volume_ids: ["String"],
+    #         volume_ids: ["VolumeId"],
     #         dry_run: false,
     #       }
     #
@@ -19718,7 +19780,7 @@ module Aws::EC2
     #
     #       {
     #         dry_run: false,
-    #         volume_ids: ["String"],
+    #         volume_ids: ["VolumeId"],
     #         filters: [
     #           {
     #             name: "String",
@@ -19742,9 +19804,11 @@ module Aws::EC2
     #   @return [Array<String>]
     #
     # @!attribute [rw] filters
-    #   The filters. Supported filters: `volume-id`, `modification-state`,
-    #   `target-size`, `target-iops`, `target-volume-type`, `original-size`,
-    #   `original-iops`, `original-volume-type`, `start-time`.
+    #   The filters. Supported filters: `volume-id` \| `modification-state`
+    #   \| `target-size` \| `target-iops` \| `target-volume-type` \|
+    #   `original-size` \| `original-iops` \| `original-volume-type` \|
+    #   `start-time` \| `originalMultiAttachEnabled` \|
+    #   `targetMultiAttachEnabled`.
     #   @return [Array<Types::Filter>]
     #
     # @!attribute [rw] next_token
@@ -19793,7 +19857,7 @@ module Aws::EC2
     #             values: ["String"],
     #           },
     #         ],
-    #         volume_ids: ["String"],
+    #         volume_ids: ["VolumeId"],
     #         dry_run: false,
     #         max_results: 1,
     #         next_token: "String",
@@ -19825,6 +19889,13 @@ module Aws::EC2
     #   * `encrypted` - Indicates whether the volume is encrypted (`true` \|
     #     `false`)
     #
+    #   * `multi-attach-enabled` - Indicates whether the volume is enabled
+    #     for Multi-Attach (`true` \| `false`)
+    #
+    #   * `fast-restored` - Indicates whether the volume was created from a
+    #     snapshot that is enabled for fast snapshot restore (`true` \|
+    #     `false`).
+    #
     #   * `size` - The size of the volume, in GiB.
     #
     #   * `snapshot-id` - The snapshot from which the volume was created.
@@ -21167,7 +21238,8 @@ module Aws::EC2
     #   @return [Boolean]
     #
     # @!attribute [rw] instance_id
-    #   The ID of the instance.
+    #   The ID of the instance. If you are detaching a Multi-Attach enabled
+    #   volume, you must specify an instance ID.
     #   @return [String]
     #
     # @!attribute [rw] volume_id
@@ -22286,6 +22358,8 @@ module Aws::EC2
     #   Amazon EBS encryption. For more information, see [Supported Instance
     #   Types][2].
     #
+    #   This parameter is not returned by .
+    #
     #
     #
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html#encryption-parameters
@@ -23935,7 +24009,10 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] subnet_id
-    #   The ID of the subnet in which to launch the instances.
+    #   The IDs of the subnets in which to launch the instances. Separate
+    #   multiple subnet IDs using commas (for example,
+    #   `subnet-1234abcdeexample1, subnet-0987cdef6example2`). A request of
+    #   type `instant` can have only one subnet ID.
     #   @return [String]
     #
     # @!attribute [rw] availability_zone
@@ -24110,9 +24187,11 @@ module Aws::EC2
     #   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.
+    #   When a network interface is attached to a [Nitro-based instance][1],
+    #   the aggregation interval is always 60 seconds (1 minute) or less,
+    #   regardless of the specified value.
+    #
+    #   Valid Values: `60` \| `600`
     #
     #
     #
@@ -26051,6 +26130,31 @@ 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 [Obtaining Billing Information][1] in the
+    #   *Amazon Elastic Compute Cloud User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-billing-info.html
+    #   @return [String]
+    #
+    # @!attribute [rw] usage_operation
+    #   The operation of the Amazon EC2 instance and the billing code that
+    #   is associated with the AMI. `usageOperation` corresponds to the
+    #   [lineitem/Operation][1] column on your AWS Cost and Usage Report and
+    #   in the [AWS Price List API][2]. For the list of `UsageOperation`
+    #   codes, see [Platform Details and Usage Operation Billing Codes][3]
+    #   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/awsaccountbilling/latest/aboutv2/price-changes.html
+    #   [3]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-billing-info.html#billing-info
+    #   @return [String]
+    #
     # @!attribute [rw] product_codes
     #   Any product codes associated with the AMI.
     #   @return [Array<Types::ProductCode>]
@@ -26129,6 +26233,8 @@ module Aws::EC2
       :kernel_id,
       :owner_id,
       :platform,
+      :platform_details,
+      :usage_operation,
       :product_codes,
       :ramdisk_id,
       :state,
@@ -28296,6 +28402,9 @@ module Aws::EC2
     #
     # @!attribute [rw] network_interface_id
     #   The ID of the network interface.
+    #
+    #   If you are creating a Spot Fleet, omit this parameter because you
+    #   can’t specify a network interface ID in a launch specification.
     #   @return [String]
     #
     # @!attribute [rw] private_ip_address
@@ -35281,11 +35390,15 @@ module Aws::EC2
     #
     #   If not specified, an Availability Zone will be automatically chosen
     #   for you based on the load balancing criteria for the Region.
+    #
+    #   This parameter is not supported by .
     #   @return [String]
     #
     # @!attribute [rw] affinity
     #   The affinity setting for the instance on the Dedicated Host. This
     #   parameter is not supported for the ImportInstance command.
+    #
+    #   This parameter is not supported by .
     #   @return [String]
     #
     # @!attribute [rw] group_name
@@ -35295,11 +35408,15 @@ module Aws::EC2
     # @!attribute [rw] partition_number
     #   The number of the partition the instance is in. Valid only if the
     #   placement group strategy is set to `partition`.
+    #
+    #   This parameter is not supported by .
     #   @return [Integer]
     #
     # @!attribute [rw] host_id
     #   The ID of the Dedicated Host on which the instance resides. This
     #   parameter is not supported for the ImportInstance command.
+    #
+    #   This parameter is not supported by .
     #   @return [String]
     #
     # @!attribute [rw] tenancy
@@ -35307,16 +35424,22 @@ module Aws::EC2
     #   An instance with a tenancy of `dedicated` runs on single-tenant
     #   hardware. The `host` tenancy is not supported for the ImportInstance
     #   command.
+    #
+    #   This parameter is not supported by .
     #   @return [String]
     #
     # @!attribute [rw] spread_domain
     #   Reserved for future use.
+    #
+    #   This parameter is not supported by .
     #   @return [String]
     #
     # @!attribute [rw] host_resource_group_arn
     #   The ARN of the host resource group in which to launch the instances.
     #   If you specify a host resource group ARN, omit the **Tenancy**
     #   parameter or set it to `host`.
+    #
+    #   This parameter is not supported by .
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/Placement AWS API Documentation
@@ -35876,6 +35999,10 @@ module Aws::EC2
     #   The total number of available addresses.
     #   @return [Integer]
     #
+    # @!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/PublicIpv4Pool AWS API Documentation
     #
     class PublicIpv4Pool < Struct.new(
@@ -35883,7 +36010,8 @@ module Aws::EC2
       :description,
       :pool_address_ranges,
       :total_address_count,
-      :total_available_address_count)
+      :total_available_address_count,
+      :tags)
       include Aws::Structure
     end
 
@@ -37775,6 +37903,17 @@ module Aws::EC2
     #             },
     #           },
     #           instance_pools_to_use_count: 1,
+    #           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",
+    #                 },
+    #               ],
+    #             },
+    #           ],
     #         },
     #       }
     #
@@ -42394,6 +42533,10 @@ module Aws::EC2
     #   The state of the Spot Fleet request.
     #   @return [String]
     #
+    # @!attribute [rw] tags
+    #   The tags for a Spot Fleet resource.
+    #   @return [Array<Types::Tag>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/SpotFleetRequestConfig AWS API Documentation
     #
     class SpotFleetRequestConfig < Struct.new(
@@ -42401,7 +42544,8 @@ module Aws::EC2
       :create_time,
       :spot_fleet_request_config,
       :spot_fleet_request_id,
-      :spot_fleet_request_state)
+      :spot_fleet_request_state,
+      :tags)
       include Aws::Structure
     end
 
@@ -42551,6 +42695,17 @@ module Aws::EC2
     #           },
     #         },
     #         instance_pools_to_use_count: 1,
+    #         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] allocation_strategy
@@ -42739,6 +42894,19 @@ module Aws::EC2
     #   pools that you specify.
     #   @return [Integer]
     #
+    # @!attribute [rw] tag_specifications
+    #   The key-value pair for tagging the Spot Fleet request on creation.
+    #   The value for `ResourceType` must be `spot-fleet-request`, otherwise
+    #   the Spot Fleet request fails. To tag instances at launch, specify
+    #   the tags in the [launch template][1]. For information about tagging
+    #   after launch, see [Tagging Your Resources][2].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html#create-launch-template
+    #   [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html#tag-resources
+    #   @return [Array<Types::TagSpecification>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/SpotFleetRequestConfigData AWS API Documentation
     #
     class SpotFleetRequestConfigData < Struct.new(
@@ -42763,7 +42931,8 @@ module Aws::EC2
       :replace_unhealthy_instances,
       :instance_interruption_behavior,
       :load_balancers_config,
-      :instance_pools_to_use_count)
+      :instance_pools_to_use_count,
+      :tag_specifications)
       include Aws::Structure
     end
 
@@ -42783,8 +42952,8 @@ module Aws::EC2
     #       }
     #
     # @!attribute [rw] resource_type
-    #   The type of resource. Currently, the only resource type that is
-    #   supported is `instance`.
+    #   The type of resource. Currently, the only resource types that are
+    #   supported are `spot-fleet-request` and `instance`.
     #   @return [String]
     #
     # @!attribute [rw] tags
@@ -45346,7 +45515,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] ipv_6_support
-    #   Indicates whether IPv6 support is enabled.
+    #   Indicates whether IPv6 support is disabled.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/TransitGatewayVpcAttachmentOptions AWS API Documentation
@@ -46118,6 +46287,10 @@ module Aws::EC2
     #   restore.
     #   @return [Boolean]
     #
+    # @!attribute [rw] multi_attach_enabled
+    #   Indicates whether Amazon EBS Multi-Attach is enabled.
+    #   @return [Boolean]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/Volume AWS API Documentation
     #
     class Volume < Struct.new(
@@ -46134,7 +46307,8 @@ module Aws::EC2
       :iops,
       :tags,
       :volume_type,
-      :fast_restored)
+      :fast_restored,
+      :multi_attach_enabled)
       include Aws::Structure
     end
 
@@ -46296,6 +46470,24 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Information about the instances to which the volume is attached.
+    #
+    # @!attribute [rw] io_performance
+    #   The maximum IOPS supported by the attached instance.
+    #   @return [String]
+    #
+    # @!attribute [rw] instance_id
+    #   The ID of the attached instance.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/VolumeStatusAttachmentStatus AWS API Documentation
+    #
+    class VolumeStatusAttachmentStatus < Struct.new(
+      :io_performance,
+      :instance_id)
+      include Aws::Structure
+    end
+
     # Describes a volume status.
     #
     # @!attribute [rw] name
@@ -46336,6 +46528,10 @@ module Aws::EC2
     #   The earliest start time of the event.
     #   @return [Time]
     #
+    # @!attribute [rw] instance_id
+    #   The ID of the instance associated with the event.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/VolumeStatusEvent AWS API Documentation
     #
     class VolumeStatusEvent < Struct.new(
@@ -46343,7 +46539,8 @@ module Aws::EC2
       :event_id,
       :event_type,
       :not_after,
-      :not_before)
+      :not_before,
+      :instance_id)
       include Aws::Structure
     end
 
@@ -46391,6 +46588,10 @@ module Aws::EC2
     #   The volume status.
     #   @return [Types::VolumeStatusInfo]
     #
+    # @!attribute [rw] attachment_statuses
+    #   Information about the instances to which the volume is attached.
+    #   @return [Array<Types::VolumeStatusAttachmentStatus>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/VolumeStatusItem AWS API Documentation
     #
     class VolumeStatusItem < Struct.new(
@@ -46399,7 +46600,8 @@ module Aws::EC2
       :outpost_arn,
       :events,
       :volume_id,
-      :volume_status)
+      :volume_status,
+      :attachment_statuses)
       include Aws::Structure
     end
 
@@ -47103,7 +47305,7 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # The tunnel options for a VPN connection.
+    # The tunnel options for a single VPN tunnel.
     #
     # @note When making an API call, you may pass VpnTunnelOptionsSpecification
     #   data as a hash: