aws-sdk-ec2 1.307.0 → 1.309.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ce12bfe4b34af34a42e340ad40915c30e1dd8b055f5ef5e3e23658bb7b3793f
-  data.tar.gz: 9374844700763e135363bc884a9e9ae2fd2f7100d6ef594b3d11fd640cbc14d2
+  metadata.gz: 2e285a4ec10318bc908bea452a07179d6083076c04c1e9f98ccc560bceb99889
+  data.tar.gz: 5b4b2f2a824da32e96c119e1e8e8b9d9a82aed3003f35e8cb309813e17cea6b2
 SHA512:
-  metadata.gz: 051d8d1f36d2dbb91312a4d67195f1c43271624fa1fe996887d5339b432e49f1df22627147bf2f1d488b27e020451c75c1a5f89a0e0d4daffe014d45a1500b1e
-  data.tar.gz: 4e89fe849d022abe70713a6a41e1dc575e71e68fa363263bb75e96c3873da01b0875fae39bb3ea9c04b36a801577acb7ed96fdb8f6e3359f19805adafe0f4deb
+  metadata.gz: c99bb361a69770847fda20d0f8dfd8be23887472077901ad63e4ef4952a0e1f6a72ad487cc81b82f2f1400ecc026a46d197f62d51433090beb7c560a83a3fce5
+  data.tar.gz: ea4719f3d4e8a0343b54aed166361d3015e9cfb1a3602300e4cf3d3794593a01c4b519be4b4f535304c1de3e82d82d080c2243f8f201f0729efea90894fb1c9f

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 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)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.307.0
+1.309.0

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

@@ -6959,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
@@ -6999,6 +7001,11 @@ module Aws::EC2
     # @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
@@ -7033,6 +7040,7 @@ module Aws::EC2
     #         ],
     #       },
     #     ],
+    #     key_format: "pem", # accepts pem, ppk
     #   })
     #
     # @example Response structure
@@ -21668,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.
     #
@@ -22676,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;
@@ -22713,6 +22729,7 @@ module Aws::EC2
     #     key_names: ["KeyPairName"],
     #     key_pair_ids: ["KeyPairId"],
     #     dry_run: false,
+    #     include_public_key: false,
     #   })
     #
     # @example Response structure
@@ -22725,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):
@@ -23983,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
     #
@@ -28433,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,
@@ -41074,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
@@ -44971,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,
@@ -45434,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.
@@ -47296,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,
@@ -49475,7 +49506,7 @@ module Aws::EC2
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-ec2'
-      context[:gem_version] = '1.307.0'
+      context[:gem_version] = '1.309.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 
@@ -49560,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             |
@@ -49643,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/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,
@@ -631,6 +631,7 @@ module Aws::EC2
     #         ],
     #       },
     #     ],
+    #     key_format: "pem", # accepts pem, ppk
     #   })
     # @param [Hash] options ({})
     # @option options [required, String] :key_name
@@ -649,6 +650,10 @@ module Aws::EC2
     #   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)
@@ -2147,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.
     #
@@ -2525,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
@@ -2556,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,
@@ -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

@@ -8997,6 +8997,7 @@ module Aws::EC2
     #             ],
     #           },
     #         ],
+    #         key_format: "pem", # accepts pem, ppk
     #       }
     #
     # @!attribute [rw] key_name
@@ -9023,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
@@ -21406,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.
     #
@@ -22132,6 +22143,7 @@ module Aws::EC2
     #         key_names: ["KeyPairName"],
     #         key_pair_ids: ["KeyPairId"],
     #         dry_run: false,
+    #         include_public_key: false,
     #       }
     #
     # @!attribute [rw] filters
@@ -22171,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
@@ -26275,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
@@ -38874,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
@@ -43341,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
@@ -43415,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(
@@ -43422,7 +43472,9 @@ module Aws::EC2
       :key_fingerprint,
       :key_name,
       :key_type,
-      :tags)
+      :tags,
+      :public_key,
+      :create_time)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -43572,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
@@ -49177,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
@@ -57050,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
@@ -59193,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,
@@ -59759,7 +59810,7 @@ module Aws::EC2
       :enclave_options,
       :private_dns_name_options,
       :maintenance_options)
-      SENSITIVE = []
+      SENSITIVE = [:user_data]
       include Aws::Structure
     end
 
@@ -63244,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
@@ -63338,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.307.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.307.0
+  version: 1.309.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-14 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sigv4