aws-sdk-ec2 1.222.0 → 1.227.0

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 
@@ -123,6 +123,18 @@ module Aws::EC2
       data[:owner_alias]
     end
 
+    # The ARN of the AWS Outpost on which the snapshot is stored. For more
+    # information, see [EBS Local Snapshot on Outposts][1] in the *Amazon
+    # Elastic Compute Cloud User Guide*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/snapshots-outposts.html
+    # @return [String]
+    def outpost_arn
+      data[:outpost_arn]
+    end
+
     # Any tags assigned to the snapshot.
     # @return [Array<Types::Tag>]
     def tags
@@ -285,6 +297,7 @@ module Aws::EC2
     #
     #   snapshot.copy({
     #     description: "String",
+    #     destination_outpost_arn: "String",
     #     destination_region: "String",
     #     encrypted: false,
     #     kms_key_id: "KmsKeyId",
@@ -306,6 +319,19 @@ module Aws::EC2
     # @param [Hash] options ({})
     # @option options [String] :description
     #   A description for the EBS snapshot.
+    # @option options [String] :destination_outpost_arn
+    #   The Amazon Resource Name (ARN) of the Outpost to which to copy the
+    #   snapshot. Only specify this parameter when copying a snapshot from an
+    #   AWS Region to an Outpost. The snapshot must be in the Region for the
+    #   destination Outpost. You cannot copy a snapshot from an Outpost to a
+    #   Region, from one Outpost to another, or within the same Outpost.
+    #
+    #   For more information, see [ Copying snapshots from an AWS Region to an
+    #   Outpost][1] in the *Amazon Elastic Compute Cloud User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/snapshots-outposts.html#copy-snapshots
     # @option options [String] :destination_region
     #   The destination Region to use in the `PresignedUrl` parameter of a
     #   snapshot copy operation. This parameter is only valid for specifying

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 
@@ -287,6 +287,7 @@ module Aws::EC2
     #           volume_type: "standard", # accepts standard, io1, io2, gp2, sc1, st1, gp3
     #           kms_key_id: "String",
     #           throughput: 1,
+    #           outpost_arn: "String",
     #           encrypted: false,
     #         },
     #         no_device: "String",
@@ -601,7 +602,7 @@ module Aws::EC2
     #
     #   Default: `false`
     # @option options [Types::IamInstanceProfileSpecification] :iam_instance_profile
-    #   The IAM instance profile.
+    #   The name or Amazon Resource Name (ARN) of an IAM instance profile.
     # @option options [String] :instance_initiated_shutdown_behavior
     #   Indicates whether an instance stops or terminates when you initiate
     #   shutdown from the instance (using the operating system command for
@@ -1405,9 +1406,8 @@ module Aws::EC2
     #   * `private-dns-name` - The private DNS name of the network interface
     #     (IPv4).
     #
-    #   * `requester-id` - The ID of the entity that launched the instance on
-    #     your behalf (for example, AWS Management Console, Auto Scaling, and
-    #     so on).
+    #   * `requester-id` - The alias or AWS account ID of the principal or
+    #     service that created the network interface.
     #
     #   * `requester-managed` - Indicates whether the network interface is
     #     being managed by an AWS service (for example, AWS Management

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 

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

@@ -3,7 +3,7 @@
 # WARNING ABOUT GENERATED CODE
 #
 # This file is generated. See the contributing guide for more information:
-# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
+# https://github.com/aws/aws-sdk-ruby/blob/version-3/CONTRIBUTING.md
 #
 # WARNING ABOUT GENERATED CODE
 
@@ -467,6 +467,35 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # The attributes associated with an Elastic IP address.
+    #
+    # @!attribute [rw] public_ip
+    #   The public IP address.
+    #   @return [String]
+    #
+    # @!attribute [rw] allocation_id
+    #   \[EC2-VPC\] The allocation ID.
+    #   @return [String]
+    #
+    # @!attribute [rw] ptr_record
+    #   The pointer (PTR) record for the IP address.
+    #   @return [String]
+    #
+    # @!attribute [rw] ptr_record_update
+    #   The updated PTR record for the IP address.
+    #   @return [Types::PtrUpdateStatus]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/AddressAttribute AWS API Documentation
+    #
+    class AddressAttribute < Struct.new(
+      :public_ip,
+      :allocation_id,
+      :ptr_record,
+      :ptr_record_update)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass AdvertiseByoipCidrRequest
     #   data as a hash:
     #
@@ -1138,10 +1167,12 @@ module Aws::EC2
     #       }
     #
     # @!attribute [rw] ipv_6_address_count
-    #   The number of IPv6 addresses to assign to the network interface.
-    #   Amazon EC2 automatically selects the IPv6 addresses from the subnet
-    #   range. You can't use this option if specifying specific IPv6
-    #   addresses.
+    #   The number of additional IPv6 addresses to assign to the network
+    #   interface. The specified number of IPv6 addresses are assigned in
+    #   addition to the existing IPv6 addresses that are already assigned to
+    #   the network interface. Amazon EC2 automatically selects the IPv6
+    #   addresses from the subnet range. You can't use this option if
+    #   specifying specific IPv6 addresses.
     #   @return [Integer]
     #
     # @!attribute [rw] ipv_6_addresses
@@ -1165,7 +1196,9 @@ module Aws::EC2
     end
 
     # @!attribute [rw] assigned_ipv_6_addresses
-    #   The IPv6 addresses assigned to the network interface.
+    #   The new IPv6 addresses assigned to the network interface. Existing
+    #   IPv6 addresses that were assigned to the network interface before
+    #   the request are not included.
     #   @return [Array<String>]
     #
     # @!attribute [rw] network_interface_id
@@ -1278,15 +1311,16 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] instance_id
-    #   The ID of the instance. This is required for EC2-Classic. For
-    #   EC2-VPC, you can specify either the instance ID or the network
-    #   interface ID, but not both. The operation fails if you specify an
-    #   instance ID unless exactly one network interface is attached.
+    #   The ID of the instance. The instance must have exactly one attached
+    #   network interface. For EC2-VPC, you can specify either the instance
+    #   ID or the network interface ID, but not both. For EC2-Classic, you
+    #   must specify an instance ID and the instance must be in the running
+    #   state.
     #   @return [String]
     #
     # @!attribute [rw] public_ip
-    #   The Elastic IP address to associate with the instance. This is
-    #   required for EC2-Classic.
+    #   \[EC2-Classic\] The Elastic IP address to associate with the
+    #   instance. This is required for EC2-Classic.
     #   @return [String]
     #
     # @!attribute [rw] allow_reassociation
@@ -1493,7 +1527,7 @@ module Aws::EC2
     # @!attribute [rw] certificate_s3_object_key
     #   The Amazon S3 object key where the certificate, certificate chain,
     #   and encrypted private key bundle are stored. The object key is
-    #   formatted as follows: `certificate_arn`/`role_arn`.
+    #   formatted as follows: `role_arn`/`certificate_arn`.
     #   @return [String]
     #
     # @!attribute [rw] encryption_kms_key_id
@@ -1613,24 +1647,24 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         ipv_6_cidr_block: "String", # required
     #         subnet_id: "SubnetId", # required
+    #         ipv_6_cidr_block: "String", # required
     #       }
     #
+    # @!attribute [rw] subnet_id
+    #   The ID of your subnet.
+    #   @return [String]
+    #
     # @!attribute [rw] ipv_6_cidr_block
     #   The IPv6 CIDR block for your subnet. The subnet must have a /64
     #   prefix length.
     #   @return [String]
     #
-    # @!attribute [rw] subnet_id
-    #   The ID of your subnet.
-    #   @return [String]
-    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/AssociateSubnetCidrBlockRequest AWS API Documentation
     #
     class AssociateSubnetCidrBlockRequest < Struct.new(
-      :ipv_6_cidr_block,
-      :subnet_id)
+      :subnet_id,
+      :ipv_6_cidr_block)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -1851,7 +1885,7 @@ module Aws::EC2
     # @!attribute [rw] certificate_s3_object_key
     #   The key of the Amazon S3 object ey where the certificate,
     #   certificate chain, and encrypted private key bundle is stored. The
-    #   object key is formated as follows: `certificate_arn`/`role_arn`.
+    #   object key is formated as follows: `role_arn`/`certificate_arn`.
     #   @return [String]
     #
     # @!attribute [rw] encryption_kms_key_id
@@ -2748,6 +2782,7 @@ module Aws::EC2
     #           volume_type: "standard", # accepts standard, io1, io2, gp2, sc1, st1, gp3
     #           kms_key_id: "String",
     #           throughput: 1,
+    #           outpost_arn: "String",
     #           encrypted: false,
     #         },
     #         no_device: "String",
@@ -4937,17 +4972,18 @@ module Aws::EC2
     #         name: "String", # required
     #         source_image_id: "String", # required
     #         source_region: "String", # required
+    #         destination_outpost_arn: "String",
     #         dry_run: false,
     #       }
     #
     # @!attribute [rw] client_token
     #   Unique, case-sensitive identifier you provide to ensure idempotency
-    #   of the request. For more information, see [How to Ensure
-    #   Idempotency][1] in the *Amazon Elastic Compute Cloud User Guide*.
+    #   of the request. For more information, see [Ensuring idempotency][1]
+    #   in the *Amazon EC2 API Reference*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Run_Instance_Idempotency.html
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Run_Instance_Idempotency.html
     #   @return [String]
     #
     # @!attribute [rw] description
@@ -5008,6 +5044,21 @@ module Aws::EC2
     #   The name of the Region that contains the AMI to copy.
     #   @return [String]
     #
+    # @!attribute [rw] destination_outpost_arn
+    #   The Amazon Resource Name (ARN) of the Outpost to which to copy the
+    #   AMI. Only specify this parameter when copying an AMI from an AWS
+    #   Region to an Outpost. The AMI must be in the Region of the
+    #   destination Outpost. You cannot copy an AMI from an Outpost to a
+    #   Region, from one Outpost to another, or within the same Outpost.
+    #
+    #   For more information, see [ Copying AMIs from an AWS Region to an
+    #   Outpost][1] in the *Amazon Elastic Compute Cloud User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/snapshots-outposts.html#copy-amis
+    #   @return [String]
+    #
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -5025,6 +5076,7 @@ module Aws::EC2
       :name,
       :source_image_id,
       :source_region,
+      :destination_outpost_arn,
       :dry_run)
       SENSITIVE = []
       include Aws::Structure
@@ -5049,6 +5101,7 @@ module Aws::EC2
     #
     #       {
     #         description: "String",
+    #         destination_outpost_arn: "String",
     #         destination_region: "String",
     #         encrypted: false,
     #         kms_key_id: "KmsKeyId",
@@ -5073,6 +5126,22 @@ module Aws::EC2
     #   A description for the EBS snapshot.
     #   @return [String]
     #
+    # @!attribute [rw] destination_outpost_arn
+    #   The Amazon Resource Name (ARN) of the Outpost to which to copy the
+    #   snapshot. Only specify this parameter when copying a snapshot from
+    #   an AWS Region to an Outpost. The snapshot must be in the Region for
+    #   the destination Outpost. You cannot copy a snapshot from an Outpost
+    #   to a Region, from one Outpost to another, or within the same
+    #   Outpost.
+    #
+    #   For more information, see [ Copying snapshots from an AWS Region to
+    #   an Outpost][1] in the *Amazon Elastic Compute Cloud User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/snapshots-outposts.html#copy-snapshots
+    #   @return [String]
+    #
     # @!attribute [rw] destination_region
     #   The destination Region to use in the `PresignedUrl` parameter of a
     #   snapshot copy operation. This parameter is only valid for specifying
@@ -5169,6 +5238,7 @@ module Aws::EC2
     #
     class CopySnapshotRequest < Struct.new(
       :description,
+      :destination_outpost_arn,
       :destination_region,
       :encrypted,
       :kms_key_id,
@@ -6206,7 +6276,7 @@ module Aws::EC2
     #         dry_run: false,
     #         client_token: "String",
     #         spot_options: {
-    #           allocation_strategy: "lowest-price", # accepts lowest-price, diversified, capacity-optimized
+    #           allocation_strategy: "lowest-price", # accepts lowest-price, diversified, capacity-optimized, capacity-optimized-prioritized
     #           maintenance_strategies: {
     #             capacity_rebalance: {
     #               replacement_strategy: "launch", # accepts launch
@@ -6365,7 +6435,13 @@ module Aws::EC2
     #   @return [Time]
     #
     # @!attribute [rw] replace_unhealthy_instances
-    #   Indicates whether EC2 Fleet should replace unhealthy instances.
+    #   Indicates whether EC2 Fleet should replace unhealthy Spot Instances.
+    #   Supported only for fleets of type `maintain`. For more information,
+    #   see [EC2 Fleet health checks][1] in the *Amazon EC2 User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/manage-ec2-fleet.html#ec2-fleet-health-checks
     #   @return [Boolean]
     #
     # @!attribute [rw] tag_specifications
@@ -6731,6 +6807,7 @@ module Aws::EC2
     #               volume_type: "standard", # accepts standard, io1, io2, gp2, sc1, st1, gp3
     #               kms_key_id: "String",
     #               throughput: 1,
+    #               outpost_arn: "String",
     #               encrypted: false,
     #             },
     #             no_device: "String",
@@ -6870,7 +6947,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] export_to_s3_task
-    #   The format and location for an instance export task.
+    #   The format and location for an export instance task.
     #   @return [Types::ExportToS3TaskSpecification]
     #
     # @!attribute [rw] instance_id
@@ -6882,7 +6959,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] tag_specifications
-    #   The tags to apply to the instance export task during creation.
+    #   The tags to apply to the export instance task during creation.
     #   @return [Array<Types::TagSpecification>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateInstanceExportTaskRequest AWS API Documentation
@@ -6898,7 +6975,7 @@ module Aws::EC2
     end
 
     # @!attribute [rw] export_task
-    #   Information about the instance export task.
+    #   Information about the export instance task.
     #   @return [Types::ExportTask]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateInstanceExportTaskResult AWS API Documentation
@@ -7678,7 +7755,6 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         allocation_id: "AllocationId", # required
     #         client_token: "String",
     #         dry_run: false,
     #         subnet_id: "SubnetId", # required
@@ -7693,14 +7769,9 @@ module Aws::EC2
     #             ],
     #           },
     #         ],
+    #         allocation_id: "AllocationId", # required
     #       }
     #
-    # @!attribute [rw] allocation_id
-    #   The allocation ID of an Elastic IP address to associate with the NAT
-    #   gateway. If the Elastic IP address is associated with another
-    #   resource, you must first disassociate it.
-    #   @return [String]
-    #
     # @!attribute [rw] client_token
     #   Unique, case-sensitive identifier that you provide to ensure the
     #   idempotency of the request. For more information, see [How to Ensure
@@ -7731,14 +7802,20 @@ module Aws::EC2
     #   The tags to assign to the NAT gateway.
     #   @return [Array<Types::TagSpecification>]
     #
+    # @!attribute [rw] allocation_id
+    #   The allocation ID of an Elastic IP address to associate with the NAT
+    #   gateway. If the Elastic IP address is associated with another
+    #   resource, you must first disassociate it.
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateNatGatewayRequest AWS API Documentation
     #
     class CreateNatGatewayRequest < Struct.new(
-      :allocation_id,
       :client_token,
       :dry_run,
       :subnet_id,
-      :tag_specifications)
+      :tag_specifications,
+      :allocation_id)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -8651,6 +8728,7 @@ module Aws::EC2
     #
     #       {
     #         description: "String",
+    #         outpost_arn: "String",
     #         volume_id: "VolumeId", # required
     #         tag_specifications: [
     #           {
@@ -8670,6 +8748,30 @@ module Aws::EC2
     #   A description for the snapshot.
     #   @return [String]
     #
+    # @!attribute [rw] outpost_arn
+    #   The Amazon Resource Name (ARN) of the AWS Outpost on which to create
+    #   a local snapshot.
+    #
+    #   * To create a snapshot of a volume in a Region, omit this parameter.
+    #     The snapshot is created in the same Region as the volume.
+    #
+    #   * To create a snapshot of a volume on an Outpost and store the
+    #     snapshot in the Region, omit this parameter. The snapshot is
+    #     created in the Region for the Outpost.
+    #
+    #   * To create a snapshot of a volume on an Outpost and store the
+    #     snapshot on an Outpost, specify the ARN of the destination
+    #     Outpost. The snapshot must be created on the same Outpost as the
+    #     volume.
+    #
+    #   For more information, see [ Creating local snapshots from volumes on
+    #   an Outpost][1] in the *Amazon Elastic Compute Cloud User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/snapshots-outposts.html#create-snapshot
+    #   @return [String]
+    #
     # @!attribute [rw] volume_id
     #   The ID of the EBS volume.
     #   @return [String]
@@ -8689,6 +8791,7 @@ module Aws::EC2
     #
     class CreateSnapshotRequest < Struct.new(
       :description,
+      :outpost_arn,
       :volume_id,
       :tag_specifications,
       :dry_run)
@@ -8705,6 +8808,7 @@ module Aws::EC2
     #           instance_id: "InstanceId",
     #           exclude_boot_volume: false,
     #         },
+    #         outpost_arn: "String",
     #         tag_specifications: [
     #           {
     #             resource_type: "client-vpn-endpoint", # accepts client-vpn-endpoint, customer-gateway, dedicated-host, dhcp-options, egress-only-internet-gateway, elastic-ip, elastic-gpu, export-image-task, export-instance-task, fleet, fpga-image, host-reservation, image, import-image-task, import-snapshot-task, instance, internet-gateway, key-pair, launch-template, local-gateway-route-table-vpc-association, natgateway, network-acl, network-interface, network-insights-analysis, network-insights-path, 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-connect-peer, transit-gateway-multicast-domain, transit-gateway-route-table, volume, vpc, vpc-peering-connection, vpn-connection, vpn-gateway, vpc-flow-log
@@ -8730,6 +8834,32 @@ module Aws::EC2
     #   snapshots.
     #   @return [Types::InstanceSpecification]
     #
+    # @!attribute [rw] outpost_arn
+    #   The Amazon Resource Name (ARN) of the AWS Outpost on which to create
+    #   the local snapshots.
+    #
+    #   * To create snapshots from an instance in a Region, omit this
+    #     parameter. The snapshots are created in the same Region as the
+    #     instance.
+    #
+    #   * To create snapshots from an instance on an Outpost and store the
+    #     snapshots in the Region, omit this parameter. The snapshots are
+    #     created in the Region for the Outpost.
+    #
+    #   * To create snapshots from an instance on an Outpost and store the
+    #     snapshots on an Outpost, specify the ARN of the destination
+    #     Outpost. The snapshots must be created on the same Outpost as the
+    #     instance.
+    #
+    #   For more information, see [ Creating multi-volume local snapshots
+    #   from instances on an Outpost][1] in the *Amazon Elastic Compute
+    #   Cloud User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/snapshots-outposts.html#create-multivol-snapshot
+    #   @return [String]
+    #
     # @!attribute [rw] tag_specifications
     #   Tags to apply to every snapshot specified by the instance.
     #   @return [Array<Types::TagSpecification>]
@@ -8750,6 +8880,7 @@ module Aws::EC2
     class CreateSnapshotsRequest < Struct.new(
       :description,
       :instance_specification,
+      :outpost_arn,
       :tag_specifications,
       :dry_run,
       :copy_tags_from_source)
@@ -8842,11 +8973,11 @@ module Aws::EC2
     #         ],
     #         availability_zone: "String",
     #         availability_zone_id: "String",
-    #         cidr_block: "String", # required
     #         ipv_6_cidr_block: "String",
     #         outpost_arn: "String",
     #         vpc_id: "VpcId", # required
     #         dry_run: false,
+    #         cidr_block: "String", # required
     #       }
     #
     # @!attribute [rw] tag_specifications
@@ -8877,13 +9008,6 @@ module Aws::EC2
     #   The AZ ID or the Local Zone ID of the subnet.
     #   @return [String]
     #
-    # @!attribute [rw] cidr_block
-    #   The IPv4 network range for the subnet, in CIDR notation. For
-    #   example, `10.0.0.0/24`. 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] ipv_6_cidr_block
     #   The IPv6 network range for the subnet, in CIDR notation. The subnet
     #   size must use a /64 prefix length.
@@ -8906,17 +9030,24 @@ module Aws::EC2
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     #   @return [Boolean]
     #
+    # @!attribute [rw] cidr_block
+    #   The IPv4 network range for the subnet, in CIDR notation. For
+    #   example, `10.0.0.0/24`. 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/CreateSubnetRequest AWS API Documentation
     #
     class CreateSubnetRequest < Struct.new(
       :tag_specifications,
       :availability_zone,
       :availability_zone_id,
-      :cidr_block,
       :ipv_6_cidr_block,
       :outpost_arn,
       :vpc_id,
-      :dry_run)
+      :dry_run,
+      :cidr_block)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -13785,6 +13916,72 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass DescribeAddressesAttributeRequest
+    #   data as a hash:
+    #
+    #       {
+    #         allocation_ids: ["AllocationId"],
+    #         attribute: "domain-name", # accepts domain-name
+    #         next_token: "NextToken",
+    #         max_results: 1,
+    #         dry_run: false,
+    #       }
+    #
+    # @!attribute [rw] allocation_ids
+    #   \[EC2-VPC\] The allocation IDs.
+    #   @return [Array<String>]
+    #
+    # @!attribute [rw] attribute
+    #   The attribute of the IP address.
+    #   @return [String]
+    #
+    # @!attribute [rw] next_token
+    #   The token for the next page of results.
+    #   @return [String]
+    #
+    # @!attribute [rw] max_results
+    #   The maximum number of results to return with a single call. To
+    #   retrieve the remaining results, make another call with the returned
+    #   `nextToken` value.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeAddressesAttributeRequest AWS API Documentation
+    #
+    class DescribeAddressesAttributeRequest < Struct.new(
+      :allocation_ids,
+      :attribute,
+      :next_token,
+      :max_results,
+      :dry_run)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] addresses
+    #   Information about the IP addresses.
+    #   @return [Array<Types::AddressAttribute>]
+    #
+    # @!attribute [rw] next_token
+    #   The token to use to retrieve the next page of results. This value is
+    #   `null` when there are no more results to return.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeAddressesAttributeResult AWS API Documentation
+    #
+    class DescribeAddressesAttributeResult < Struct.new(
+      :addresses,
+      :next_token)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass DescribeAddressesRequest
     #   data as a hash:
     #
@@ -16654,10 +16851,10 @@ module Aws::EC2
     # @!attribute [rw] attribute
     #   The AMI attribute.
     #
-    #   **Note**\: Depending on your account privileges, the
-    #   `blockDeviceMapping` attribute may return a `Client.AuthFailure`
-    #   error. If this happens, use DescribeImages to get information about
-    #   the block device mapping for the AMI.
+    #   **Note**\: The `blockDeviceMapping` attribute is deprecated. Using
+    #   this attribute returns the `Client.AuthFailure` error. To get
+    #   information about the block device mappings for an AMI, use the
+    #   DescribeImages action.
     #   @return [String]
     #
     # @!attribute [rw] image_id
@@ -16750,13 +16947,14 @@ module Aws::EC2
     #
     #   * `name` - The name of the AMI (provided during image creation).
     #
-    #   * `owner-alias` - The owner alias, from an Amazon-maintained list
-    #     (`amazon` \| `aws-marketplace`). This is not the user-configured
-    #     AWS account alias set using the IAM console. We recommend that you
-    #     use the related parameter instead of this filter.
+    #   * `owner-alias` - The owner alias (`amazon` \| `aws-marketplace`).
+    #     The valid aliases are defined in an Amazon-maintained list. This
+    #     is not the AWS account alias that can be set using the IAM
+    #     console. We recommend that you use the **Owner** request parameter
+    #     instead of this filter.
     #
     #   * `owner-id` - The AWS account ID of the owner. We recommend that
-    #     you use the related parameter instead of this filter.
+    #     you use the **Owner** request parameter instead of this filter.
     #
     #   * `platform` - The platform. To only list Windows-based AMIs, use
     #     `windows`.
@@ -19664,9 +19862,8 @@ module Aws::EC2
     #   * `private-dns-name` - The private DNS name of the network interface
     #     (IPv4).
     #
-    #   * `requester-id` - The ID of the entity that launched the instance
-    #     on your behalf (for example, AWS Management Console, Auto Scaling,
-    #     and so on).
+    #   * `requester-id` - The alias or AWS account ID of the principal or
+    #     service that created the network interface.
     #
     #   * `requester-managed` - Indicates whether the network interface is
     #     being managed by an AWS service (for example, AWS Management
@@ -21031,7 +21228,7 @@ module Aws::EC2
     #     has been referenced in an outbound security group rule.
     #
     #   * `egress.ip-permission.group-name` - The name of a security group
-    #     that has been referenced in an outbound security group rule.
+    #     that is referenced in an outbound security group rule.
     #
     #   * `egress.ip-permission.ipv6-cidr` - An IPv6 CIDR block for an
     #     outbound security group rule.
@@ -21040,8 +21237,8 @@ module Aws::EC2
     #     which a security group rule allows outbound access.
     #
     #   * `egress.ip-permission.protocol` - The IP protocol for an outbound
-    #     security group rule (`tcp` \| `udp` \| `icmp` or a protocol
-    #     number).
+    #     security group rule (`tcp` \| `udp` \| `icmp`, a protocol number,
+    #     or -1 for all protocols).
     #
     #   * `egress.ip-permission.to-port` - For an outbound rule, the end of
     #     port range for the TCP and UDP protocols, or an ICMP code.
@@ -21062,8 +21259,8 @@ module Aws::EC2
     #   * `ip-permission.group-id` - The ID of a security group that has
     #     been referenced in an inbound security group rule.
     #
-    #   * `ip-permission.group-name` - The name of a security group that has
-    #     been referenced in an inbound security group rule.
+    #   * `ip-permission.group-name` - The name of a security group that is
+    #     referenced in an inbound security group rule.
     #
     #   * `ip-permission.ipv6-cidr` - An IPv6 CIDR block for an inbound
     #     security group rule.
@@ -21072,7 +21269,8 @@ module Aws::EC2
     #     which a security group rule allows inbound access.
     #
     #   * `ip-permission.protocol` - The IP protocol for an inbound security
-    #     group rule (`tcp` \| `udp` \| `icmp` or a protocol number).
+    #     group rule (`tcp` \| `udp` \| `icmp`, a protocol number, or -1 for
+    #     all protocols).
     #
     #   * `ip-permission.to-port` - For an inbound rule, the end of port
     #     range for the TCP and UDP protocols, or an ICMP code.
@@ -24135,6 +24333,8 @@ module Aws::EC2
     #
     #   * `service-name` - The name of the service.
     #
+    #   * `service-type` - The type of service (`Interface` \| `Gateway`).
+    #
     #   * `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
@@ -26007,6 +26207,7 @@ module Aws::EC2
     #         volume_type: "standard", # accepts standard, io1, io2, gp2, sc1, st1, gp3
     #         kms_key_id: "String",
     #         throughput: 1,
+    #         outpost_arn: "String",
     #         encrypted: false,
     #       }
     #
@@ -26102,6 +26303,10 @@ module Aws::EC2
     #   Valid Range: Minimum value of 125. Maximum value of 1000.
     #   @return [Integer]
     #
+    # @!attribute [rw] outpost_arn
+    #   The ARN of the Outpost on which the snapshot is stored.
+    #   @return [String]
+    #
     # @!attribute [rw] encrypted
     #   Indicates whether the encryption state of an EBS volume is changed
     #   while being restored from a backing snapshot. The effect of setting
@@ -26134,6 +26339,7 @@ module Aws::EC2
       :volume_type,
       :kms_key_id,
       :throughput,
+      :outpost_arn,
       :encrypted)
       SENSITIVE = []
       include Aws::Structure
@@ -27444,7 +27650,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] tag_specifications
-    #   The tags to apply to the image being exported.
+    #   The tags to apply to the export image task during creation.
     #   @return [Array<Types::TagSpecification>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ExportImageRequest AWS API Documentation
@@ -27501,7 +27707,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] tags
-    #   Any tags assigned to the image being exported.
+    #   Any tags assigned to the export image task.
     #   @return [Array<Types::Tag>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ExportImageResult AWS API Documentation
@@ -27553,7 +27759,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] tags
-    #   Any tags assigned to the image being exported.
+    #   Any tags assigned to the export image task.
     #   @return [Array<Types::Tag>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ExportImageTask AWS API Documentation
@@ -27571,7 +27777,7 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Describes an instance export task.
+    # Describes an export instance task.
     #
     # @!attribute [rw] description
     #   A description of the resource being exported.
@@ -27661,7 +27867,7 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Describes the format and location for an instance export task.
+    # Describes the format and location for the export task.
     #
     # @!attribute [rw] container_format
     #   The container format used to combine disk images with metadata (such
@@ -27693,7 +27899,7 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Describes an instance export task.
+    # Describes an export instance task.
     #
     # @note When making an API call, you may pass ExportToS3TaskSpecification
     #   data as a hash:
@@ -27892,28 +28098,7 @@ module Aws::EC2
     # A filter name and value pair that is used to return a more specific
     # list of results from a describe operation. Filters can be used to
     # match a set of resources by specific criteria, such as tags,
-    # attributes, or IDs. The filters supported by a describe operation are
-    # documented with the describe operation. For example:
-    #
-    # * DescribeAvailabilityZones
-    #
-    # * DescribeImages
-    #
-    # * DescribeInstances
-    #
-    # * DescribeKeyPairs
-    #
-    # * DescribeSecurityGroups
-    #
-    # * DescribeSnapshots
-    #
-    # * DescribeSubnets
-    #
-    # * DescribeTags
-    #
-    # * DescribeVolumes
-    #
-    # * DescribeVpcs
+    # attributes, or IDs.
     #
     # @note When making an API call, you may pass Filter
     #   data as a hash:
@@ -28034,7 +28219,13 @@ module Aws::EC2
     #   @return [Time]
     #
     # @!attribute [rw] replace_unhealthy_instances
-    #   Indicates whether EC2 Fleet should replace unhealthy instances.
+    #   Indicates whether EC2 Fleet should replace unhealthy Spot Instances.
+    #   Supported only for fleets of type `maintain`. For more information,
+    #   see [EC2 Fleet health checks][1] in the *Amazon EC2 User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/manage-ec2-fleet.html#ec2-fleet-health-checks
     #   @return [Boolean]
     #
     # @!attribute [rw] spot_options
@@ -28182,13 +28373,22 @@ module Aws::EC2
     #   @return [Float]
     #
     # @!attribute [rw] priority
-    #   The priority for the launch template override. If
-    #   **AllocationStrategy** is set to `prioritized`, EC2 Fleet uses
-    #   priority to determine which launch template override to use first in
-    #   fulfilling On-Demand capacity. The highest priority is launched
-    #   first. Valid values are whole numbers starting at `0`. The lower the
+    #   The priority for the launch template override. The highest priority
+    #   is launched first.
+    #
+    #   If the On-Demand `AllocationStrategy` is set to `prioritized`, EC2
+    #   Fleet uses priority to determine which launch template override to
+    #   use first in fulfilling On-Demand capacity.
+    #
+    #   If the Spot `AllocationStrategy` is set to
+    #   `capacity-optimized-prioritized`, EC2 Fleet uses priority on a
+    #   best-effort basis to determine which launch template override to use
+    #   first in fulfilling Spot capacity, but optimizes for capacity first.
+    #
+    #   Valid values are whole numbers starting at `0`. The lower the
     #   number, the higher the priority. If no number is set, the override
-    #   has the lowest priority.
+    #   has the lowest priority. You can set the same priority for different
+    #   launch template overrides.
     #   @return [Float]
     #
     # @!attribute [rw] placement
@@ -28258,13 +28458,22 @@ module Aws::EC2
     #   @return [Float]
     #
     # @!attribute [rw] priority
-    #   The priority for the launch template override. If
-    #   **AllocationStrategy** is set to `prioritized`, EC2 Fleet uses
-    #   priority to determine which launch template override to use first in
-    #   fulfilling On-Demand capacity. The highest priority is launched
-    #   first. Valid values are whole numbers starting at `0`. The lower the
+    #   The priority for the launch template override. The highest priority
+    #   is launched first.
+    #
+    #   If the On-Demand `AllocationStrategy` is set to `prioritized`, EC2
+    #   Fleet uses priority to determine which launch template override to
+    #   use first in fulfilling On-Demand capacity.
+    #
+    #   If the Spot `AllocationStrategy` is set to
+    #   `capacity-optimized-prioritized`, EC2 Fleet uses priority on a
+    #   best-effort basis to determine which launch template override to use
+    #   first in fulfilling Spot capacity, but optimizes for capacity first.
+    #
+    #   Valid values are whole numbers starting at `0`. The lower the
     #   number, the higher the priority. If no number is set, the launch
-    #   template override has the lowest priority.
+    #   template override has the lowest priority. You can set the same
+    #   priority for different launch template overrides.
     #   @return [Float]
     #
     # @!attribute [rw] placement
@@ -31094,7 +31303,7 @@ module Aws::EC2
     # @!attribute [rw] format
     #   The format of the disk image being imported.
     #
-    #   Valid values: `OVA` \| `VHD` \| `VHDX` \|`VMDK`
+    #   Valid values: `OVA` \| `VHD` \| `VHDX` \| `VMDK` \| `RAW`
     #   @return [String]
     #
     # @!attribute [rw] snapshot_id
@@ -31383,7 +31592,7 @@ module Aws::EC2
     #   @return [Array<Types::ImportImageLicenseConfigurationRequest>]
     #
     # @!attribute [rw] tag_specifications
-    #   The tags to apply to the image being imported.
+    #   The tags to apply to the import image task during creation.
     #   @return [Array<Types::TagSpecification>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImportImageRequest AWS API Documentation
@@ -31466,7 +31675,7 @@ module Aws::EC2
     #   @return [Array<Types::ImportImageLicenseConfigurationResponse>]
     #
     # @!attribute [rw] tags
-    #   Any tags assigned to the image being imported.
+    #   Any tags assigned to the import image task.
     #   @return [Array<Types::Tag>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImportImageResult AWS API Documentation
@@ -32045,7 +32254,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] tag_specifications
-    #   The tags to apply to the snapshot being imported.
+    #   The tags to apply to the import snapshot task during creation.
     #   @return [Array<Types::TagSpecification>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImportSnapshotRequest AWS API Documentation
@@ -32077,7 +32286,7 @@ module Aws::EC2
     #   @return [Types::SnapshotTaskDetail]
     #
     # @!attribute [rw] tags
-    #   Any tags assigned to the snapshot being imported.
+    #   Any tags assigned to the import snapshot task.
     #   @return [Array<Types::Tag>]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImportSnapshotResult AWS API Documentation
@@ -34275,6 +34484,9 @@ module Aws::EC2
     #
     # @!attribute [rw] user_id
     #   The AWS account ID.
+    #
+    #   Constraints: Up to 10 000 account IDs can be specified in a single
+    #   request.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/LaunchPermission AWS API Documentation
@@ -34500,8 +34712,8 @@ module Aws::EC2
     #   @return [Types::LaunchTemplateEbsBlockDevice]
     #
     # @!attribute [rw] no_device
-    #   Suppresses the specified device included in the block device mapping
-    #   of the AMI.
+    #   To omit the device from the block device mapping, specify an empty
+    #   string.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/LaunchTemplateBlockDeviceMapping AWS API Documentation
@@ -34555,8 +34767,8 @@ module Aws::EC2
     #   @return [Types::LaunchTemplateEbsBlockDeviceRequest]
     #
     # @!attribute [rw] no_device
-    #   Suppresses the specified device included in the block device mapping
-    #   of the AMI.
+    #   To omit the device from the block device mapping, specify an empty
+    #   string.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/LaunchTemplateBlockDeviceMappingRequest AWS API Documentation
@@ -34831,9 +35043,9 @@ module Aws::EC2
     #   [Instances built on the Nitro System][1]. Other instance families
     #   guarantee performance up to 32,000 IOPS.
     #
-    #   This parameter is required for `io1` and `io2` volumes. The default
-    #   for `gp3` volumes is 3,000 IOPS. This parameter is not supported for
-    #   `gp2`, `st1`, `sc1`, or `standard` volumes.
+    #   This parameter is supported for `io1`, `io2`, and `gp3` volumes
+    #   only. This parameter is not supported for `gp2`, `st1`, `sc1`, or
+    #   `standard` volumes.
     #
     #
     #
@@ -34851,11 +35063,8 @@ module Aws::EC2
     #
     # @!attribute [rw] volume_size
     #   The size of the volume, in GiBs. You must specify either a snapshot
-    #   ID or a volume size. If you specify a snapshot, the default is the
-    #   snapshot size. You can specify a volume size that is equal to or
-    #   larger than the snapshot size.
-    #
-    #   The following are the supported volumes sizes for each volume type:
+    #   ID or a volume size. The following are the supported volumes sizes
+    #   for each volume type:
     #
     #   * `gp2` and `gp3`\: 1-16,384
     #
@@ -34867,9 +35076,8 @@ module Aws::EC2
     #   @return [Integer]
     #
     # @!attribute [rw] volume_type
-    #   The volume type. The default is `gp2`. For more information, see
-    #   [Amazon EBS volume types][1] in the *Amazon Elastic Compute Cloud
-    #   User Guide*.
+    #   The volume type. For more information, see [Amazon EBS volume
+    #   types][1] in the *Amazon Elastic Compute Cloud User Guide*.
     #
     #
     #
@@ -35585,13 +35793,22 @@ module Aws::EC2
     #   @return [Float]
     #
     # @!attribute [rw] priority
-    #   The priority for the launch template override. If
-    #   **OnDemandAllocationStrategy** is set to `prioritized`, Spot Fleet
+    #   The priority for the launch template override. The highest priority
+    #   is launched first.
+    #
+    #   If `OnDemandAllocationStrategy` is set to `prioritized`, Spot Fleet
     #   uses priority to determine which launch template override to use
-    #   first in fulfilling On-Demand capacity. The highest priority is
-    #   launched first. Valid values are whole numbers starting at `0`. The
-    #   lower the number, the higher the priority. If no number is set, the
-    #   launch template override has the lowest priority.
+    #   first in fulfilling On-Demand capacity.
+    #
+    #   If the Spot `AllocationStrategy` is set to
+    #   `capacityOptimizedPrioritized`, Spot Fleet uses priority on a
+    #   best-effort basis to determine which launch template override to use
+    #   first in fulfilling Spot capacity, but optimizes for capacity first.
+    #
+    #   Valid values are whole numbers starting at `0`. The lower the
+    #   number, the higher the priority. If no number is set, the launch
+    #   template override has the lowest priority. You can set the same
+    #   priority for different launch template overrides.
     #   @return [Float]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/LaunchTemplateOverrides AWS API Documentation
@@ -36547,6 +36764,52 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass ModifyAddressAttributeRequest
+    #   data as a hash:
+    #
+    #       {
+    #         allocation_id: "AllocationId", # required
+    #         domain_name: "String",
+    #         dry_run: false,
+    #       }
+    #
+    # @!attribute [rw] allocation_id
+    #   \[EC2-VPC\] The allocation ID.
+    #   @return [String]
+    #
+    # @!attribute [rw] domain_name
+    #   The domain name to modify for the IP address.
+    #   @return [String]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ModifyAddressAttributeRequest AWS API Documentation
+    #
+    class ModifyAddressAttributeRequest < Struct.new(
+      :allocation_id,
+      :domain_name,
+      :dry_run)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] address
+    #   Information about the Elastic IP address.
+    #   @return [Types::AddressAttribute]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ModifyAddressAttributeResult AWS API Documentation
+    #
+    class ModifyAddressAttributeResult < Struct.new(
+      :address)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass ModifyAvailabilityZoneGroupRequest
     #   data as a hash:
     #
@@ -40797,8 +41060,8 @@ module Aws::EC2
     #   @return [Array<Types::NetworkInterfacePrivateIpAddress>]
     #
     # @!attribute [rw] requester_id
-    #   The ID of the entity that launched the instance on your behalf (for
-    #   example, AWS Management Console or Auto Scaling).
+    #   The alias or AWS account ID of the principal or service that created
+    #   the network interface.
     #   @return [String]
     #
     # @!attribute [rw] requester_managed
@@ -42376,6 +42639,31 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # The status of an updated pointer (PTR) record for an Elastic IP
+    # address.
+    #
+    # @!attribute [rw] value
+    #   The value for the PTR record update.
+    #   @return [String]
+    #
+    # @!attribute [rw] status
+    #   The status of the PTR record update.
+    #   @return [String]
+    #
+    # @!attribute [rw] reason
+    #   The reason for the PTR record update.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/PtrUpdateStatus AWS API Documentation
+    #
+    class PtrUpdateStatus < Struct.new(
+      :value,
+      :status,
+      :reason)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Describes an IPv4 address pool.
     #
     # @!attribute [rw] pool_id
@@ -42867,6 +43155,7 @@ module Aws::EC2
     #               volume_type: "standard", # accepts standard, io1, io2, gp2, sc1, st1, gp3
     #               kms_key_id: "String",
     #               throughput: 1,
+    #               outpost_arn: "String",
     #               encrypted: false,
     #             },
     #             no_device: "String",
@@ -42905,6 +43194,20 @@ module Aws::EC2
     #
     # @!attribute [rw] block_device_mappings
     #   The block device mapping entries.
+    #
+    #   If you specify an EBS volume using the ID of an EBS snapshot, you
+    #   can't specify the encryption state of the volume.
+    #
+    #   If you create an AMI on an Outpost, then all backing snapshots must
+    #   be on the same Outpost or in the Region of that Outpost. AMIs on an
+    #   Outpost that include local snapshots can be used to launch instances
+    #   on the same Outpost only. For more information, [ Amazon EBS local
+    #   snapshots on Outposts][1] in the *Amazon Elastic Compute Cloud User
+    #   Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/snapshots-outposts.html#ami
     #   @return [Array<Types::BlockDeviceMapping>]
     #
     # @!attribute [rw] description
@@ -44180,7 +44483,7 @@ module Aws::EC2
     #   @return [Boolean]
     #
     # @!attribute [rw] iam_instance_profile
-    #   The IAM instance profile.
+    #   The name or Amazon Resource Name (ARN) of an IAM instance profile.
     #   @return [Types::LaunchTemplateIamInstanceProfileSpecificationRequest]
     #
     # @!attribute [rw] block_device_mappings
@@ -44417,7 +44720,7 @@ module Aws::EC2
     #       {
     #         dry_run: false,
     #         spot_fleet_request_config: { # required
-    #           allocation_strategy: "lowestPrice", # accepts lowestPrice, diversified, capacityOptimized
+    #           allocation_strategy: "lowestPrice", # accepts lowestPrice, diversified, capacityOptimized, capacityOptimizedPrioritized
     #           on_demand_allocation_strategy: "lowestPrice", # accepts lowestPrice, prioritized
     #           spot_maintenance_strategies: {
     #             capacity_rebalance: {
@@ -44450,6 +44753,7 @@ module Aws::EC2
     #                     volume_type: "standard", # accepts standard, io1, io2, gp2, sc1, st1, gp3
     #                     kms_key_id: "String",
     #                     throughput: 1,
+    #                     outpost_arn: "String",
     #                     encrypted: false,
     #                   },
     #                   no_device: "String",
@@ -44641,6 +44945,7 @@ module Aws::EC2
     #                 volume_type: "standard", # accepts standard, io1, io2, gp2, sc1, st1, gp3
     #                 kms_key_id: "String",
     #                 throughput: 1,
+    #                 outpost_arn: "String",
     #                 encrypted: false,
     #               },
     #               no_device: "String",
@@ -44901,6 +45206,7 @@ module Aws::EC2
     #               volume_type: "standard", # accepts standard, io1, io2, gp2, sc1, st1, gp3
     #               kms_key_id: "String",
     #               throughput: 1,
+    #               outpost_arn: "String",
     #               encrypted: false,
     #             },
     #             no_device: "String",
@@ -45585,6 +45891,52 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @note When making an API call, you may pass ResetAddressAttributeRequest
+    #   data as a hash:
+    #
+    #       {
+    #         allocation_id: "AllocationId", # required
+    #         attribute: "domain-name", # required, accepts domain-name
+    #         dry_run: false,
+    #       }
+    #
+    # @!attribute [rw] allocation_id
+    #   \[EC2-VPC\] The allocation ID.
+    #   @return [String]
+    #
+    # @!attribute [rw] attribute
+    #   The attribute of the IP address.
+    #   @return [String]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request, and provides an error response.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ResetAddressAttributeRequest AWS API Documentation
+    #
+    class ResetAddressAttributeRequest < Struct.new(
+      :allocation_id,
+      :attribute,
+      :dry_run)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] address
+    #   Information about the IP address.
+    #   @return [Types::AddressAttribute]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ResetAddressAttributeResult AWS API Documentation
+    #
+    class ResetAddressAttributeResult < Struct.new(
+      :address)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @note When making an API call, you may pass ResetEbsDefaultKmsKeyIdRequest
     #   data as a hash:
     #
@@ -46679,6 +47031,7 @@ module Aws::EC2
     #               volume_type: "standard", # accepts standard, io1, io2, gp2, sc1, st1, gp3
     #               kms_key_id: "String",
     #               throughput: 1,
+    #               outpost_arn: "String",
     #               encrypted: false,
     #             },
     #             no_device: "String",
@@ -47046,7 +47399,7 @@ module Aws::EC2
     #   @return [Boolean]
     #
     # @!attribute [rw] iam_instance_profile
-    #   The IAM instance profile.
+    #   The name or Amazon Resource Name (ARN) of an IAM instance profile.
     #   @return [Types::IamInstanceProfileSpecification]
     #
     # @!attribute [rw] instance_initiated_shutdown_behavior
@@ -48890,6 +49243,16 @@ module Aws::EC2
     #   console.
     #   @return [String]
     #
+    # @!attribute [rw] outpost_arn
+    #   The ARN of the AWS Outpost on which the snapshot is stored. For more
+    #   information, see [EBS Local Snapshot on Outposts][1] in the *Amazon
+    #   Elastic Compute Cloud User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/snapshots-outposts.html
+    #   @return [String]
+    #
     # @!attribute [rw] tags
     #   Any tags assigned to the snapshot.
     #   @return [Array<Types::Tag>]
@@ -48910,6 +49273,7 @@ module Aws::EC2
       :volume_id,
       :volume_size,
       :owner_alias,
+      :outpost_arn,
       :tags)
       SENSITIVE = []
       include Aws::Structure
@@ -48996,7 +49360,7 @@ module Aws::EC2
     # @!attribute [rw] format
     #   The format of the disk image being imported.
     #
-    #   Valid values: `VHD` \| `VMDK`
+    #   Valid values: `VHD` \| `VMDK` \| `RAW`
     #   @return [String]
     #
     # @!attribute [rw] url
@@ -49063,6 +49427,16 @@ module Aws::EC2
     #   Snapshot id that can be used to describe this snapshot.
     #   @return [String]
     #
+    # @!attribute [rw] outpost_arn
+    #   The ARN of the AWS Outpost on which the snapshot is stored. For more
+    #   information, see [EBS Local Snapshot on Outposts][1] in the *Amazon
+    #   Elastic Compute Cloud User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/snapshots-outposts.html
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/SnapshotInfo AWS API Documentation
     #
     class SnapshotInfo < Struct.new(
@@ -49075,7 +49449,8 @@ module Aws::EC2
       :start_time,
       :progress,
       :owner_id,
-      :snapshot_id)
+      :snapshot_id,
+      :outpost_arn)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -49253,6 +49628,7 @@ module Aws::EC2
     #               volume_type: "standard", # accepts standard, io1, io2, gp2, sc1, st1, gp3
     #               kms_key_id: "String",
     #               throughput: 1,
+    #               outpost_arn: "String",
     #               encrypted: false,
     #             },
     #             no_device: "String",
@@ -49532,7 +49908,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         allocation_strategy: "lowestPrice", # accepts lowestPrice, diversified, capacityOptimized
+    #         allocation_strategy: "lowestPrice", # accepts lowestPrice, diversified, capacityOptimized, capacityOptimizedPrioritized
     #         on_demand_allocation_strategy: "lowestPrice", # accepts lowestPrice, prioritized
     #         spot_maintenance_strategies: {
     #           capacity_rebalance: {
@@ -49565,6 +49941,7 @@ module Aws::EC2
     #                   volume_type: "standard", # accepts standard, io1, io2, gp2, sc1, st1, gp3
     #                   kms_key_id: "String",
     #                   throughput: 1,
+    #                   outpost_arn: "String",
     #                   encrypted: false,
     #                 },
     #                 no_device: "String",
@@ -49704,9 +50081,19 @@ module Aws::EC2
     #   If the allocation strategy is `diversified`, Spot Fleet launches
     #   instances from all the Spot Instance pools that you specify.
     #
-    #   If the allocation strategy is `capacityOptimized`, Spot Fleet
-    #   launches instances from Spot Instance pools with optimal capacity
-    #   for the number of instances that are launching.
+    #   If the allocation strategy is `capacityOptimized` (recommended),
+    #   Spot Fleet launches instances from Spot Instance pools with optimal
+    #   capacity for the number of instances that are launching. To give
+    #   certain instance types a higher chance of launching first, use
+    #   `capacityOptimizedPrioritized`. Set a priority for each instance
+    #   type by using the `Priority` parameter for
+    #   `LaunchTemplateOverrides`. You can assign the same priority to
+    #   different `LaunchTemplateOverrides`. EC2 implements the priorities
+    #   on a best-effort basis, but optimizes for capacity first.
+    #   `capacityOptimizedPrioritized` is supported only if your Spot Fleet
+    #   uses a launch template. Note that if the
+    #   `OnDemandAllocationStrategy` is set to `prioritized`, the same
+    #   priority is applied when fulfilling On-Demand capacity.
     #   @return [String]
     #
     # @!attribute [rw] on_demand_allocation_strategy
@@ -50267,9 +50654,19 @@ module Aws::EC2
     #   If the allocation strategy is `diversified`, EC2 Fleet launches
     #   instances from all of the Spot Instance pools that you specify.
     #
-    #   If the allocation strategy is `capacity-optimized`, EC2 Fleet
-    #   launches instances from Spot Instance pools with optimal capacity
-    #   for the number of instances that are launching.
+    #   If the allocation strategy is `capacity-optimized` (recommended),
+    #   EC2 Fleet launches instances from Spot Instance pools with optimal
+    #   capacity for the number of instances that are launching. To give
+    #   certain instance types a higher chance of launching first, use
+    #   `capacity-optimized-prioritized`. Set a priority for each instance
+    #   type by using the `Priority` parameter for
+    #   `LaunchTemplateOverrides`. You can assign the same priority to
+    #   different `LaunchTemplateOverrides`. EC2 implements the priorities
+    #   on a best-effort basis, but optimizes for capacity first.
+    #   `capacity-optimized-prioritized` is supported only if your fleet
+    #   uses a launch template. Note that if the On-Demand
+    #   `AllocationStrategy` is set to `prioritized`, the same priority is
+    #   applied when fulfilling On-Demand capacity.
     #   @return [String]
     #
     # @!attribute [rw] maintenance_strategies
@@ -50334,7 +50731,7 @@ module Aws::EC2
     #   data as a hash:
     #
     #       {
-    #         allocation_strategy: "lowest-price", # accepts lowest-price, diversified, capacity-optimized
+    #         allocation_strategy: "lowest-price", # accepts lowest-price, diversified, capacity-optimized, capacity-optimized-prioritized
     #         maintenance_strategies: {
     #           capacity_rebalance: {
     #             replacement_strategy: "launch", # accepts launch
@@ -50359,9 +50756,19 @@ module Aws::EC2
     #   If the allocation strategy is `diversified`, EC2 Fleet launches
     #   instances from all of the Spot Instance pools that you specify.
     #
-    #   If the allocation strategy is `capacity-optimized`, EC2 Fleet
-    #   launches instances from Spot Instance pools with optimal capacity
-    #   for the number of instances that are launching.
+    #   If the allocation strategy is `capacity-optimized` (recommended),
+    #   EC2 Fleet launches instances from Spot Instance pools with optimal
+    #   capacity for the number of instances that are launching. To give
+    #   certain instance types a higher chance of launching first, use
+    #   `capacity-optimized-prioritized`. Set a priority for each instance
+    #   type by using the `Priority` parameter for
+    #   `LaunchTemplateOverrides`. You can assign the same priority to
+    #   different `LaunchTemplateOverrides`. EC2 implements the priorities
+    #   on a best-effort basis, but optimizes for capacity first.
+    #   `capacity-optimized-prioritized` is supported only if your fleet
+    #   uses a launch template. Note that if the On-Demand
+    #   `AllocationStrategy` is set to `prioritized`, the same priority is
+    #   applied when fulfilling On-Demand capacity.
     #   @return [String]
     #
     # @!attribute [rw] maintenance_strategies