aws-sdk-ec2 1.306.0 → 1.309.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a05de3da3b87f32d7f4d0559418c57bf203dc9b02a8cc54b447d9139f74a8f6
-  data.tar.gz: 0ae2278de55efe1b0ca7144a638ec229db8d3903f64510faead445ad7066b71f
+  metadata.gz: 2e285a4ec10318bc908bea452a07179d6083076c04c1e9f98ccc560bceb99889
+  data.tar.gz: 5b4b2f2a824da32e96c119e1e8e8b9d9a82aed3003f35e8cb309813e17cea6b2
 SHA512:
-  metadata.gz: e95459f6e8a8ba7c629e463977ef7f9e6a1a38740be190faa1ca6581e82f33c7bfb6ede8142da1625ff9a26cb3f65d39c60e95362088cbd2c5d610a074c96c0a
-  data.tar.gz: 9eaec01e181f0ef74b90b037d54b55d340a974b0776f26ce88b1c566a4ab83fe107f8acf177499e20067a85964624aa88051255f03863d5ffbd77759c90835bb
+  metadata.gz: c99bb361a69770847fda20d0f8dfd8be23887472077901ad63e4ef4952a0e1f6a72ad487cc81b82f2f1400ecc026a46d197f62d51433090beb7c560a83a3fce5
+  data.tar.gz: ea4719f3d4e8a0343b54aed166361d3015e9cfb1a3602300e4cf3d3794593a01c4b519be4b4f535304c1de3e82d82d080c2243f8f201f0729efea90894fb1c9f

data/CHANGELOG.md

@@ -1,6 +1,21 @@
 Unreleased Changes
 ------------------
 
+1.309.0 (2022-04-28)
+------------------
+
+* Feature - This release adds support to query the public key and creation date of EC2 Key Pairs. Additionally, the format (pem or ppk) of a key pair can be specified when creating a new key pair.
+
+1.308.0 (2022-04-22)
+------------------
+
+* Feature - Adds support for waiters that automatically poll for a deleted NAT Gateway until it reaches the deleted state.
+
+1.307.0 (2022-04-14)
+------------------
+
+* Feature - Documentation updates for Amazon EC2.
+
 1.306.0 (2022-04-12)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.306.0
+1.309.0

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

@@ -4976,32 +4976,18 @@ module Aws::EC2
     # For devices that use Border Gateway Protocol (BGP), you can also
     # provide the device's BGP Autonomous System Number (ASN). You can use
     # an existing ASN assigned to your network. If you don't have an ASN
-    # already, you can use a private ASN (in the 64512 - 65534 range).
-    #
-    # <note markdown="1"> Amazon EC2 supports all 4-byte ASN numbers in the range of 1 -
-    # 2147483647, with the exception of the following:
-    #
-    #  * 7224 - reserved in the `us-east-1` Region
-    #
-    # * 9059 - reserved in the `eu-west-1` Region
-    #
-    # * 17943 - reserved in the `ap-southeast-1` Region
-    #
-    # * 10124 - reserved in the `ap-northeast-1` Region
-    #
-    #  </note>
-    #
-    # For more information, see [Amazon Web Services Site-to-Site VPN][1] in
+    # already, you can use a private ASN. For more information, see
+    # [Customer gateway options for your Site-to-Site VPN connection][1] in
     # the *Amazon Web Services Site-to-Site VPN User Guide*.
     #
     # To create more than one customer gateway with the same VPN type, IP
     # address, and BGP ASN, specify a unique device name for each customer
-    # gateway. Identical requests return information about the existing
-    # customer gateway and do not create new customer gateways.
+    # gateway. An identical request returns information about the existing
+    # customer gateway; it doesn't create a new customer gateway.
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/vpn/latest/s2svpn/VPC_VPN.html
+    # [1]: https://docs.aws.amazon.com/vpn/latest/s2svpn/cgw-options.html
     #
     # @option params [required, Integer] :bgp_asn
     #   For devices that support BGP, the customer gateway's BGP ASN.
@@ -6121,12 +6107,17 @@ module Aws::EC2
     # Creates an Amazon EBS-backed AMI from an Amazon EBS-backed instance
     # that is either running or stopped.
     #
-    # By default, Amazon EC2 shuts down and reboots the instance before
-    # creating the AMI to ensure that everything on the instance is stopped
-    # and in a consistent state during the creation process. If you're
-    # confident that your instance is in a consistent state appropriate for
-    # AMI creation, use the **NoReboot** parameter to prevent Amazon EC2
-    # from shutting down and rebooting the instance.
+    # By default, when Amazon EC2 creates the new AMI, it reboots the
+    # instance so that it can take snapshots of the attached volumes while
+    # data is at rest, in order to ensure a consistent state. You can set
+    # the `NoReboot` parameter to `true` in the API request, or use the
+    # `--no-reboot` option in the CLI to prevent Amazon EC2 from shutting
+    # down and rebooting the instance.
+    #
+    # If you choose to bypass the shutdown and reboot process by setting the
+    # `NoReboot` parameter to `true` in the API request, or by using the
+    # `--no-reboot` option in the CLI, we can't guarantee the file system
+    # integrity of the created image.
     #
     # If you customized your instance with instance store volumes or Amazon
     # EBS volumes in addition to the root device volume, the new AMI
@@ -6166,13 +6157,19 @@ module Aws::EC2
     #   single quotes ('), at-signs (@), or underscores(\_)
     #
     # @option params [Boolean] :no_reboot
-    #   By default, Amazon EC2 attempts to shut down and reboot the instance
-    #   before creating the image. If the `No Reboot` option is set, Amazon
-    #   EC2 doesn't shut down the instance before creating the image. Without
-    #   a reboot, the AMI will be crash consistent (all the volumes are
-    #   snapshotted at the same time), but not application consistent (all the
-    #   operating system buffers are not flushed to disk before the snapshots
-    #   are created).
+    #   By default, when Amazon EC2 creates the new AMI, it reboots the
+    #   instance so that it can take snapshots of the attached volumes while
+    #   data is at rest, in order to ensure a consistent state. You can set
+    #   the `NoReboot` parameter to `true` in the API request, or use the
+    #   `--no-reboot` option in the CLI to prevent Amazon EC2 from shutting
+    #   down and rebooting the instance.
+    #
+    #   If you choose to bypass the shutdown and reboot process by setting the
+    #   `NoReboot` parameter to `true` in the API request, or by using the
+    #   `--no-reboot` option in the CLI, we can't guarantee the file system
+    #   integrity of the created image.
+    #
+    #   Default: `false` (follow standard reboot process)
     #
     # @option params [Array<Types::TagSpecification>] :tag_specifications
     #   The tags to apply to the AMI and snapshots on creation. You can tag
@@ -6578,7 +6575,7 @@ module Aws::EC2
       req.send_request(options)
     end
 
-    # Create an IPAM. Amazon VCP IP Address Manager (IPAM) is a VPC feature
+    # Create an IPAM. Amazon VPC IP Address Manager (IPAM) is a VPC feature
     # that you can use to automate your IP address management workflows
     # including assigning, tracking, troubleshooting, and auditing IP
     # addresses across Amazon Web Services Regions and accounts throughout
@@ -6962,11 +6959,13 @@ module Aws::EC2
       req.send_request(options)
     end
 
-    # Creates an ED25519 or 2048-bit RSA key pair with the specified name.
-    # Amazon EC2 stores the public key and displays the private key for you
-    # to save to a file. The private key is returned as an unencrypted PEM
-    # encoded PKCS#1 private key. If a key with the specified name already
-    # exists, Amazon EC2 returns an error.
+    # Creates an ED25519 or 2048-bit RSA key pair with the specified name
+    # and in the specified PEM or PPK format. Amazon EC2 stores the public
+    # key and displays the private key for you to save to a file. The
+    # private key is returned as an unencrypted PEM encoded PKCS#1 private
+    # key or an unencrypted PPK formatted private key for use with PuTTY. If
+    # a key with the specified name already exists, Amazon EC2 returns an
+    # error.
     #
     # The key pair returned to you is available only in the Amazon Web
     # Services Region in which you create it. If you prefer, you can create
@@ -6995,13 +6994,18 @@ module Aws::EC2
     #
     # @option params [String] :key_type
     #   The type of key pair. Note that ED25519 keys are not supported for
-    #   Windows instances, EC2 Instance Connect, and EC2 Serial Console.
+    #   Windows instances.
     #
     #   Default: `rsa`
     #
     # @option params [Array<Types::TagSpecification>] :tag_specifications
     #   The tags to apply to the new key pair.
     #
+    # @option params [String] :key_format
+    #   The format of the key pair.
+    #
+    #   Default: `pem`
+    #
     # @return [Types::KeyPair] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::KeyPair#key_fingerprint #key_fingerprint} => String
@@ -7036,6 +7040,7 @@ module Aws::EC2
     #         ],
     #       },
     #     ],
+    #     key_format: "pem", # accepts pem, ppk
     #   })
     #
     # @example Response structure
@@ -7057,16 +7062,24 @@ module Aws::EC2
       req.send_request(options)
     end
 
-    # Creates a launch template. A launch template contains the parameters
-    # to launch an instance. When you launch an instance using RunInstances,
-    # you can specify a launch template instead of providing the launch
-    # parameters in the request. For more information, see [Launching an
-    # instance from a launch template][1] in the *Amazon Elastic Compute
-    # Cloud User Guide*.
+    # Creates a launch template.
+    #
+    # A launch template contains the parameters to launch an instance. When
+    # you launch an instance using RunInstances, you can specify a launch
+    # template instead of providing the launch parameters in the request.
+    # For more information, see [Launching an instance from a launch
+    # template][1] in the *Amazon Elastic Compute Cloud User Guide*.
+    #
+    # If you want to clone an existing launch template as the basis for
+    # creating a new launch template, you can use the Amazon EC2 console.
+    # The API, SDKs, and CLI do not support cloning a template. For more
+    # information, see [Create a launch template from an existing launch
+    # template][2] in the *Amazon Elastic Compute Cloud User Guide*.
     #
     #
     #
     # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html
+    # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html#create-launch-template-from-existing-launch-template
     #
     # @option params [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
@@ -12398,29 +12411,12 @@ module Aws::EC2
     # you to create a private connection between your VPC and the service.
     # The service may be provided by Amazon Web Services, an Amazon Web
     # Services Marketplace Partner, or another Amazon Web Services account.
-    # For more information, see [VPC Endpoints][1] in the *Amazon Virtual
-    # Private Cloud User Guide*.
-    #
-    # A `gateway` endpoint serves as a target for a route in your route
-    # table for traffic destined for the Amazon Web Service. You can specify
-    # an endpoint policy to attach to the endpoint, which will control
-    # access to the service from your VPC. You can also specify the VPC
-    # route tables that use the endpoint.
-    #
-    # An `interface` endpoint is a network interface in your subnet that
-    # serves as an endpoint for communicating with the specified service.
-    # You can specify the subnets in which to create an endpoint, and the
-    # security groups to associate with the endpoint network interface.
+    # For more information, see the [Amazon Web Services PrivateLink
+    # Guide][1].
     #
-    # A `GatewayLoadBalancer` endpoint is a network interface in your subnet
-    # that serves an endpoint for communicating with a Gateway Load Balancer
-    # that you've configured as a VPC endpoint service.
     #
-    # Use DescribeVpcEndpointServices to get a list of supported services.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/vpc/latest/userguide/vpc-endpoints.html
+    # [1]: https://docs.aws.amazon.com/vpc/latest/privatelink/
     #
     # @option params [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
@@ -12635,12 +12631,11 @@ module Aws::EC2
       req.send_request(options)
     end
 
-    # Creates a VPC endpoint service configuration to which service
-    # consumers (Amazon Web Services accounts, IAM users, and IAM roles) can
-    # connect.
+    # Creates a VPC endpoint service to which service consumers (Amazon Web
+    # Services accounts, IAM users, and IAM roles) can connect.
     #
-    # To create an endpoint service configuration, you must first create one
-    # of the following for your service:
+    # Before you create an endpoint service, you must create one of the
+    # following for your service:
     #
     # * A [Network Load Balancer][1]. Service consumers connect to your
     #   service using an interface endpoint.
@@ -12648,20 +12643,17 @@ module Aws::EC2
     # * A [Gateway Load Balancer][2]. Service consumers connect to your
     #   service using a Gateway Load Balancer endpoint.
     #
-    # For more information, see [VPC Endpoint Services][3] in the *Amazon
-    # Virtual Private Cloud User Guide*.
-    #
     # If you set the private DNS name, you must prove that you own the
-    # private DNS domain name. For more information, see [VPC Endpoint
-    # Service Private DNS Name Verification][4] in the *Amazon Virtual
-    # Private Cloud User Guide*.
+    # private DNS domain name.
+    #
+    # For more information, see the [Amazon Web Services PrivateLink
+    # Guide][3].
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/elasticloadbalancing/latest/network/introduction.html
-    # [2]: https://docs.aws.amazon.com/elasticloadbalancing/latest/gateway/introduction.html
-    # [3]: https://docs.aws.amazon.com/vpc/latest/userguide/endpoint-service.html
-    # [4]: https://docs.aws.amazon.com/vpc/latest/userguide/endpoint-services-dns-validation.html
+    # [1]: https://docs.aws.amazon.com/elasticloadbalancing/latest/network/
+    # [2]: https://docs.aws.amazon.com/elasticloadbalancing/latest/gateway/
+    # [3]: https://docs.aws.amazon.com/vpc/latest/privatelink/
     #
     # @option params [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
@@ -12671,8 +12663,7 @@ module Aws::EC2
     #
     # @option params [Boolean] :acceptance_required
     #   Indicates whether requests from service consumers to create an
-    #   endpoint to your service must be accepted. To accept a request, use
-    #   AcceptVpcEndpointConnections.
+    #   endpoint to your service must be accepted manually.
     #
     # @option params [String] :private_dns_name
     #   (Interface endpoint configuration) The private DNS name to assign to
@@ -13703,22 +13694,10 @@ module Aws::EC2
     # Delete an IPAM. Deleting an IPAM removes all monitored data associated
     # with the IPAM including the historical data for CIDRs.
     #
-    # <note markdown="1"> You cannot delete an IPAM if there are CIDRs provisioned to pools or
-    # if there are allocations in the pools within the IPAM. To deprovision
-    # pool CIDRs, see [DeprovisionIpamPoolCidr][1]. To release allocations,
-    # see [ReleaseIpamPoolAllocation][2].
-    #
-    #  </note>
-    #
     # For more information, see [Delete an
     # IPAM](/vpc/latest/ipam/delete-ipam.html) in the *Amazon VPC IPAM User
     # Guide*.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DeprovisionIpamPoolCidr.html
-    # [2]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_ReleaseIpamPoolAllocation.html
-    #
     # @option params [Boolean] :dry_run
     #   A check for whether you have the required permissions for the action
     #   without actually making the request and provides an error response. If
@@ -20271,6 +20250,11 @@ module Aws::EC2
     #   * `block-device-mapping.encrypted` - A Boolean that indicates whether
     #     the Amazon EBS volume is encrypted.
     #
+    #   * `creation-date` - The time when the image was created, in the ISO
+    #     8601 format in the UTC time zone (YYYY-MM-DDThh:mm:ss.sssZ), for
+    #     example, `2021-09-29T11:04:43.305Z`. You can use a wildcard (`*`),
+    #     for example, `2021-09-29T*`, which matches an entire day.
+    #
     #   * `description` - The description of the image (provided during image
     #     creation).
     #
@@ -21692,6 +21676,9 @@ module Aws::EC2
     #
     #   * `block-device-mapping.volume-id` - The volume ID of the EBS volume.
     #
+    #   * `capacity-reservation-id` - The ID of the Capacity Reservation into
+    #     which the instance was launched.
+    #
     #   * `client-token` - The idempotency token you provided when you
     #     launched the instance.
     #
@@ -22700,6 +22687,11 @@ module Aws::EC2
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     #
+    # @option params [Boolean] :include_public_key
+    #   If `true`, the public key material is included in the response.
+    #
+    #   Default: `false`
+    #
     # @return [Types::DescribeKeyPairsResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::DescribeKeyPairsResult#key_pairs #key_pairs} => Array&lt;Types::KeyPairInfo&gt;
@@ -22737,6 +22729,7 @@ module Aws::EC2
     #     key_names: ["KeyPairName"],
     #     key_pair_ids: ["KeyPairId"],
     #     dry_run: false,
+    #     include_public_key: false,
     #   })
     #
     # @example Response structure
@@ -22749,6 +22742,8 @@ module Aws::EC2
     #   resp.key_pairs[0].tags #=> Array
     #   resp.key_pairs[0].tags[0].key #=> String
     #   resp.key_pairs[0].tags[0].value #=> String
+    #   resp.key_pairs[0].public_key #=> String
+    #   resp.key_pairs[0].create_time #=> Time
     #
     #
     # The following waiters are defined for this operation (see {Client#wait_until} for detailed usage):
@@ -23561,9 +23556,6 @@ module Aws::EC2
     #   * `local-gateway-virtual-interface-id` - The ID of the virtual
     #     interface.
     #
-    #   * `local-gateway-virtual-interface-group-id` - The ID of the virtual
-    #     interface group.
-    #
     #   * `owner-id` - The ID of the Amazon Web Services account that owns the
     #     local gateway virtual interface.
     #
@@ -24010,6 +24002,7 @@ module Aws::EC2
     # The following waiters are defined for this operation (see {Client#wait_until} for detailed usage):
     #
     #   * nat_gateway_available
+    #   * nat_gateway_deleted
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeNatGateways AWS API Documentation
     #
@@ -28460,7 +28453,7 @@ module Aws::EC2
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-bid-status.html
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-request-status.html
     #
     # @option params [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
@@ -41101,12 +41094,11 @@ module Aws::EC2
     #   destinations.
     #
     # @option params [String] :private_dns_hostname_type_on_launch
-    #   The type of hostnames to assign to instances in the subnet at launch.
-    #   For IPv4 only subnets, an instance DNS name must be based on the
-    #   instance IPv4 address. For IPv6 only subnets, an instance DNS name
-    #   must be based on the instance ID. For dual-stack subnets, you can
-    #   specify whether DNS names use the instance IPv4 address or the
-    #   instance ID.
+    #   The type of hostname to assign to instances in the subnet at launch.
+    #   For IPv4-only and dual-stack (IPv4 and IPv6) subnets, an instance DNS
+    #   name can be based on the instance IPv4 address (ip-name) or the
+    #   instance ID (resource-name). For IPv6 only subnets, an instance DNS
+    #   name must be based on the instance ID (resource-name).
     #
     # @option params [Types::AttributeBooleanValue] :enable_resource_name_dns_a_record_on_launch
     #   Indicates whether to respond to DNS queries for instance hostnames
@@ -41676,9 +41668,10 @@ module Aws::EC2
     # require detaching and reattaching the volume or stopping and
     # restarting the instance.
     #
-    # If you reach the maximum volume modification rate per volume limit,
-    # you must wait at least six hours before applying further modifications
-    # to the affected EBS volume.
+    # After modifying a volume, you must wait at least six hours and ensure
+    # that the volume is in the `in-use` or `available` state before you can
+    # modify the same volume. This is sometimes referred to as a cooldown
+    # period.
     #
     #
     #
@@ -41947,12 +41940,12 @@ module Aws::EC2
 
     # Modifies attributes of a specified VPC endpoint. The attributes that
     # you can modify depend on the type of VPC endpoint (interface, gateway,
-    # or Gateway Load Balancer). For more information, see [VPC
-    # Endpoints][1] in the *Amazon Virtual Private Cloud User Guide*.
+    # or Gateway Load Balancer). For more information, see the [Amazon Web
+    # Services PrivateLink Guide][1].
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/vpc/latest/userguide/vpc-endpoints.html
+    # [1]: https://docs.aws.amazon.com/vpc/latest/privatelink/
     #
     # @option params [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
@@ -42087,13 +42080,7 @@ module Aws::EC2
     # VPC endpoint.
     #
     # If you set or modify the private DNS name, you must prove that you own
-    # the private DNS domain name. For more information, see [VPC Endpoint
-    # Service Private DNS Name Verification][1] in the *Amazon Virtual
-    # Private Cloud User Guide*.
-    #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/vpc/latest/userguide/endpoint-services-dns-validation.html
+    # the private DNS domain name.
     #
     # @option params [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
@@ -42204,19 +42191,15 @@ module Aws::EC2
       req.send_request(options)
     end
 
-    # Modifies the permissions for your [VPC endpoint service][1]. You can
-    # add or remove permissions for service consumers (IAM users, IAM roles,
-    # and Amazon Web Services accounts) to connect to your endpoint service.
+    # Modifies the permissions for your VPC endpoint service. You can add or
+    # remove permissions for service consumers (IAM users, IAM roles, and
+    # Amazon Web Services accounts) to connect to your endpoint service.
     #
     # If you grant permissions to all principals, the service is public. Any
     # users who know the name of a public service can send a request to
     # attach an endpoint. If the service does not require manual approval,
     # attachments are automatically approved.
     #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/vpc/latest/userguide/endpoint-service.html
-    #
     # @option params [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -45007,9 +44990,15 @@ module Aws::EC2
     # For more information, see [Spot Fleet requests][1] in the *Amazon EC2
     # User Guide for Linux Instances*.
     #
+    # We strongly discourage using the RequestSpotFleet API because it is a
+    # legacy API with no planned investment. For options for requesting Spot
+    # Instances, see [Which is the best Spot request method to use?][2] in
+    # the *Amazon EC2 User Guide for Linux Instances*.
+    #
     #
     #
     # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-fleet-requests.html
+    # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-best-practices.html#which-spot-request-method-to-use
     #
     # @option params [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
@@ -45470,9 +45459,15 @@ module Aws::EC2
     # For more information, see [Spot Instance requests][1] in the *Amazon
     # EC2 User Guide for Linux Instances*.
     #
+    # We strongly discourage using the RequestSpotInstances API because it
+    # is a legacy API with no planned investment. For options for requesting
+    # Spot Instances, see [Which is the best Spot request method to use?][2]
+    # in the *Amazon EC2 User Guide for Linux Instances*.
+    #
     #
     #
     # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-requests.html
+    # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-best-practices.html#which-spot-request-method-to-use
     #
     # @option params [String] :availability_zone_group
     #   The user-specified name for a logical grouping of requests.
@@ -47027,12 +47022,12 @@ module Aws::EC2
     #   part of the network interface.
     #
     # @option params [String] :user_data
-    #   The user data to make available to the instance. For more information,
-    #   see [Run commands on your Linux instance at launch][1] and [Run
-    #   commands on your Windows instance at launch][2]. If you are using a
-    #   command line tool, base64-encoding is performed for you, and you can
-    #   load the text from a file. Otherwise, you must provide base64-encoded
-    #   text. User data is limited to 16 KB.
+    #   The user data script to make available to the instance. For more
+    #   information, see [Run commands on your Linux instance at launch][1]
+    #   and [Run commands on your Windows instance at launch][2]. If you are
+    #   using a command line tool, base64-encoding is performed for you, and
+    #   you can load the text from a file. Otherwise, you must provide
+    #   base64-encoded text. User data is limited to 16 KB.
     #
     #
     #
@@ -47332,7 +47327,7 @@ module Aws::EC2
     #     security_group_ids: ["SecurityGroupId"],
     #     security_groups: ["SecurityGroupName"],
     #     subnet_id: "SubnetId",
-    #     user_data: "String",
+    #     user_data: "RunInstancesUserData",
     #     additional_info: "String",
     #     client_token: "String",
     #     disable_api_termination: false,
@@ -48712,12 +48707,7 @@ module Aws::EC2
     # the consumer can use the name to access the service.
     #
     # Before the service provider runs this command, they must add a record
-    # to the DNS server. For more information, see [Adding a TXT Record to
-    # Your Domain's DNS Server ][1] in the *Amazon VPC User Guide*.
-    #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/vpc/latest/userguide/endpoint-services-dns-validation.html#add-dns-txt-record
+    # to the DNS server.
     #
     # @option params [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
@@ -49516,7 +49506,7 @@ module Aws::EC2
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-ec2'
-      context[:gem_version] = '1.306.0'
+      context[:gem_version] = '1.309.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 
@@ -49601,6 +49591,7 @@ module Aws::EC2
     # | internet_gateway_exists         | {Client#describe_internet_gateways}       | 5        | 6             |
     # | key_pair_exists                 | {Client#describe_key_pairs}               | 5        | 6             |
     # | nat_gateway_available           | {Client#describe_nat_gateways}            | 15       | 40            |
+    # | nat_gateway_deleted             | {Client#describe_nat_gateways}            | 15       | 40            |
     # | network_interface_available     | {Client#describe_network_interfaces}      | 20       | 10            |
     # | password_data_available         | {Client#get_password_data}                | 15       | 40            |
     # | security_group_exists           | {Client#describe_security_groups}         | 5        | 6             |
@@ -49684,6 +49675,7 @@ module Aws::EC2
         internet_gateway_exists: Waiters::InternetGatewayExists,
         key_pair_exists: Waiters::KeyPairExists,
         nat_gateway_available: Waiters::NatGatewayAvailable,
+        nat_gateway_deleted: Waiters::NatGatewayDeleted,
         network_interface_available: Waiters::NetworkInterfaceAvailable,
         password_data_available: Waiters::PasswordDataAvailable,
         security_group_exists: Waiters::SecurityGroupExists,

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

@@ -1581,6 +1581,7 @@ module Aws::EC2
     Ipv6RangeList = Shapes::ListShape.new(name: 'Ipv6RangeList')
     Ipv6SupportValue = Shapes::StringShape.new(name: 'Ipv6SupportValue')
     KernelId = Shapes::StringShape.new(name: 'KernelId')
+    KeyFormat = Shapes::StringShape.new(name: 'KeyFormat')
     KeyNameStringList = Shapes::ListShape.new(name: 'KeyNameStringList')
     KeyPair = Shapes::StructureShape.new(name: 'KeyPair')
     KeyPairId = Shapes::StringShape.new(name: 'KeyPairId')
@@ -2230,6 +2231,7 @@ module Aws::EC2
     RuleAction = Shapes::StringShape.new(name: 'RuleAction')
     RunInstancesMonitoringEnabled = Shapes::StructureShape.new(name: 'RunInstancesMonitoringEnabled')
     RunInstancesRequest = Shapes::StructureShape.new(name: 'RunInstancesRequest')
+    RunInstancesUserData = Shapes::StringShape.new(name: 'RunInstancesUserData')
     RunScheduledInstancesRequest = Shapes::StructureShape.new(name: 'RunScheduledInstancesRequest')
     RunScheduledInstancesResult = Shapes::StructureShape.new(name: 'RunScheduledInstancesResult')
     S3ObjectTag = Shapes::StructureShape.new(name: 'S3ObjectTag')
@@ -4074,6 +4076,7 @@ module Aws::EC2
     CreateKeyPairRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     CreateKeyPairRequest.add_member(:key_type, Shapes::ShapeRef.new(shape: KeyType, location_name: "KeyType"))
     CreateKeyPairRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
+    CreateKeyPairRequest.add_member(:key_format, Shapes::ShapeRef.new(shape: KeyFormat, location_name: "KeyFormat"))
     CreateKeyPairRequest.struct_class = Types::CreateKeyPairRequest
 
     CreateLaunchTemplateRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
@@ -5771,6 +5774,7 @@ module Aws::EC2
     DescribeKeyPairsRequest.add_member(:key_names, Shapes::ShapeRef.new(shape: KeyNameStringList, location_name: "KeyName"))
     DescribeKeyPairsRequest.add_member(:key_pair_ids, Shapes::ShapeRef.new(shape: KeyPairIdStringList, location_name: "KeyPairId"))
     DescribeKeyPairsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
+    DescribeKeyPairsRequest.add_member(:include_public_key, Shapes::ShapeRef.new(shape: Boolean, location_name: "IncludePublicKey"))
     DescribeKeyPairsRequest.struct_class = Types::DescribeKeyPairsRequest
 
     DescribeKeyPairsResult.add_member(:key_pairs, Shapes::ShapeRef.new(shape: KeyPairList, location_name: "keySet"))
@@ -8970,6 +8974,8 @@ module Aws::EC2
     KeyPairInfo.add_member(:key_name, Shapes::ShapeRef.new(shape: String, location_name: "keyName"))
     KeyPairInfo.add_member(:key_type, Shapes::ShapeRef.new(shape: KeyType, location_name: "keyType"))
     KeyPairInfo.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
+    KeyPairInfo.add_member(:public_key, Shapes::ShapeRef.new(shape: String, location_name: "publicKey"))
+    KeyPairInfo.add_member(:create_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "createTime"))
     KeyPairInfo.struct_class = Types::KeyPairInfo
 
     KeyPairList.member = Shapes::ShapeRef.new(shape: KeyPairInfo, location_name: "item")
@@ -11494,7 +11500,7 @@ module Aws::EC2
     RunInstancesRequest.add_member(:security_group_ids, Shapes::ShapeRef.new(shape: SecurityGroupIdStringList, location_name: "SecurityGroupId"))
     RunInstancesRequest.add_member(:security_groups, Shapes::ShapeRef.new(shape: SecurityGroupStringList, location_name: "SecurityGroup"))
     RunInstancesRequest.add_member(:subnet_id, Shapes::ShapeRef.new(shape: SubnetId, location_name: "SubnetId"))
-    RunInstancesRequest.add_member(:user_data, Shapes::ShapeRef.new(shape: String, location_name: "UserData"))
+    RunInstancesRequest.add_member(:user_data, Shapes::ShapeRef.new(shape: RunInstancesUserData, location_name: "UserData"))
     RunInstancesRequest.add_member(:additional_info, Shapes::ShapeRef.new(shape: String, location_name: "additionalInfo"))
     RunInstancesRequest.add_member(:client_token, Shapes::ShapeRef.new(shape: String, location_name: "clientToken", metadata: {"idempotencyToken"=>true}))
     RunInstancesRequest.add_member(:disable_api_termination, Shapes::ShapeRef.new(shape: Boolean, location_name: "disableApiTermination"))

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

@@ -745,13 +745,19 @@ module Aws::EC2
     #   brackets (\[\]), spaces ( ), periods (.), slashes (/), dashes (-),
     #   single quotes ('), at-signs (@), or underscores(\_)
     # @option options [Boolean] :no_reboot
-    #   By default, Amazon EC2 attempts to shut down and reboot the instance
-    #   before creating the image. If the `No Reboot` option is set, Amazon
-    #   EC2 doesn't shut down the instance before creating the image. Without
-    #   a reboot, the AMI will be crash consistent (all the volumes are
-    #   snapshotted at the same time), but not application consistent (all the
-    #   operating system buffers are not flushed to disk before the snapshots
-    #   are created).
+    #   By default, when Amazon EC2 creates the new AMI, it reboots the
+    #   instance so that it can take snapshots of the attached volumes while
+    #   data is at rest, in order to ensure a consistent state. You can set
+    #   the `NoReboot` parameter to `true` in the API request, or use the
+    #   `--no-reboot` option in the CLI to prevent Amazon EC2 from shutting
+    #   down and rebooting the instance.
+    #
+    #   If you choose to bypass the shutdown and reboot process by setting the
+    #   `NoReboot` parameter to `true` in the API request, or by using the
+    #   `--no-reboot` option in the CLI, we can't guarantee the file system
+    #   integrity of the created image.
+    #
+    #   Default: `false` (follow standard reboot process)
     # @option options [Array<Types::TagSpecification>] :tag_specifications
     #   The tags to apply to the AMI and snapshots on creation. You can tag
     #   the AMI, the snapshots, or both.

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

@@ -35,7 +35,12 @@ module Aws::EC2
     end
     alias :key_name :name
 
-    # The SHA-1 digest of the DER encoded private key.
+    # * For RSA key pairs, the key fingerprint is the SHA-1 digest of the
+    #   DER encoded private key.
+    #
+    # * For ED25519 key pairs, the key fingerprint is the base64-encoded
+    #   SHA-256 digest, which is the default for OpenSSH, starting with
+    #   OpenSSH 6.8.
     # @return [String]
     def key_fingerprint
       data[:key_fingerprint]

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

@@ -80,6 +80,28 @@ module Aws::EC2
       data[:tags]
     end
 
+    # The public key material.
+    # @return [String]
+    def public_key
+      data[:public_key]
+    end
+
+    # If you used Amazon EC2 to create the key pair, this is the date and
+    # time when the key was created, in [ISO 8601 date-time format][1], in
+    # the UTC time zone.
+    #
+    # If you imported an existing key pair to Amazon EC2, this is the date
+    # and time the key was imported, in [ISO 8601 date-time format][1], in
+    # the UTC time zone.
+    #
+    #
+    #
+    # [1]: https://www.iso.org/iso-8601-date-and-time-format.html
+    # @return [Time]
+    def create_time
+      data[:create_time]
+    end
+
     # @!endgroup
 
     # @return [Client]

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

@@ -265,6 +265,9 @@ module Aws::EC2
     #
     #   * `block-device-mapping.volume-id` - The volume ID of the EBS volume.
     #
+    #   * `capacity-reservation-id` - The ID of the Capacity Reservation into
+    #     which the instance was launched.
+    #
     #   * `client-token` - The idempotency token you provided when you
     #     launched the instance.
     #

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

@@ -127,7 +127,7 @@ module Aws::EC2
     #     security_group_ids: ["SecurityGroupId"],
     #     security_groups: ["SecurityGroupName"],
     #     subnet_id: "SubnetId",
-    #     user_data: "String",
+    #     user_data: "RunInstancesUserData",
     #     additional_info: "String",
     #     client_token: "String",
     #     disable_api_termination: false,
@@ -387,12 +387,12 @@ module Aws::EC2
     #   If you specify a network interface, you must specify any subnets as
     #   part of the network interface.
     # @option options [String] :user_data
-    #   The user data to make available to the instance. For more information,
-    #   see [Run commands on your Linux instance at launch][1] and [Run
-    #   commands on your Windows instance at launch][2]. If you are using a
-    #   command line tool, base64-encoding is performed for you, and you can
-    #   load the text from a file. Otherwise, you must provide base64-encoded
-    #   text. User data is limited to 16 KB.
+    #   The user data script to make available to the instance. For more
+    #   information, see [Run commands on your Linux instance at launch][1]
+    #   and [Run commands on your Windows instance at launch][2]. If you are
+    #   using a command line tool, base64-encoding is performed for you, and
+    #   you can load the text from a file. Otherwise, you must provide
+    #   base64-encoded text. User data is limited to 16 KB.
     #
     #
     #
@@ -631,6 +631,7 @@ module Aws::EC2
     #         ],
     #       },
     #     ],
+    #     key_format: "pem", # accepts pem, ppk
     #   })
     # @param [Hash] options ({})
     # @option options [required, String] :key_name
@@ -644,11 +645,15 @@ module Aws::EC2
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     # @option options [String] :key_type
     #   The type of key pair. Note that ED25519 keys are not supported for
-    #   Windows instances, EC2 Instance Connect, and EC2 Serial Console.
+    #   Windows instances.
     #
     #   Default: `rsa`
     # @option options [Array<Types::TagSpecification>] :tag_specifications
     #   The tags to apply to the new key pair.
+    # @option options [String] :key_format
+    #   The format of the key pair.
+    #
+    #   Default: `pem`
     # @return [KeyPair]
     def create_key_pair(options = {})
       resp = @client.create_key_pair(options)
@@ -1985,6 +1990,11 @@ module Aws::EC2
     #   * `block-device-mapping.encrypted` - A Boolean that indicates whether
     #     the Amazon EBS volume is encrypted.
     #
+    #   * `creation-date` - The time when the image was created, in the ISO
+    #     8601 format in the UTC time zone (YYYY-MM-DDThh:mm:ss.sssZ), for
+    #     example, `2021-09-29T11:04:43.305Z`. You can use a wildcard (`*`),
+    #     for example, `2021-09-29T*`, which matches an entire day.
+    #
     #   * `description` - The description of the image (provided during image
     #     creation).
     #
@@ -2142,6 +2152,9 @@ module Aws::EC2
     #
     #   * `block-device-mapping.volume-id` - The volume ID of the EBS volume.
     #
+    #   * `capacity-reservation-id` - The ID of the Capacity Reservation into
+    #     which the instance was launched.
+    #
     #   * `client-token` - The idempotency token you provided when you
     #     launched the instance.
     #
@@ -2520,6 +2533,7 @@ module Aws::EC2
     #     key_names: ["KeyPairName"],
     #     key_pair_ids: ["KeyPairId"],
     #     dry_run: false,
+    #     include_public_key: false,
     #   })
     # @param [Hash] options ({})
     # @option options [Array<Types::Filter>] :filters
@@ -2551,6 +2565,10 @@ module Aws::EC2
     #   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 [Boolean] :include_public_key
+    #   If `true`, the public key material is included in the response.
+    #
+    #   Default: `false`
     # @return [KeyPairInfo::Collection]
     def key_pairs(options = {})
       batches = Enumerator.new do |y|

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

@@ -351,7 +351,7 @@ module Aws::EC2
     #     ramdisk_id: "RamdiskId",
     #     security_group_ids: ["SecurityGroupId"],
     #     security_groups: ["SecurityGroupName"],
-    #     user_data: "String",
+    #     user_data: "RunInstancesUserData",
     #     additional_info: "String",
     #     client_token: "String",
     #     disable_api_termination: false,
@@ -606,12 +606,12 @@ module Aws::EC2
     #
     #   Default: Amazon EC2 uses the default security group.
     # @option options [String] :user_data
-    #   The user data to make available to the instance. For more information,
-    #   see [Run commands on your Linux instance at launch][1] and [Run
-    #   commands on your Windows instance at launch][2]. If you are using a
-    #   command line tool, base64-encoding is performed for you, and you can
-    #   load the text from a file. Otherwise, you must provide base64-encoded
-    #   text. User data is limited to 16 KB.
+    #   The user data script to make available to the instance. For more
+    #   information, see [Run commands on your Linux instance at launch][1]
+    #   and [Run commands on your Windows instance at launch][2]. If you are
+    #   using a command line tool, base64-encoding is performed for you, and
+    #   you can load the text from a file. Otherwise, you must provide
+    #   base64-encoded text. User data is limited to 16 KB.
     #
     #
     #
@@ -1069,6 +1069,9 @@ module Aws::EC2
     #
     #   * `block-device-mapping.volume-id` - The volume ID of the EBS volume.
     #
+    #   * `capacity-reservation-id` - The ID of the Capacity Reservation into
+    #     which the instance was launched.
+    #
     #   * `client-token` - The idempotency token you provided when you
     #     launched the instance.
     #

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

@@ -8332,13 +8332,19 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] no_reboot
-    #   By default, Amazon EC2 attempts to shut down and reboot the instance
-    #   before creating the image. If the `No Reboot` option is set, Amazon
-    #   EC2 doesn't shut down the instance before creating the image.
-    #   Without a reboot, the AMI will be crash consistent (all the volumes
-    #   are snapshotted at the same time), but not application consistent
-    #   (all the operating system buffers are not flushed to disk before the
-    #   snapshots are created).
+    #   By default, when Amazon EC2 creates the new AMI, it reboots the
+    #   instance so that it can take snapshots of the attached volumes while
+    #   data is at rest, in order to ensure a consistent state. You can set
+    #   the `NoReboot` parameter to `true` in the API request, or use the
+    #   `--no-reboot` option in the CLI to prevent Amazon EC2 from shutting
+    #   down and rebooting the instance.
+    #
+    #   If you choose to bypass the shutdown and reboot process by setting
+    #   the `NoReboot` parameter to `true` in the API request, or by using
+    #   the `--no-reboot` option in the CLI, we can't guarantee the file
+    #   system integrity of the created image.
+    #
+    #   Default: `false` (follow standard reboot process)
     #   @return [Boolean]
     #
     # @!attribute [rw] tag_specifications
@@ -8991,6 +8997,7 @@ module Aws::EC2
     #             ],
     #           },
     #         ],
+    #         key_format: "pem", # accepts pem, ppk
     #       }
     #
     # @!attribute [rw] key_name
@@ -9008,7 +9015,7 @@ module Aws::EC2
     #
     # @!attribute [rw] key_type
     #   The type of key pair. Note that ED25519 keys are not supported for
-    #   Windows instances, EC2 Instance Connect, and EC2 Serial Console.
+    #   Windows instances.
     #
     #   Default: `rsa`
     #   @return [String]
@@ -9017,13 +9024,20 @@ module Aws::EC2
     #   The tags to apply to the new key pair.
     #   @return [Array<Types::TagSpecification>]
     #
+    # @!attribute [rw] key_format
+    #   The format of the key pair.
+    #
+    #   Default: `pem`
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateKeyPairRequest AWS API Documentation
     #
     class CreateKeyPairRequest < Struct.new(
       :key_name,
       :dry_run,
       :key_type,
-      :tag_specifications)
+      :tag_specifications,
+      :key_format)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -13503,8 +13517,7 @@ module Aws::EC2
     #
     # @!attribute [rw] acceptance_required
     #   Indicates whether requests from service consumers to create an
-    #   endpoint to your service must be accepted. To accept a request, use
-    #   AcceptVpcEndpointConnections.
+    #   endpoint to your service must be accepted manually.
     #   @return [Boolean]
     #
     # @!attribute [rw] private_dns_name
@@ -20384,6 +20397,11 @@ module Aws::EC2
     #   * `block-device-mapping.encrypted` - A Boolean that indicates
     #     whether the Amazon EBS volume is encrypted.
     #
+    #   * `creation-date` - The time when the image was created, in the ISO
+    #     8601 format in the UTC time zone (YYYY-MM-DDThh:mm:ss.sssZ), for
+    #     example, `2021-09-29T11:04:43.305Z`. You can use a wildcard (`*`),
+    #     for example, `2021-09-29T*`, which matches an entire day.
+    #
     #   * `description` - The description of the image (provided during
     #     image creation).
     #
@@ -21396,6 +21414,9 @@ module Aws::EC2
     #   * `block-device-mapping.volume-id` - The volume ID of the EBS
     #     volume.
     #
+    #   * `capacity-reservation-id` - The ID of the Capacity Reservation
+    #     into which the instance was launched.
+    #
     #   * `client-token` - The idempotency token you provided when you
     #     launched the instance.
     #
@@ -22122,6 +22143,7 @@ module Aws::EC2
     #         key_names: ["KeyPairName"],
     #         key_pair_ids: ["KeyPairId"],
     #         dry_run: false,
+    #         include_public_key: false,
     #       }
     #
     # @!attribute [rw] filters
@@ -22161,13 +22183,20 @@ module Aws::EC2
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     #   @return [Boolean]
     #
+    # @!attribute [rw] include_public_key
+    #   If `true`, the public key material is included in the response.
+    #
+    #   Default: `false`
+    #   @return [Boolean]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeKeyPairsRequest AWS API Documentation
     #
     class DescribeKeyPairsRequest < Struct.new(
       :filters,
       :key_names,
       :key_pair_ids,
-      :dry_run)
+      :dry_run,
+      :include_public_key)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -22804,9 +22833,6 @@ module Aws::EC2
     #   * `local-gateway-virtual-interface-id` - The ID of the virtual
     #     interface.
     #
-    #   * `local-gateway-virtual-interface-group-id` - The ID of the virtual
-    #     interface group.
-    #
     #   * `owner-id` - The ID of the Amazon Web Services account that owns
     #     the local gateway virtual interface.
     #
@@ -26268,7 +26294,7 @@ module Aws::EC2
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-bid-status.html
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-request-status.html
     #   @return [Array<Types::Filter>]
     #
     # @!attribute [rw] dry_run
@@ -31164,6 +31190,13 @@ module Aws::EC2
     #
     # @!attribute [rw] outpost_arn
     #   The ARN of the Outpost on which the snapshot is stored.
+    #
+    #   This parameter is only supported on `BlockDeviceMapping` objects
+    #   called by [ CreateImage][1].
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateImage.html
     #   @return [String]
     #
     # @!attribute [rw] encrypted
@@ -38860,8 +38893,16 @@ module Aws::EC2
     end
 
     # @!attribute [rw] key_fingerprint
-    #   The MD5 public key fingerprint as specified in section 4 of RFC
-    #   4716.
+    #   * For RSA key pairs, the key fingerprint is the MD5 public key
+    #     fingerprint as specified in section 4 of RFC 4716.
+    #
+    #   * For ED25519 key pairs, the key fingerprint is the base64-encoded
+    #     SHA-256 digest, which is the default for OpenSSH, starting with
+    #     [OpenSSH 6.8][1].
+    #
+    #
+    #
+    #   [1]: http://www.openssh.com/txt/release-6.8
     #   @return [String]
     #
     # @!attribute [rw] key_name
@@ -43327,7 +43368,12 @@ module Aws::EC2
     # Describes a key pair.
     #
     # @!attribute [rw] key_fingerprint
-    #   The SHA-1 digest of the DER encoded private key.
+    #   * For RSA key pairs, the key fingerprint is the SHA-1 digest of the
+    #     DER encoded private key.
+    #
+    #   * For ED25519 key pairs, the key fingerprint is the base64-encoded
+    #     SHA-256 digest, which is the default for OpenSSH, starting with
+    #     OpenSSH 6.8.
     #   @return [String]
     #
     # @!attribute [rw] key_material
@@ -43401,6 +43447,24 @@ module Aws::EC2
     #   Any tags applied to the key pair.
     #   @return [Array<Types::Tag>]
     #
+    # @!attribute [rw] public_key
+    #   The public key material.
+    #   @return [String]
+    #
+    # @!attribute [rw] create_time
+    #   If you used Amazon EC2 to create the key pair, this is the date and
+    #   time when the key was created, in [ISO 8601 date-time format][1], in
+    #   the UTC time zone.
+    #
+    #   If you imported an existing key pair to Amazon EC2, this is the date
+    #   and time the key was imported, in [ISO 8601 date-time format][1], in
+    #   the UTC time zone.
+    #
+    #
+    #
+    #   [1]: https://www.iso.org/iso-8601-date-and-time-format.html
+    #   @return [Time]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/KeyPairInfo AWS API Documentation
     #
     class KeyPairInfo < Struct.new(
@@ -43408,7 +43472,9 @@ module Aws::EC2
       :key_fingerprint,
       :key_name,
       :key_type,
-      :tags)
+      :tags,
+      :public_key,
+      :create_time)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -43558,7 +43624,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] instance_type
-    #   The instance type.
+    #   The instance type. Only one instance type can be specified.
     #   @return [String]
     #
     # @!attribute [rw] kernel_id
@@ -49163,12 +49229,11 @@ module Aws::EC2
     #   @return [Types::AttributeBooleanValue]
     #
     # @!attribute [rw] private_dns_hostname_type_on_launch
-    #   The type of hostnames to assign to instances in the subnet at
-    #   launch. For IPv4 only subnets, an instance DNS name must be based on
-    #   the instance IPv4 address. For IPv6 only subnets, an instance DNS
-    #   name must be based on the instance ID. For dual-stack subnets, you
-    #   can specify whether DNS names use the instance IPv4 address or the
-    #   instance ID.
+    #   The type of hostname to assign to instances in the subnet at launch.
+    #   For IPv4-only and dual-stack (IPv4 and IPv6) subnets, an instance
+    #   DNS name can be based on the instance IPv4 address (ip-name) or the
+    #   instance ID (resource-name). For IPv6 only subnets, an instance DNS
+    #   name must be based on the instance ID (resource-name).
     #   @return [String]
     #
     # @!attribute [rw] enable_resource_name_dns_a_record_on_launch
@@ -53439,14 +53504,7 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # Information about the private DNS name for the service endpoint. For
-    # more information about these parameters, see [VPC Endpoint Service
-    # Private DNS Name Verification][1] in the *Amazon Virtual Private Cloud
-    # User Guide*.
-    #
-    #
-    #
-    # [1]: https://docs.aws.amazon.com/vpc/latest/userguide/ndpoint-services-dns-validation.html
+    # Information about the private DNS name for the service endpoint.
     #
     # @!attribute [rw] state
     #   The verification state of the VPC endpoint service.
@@ -55834,6 +55892,10 @@ module Aws::EC2
 
     # The information to include in the launch template.
     #
+    # <note markdown="1"> You must specify at least one parameter for the launch template data.
+    #
+    #  </note>
+    #
     # @note When making an API call, you may pass RequestLaunchTemplateData
     #   data as a hash:
     #
@@ -57039,7 +57101,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] instance_type
-    #   The instance type.
+    #   The instance type. Only one instance type can be specified.
     #   @return [String]
     #
     # @!attribute [rw] kernel_id
@@ -59182,7 +59244,7 @@ module Aws::EC2
     #         security_group_ids: ["SecurityGroupId"],
     #         security_groups: ["SecurityGroupName"],
     #         subnet_id: "SubnetId",
-    #         user_data: "String",
+    #         user_data: "RunInstancesUserData",
     #         additional_info: "String",
     #         client_token: "String",
     #         disable_api_termination: false,
@@ -59474,7 +59536,7 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] user_data
-    #   The user data to make available to the instance. For more
+    #   The user data script to make available to the instance. For more
     #   information, see [Run commands on your Linux instance at launch][1]
     #   and [Run commands on your Windows instance at launch][2]. If you are
     #   using a command line tool, base64-encoding is performed for you, and
@@ -59748,7 +59810,7 @@ module Aws::EC2
       :enclave_options,
       :private_dns_name_options,
       :maintenance_options)
-      SENSITIVE = []
+      SENSITIVE = [:user_data]
       include Aws::Structure
     end
 
@@ -63233,13 +63295,14 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] state
-    #   The state of the Spot Instance request. Spot status information
-    #   helps track your Spot Instance requests. For more information, see
-    #   [Spot status][1] in the *Amazon EC2 User Guide for Linux Instances*.
+    #   The state of the Spot Instance request. Spot request status
+    #   information helps track your Spot Instance requests. For more
+    #   information, see [Spot request status][1] in the *Amazon EC2 User
+    #   Guide for Linux Instances*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-bid-status.html
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-request-status.html
     #   @return [String]
     #
     # @!attribute [rw] status
@@ -63327,12 +63390,12 @@ module Aws::EC2
     # Describes the status of a Spot Instance request.
     #
     # @!attribute [rw] code
-    #   The status code. For a list of status codes, see [Spot status
-    #   codes][1] in the *Amazon EC2 User Guide for Linux Instances*.
+    #   The status code. For a list of status codes, see [Spot request
+    #   status codes][1] in the *Amazon EC2 User Guide for Linux Instances*.
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-bid-status.html#spot-instance-bid-status-understand
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-request-status.html#spot-instance-request-status-understand
     #   @return [String]
     #
     # @!attribute [rw] message

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

@@ -966,6 +966,9 @@ module Aws::EC2
     #
     #   * `block-device-mapping.volume-id` - The volume ID of the EBS volume.
     #
+    #   * `capacity-reservation-id` - The ID of the Capacity Reservation into
+    #     which the instance was launched.
+    #
     #   * `client-token` - The idempotency token you provided when you
     #     launched the instance.
     #

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

@@ -86,6 +86,7 @@ module Aws::EC2
   # | internet_gateway_exists         | {Client#describe_internet_gateways}       | 5        | 6             |
   # | key_pair_exists                 | {Client#describe_key_pairs}               | 5        | 6             |
   # | nat_gateway_available           | {Client#describe_nat_gateways}            | 15       | 40            |
+  # | nat_gateway_deleted             | {Client#describe_nat_gateways}            | 15       | 40            |
   # | network_interface_available     | {Client#describe_network_interfaces}      | 20       | 10            |
   # | password_data_available         | {Client#get_password_data}                | 15       | 40            |
   # | security_group_exists           | {Client#describe_security_groups}         | 5        | 6             |
@@ -874,6 +875,49 @@ module Aws::EC2
 
     end
 
+    class NatGatewayDeleted
+
+      # @param [Hash] options
+      # @option options [required, Client] :client
+      # @option options [Integer] :max_attempts (40)
+      # @option options [Integer] :delay (15)
+      # @option options [Proc] :before_attempt
+      # @option options [Proc] :before_wait
+      def initialize(options)
+        @client = options.fetch(:client)
+        @waiter = Aws::Waiters::Waiter.new({
+          max_attempts: 40,
+          delay: 15,
+          poller: Aws::Waiters::Poller.new(
+            operation_name: :describe_nat_gateways,
+            acceptors: [
+              {
+                "state" => "success",
+                "matcher" => "pathAll",
+                "argument" => "nat_gateways[].state",
+                "expected" => "deleted"
+              },
+              {
+                "state" => "success",
+                "matcher" => "error",
+                "expected" => "NatGatewayNotFound"
+              }
+            ]
+          )
+        }.merge(options))
+      end
+
+      # @option (see Client#describe_nat_gateways)
+      # @return (see Client#describe_nat_gateways)
+      def wait(params = {})
+        @waiter.wait(client: @client, params: params)
+      end
+
+      # @api private
+      attr_reader :waiter
+
+    end
+
     class NetworkInterfaceAvailable
 
       # @param [Hash] options

data/lib/aws-sdk-ec2.rb

@@ -72,6 +72,6 @@ require_relative 'aws-sdk-ec2/customizations'
 # @!group service
 module Aws::EC2
 
-  GEM_VERSION = '1.306.0'
+  GEM_VERSION = '1.309.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-ec2
 version: !ruby/object:Gem::Version
-  version: 1.306.0
+  version: 1.309.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-12 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sigv4