aws-sdk-ec2 1.527.0 → 1.529.0

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

@@ -55,6 +55,7 @@ module Aws::EC2
     AccountID = Shapes::StringShape.new(name: 'AccountID')
     ActiveInstance = Shapes::StructureShape.new(name: 'ActiveInstance')
     ActiveInstanceSet = Shapes::ListShape.new(name: 'ActiveInstanceSet')
+    ActiveVpnTunnelStatus = Shapes::StructureShape.new(name: 'ActiveVpnTunnelStatus')
     ActivityStatus = Shapes::StringShape.new(name: 'ActivityStatus')
     AddIpamOperatingRegion = Shapes::StructureShape.new(name: 'AddIpamOperatingRegion')
     AddIpamOperatingRegionSet = Shapes::ListShape.new(name: 'AddIpamOperatingRegionSet')
@@ -775,6 +776,8 @@ module Aws::EC2
     DeleteSecurityGroupRequest = Shapes::StructureShape.new(name: 'DeleteSecurityGroupRequest')
     DeleteSecurityGroupResult = Shapes::StructureShape.new(name: 'DeleteSecurityGroupResult')
     DeleteSnapshotRequest = Shapes::StructureShape.new(name: 'DeleteSnapshotRequest')
+    DeleteSnapshotResultSet = Shapes::ListShape.new(name: 'DeleteSnapshotResultSet')
+    DeleteSnapshotReturnCode = Shapes::StructureShape.new(name: 'DeleteSnapshotReturnCode')
     DeleteSpotDatafeedSubscriptionRequest = Shapes::StructureShape.new(name: 'DeleteSpotDatafeedSubscriptionRequest')
     DeleteSubnetCidrReservationRequest = Shapes::StructureShape.new(name: 'DeleteSubnetCidrReservationRequest')
     DeleteSubnetCidrReservationResult = Shapes::StructureShape.new(name: 'DeleteSubnetCidrReservationResult')
@@ -1599,6 +1602,8 @@ module Aws::EC2
     GVCDMaxResults = Shapes::IntegerShape.new(name: 'GVCDMaxResults')
     GatewayAssociationState = Shapes::StringShape.new(name: 'GatewayAssociationState')
     GatewayType = Shapes::StringShape.new(name: 'GatewayType')
+    GetActiveVpnTunnelStatusRequest = Shapes::StructureShape.new(name: 'GetActiveVpnTunnelStatusRequest')
+    GetActiveVpnTunnelStatusResult = Shapes::StructureShape.new(name: 'GetActiveVpnTunnelStatusResult')
     GetAllowedImagesSettingsRequest = Shapes::StructureShape.new(name: 'GetAllowedImagesSettingsRequest')
     GetAllowedImagesSettingsResult = Shapes::StructureShape.new(name: 'GetAllowedImagesSettingsResult')
     GetAssociatedEnclaveCertificateIamRolesRequest = Shapes::StructureShape.new(name: 'GetAssociatedEnclaveCertificateIamRolesRequest')
@@ -3053,6 +3058,7 @@ module Aws::EC2
     SnapshotLocationEnum = Shapes::StringShape.new(name: 'SnapshotLocationEnum')
     SnapshotRecycleBinInfo = Shapes::StructureShape.new(name: 'SnapshotRecycleBinInfo')
     SnapshotRecycleBinInfoList = Shapes::ListShape.new(name: 'SnapshotRecycleBinInfoList')
+    SnapshotReturnCodes = Shapes::StringShape.new(name: 'SnapshotReturnCodes')
     SnapshotSet = Shapes::ListShape.new(name: 'SnapshotSet')
     SnapshotState = Shapes::StringShape.new(name: 'SnapshotState')
     SnapshotTaskDetail = Shapes::StructureShape.new(name: 'SnapshotTaskDetail')
@@ -3542,6 +3548,7 @@ module Aws::EC2
     VpnTunnelLogOptionsSpecification = Shapes::StructureShape.new(name: 'VpnTunnelLogOptionsSpecification')
     VpnTunnelOptionsSpecification = Shapes::StructureShape.new(name: 'VpnTunnelOptionsSpecification')
     VpnTunnelOptionsSpecificationsList = Shapes::ListShape.new(name: 'VpnTunnelOptionsSpecificationsList')
+    VpnTunnelProvisioningStatus = Shapes::StringShape.new(name: 'VpnTunnelProvisioningStatus')
     WeekDay = Shapes::StringShape.new(name: 'WeekDay')
     WithdrawByoipCidrRequest = Shapes::StructureShape.new(name: 'WithdrawByoipCidrRequest')
     WithdrawByoipCidrResult = Shapes::StructureShape.new(name: 'WithdrawByoipCidrResult')
@@ -3682,6 +3689,17 @@ module Aws::EC2
 
     ActiveInstanceSet.member = Shapes::ShapeRef.new(shape: ActiveInstance, location_name: "item")
 
+    ActiveVpnTunnelStatus.add_member(:phase_1_encryption_algorithm, Shapes::ShapeRef.new(shape: String, location_name: "phase1EncryptionAlgorithm"))
+    ActiveVpnTunnelStatus.add_member(:phase_2_encryption_algorithm, Shapes::ShapeRef.new(shape: String, location_name: "phase2EncryptionAlgorithm"))
+    ActiveVpnTunnelStatus.add_member(:phase_1_integrity_algorithm, Shapes::ShapeRef.new(shape: String, location_name: "phase1IntegrityAlgorithm"))
+    ActiveVpnTunnelStatus.add_member(:phase_2_integrity_algorithm, Shapes::ShapeRef.new(shape: String, location_name: "phase2IntegrityAlgorithm"))
+    ActiveVpnTunnelStatus.add_member(:phase_1_dh_group, Shapes::ShapeRef.new(shape: Integer, location_name: "phase1DHGroup"))
+    ActiveVpnTunnelStatus.add_member(:phase_2_dh_group, Shapes::ShapeRef.new(shape: Integer, location_name: "phase2DHGroup"))
+    ActiveVpnTunnelStatus.add_member(:ike_version, Shapes::ShapeRef.new(shape: String, location_name: "ikeVersion"))
+    ActiveVpnTunnelStatus.add_member(:provisioning_status, Shapes::ShapeRef.new(shape: VpnTunnelProvisioningStatus, location_name: "provisioningStatus"))
+    ActiveVpnTunnelStatus.add_member(:provisioning_status_reason, Shapes::ShapeRef.new(shape: String, location_name: "provisioningStatusReason"))
+    ActiveVpnTunnelStatus.struct_class = Types::ActiveVpnTunnelStatus
+
     AddIpamOperatingRegion.add_member(:region_name, Shapes::ShapeRef.new(shape: String, location_name: "RegionName"))
     AddIpamOperatingRegion.struct_class = Types::AddIpamOperatingRegion
 
@@ -6225,6 +6243,7 @@ module Aws::EC2
     CreateVpnConnectionRequest.add_member(:vpn_gateway_id, Shapes::ShapeRef.new(shape: VpnGatewayId, location_name: "VpnGatewayId"))
     CreateVpnConnectionRequest.add_member(:transit_gateway_id, Shapes::ShapeRef.new(shape: TransitGatewayId, location_name: "TransitGatewayId"))
     CreateVpnConnectionRequest.add_member(:tag_specifications, Shapes::ShapeRef.new(shape: TagSpecificationList, location_name: "TagSpecification"))
+    CreateVpnConnectionRequest.add_member(:pre_shared_key_storage, Shapes::ShapeRef.new(shape: String, location_name: "PreSharedKeyStorage"))
     CreateVpnConnectionRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     CreateVpnConnectionRequest.add_member(:options, Shapes::ShapeRef.new(shape: VpnConnectionOptionsSpecification, location_name: "options"))
     CreateVpnConnectionRequest.struct_class = Types::CreateVpnConnectionRequest
@@ -6672,6 +6691,12 @@ module Aws::EC2
     DeleteSnapshotRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DeleteSnapshotRequest.struct_class = Types::DeleteSnapshotRequest
 
+    DeleteSnapshotResultSet.member = Shapes::ShapeRef.new(shape: DeleteSnapshotReturnCode, location_name: "item")
+
+    DeleteSnapshotReturnCode.add_member(:snapshot_id, Shapes::ShapeRef.new(shape: SnapshotId, location_name: "snapshotId"))
+    DeleteSnapshotReturnCode.add_member(:return_code, Shapes::ShapeRef.new(shape: SnapshotReturnCodes, location_name: "returnCode"))
+    DeleteSnapshotReturnCode.struct_class = Types::DeleteSnapshotReturnCode
+
     DeleteSpotDatafeedSubscriptionRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DeleteSpotDatafeedSubscriptionRequest.struct_class = Types::DeleteSpotDatafeedSubscriptionRequest
 
@@ -6920,9 +6945,12 @@ module Aws::EC2
     DeprovisionedAddressSet.member = Shapes::ShapeRef.new(shape: String, location_name: "item")
 
     DeregisterImageRequest.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, required: true, location_name: "ImageId"))
+    DeregisterImageRequest.add_member(:delete_associated_snapshots, Shapes::ShapeRef.new(shape: Boolean, location_name: "DeleteAssociatedSnapshots"))
     DeregisterImageRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DeregisterImageRequest.struct_class = Types::DeregisterImageRequest
 
+    DeregisterImageResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
+    DeregisterImageResult.add_member(:delete_snapshot_results, Shapes::ShapeRef.new(shape: DeleteSnapshotResultSet, location_name: "deleteSnapshotResultSet"))
     DeregisterImageResult.struct_class = Types::DeregisterImageResult
 
     DeregisterInstanceEventNotificationAttributesRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
@@ -10011,6 +10039,14 @@ module Aws::EC2
     FpgaInfo.add_member(:total_fpga_memory_in_mi_b, Shapes::ShapeRef.new(shape: totalFpgaMemory, location_name: "totalFpgaMemoryInMiB"))
     FpgaInfo.struct_class = Types::FpgaInfo
 
+    GetActiveVpnTunnelStatusRequest.add_member(:vpn_connection_id, Shapes::ShapeRef.new(shape: VpnConnectionId, required: true, location_name: "VpnConnectionId"))
+    GetActiveVpnTunnelStatusRequest.add_member(:vpn_tunnel_outside_ip_address, Shapes::ShapeRef.new(shape: String, required: true, location_name: "VpnTunnelOutsideIpAddress"))
+    GetActiveVpnTunnelStatusRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    GetActiveVpnTunnelStatusRequest.struct_class = Types::GetActiveVpnTunnelStatusRequest
+
+    GetActiveVpnTunnelStatusResult.add_member(:active_vpn_tunnel_status, Shapes::ShapeRef.new(shape: ActiveVpnTunnelStatus, location_name: "activeVpnTunnelStatus"))
+    GetActiveVpnTunnelStatusResult.struct_class = Types::GetActiveVpnTunnelStatusResult
+
     GetAllowedImagesSettingsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     GetAllowedImagesSettingsRequest.struct_class = Types::GetAllowedImagesSettingsRequest
 
@@ -10550,6 +10586,7 @@ module Aws::EC2
     GetVpnConnectionDeviceSampleConfigurationRequest.add_member(:vpn_connection_id, Shapes::ShapeRef.new(shape: VpnConnectionId, required: true, location_name: "VpnConnectionId"))
     GetVpnConnectionDeviceSampleConfigurationRequest.add_member(:vpn_connection_device_type_id, Shapes::ShapeRef.new(shape: VpnConnectionDeviceTypeId, required: true, location_name: "VpnConnectionDeviceTypeId"))
     GetVpnConnectionDeviceSampleConfigurationRequest.add_member(:internet_key_exchange_version, Shapes::ShapeRef.new(shape: String, location_name: "InternetKeyExchangeVersion"))
+    GetVpnConnectionDeviceSampleConfigurationRequest.add_member(:sample_type, Shapes::ShapeRef.new(shape: String, location_name: "SampleType"))
     GetVpnConnectionDeviceSampleConfigurationRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     GetVpnConnectionDeviceSampleConfigurationRequest.struct_class = Types::GetVpnConnectionDeviceSampleConfigurationRequest
 
@@ -13427,6 +13464,7 @@ module Aws::EC2
     ModifyVpnTunnelOptionsRequest.add_member(:tunnel_options, Shapes::ShapeRef.new(shape: ModifyVpnTunnelOptionsSpecification, required: true, location_name: "TunnelOptions"))
     ModifyVpnTunnelOptionsRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     ModifyVpnTunnelOptionsRequest.add_member(:skip_tunnel_replacement, Shapes::ShapeRef.new(shape: Boolean, location_name: "SkipTunnelReplacement"))
+    ModifyVpnTunnelOptionsRequest.add_member(:pre_shared_key_storage, Shapes::ShapeRef.new(shape: String, location_name: "PreSharedKeyStorage"))
     ModifyVpnTunnelOptionsRequest.struct_class = Types::ModifyVpnTunnelOptionsRequest
 
     ModifyVpnTunnelOptionsResult.add_member(:vpn_connection, Shapes::ShapeRef.new(shape: VpnConnection, location_name: "vpnConnection"))
@@ -17378,6 +17416,7 @@ module Aws::EC2
     VpnConnection.add_member(:routes, Shapes::ShapeRef.new(shape: VpnStaticRouteList, location_name: "routes"))
     VpnConnection.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
     VpnConnection.add_member(:vgw_telemetry, Shapes::ShapeRef.new(shape: VgwTelemetryList, location_name: "vgwTelemetry"))
+    VpnConnection.add_member(:pre_shared_key_arn, Shapes::ShapeRef.new(shape: String, location_name: "preSharedKeyArn"))
     VpnConnection.add_member(:vpn_connection_id, Shapes::ShapeRef.new(shape: String, location_name: "vpnConnectionId"))
     VpnConnection.add_member(:state, Shapes::ShapeRef.new(shape: VpnState, location_name: "state"))
     VpnConnection.add_member(:customer_gateway_configuration, Shapes::ShapeRef.new(shape: customerGatewayConfiguration, location_name: "customerGatewayConfiguration"))
@@ -22042,6 +22081,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: ExportVerifiedAccessInstanceClientConfigurationResult)
       end)
 
+      api.add_operation(:get_active_vpn_tunnel_status, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "GetActiveVpnTunnelStatus"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: GetActiveVpnTunnelStatusRequest)
+        o.output = Shapes::ShapeRef.new(shape: GetActiveVpnTunnelStatusResult)
+      end)
+
       api.add_operation(:get_allowed_images_settings, Seahorse::Model::Operation.new.tap do |o|
         o.name = "GetAllowedImagesSettings"
         o.http_method = "POST"

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

@@ -142,8 +142,9 @@ module Aws::EC2
       data[:virtualization_type]
     end
 
-    # The boot mode of the image. For more information, see [Boot modes][1]
-    # in the *Amazon EC2 User Guide*.
+    # The boot mode of the image. For more information, see [Instance launch
+    # behavior with Amazon EC2 boot modes][1] in the *Amazon EC2 User
+    # Guide*.
     #
     #
     #
@@ -245,7 +246,8 @@ module Aws::EC2
     # CopyImage, or CreateRestoreImageTask. The ID does not appear if the
     # AMI was created using any other API. For some older AMIs, the ID might
     # not be available. For more information, see [Identify the source AMI
-    # used to create a new AMI][1] in the *Amazon EC2 User Guide*.
+    # used to create a new Amazon EC2 AMI][1] in the *Amazon EC2 User
+    # Guide*.
     #
     #
     #
@@ -261,8 +263,8 @@ module Aws::EC2
     # CopyImage, or CreateRestoreImageTask. The Region does not appear if
     # the AMI was created using any other API. For some older AMIs, the
     # Region might not be available. For more information, see [Identify the
-    # source AMI used to create a new AMI][1] in the *Amazon EC2 User
-    # Guide*.
+    # source AMI used to create a new Amazon EC2 AMI][1] in the *Amazon EC2
+    # User Guide*.
     #
     #
     #
@@ -605,9 +607,20 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   image.deregister({
+    #     delete_associated_snapshots: false,
     #     dry_run: false,
     #   })
     # @param [Hash] options ({})
+    # @option options [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 options [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.

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

@@ -1968,7 +1968,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*.
     #
     #
     #
@@ -1981,8 +1981,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*.
     #
     #
     #
@@ -1997,8 +1998,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*.
     #
     #
     #
@@ -2014,8 +2015,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*.
     #
     #
     #
@@ -2082,8 +2083,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*.
     #
     #
     #

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

@@ -535,6 +535,63 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # Contains information about the current security configuration of an
+    # active VPN tunnel.
+    #
+    # @!attribute [rw] phase_1_encryption_algorithm
+    #   The encryption algorithm negotiated in Phase 1 IKE negotiations.
+    #   @return [String]
+    #
+    # @!attribute [rw] phase_2_encryption_algorithm
+    #   The encryption algorithm negotiated in Phase 2 IKE negotiations.
+    #   @return [String]
+    #
+    # @!attribute [rw] phase_1_integrity_algorithm
+    #   The integrity algorithm negotiated in Phase 1 IKE negotiations.
+    #   @return [String]
+    #
+    # @!attribute [rw] phase_2_integrity_algorithm
+    #   The integrity algorithm negotiated in Phase 2 IKE negotiations.
+    #   @return [String]
+    #
+    # @!attribute [rw] phase_1_dh_group
+    #   The Diffie-Hellman group number being used in Phase 1 IKE
+    #   negotiations.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] phase_2_dh_group
+    #   The Diffie-Hellman group number being used in Phase 2 IKE
+    #   negotiations.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] ike_version
+    #   The version of the Internet Key Exchange (IKE) protocol being used.
+    #   @return [String]
+    #
+    # @!attribute [rw] provisioning_status
+    #   The current provisioning status of the VPN tunnel.
+    #   @return [String]
+    #
+    # @!attribute [rw] provisioning_status_reason
+    #   The reason for the current provisioning status.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ActiveVpnTunnelStatus AWS API Documentation
+    #
+    class ActiveVpnTunnelStatus < Struct.new(
+      :phase_1_encryption_algorithm,
+      :phase_2_encryption_algorithm,
+      :phase_1_integrity_algorithm,
+      :phase_2_integrity_algorithm,
+      :phase_1_dh_group,
+      :phase_2_dh_group,
+      :ike_version,
+      :provisioning_status,
+      :provisioning_status_reason)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Add an operating Region to an IPAM. Operating Regions are Amazon Web
     # Services Regions where the IPAM is allowed to manage IP address CIDRs.
     # IPAM only discovers and monitors resources in the Amazon Web Services
@@ -7200,8 +7257,8 @@ module Aws::EC2
     #
     # @!attribute [rw] 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*.
+    #   of 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.
@@ -7328,7 +7385,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].
     #
     #
     #
@@ -15207,6 +15265,12 @@ module Aws::EC2
     #   The tags to apply to the VPN connection.
     #   @return [Array<Types::TagSpecification>]
     #
+    # @!attribute [rw] 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).
+    #   @return [String]
+    #
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -15226,6 +15290,7 @@ module Aws::EC2
       :vpn_gateway_id,
       :transit_gateway_id,
       :tag_specifications,
+      :pre_shared_key_storage,
       :dry_run,
       :options)
       SENSITIVE = []
@@ -17339,6 +17404,49 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # The snapshot ID and its deletion result code.
+    #
+    # @!attribute [rw] snapshot_id
+    #   The ID of the snapshot.
+    #   @return [String]
+    #
+    # @!attribute [rw] return_code
+    #   The result code from the snapshot deletion attempt. Possible values:
+    #
+    #   * `success` - The snapshot was successfully deleted.
+    #
+    #   * `skipped` - The snapshot was not deleted because it's associated
+    #     with other AMIs.
+    #
+    #   * `missing-permissions` - The snapshot was not deleted because the
+    #     role lacks `DeleteSnapshot` permissions. For more information, see
+    #     [How Amazon EBS works with IAM][1].
+    #
+    #   * `internal-error` - The snapshot was not deleted due to a server
+    #     error.
+    #
+    #   * `client-error` - The snapshot was not deleted due to a client
+    #     configuration error.
+    #
+    #   For details about an error, check the `DeleteSnapshot` event in the
+    #   CloudTrail event history. For more information, see [View event
+    #   history][2] in the *Amazon Web Services CloudTrail User Guide*.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/ebs/latest/userguide/security_iam_service-with-iam.html
+    #   [2]: https://docs.aws.amazon.com/awscloudtrail/latest/userguide/tutorial-event-history.html
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DeleteSnapshotReturnCode AWS API Documentation
+    #
+    class DeleteSnapshotReturnCode < Struct.new(
+      :snapshot_id,
+      :return_code)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # Contains the parameters for DeleteSpotDatafeedSubscription.
     #
     # @!attribute [rw] dry_run
@@ -18548,6 +18656,18 @@ module Aws::EC2
     #   The ID of the AMI.
     #   @return [String]
     #
+    # @!attribute [rw] 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.
+    #   @return [Boolean]
+    #
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -18559,14 +18679,30 @@ module Aws::EC2
     #
     class DeregisterImageRequest < Struct.new(
       :image_id,
+      :delete_associated_snapshots,
       :dry_run)
       SENSITIVE = []
       include Aws::Structure
     end
 
+    # @!attribute [rw] return
+    #   Returns `true` if the request succeeds; otherwise, it returns an
+    #   error.
+    #   @return [Boolean]
+    #
+    # @!attribute [rw] delete_snapshot_results
+    #   The deletion result for each snapshot associated with the AMI,
+    #   including the snapshot ID and its success or error code.
+    #   @return [Array<Types::DeleteSnapshotReturnCode>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DeregisterImageResult AWS API Documentation
     #
-    class DeregisterImageResult < Aws::EmptyStructure; end
+    class DeregisterImageResult < Struct.new(
+      :return,
+      :delete_snapshot_results)
+      SENSITIVE = []
+      include Aws::Structure
+    end
 
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
@@ -38419,6 +38555,44 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @!attribute [rw] vpn_connection_id
+    #   The ID of the VPN connection for which to retrieve the active tunnel
+    #   status.
+    #   @return [String]
+    #
+    # @!attribute [rw] vpn_tunnel_outside_ip_address
+    #   The external IP address of the VPN tunnel for which to retrieve the
+    #   active status.
+    #   @return [String]
+    #
+    # @!attribute [rw] dry_run
+    #   Checks whether you have the required permissions for the action,
+    #   without actually making the request.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/GetActiveVpnTunnelStatusRequest AWS API Documentation
+    #
+    class GetActiveVpnTunnelStatusRequest < Struct.new(
+      :vpn_connection_id,
+      :vpn_tunnel_outside_ip_address,
+      :dry_run)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] active_vpn_tunnel_status
+    #   Information about the current security configuration of the VPN
+    #   tunnel.
+    #   @return [Types::ActiveVpnTunnelStatus]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/GetActiveVpnTunnelStatusResult AWS API Documentation
+    #
+    class GetActiveVpnTunnelStatusResult < Struct.new(
+      :active_vpn_tunnel_status)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -41357,6 +41531,12 @@ module Aws::EC2
     #   versions: `ikev1` or `ikev2`.
     #   @return [String]
     #
+    # @!attribute [rw] sample_type
+    #   The type of sample configuration to generate. Valid values are
+    #   "compatibility" (includes IKEv1) or "recommended" (throws
+    #   UnsupportedOperationException for IKEv1).
+    #   @return [String]
+    #
     # @!attribute [rw] dry_run
     #   Checks whether you have the required permissions for the action,
     #   without actually making the request, and provides an error response.
@@ -41370,6 +41550,7 @@ module Aws::EC2
       :vpn_connection_id,
       :vpn_connection_device_type_id,
       :internet_key_exchange_version,
+      :sample_type,
       :dry_run)
       SENSITIVE = []
       include Aws::Structure
@@ -42267,8 +42448,9 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] boot_mode
-    #   The boot mode of the image. For more information, see [Boot
-    #   modes][1] in the *Amazon EC2 User Guide*.
+    #   The boot mode of the image. For more information, see [Instance
+    #   launch behavior with Amazon EC2 boot modes][1] in the *Amazon EC2
+    #   User Guide*.
     #
     #
     #
@@ -42356,8 +42538,8 @@ module Aws::EC2
     #   CopyImage, or CreateRestoreImageTask. The ID does not appear if the
     #   AMI was created using any other API. For some older AMIs, the ID
     #   might not be available. For more information, see [Identify the
-    #   source AMI used to create a new AMI][1] in the *Amazon EC2 User
-    #   Guide*.
+    #   source AMI used to create a new Amazon EC2 AMI][1] in the *Amazon
+    #   EC2 User Guide*.
     #
     #
     #
@@ -42371,8 +42553,8 @@ module Aws::EC2
     #   CopyImage, or CreateRestoreImageTask. The Region does not appear if
     #   the AMI was created using any other API. For some older AMIs, the
     #   Region might not be available. For more information, see [Identify
-    #   the source AMI used to create a new AMI][1] in the *Amazon EC2 User
-    #   Guide*.
+    #   the source AMI used to create a new Amazon EC2 AMI][1] in the
+    #   *Amazon EC2 User Guide*.
     #
     #
     #
@@ -42509,7 +42691,8 @@ module Aws::EC2
     #   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*.
+    #   Secure Boot for Amazon EC2 instances][3] in the *Amazon EC2 User
+    #   Guide*.
     #
     #
     #
@@ -57677,6 +57860,12 @@ module Aws::EC2
     #   Valid values: `True` \| `False`
     #   @return [Boolean]
     #
+    # @!attribute [rw] 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 [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ModifyVpnTunnelOptionsRequest AWS API Documentation
     #
     class ModifyVpnTunnelOptionsRequest < Struct.new(
@@ -57684,7 +57873,8 @@ module Aws::EC2
       :vpn_tunnel_outside_ip_address,
       :tunnel_options,
       :dry_run,
-      :skip_tunnel_replacement)
+      :skip_tunnel_replacement,
+      :pre_shared_key_storage)
       SENSITIVE = [:tunnel_options]
       include Aws::Structure
     end
@@ -62205,8 +62395,8 @@ 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*.
+    #   information, see [Canned ACL][1] in the *Amazon S3 Service Developer
+    #   Guide*.
     #
     #
     #
@@ -62221,8 +62411,10 @@ 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*.
     #
     #
     #
@@ -62239,8 +62431,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*.
     #
     #
     #
@@ -62261,7 +62453,8 @@ module Aws::EC2
     #   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*.
+    #   Secure Boot for Amazon EC2 instances][3] in the *Amazon EC2 User
+    #   Guide*.
     #
     #
     #
@@ -62350,8 +62543,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*.
     #
     #
     #
@@ -77313,6 +77506,11 @@ module Aws::EC2
     #   Information about the VPN tunnel.
     #   @return [Array<Types::VgwTelemetry>]
     #
+    # @!attribute [rw] pre_shared_key_arn
+    #   The Amazon Resource Name (ARN) of the Secrets Manager secret storing
+    #   the pre-shared key(s) for the VPN connection.
+    #   @return [String]
+    #
     # @!attribute [rw] vpn_connection_id
     #   The ID of the VPN connection.
     #   @return [String]
@@ -77354,6 +77552,7 @@ module Aws::EC2
       :routes,
       :tags,
       :vgw_telemetry,
+      :pre_shared_key_arn,
       :vpn_connection_id,
       :state,
       :customer_gateway_configuration,

data/lib/aws-sdk-ec2.rb

@@ -78,7 +78,7 @@ module Aws::EC2
   autoload :VpcPeeringConnection, 'aws-sdk-ec2/vpc_peering_connection'
   autoload :VpcAddress, 'aws-sdk-ec2/vpc_address'
 
-  GEM_VERSION = '1.527.0'
+  GEM_VERSION = '1.529.0'
 
 end