aws-sdk-ec2 1.527.0 → 1.531.0

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

@@ -3305,15 +3305,19 @@ module Aws::EC2
       req.send_request(options)
     end
 
-    # Attaches an EBS volume to a running or stopped instance and exposes it
-    # to the instance with the specified device name.
+    # Attaches an Amazon EBS volume to a `running` or `stopped` instance,
+    # and exposes it to the instance with the specified device name.
     #
-    # Encrypted EBS volumes must be attached to instances that support
-    # Amazon EBS encryption. For more information, see [Amazon EBS
-    # encryption][1] in the *Amazon EBS User Guide*.
+    # <note markdown="1"> The maximum number of Amazon EBS volumes that you can attach to an
+    # instance depends on the instance type. If you exceed the volume
+    # attachment limit for an instance type, the attachment request fails
+    # with the `AttachmentLimitExceeded` error. For more information, see
+    # [Instance volume limits][1].
     #
-    # After you attach an EBS volume, you must make it available. For more
-    # information, see [Make an EBS volume available for use][2].
+    #  </note>
+    #
+    # After you attach an EBS volume, you must make it available for use.
+    # For more information, see [Make an EBS volume available for use][2].
     #
     # If a volume has an Amazon Web Services Marketplace product code:
     #
@@ -3333,7 +3337,7 @@ module Aws::EC2
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/ebs/latest/userguide/ebs-encryption.html
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/volume_limits.html
     # [2]: https://docs.aws.amazon.com/ebs/latest/userguide/ebs-using-volumes.html
     # [3]: https://docs.aws.amazon.com/ebs/latest/userguide/ebs-attaching-volume.html
     #
@@ -4397,9 +4401,9 @@ module Aws::EC2
     end
 
     # Removes your Amazon Web Services account from the launch permissions
-    # for the specified AMI. For more information, see [ Cancel having an
-    # AMI shared with your Amazon Web Services account][1] in the *Amazon
-    # EC2 User Guide*.
+    # for the specified AMI. For more information, see [Cancel having an AMI
+    # shared with your Amazon Web Services account][1] in the *Amazon EC2
+    # User Guide*.
     #
     #
     #
@@ -4844,7 +4848,7 @@ module Aws::EC2
     # unencrypted snapshots.
     #
     # For information about the prerequisites when copying an AMI, see [Copy
-    # an AMI][2] in the *Amazon EC2 User Guide*.
+    # an Amazon EC2 AMI][2] in the *Amazon EC2 User Guide*.
     #
     #
     #
@@ -4853,8 +4857,8 @@ module Aws::EC2
     #
     # @option params [String] :client_token
     #   Unique, case-sensitive identifier you provide to ensure idempotency of
-    #   the request. For more information, see [Ensuring idempotency][1] in
-    #   the *Amazon EC2 API Reference*.
+    #   the request. For more information, see [Ensuring idempotency in Amazon
+    #   EC2 API requests][1] in the *Amazon EC2 API Reference*.
     #
     #   **A suitable default value is auto-generated.** You should normally
     #   not need to pass this option.**
@@ -4971,7 +4975,8 @@ module Aws::EC2
     #   If you do not specify a value, the AMI copy operation is completed on
     #   a best-effort basis.
     #
-    #   For more information, see [ Time-based copies][1].
+    #   For more information, see [Time-based copies for Amazon EBS snapshots
+    #   and EBS-backed AMIs][1].
     #
     #
     #
@@ -6585,8 +6590,9 @@ module Aws::EC2
     #   resp.subnet.private_dns_name_options_on_launch.enable_resource_name_dns_a_record #=> Boolean
     #   resp.subnet.private_dns_name_options_on_launch.enable_resource_name_dns_aaaa_record #=> Boolean
     #   resp.subnet.block_public_access_states.internet_gateway_block_mode #=> String, one of "off", "block-bidirectional", "block-ingress"
+    #   resp.subnet.type #=> String
     #   resp.subnet.subnet_id #=> String
-    #   resp.subnet.state #=> String, one of "pending", "available", "unavailable"
+    #   resp.subnet.state #=> String, one of "pending", "available", "unavailable", "failed", "failed-insufficient-capacity"
     #   resp.subnet.vpc_id #=> String
     #   resp.subnet.cidr_block #=> String
     #   resp.subnet.available_ip_address_count #=> Integer
@@ -7764,8 +7770,8 @@ module Aws::EC2
     # launch an instance from this new AMI, the instance automatically
     # launches with those additional volumes.
     #
-    # For more information, see [Create an Amazon EBS-backed Linux AMI][1]
-    # in the *Amazon Elastic Compute Cloud User Guide*.
+    # For more information, see [Create an Amazon EBS-backed AMI][1] in the
+    # *Amazon Elastic Compute Cloud User Guide*.
     #
     #
     #
@@ -11933,6 +11939,8 @@ module Aws::EC2
     #   resp.network_interface.ipv_6_address #=> String
     #   resp.network_interface.operator.managed #=> Boolean
     #   resp.network_interface.operator.principal #=> String
+    #   resp.network_interface.associated_subnets #=> Array
+    #   resp.network_interface.associated_subnets[0] #=> String
     #   resp.client_token #=> String
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/CreateNetworkInterface AWS API Documentation
@@ -12432,15 +12440,15 @@ module Aws::EC2
     #
     # To use this API, you must have the required permissions. For more
     # information, see [Permissions for storing and restoring AMIs using
-    # Amazon S3][2] in the *Amazon EC2 User Guide*.
+    # S3][2] in the *Amazon EC2 User Guide*.
     #
-    # For more information, see [Store and restore an AMI using Amazon
-    # S3][3] in the *Amazon EC2 User Guide*.
+    # For more information, see [Store and restore an AMI using S3][3] in
+    # the *Amazon EC2 User Guide*.
     #
     #
     #
     # [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateStoreImageTask.html
-    # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-store-restore.html#ami-s3-permissions
+    # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/work-with-ami-store-restore.html#ami-s3-permissions
     # [3]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-store-restore.html
     #
     # @option params [required, String] :bucket
@@ -13616,14 +13624,14 @@ module Aws::EC2
     #
     # To use this API, you must have the required permissions. For more
     # information, see [Permissions for storing and restoring AMIs using
-    # Amazon S3][1] in the *Amazon EC2 User Guide*.
+    # S3][1] in the *Amazon EC2 User Guide*.
     #
-    # For more information, see [Store and restore an AMI using Amazon
-    # S3][2] in the *Amazon EC2 User Guide*.
+    # For more information, see [Store and restore an AMI using S3][2] in
+    # the *Amazon EC2 User Guide*.
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-store-restore.html#ami-s3-permissions
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/work-with-ami-store-restore.html#ami-s3-permissions
     # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-store-restore.html
     #
     # @option params [required, String] :image_id
@@ -13854,8 +13862,9 @@ module Aws::EC2
     #   resp.subnet.private_dns_name_options_on_launch.enable_resource_name_dns_a_record #=> Boolean
     #   resp.subnet.private_dns_name_options_on_launch.enable_resource_name_dns_aaaa_record #=> Boolean
     #   resp.subnet.block_public_access_states.internet_gateway_block_mode #=> String, one of "off", "block-bidirectional", "block-ingress"
+    #   resp.subnet.type #=> String
     #   resp.subnet.subnet_id #=> String
-    #   resp.subnet.state #=> String, one of "pending", "available", "unavailable"
+    #   resp.subnet.state #=> String, one of "pending", "available", "unavailable", "failed", "failed-insufficient-capacity"
     #   resp.subnet.vpc_id #=> String
     #   resp.subnet.cidr_block #=> String
     #   resp.subnet.available_ip_address_count #=> Integer
@@ -17159,6 +17168,11 @@ module Aws::EC2
     # @option params [Array<Types::TagSpecification>] :tag_specifications
     #   The tags to apply to the VPN connection.
     #
+    # @option params [String] :pre_shared_key_storage
+    #   Specifies the storage mode for the pre-shared key (PSK). Valid values
+    #   are `Standard`" (stored in the Site-to-Site VPN service) or
+    #   `SecretsManager` (stored in Amazon Web Services Secrets Manager).
+    #
     # @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.
@@ -17190,6 +17204,7 @@ module Aws::EC2
     #         ],
     #       },
     #     ],
+    #     pre_shared_key_storage: "String",
     #     dry_run: false,
     #     options: {
     #       enable_acceleration: false,
@@ -17323,6 +17338,7 @@ module Aws::EC2
     #   resp.vpn_connection.vgw_telemetry[0].status #=> String, one of "UP", "DOWN"
     #   resp.vpn_connection.vgw_telemetry[0].status_message #=> String
     #   resp.vpn_connection.vgw_telemetry[0].certificate_arn #=> String
+    #   resp.vpn_connection.pre_shared_key_arn #=> String
     #   resp.vpn_connection.vpn_connection_id #=> String
     #   resp.vpn_connection.state #=> String, one of "pending", "available", "deleting", "deleted"
     #   resp.vpn_connection.customer_gateway_configuration #=> String
@@ -21709,16 +21725,21 @@ module Aws::EC2
     # be restored before its retention period expires, after which it is
     # permanently deleted. If the deregistered AMI doesn't match a
     # retention rule, it is permanently deleted immediately. For more
-    # information, see [Recycle Bin][1] in the *Amazon EBS User Guide*.
+    # information, see [Recover deleted Amazon EBS snapshots and EBS-backed
+    # AMIs with Recycle Bin][1] in the *Amazon EBS User Guide*.
+    #
+    # When deregistering an EBS-backed AMI, you can optionally delete its
+    # associated snapshots at the same time. However, if a snapshot is
+    # associated with multiple AMIs, it won't be deleted even if specified
+    # for deletion, although the AMI will still be deregistered.
     #
     # Deregistering an AMI does not delete the following:
     #
     # * Instances already launched from the AMI. You'll continue to incur
     #   usage costs for the instances until you terminate them.
     #
-    # * For EBS-backed AMIs: The snapshots that were created of the root and
-    #   data volumes of the instance during AMI creation. You'll continue
-    #   to incur snapshot storage costs.
+    # * For EBS-backed AMIs: Snapshots that are associated with multiple
+    #   AMIs. You'll continue to incur snapshot storage costs.
     #
     # * For instance store-backed AMIs: The files uploaded to Amazon S3
     #   during AMI creation. You'll continue to incur S3 storage costs.
@@ -21734,21 +21755,43 @@ module Aws::EC2
     # @option params [required, String] :image_id
     #   The ID of the AMI.
     #
+    # @option params [Boolean] :delete_associated_snapshots
+    #   Specifies whether to delete the snapshots associated with the AMI
+    #   during deregistration.
+    #
+    #   <note markdown="1"> If a snapshot is associated with multiple AMIs, it is not deleted,
+    #   regardless of this setting.
+    #
+    #    </note>
+    #
+    #   Default: The snapshots are not deleted.
+    #
     # @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.
     #   If you have the required permissions, the error response is
     #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
     #
-    # @return [Struct] Returns an empty {Seahorse::Client::Response response}.
+    # @return [Types::DeregisterImageResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::DeregisterImageResult#return #return} => Boolean
+    #   * {Types::DeregisterImageResult#delete_snapshot_results #delete_snapshot_results} => Array&lt;Types::DeleteSnapshotReturnCode&gt;
     #
     # @example Request syntax with placeholder values
     #
     #   resp = client.deregister_image({
     #     image_id: "ImageId", # required
+    #     delete_associated_snapshots: false,
     #     dry_run: false,
     #   })
     #
+    # @example Response structure
+    #
+    #   resp.return #=> Boolean
+    #   resp.delete_snapshot_results #=> Array
+    #   resp.delete_snapshot_results[0].snapshot_id #=> String
+    #   resp.delete_snapshot_results[0].return_code #=> String, one of "success", "skipped", "missing-permissions", "internal-error", "client-error"
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DeregisterImage AWS API Documentation
     #
     # @overload deregister_image(params = {})
@@ -22240,6 +22283,7 @@ module Aws::EC2
     #   resp.addresses[0].customer_owned_ip #=> String
     #   resp.addresses[0].customer_owned_ipv_4_pool #=> String
     #   resp.addresses[0].carrier_ip #=> String
+    #   resp.addresses[0].subnet_id #=> String
     #   resp.addresses[0].service_managed #=> String, one of "alb", "nlb", "rnat"
     #   resp.addresses[0].instance_id #=> String
     #   resp.addresses[0].public_ip #=> String
@@ -33349,7 +33393,7 @@ module Aws::EC2
     #   * `interface-type` - The type of network interface
     #     (`api_gateway_managed` \| `aws_codestar_connections_managed` \|
     #     `branch` \| `ec2_instance_connect_endpoint` \| `efa` \| `efa-only`
-    #     \| `efs` \| `gateway_load_balancer` \|
+    #     \| `efs` \| `evs` \| `gateway_load_balancer` \|
     #     `gateway_load_balancer_endpoint` \| `global_accelerator_managed` \|
     #     `interface` \| `iot_rules_managed` \| `lambda` \| `load_balancer` \|
     #     `nat_gateway` \| `network_load_balancer` \| `quicksight` \|
@@ -33568,6 +33612,8 @@ module Aws::EC2
     #   resp.network_interfaces[0].ipv_6_address #=> String
     #   resp.network_interfaces[0].operator.managed #=> Boolean
     #   resp.network_interfaces[0].operator.principal #=> String
+    #   resp.network_interfaces[0].associated_subnets #=> Array
+    #   resp.network_interfaces[0].associated_subnets[0] #=> String
     #   resp.next_token #=> String
     #
     #
@@ -37734,14 +37780,14 @@ module Aws::EC2
     #
     # To use this API, you must have the required permissions. For more
     # information, see [Permissions for storing and restoring AMIs using
-    # Amazon S3][1] in the *Amazon EC2 User Guide*.
+    # S3][1] in the *Amazon EC2 User Guide*.
     #
-    # For more information, see [Store and restore an AMI using Amazon
-    # S3][2] in the *Amazon EC2 User Guide*.
+    # For more information, see [Store and restore an AMI using S3][2] in
+    # the *Amazon EC2 User Guide*.
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-store-restore.html#ami-s3-permissions
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/work-with-ami-store-restore.html#ami-s3-permissions
     # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-store-restore.html
     #
     # @option params [Array<String>] :image_ids
@@ -38039,8 +38085,9 @@ module Aws::EC2
     #   resp.subnets[0].private_dns_name_options_on_launch.enable_resource_name_dns_a_record #=> Boolean
     #   resp.subnets[0].private_dns_name_options_on_launch.enable_resource_name_dns_aaaa_record #=> Boolean
     #   resp.subnets[0].block_public_access_states.internet_gateway_block_mode #=> String, one of "off", "block-bidirectional", "block-ingress"
+    #   resp.subnets[0].type #=> String
     #   resp.subnets[0].subnet_id #=> String
-    #   resp.subnets[0].state #=> String, one of "pending", "available", "unavailable"
+    #   resp.subnets[0].state #=> String, one of "pending", "available", "unavailable", "failed", "failed-insufficient-capacity"
     #   resp.subnets[0].vpc_id #=> String
     #   resp.subnets[0].cidr_block #=> String
     #   resp.subnets[0].available_ip_address_count #=> Integer
@@ -42160,6 +42207,7 @@ module Aws::EC2
     #   resp.vpn_connections[0].vgw_telemetry[0].status #=> String, one of "UP", "DOWN"
     #   resp.vpn_connections[0].vgw_telemetry[0].status_message #=> String
     #   resp.vpn_connections[0].vgw_telemetry[0].certificate_arn #=> String
+    #   resp.vpn_connections[0].pre_shared_key_arn #=> String
     #   resp.vpn_connections[0].vpn_connection_id #=> String
     #   resp.vpn_connections[0].state #=> String, one of "pending", "available", "deleting", "deleted"
     #   resp.vpn_connections[0].customer_gateway_configuration #=> String
@@ -43069,7 +43117,7 @@ module Aws::EC2
     #
     #
     # [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_GetImageBlockPublicAccessState.html
-    # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/sharingamis-intro.html#block-public-access-to-amis
+    # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-public-access-to-amis.html
     #
     # @option params [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
@@ -43102,8 +43150,8 @@ module Aws::EC2
 
     # Cancels the deprecation of the specified AMI.
     #
-    # For more information, see [Deprecate an AMI][1] in the *Amazon EC2
-    # User Guide*.
+    # For more information, see [Deprecate an Amazon EC2 AMI][1] in the
+    # *Amazon EC2 User Guide*.
     #
     #
     #
@@ -43150,12 +43198,12 @@ module Aws::EC2
     # deregistration protection, you won’t immediately be able to deregister
     # the AMI.
     #
-    # For more information, see [Protect an AMI from deregistration][1] in
-    # the *Amazon EC2 User Guide*.
+    # For more information, see [Protect an Amazon EC2 AMI from
+    # deregistration][1] in the *Amazon EC2 User Guide*.
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/deregister-ami.html#ami-deregistration-protection
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-deregistration-protection.html
     #
     # @option params [required, String] :image_id
     #   The ID of the AMI.
@@ -44892,8 +44940,8 @@ module Aws::EC2
     #
     # Only the AMI owner can re-enable a disabled AMI.
     #
-    # For more information, see [Disable an AMI][1] in the *Amazon EC2 User
-    # Guide*.
+    # For more information, see [Disable an Amazon EC2 AMI][1] in the
+    # *Amazon EC2 User Guide*.
     #
     #
     #
@@ -44948,7 +44996,7 @@ module Aws::EC2
     #
     #
     # [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_GetImageBlockPublicAccessState.html
-    # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/sharingamis-intro.html#block-public-access-to-amis
+    # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-public-access-to-amis.html
     #
     # @option params [required, String] :image_block_public_access_state
     #   Specify `block-new-sharing` to enable block public access for AMIs at
@@ -45044,12 +45092,12 @@ module Aws::EC2
     # To allow the AMI to be deregistered, you must first disable
     # deregistration protection using DisableImageDeregistrationProtection.
     #
-    # For more information, see [Protect an AMI from deregistration][1] in
-    # the *Amazon EC2 User Guide*.
+    # For more information, see [Protect an Amazon EC2 AMI from
+    # deregistration][1] in the *Amazon EC2 User Guide*.
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/deregister-ami.html#ami-deregistration-protection
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ami-deregistration-protection.html
     #
     # @option params [required, String] :image_id
     #   The ID of the AMI.
@@ -45876,6 +45924,55 @@ module Aws::EC2
       req.send_request(options)
     end
 
+    # Returns the currently negotiated security parameters for an active VPN
+    # tunnel, including IKE version, DH groups, encryption algorithms, and
+    # integrity algorithms.
+    #
+    # @option params [required, String] :vpn_connection_id
+    #   The ID of the VPN connection for which to retrieve the active tunnel
+    #   status.
+    #
+    # @option params [required, String] :vpn_tunnel_outside_ip_address
+    #   The external IP address of the VPN tunnel for which to retrieve the
+    #   active status.
+    #
+    # @option params [Boolean] :dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request.
+    #
+    # @return [Types::GetActiveVpnTunnelStatusResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::GetActiveVpnTunnelStatusResult#active_vpn_tunnel_status #active_vpn_tunnel_status} => Types::ActiveVpnTunnelStatus
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.get_active_vpn_tunnel_status({
+    #     vpn_connection_id: "VpnConnectionId", # required
+    #     vpn_tunnel_outside_ip_address: "String", # required
+    #     dry_run: false,
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.active_vpn_tunnel_status.phase_1_encryption_algorithm #=> String
+    #   resp.active_vpn_tunnel_status.phase_2_encryption_algorithm #=> String
+    #   resp.active_vpn_tunnel_status.phase_1_integrity_algorithm #=> String
+    #   resp.active_vpn_tunnel_status.phase_2_integrity_algorithm #=> String
+    #   resp.active_vpn_tunnel_status.phase_1_dh_group #=> Integer
+    #   resp.active_vpn_tunnel_status.phase_2_dh_group #=> Integer
+    #   resp.active_vpn_tunnel_status.ike_version #=> String
+    #   resp.active_vpn_tunnel_status.provisioning_status #=> String, one of "available", "pending", "failed"
+    #   resp.active_vpn_tunnel_status.provisioning_status_reason #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/GetActiveVpnTunnelStatus AWS API Documentation
+    #
+    # @overload get_active_vpn_tunnel_status(params = {})
+    # @param [Hash] params ({})
+    def get_active_vpn_tunnel_status(params = {}, options = {})
+      req = build_request(:get_active_vpn_tunnel_status, params)
+      req.send_request(options)
+    end
+
     # Gets the current state of the Allowed AMIs setting and the list of
     # Allowed AMIs criteria at the account level in the specified Region.
     #
@@ -46765,7 +46862,7 @@ module Aws::EC2
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/sharingamis-intro.html#block-public-access-to-amis
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-public-access-to-amis.html
     #
     # @option params [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
@@ -49990,6 +50087,11 @@ module Aws::EC2
     #   customer gateway device. You can specify one of the following
     #   versions: `ikev1` or `ikev2`.
     #
+    # @option params [String] :sample_type
+    #   The type of sample configuration to generate. Valid values are
+    #   "compatibility" (includes IKEv1) or "recommended" (throws
+    #   UnsupportedOperationException for IKEv1).
+    #
     # @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.
@@ -50006,6 +50108,7 @@ module Aws::EC2
     #     vpn_connection_id: "VpnConnectionId", # required
     #     vpn_connection_device_type_id: "VpnConnectionDeviceTypeId", # required
     #     internet_key_exchange_version: "String",
+    #     sample_type: "String",
     #     dry_run: false,
     #   })
     #
@@ -54294,6 +54397,9 @@ module Aws::EC2
     #   interface. This option can be enabled for any network interface but
     #   will only apply to the primary network interface (eth0).
     #
+    # @option params [Array<String>] :associated_subnet_ids
+    #   A list of subnet IDs to associate with the network interface.
+    #
     # @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.
@@ -54390,6 +54496,7 @@ module Aws::EC2
     #       udp_timeout: 1,
     #     },
     #     associate_public_ip_address: false,
+    #     associated_subnet_ids: ["SubnetId"],
     #     dry_run: false,
     #     network_interface_id: "NetworkInterfaceId", # required
     #     description: "value", # value <Hash,Array,String,Numeric,Boolean,IO,Set,nil>
@@ -57453,6 +57560,7 @@ module Aws::EC2
     #   resp.vpn_connection.vgw_telemetry[0].status #=> String, one of "UP", "DOWN"
     #   resp.vpn_connection.vgw_telemetry[0].status_message #=> String
     #   resp.vpn_connection.vgw_telemetry[0].certificate_arn #=> String
+    #   resp.vpn_connection.pre_shared_key_arn #=> String
     #   resp.vpn_connection.vpn_connection_id #=> String
     #   resp.vpn_connection.state #=> String, one of "pending", "available", "deleting", "deleted"
     #   resp.vpn_connection.customer_gateway_configuration #=> String
@@ -57583,6 +57691,7 @@ module Aws::EC2
     #   resp.vpn_connection.vgw_telemetry[0].status #=> String, one of "UP", "DOWN"
     #   resp.vpn_connection.vgw_telemetry[0].status_message #=> String
     #   resp.vpn_connection.vgw_telemetry[0].certificate_arn #=> String
+    #   resp.vpn_connection.pre_shared_key_arn #=> String
     #   resp.vpn_connection.vpn_connection_id #=> String
     #   resp.vpn_connection.state #=> String, one of "pending", "available", "deleting", "deleted"
     #   resp.vpn_connection.customer_gateway_configuration #=> String
@@ -57686,6 +57795,7 @@ module Aws::EC2
     #   resp.vpn_connection.vgw_telemetry[0].status #=> String, one of "UP", "DOWN"
     #   resp.vpn_connection.vgw_telemetry[0].status_message #=> String
     #   resp.vpn_connection.vgw_telemetry[0].certificate_arn #=> String
+    #   resp.vpn_connection.pre_shared_key_arn #=> String
     #   resp.vpn_connection.vpn_connection_id #=> String
     #   resp.vpn_connection.state #=> String, one of "pending", "available", "deleting", "deleted"
     #   resp.vpn_connection.customer_gateway_configuration #=> String
@@ -57734,6 +57844,11 @@ module Aws::EC2
     #
     #   Valid values: `True` \| `False`
     #
+    # @option params [String] :pre_shared_key_storage
+    #   Specifies the storage mode for the pre-shared key (PSK). Valid values
+    #   are `Standard` (stored in Site-to-Site VPN service) or
+    #   `SecretsManager` (stored in Amazon Web Services Secrets Manager).
+    #
     # @return [Types::ModifyVpnTunnelOptionsResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
     #   * {Types::ModifyVpnTunnelOptionsResult#vpn_connection #vpn_connection} => Types::VpnConnection
@@ -57801,6 +57916,7 @@ module Aws::EC2
     #     },
     #     dry_run: false,
     #     skip_tunnel_replacement: false,
+    #     pre_shared_key_storage: "String",
     #   })
     #
     # @example Response structure
@@ -57864,6 +57980,7 @@ module Aws::EC2
     #   resp.vpn_connection.vgw_telemetry[0].status #=> String, one of "UP", "DOWN"
     #   resp.vpn_connection.vgw_telemetry[0].status_message #=> String
     #   resp.vpn_connection.vgw_telemetry[0].certificate_arn #=> String
+    #   resp.vpn_connection.pre_shared_key_arn #=> String
     #   resp.vpn_connection.vpn_connection_id #=> String
     #   resp.vpn_connection.state #=> String, one of "pending", "available", "deleting", "deleted"
     #   resp.vpn_connection.customer_gateway_configuration #=> String
@@ -59024,8 +59141,7 @@ module Aws::EC2
     # instance launched from the AMI is encrypted.
     #
     # For more information, see [Create an AMI from a snapshot][1] and [Use
-    # encryption with Amazon EBS-backed AMIs][3] in the *Amazon EC2 User
-    # Guide*.
+    # encryption with EBS-backed AMIs][3] in the *Amazon EC2 User Guide*.
     #
     # **Amazon Web Services Marketplace product codes**
     #
@@ -59067,7 +59183,7 @@ module Aws::EC2
     #   The full path to your AMI manifest in Amazon S3 storage. The specified
     #   bucket must have the `aws-exec-read` canned access control list (ACL)
     #   to ensure that it can be accessed by Amazon EC2. For more information,
-    #   see [Canned ACLs][1] in the *Amazon S3 Service Developer Guide*.
+    #   see [Canned ACL][1] in the *Amazon S3 Service Developer Guide*.
     #
     #
     #
@@ -59081,8 +59197,9 @@ module Aws::EC2
     #   you can publish AMIs that include billable software and list them on
     #   the Amazon Web Services Marketplace. You must first register as a
     #   seller on the Amazon Web Services Marketplace. For more information,
-    #   see [Getting started as a seller][1] and [AMI-based products][2] in
-    #   the *Amazon Web Services Marketplace Seller Guide*.
+    #   see [Getting started as an Amazon Web Services Marketplace seller][1]
+    #   and [AMI-based products in Amazon Web Services Marketplace][2] in the
+    #   *Amazon Web Services Marketplace Seller Guide*.
     #
     #
     #
@@ -59098,8 +59215,8 @@ module Aws::EC2
     #
     #    </note>
     #
-    #   For more information, see [Boot modes][1] in the *Amazon EC2 User
-    #   Guide*.
+    #   For more information, see [Instance launch behavior with Amazon EC2
+    #   boot modes][1] in the *Amazon EC2 User Guide*.
     #
     #
     #
@@ -59117,8 +59234,8 @@ module Aws::EC2
     #   Base64 representation of the non-volatile UEFI variable store. To
     #   retrieve the UEFI data, use the [GetInstanceUefiData][1] command. You
     #   can inspect and modify the UEFI data by using the [python-uefivars
-    #   tool][2] on GitHub. For more information, see [UEFI Secure Boot][3] in
-    #   the *Amazon EC2 User Guide*.
+    #   tool][2] on GitHub. For more information, see [UEFI Secure Boot for
+    #   Amazon EC2 instances][3] in the *Amazon EC2 User Guide*.
     #
     #
     #
@@ -59195,8 +59312,8 @@ module Aws::EC2
     #   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 EBS User Guide*.
+    #   on the same Outpost only. For more information, [Create AMIs from
+    #   local snapshots][1] in the *Amazon EBS User Guide*.
     #
     #
     #
@@ -61875,7 +61992,8 @@ module Aws::EC2
     end
 
     # Restores an AMI from the Recycle Bin. For more information, see
-    # [Recycle Bin][1] in the *Amazon EC2 User Guide*.
+    # [Recover deleted Amazon EBS snapshots and EBS-back AMIs with Recycle
+    # Bin][1] in the *Amazon EC2 User Guide*.
     #
     #
     #
@@ -65975,7 +66093,7 @@ module Aws::EC2
         tracer: tracer
       )
       context[:gem_name] = 'aws-sdk-ec2'
-      context[:gem_version] = '1.527.0'
+      context[:gem_version] = '1.531.0'
       Seahorse::Client::Request.new(handlers, context)
     end