aws-sdk-ec2 1.528.0 → 1.529.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c318060a48f6e9ca23cc77f530c70e75bbdc61b10ed6c481b7d612108863a89
-  data.tar.gz: 85047b832e087aa94dc4ab1e271a374aaf148be440a48e3104431d870685d99e
+  metadata.gz: 2faa1aaf4db28fbe810198a8ccee19c1fc5cc6c587ad29d50cdb02673cdc797c
+  data.tar.gz: cd007dd57910c646c148efa61df4d6ac342bd0ab3b2b27e4f8cd48de447edb1c
 SHA512:
-  metadata.gz: 1ca671955ec3fedc23bf3fbe4d6b9c094cf5ba88d45739ad69da55f21c86557dbbcc02d6caf756a000777b282374f5968a3eb1563ad43a6080778fab22cd4591
-  data.tar.gz: 9331803d609362fa168288f11854e6f374ad1eaf15ec1e8f9382d6b2e6853fdf46d537d491339b8593d0ad22b6ed7b971ba64ea25b447bb3a660050fb735c75a
+  metadata.gz: 123c9e6fde741a41c945faf38ce3afeee757528dea49cd01ab070c4778a7cd3d9016f7ccdf0ab692b364211772ec39f74fa68f8b7498ac0d157883b015ffc522
+  data.tar.gz: d878cc90b4a0f81de8959bd44254f1fe98dbc3f4deb8ad83f8e67f4fa312eaf03617d8ef5f3953b258f492ed63c7909ff01c6fa9be46eab480a9586f93aff76e

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Unreleased Changes
 ------------------
 
+1.529.0 (2025-05-28)
+------------------
+
+* Feature - Enable the option to automatically delete underlying Amazon EBS snapshots when deregistering Amazon Machine Images (AMIs)
+
 1.528.0 (2025-05-27)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.528.0
+1.529.0

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

@@ -4397,9 +4397,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 +4844,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 +4853,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 +4971,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].
     #
     #
     #
@@ -7764,8 +7765,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*.
     #
     #
     #
@@ -12432,15 +12433,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 +13617,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
@@ -21716,16 +21717,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.
@@ -21741,21 +21747,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 = {})
@@ -37741,14 +37769,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
@@ -43077,7 +43105,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,
@@ -43110,8 +43138,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*.
     #
     #
     #
@@ -43158,12 +43186,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.
@@ -44900,8 +44928,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*.
     #
     #
     #
@@ -44956,7 +44984,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
@@ -45052,12 +45080,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.
@@ -46822,7 +46850,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,
@@ -59097,8 +59125,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**
     #
@@ -59140,7 +59167,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*.
     #
     #
     #
@@ -59154,8 +59181,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*.
     #
     #
     #
@@ -59171,8 +59199,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*.
     #
     #
     #
@@ -59190,8 +59218,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*.
     #
     #
     #
@@ -59268,8 +59296,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*.
     #
     #
     #
@@ -61948,7 +61976,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*.
     #
     #
     #
@@ -66048,7 +66077,7 @@ module Aws::EC2
         tracer: tracer
       )
       context[:gem_name] = 'aws-sdk-ec2'
-      context[:gem_version] = '1.528.0'
+      context[:gem_version] = '1.529.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -776,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')
@@ -3056,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')
@@ -6688,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
 
@@ -6936,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"))

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

@@ -7257,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.
@@ -7385,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].
     #
     #
     #
@@ -17403,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
@@ -18612,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.
@@ -18623,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,
@@ -42376,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*.
     #
     #
     #
@@ -42465,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*.
     #
     #
     #
@@ -42480,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*.
     #
     #
     #
@@ -42618,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*.
     #
     #
     #
@@ -62321,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*.
     #
     #
     #
@@ -62337,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*.
     #
     #
     #
@@ -62355,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*.
     #
     #
     #
@@ -62377,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*.
     #
     #
     #
@@ -62466,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*.
     #
     #
     #

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.528.0'
+  GEM_VERSION = '1.529.0'
 
 end
 

data/sig/client.rbs

@@ -5352,10 +5352,13 @@ module Aws
 
       interface _DeregisterImageResponseSuccess
         include ::Seahorse::Client::_ResponseSuccess[Types::DeregisterImageResult]
+        def return: () -> bool
+        def delete_snapshot_results: () -> ::Array[Types::DeleteSnapshotReturnCode]
       end
       # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/EC2/Client.html#deregister_image-instance_method
       def deregister_image: (
                               image_id: ::String,
+                              ?delete_associated_snapshots: bool,
                               ?dry_run: bool
                             ) -> _DeregisterImageResponseSuccess
                           | (Hash[Symbol, untyped] params, ?Hash[Symbol, untyped] options) -> _DeregisterImageResponseSuccess

data/sig/image.rbs

@@ -169,6 +169,7 @@ module Aws
 
       # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/EC2/Image.html#deregister-instance_method
       def deregister: (
+                        ?delete_associated_snapshots: bool,
                         ?dry_run: bool
                       ) -> Types::DeregisterImageResult
                     | (?Hash[Symbol, untyped]) -> Types::DeregisterImageResult

data/sig/types.rbs

@@ -3992,6 +3992,12 @@ module Aws::EC2
       SENSITIVE: []
     end
 
+    class DeleteSnapshotReturnCode
+      attr_accessor snapshot_id: ::String
+      attr_accessor return_code: ("success" | "skipped" | "missing-permissions" | "internal-error" | "client-error")
+      SENSITIVE: []
+    end
+
     class DeleteSpotDatafeedSubscriptionRequest
       attr_accessor dry_run: bool
       SENSITIVE: []
@@ -4371,11 +4377,15 @@ module Aws::EC2
 
     class DeregisterImageRequest
       attr_accessor image_id: ::String
+      attr_accessor delete_associated_snapshots: bool
       attr_accessor dry_run: bool
       SENSITIVE: []
     end
 
-    class DeregisterImageResult < Aws::EmptyStructure
+    class DeregisterImageResult
+      attr_accessor return: bool
+      attr_accessor delete_snapshot_results: ::Array[Types::DeleteSnapshotReturnCode]
+      SENSITIVE: []
     end
 
     class DeregisterInstanceEventNotificationAttributesRequest

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-ec2
 version: !ruby/object:Gem::Version
-  version: 1.528.0
+  version: 1.529.0
 platform: ruby
 authors:
 - Amazon Web Services