aws-sdk-ec2 1.624.0 → 1.625.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 155bd892ae13a7841d99b7fe728eb05c5ab6e315da611a5d969745d8a9977b96
-  data.tar.gz: 85a947a839322269c7f040a6ee51b0bb37d977989ced2c8ed8eaaa6729805d23
+  metadata.gz: 6867db1c50af7b0857132f507020ae6f98052f5d6d36d180e073ce37b04f5b21
+  data.tar.gz: 8581cb5bcde7850245f6823c1e2aca5758751f1ff19e5ae25f53bde4e8c67ad8
 SHA512:
-  metadata.gz: ce28421481e33d3a5c05ec7e4631f79b9a8e2ef1dd7a65998d397fc8ff565e7a210a62c5bd84b0f23ca9eb0ae2a029fd6e47edba5e275c099cec2b0d6d84d72e
-  data.tar.gz: 3857ad5e9a1ed243abb204b04b518b622b44155e96e16ed5300ab87dc903f899582cc30f10b712b4d21fc99e689f8bd0225e4a062e6e7c07be53330d2ecd2813
+  metadata.gz: 46ab18a4b5aaede3d96a4951de50e791f047d5f40e2412fc7a8eeda01eea19d2c7eb9519f3b7e8178d0f12ab1871263943c228ca24daa5e17750148ab5cbc72f
+  data.tar.gz: 9d680bcf86f4643f7e4d16b9c071c30d33cd94c02a5688947d4b1b19847649306f5f01758ac5153d3ba208206fcacee4f1dcbfd7b32b772ec9e088c469d30598

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Unreleased Changes
 ------------------
 
+1.625.0 (2026-06-22)
+------------------
+
+* Feature - This release adds support for AMI Watermark and Allowed AMIs integration
+
 1.624.0 (2026-06-18)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.624.0
+1.625.0

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

@@ -3204,8 +3204,7 @@ module Aws::EC2
 
     # Attaches a watermark to a non-public AMI. The watermark is a
     # structured identifier that automatically propagates to all derivative
-    # images created through [CreateImage][1], [CopyImage][2], and
-    # [CreateRestoreImageTask][3].
+    # images created through [CreateImage][1], and [CopyImage][2].
     #
     # Only the AMI owner can attach watermarks. Watermarks cannot be added
     # to public AMIs.
@@ -3214,7 +3213,6 @@ module Aws::EC2
     #
     # [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateImage.html
     # [2]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CopyImage.html
-    # [3]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateRestoreImageTask.html
     #
     # @option params [required, String] :image_id
     #   The ID of the AMI.
@@ -4378,29 +4376,26 @@ module Aws::EC2
     #
     # * `assessing`
     #
-    # * `scheduled` — requires a cancellation quote. Use
-    #   `CreateCapacityReservationCancellationQuote` to generate a quote,
-    #   then pass the quote ID with `ApplyCancellationCharges` set to
-    #   `commitment-wind-down`. The cancellation charge depends on how close
-    #   the reservation is to its start date.
+    # * `scheduled`
     #
     # * `active` and there is no commitment duration or the commitment
     #   duration has elapsed.
     #
-    # * `active` during the commitment duration — requires a cancellation
-    #   quote. Use `CreateCapacityReservationCancellationQuote` to generate
-    #   a quote, then pass the quote ID with `ApplyCancellationCharges` set
-    #   to `commitment-wind-down`. The Capacity Reservation transitions to
-    #   `cancelling` while charges are applied.
-    #
-    # * `delayed` — the commitment duration is waived, so no cancellation
-    #   charge applies.
+    # * `active` during the commitment duration, if you provide a
+    #   cancellation quote ID and accept the cancellation charges. Use
+    #   `CreateCapacityReservationCancellationQuote` to generate a quote.
+    #   The Capacity Reservation transitions to `cancelling` while charges
+    #   are applied.
     #
     # <note markdown="1"> You can't modify or cancel a Capacity Block. For more information,
     # see [Capacity Blocks for ML][1].
     #
     #  </note>
     #
+    # If a future-dated Capacity Reservation enters the `delayed` state, the
+    # commitment duration is waived, and you can cancel it as soon as it
+    # enters the `active` state.
+    #
     # Instances running in the reserved capacity continue running until you
     # stop them. Stopped instances that target the Capacity Reservation can
     # no longer launch. Modify these instances to either target a different
@@ -51782,6 +51777,11 @@ module Aws::EC2
     #   resp.image_criteria[0].image_names[0] #=> String
     #   resp.image_criteria[0].deprecation_time_condition.maximum_days_since_deprecated #=> Integer
     #   resp.image_criteria[0].creation_date_condition.maximum_days_since_created #=> Integer
+    #   resp.image_criteria[0].image_watermarks #=> Array
+    #   resp.image_criteria[0].image_watermarks[0].watermark_key #=> String
+    #   resp.image_criteria[0].image_watermarks[0].source_image_region #=> String
+    #   resp.image_criteria[0].image_watermarks[0].maximum_days_since_source_image_created #=> Integer
+    #   resp.image_criteria[0].image_watermarks[0].maximum_days_since_watermark_created #=> Integer
     #   resp.managed_by #=> String, one of "account", "declarative-policy"
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/GetAllowedImagesSettings AWS API Documentation
@@ -67736,6 +67736,12 @@ module Aws::EC2
 
     # Sets or replaces the criteria for Allowed AMIs.
     #
+    # The `ImageCriteria` can include up to:
+    #
+    # * 10 `ImageCriterion`
+    #
+    # ^
+    #
     # <note markdown="1"> The Allowed AMIs feature does not restrict the AMIs owned by your
     # account. Regardless of the criteria you set, the AMIs created by your
     # account will always be discoverable and usable by users in your
@@ -67779,6 +67785,14 @@ module Aws::EC2
     #         creation_date_condition: {
     #           maximum_days_since_created: 1,
     #         },
+    #         image_watermarks: [
+    #           {
+    #             watermark_key: "String",
+    #             source_image_region: "String",
+    #             maximum_days_since_source_image_created: 1,
+    #             maximum_days_since_watermark_created: 1,
+    #           },
+    #         ],
     #       },
     #     ],
     #     dry_run: false,
@@ -74087,7 +74101,7 @@ module Aws::EC2
         tracer: tracer
       )
       context[:gem_name] = 'aws-sdk-ec2'
-      context[:gem_version] = '1.624.0'
+      context[:gem_version] = '1.625.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -2073,6 +2073,10 @@ module Aws::EC2
     ImageUsageResourceTypeRequest = Shapes::StructureShape.new(name: 'ImageUsageResourceTypeRequest')
     ImageUsageResourceTypeRequestList = Shapes::ListShape.new(name: 'ImageUsageResourceTypeRequestList')
     ImageWatermark = Shapes::StructureShape.new(name: 'ImageWatermark')
+    ImageWatermarkFilterRequest = Shapes::StructureShape.new(name: 'ImageWatermarkFilterRequest')
+    ImageWatermarkFilterRequestList = Shapes::ListShape.new(name: 'ImageWatermarkFilterRequestList')
+    ImageWatermarkFilterResponse = Shapes::StructureShape.new(name: 'ImageWatermarkFilterResponse')
+    ImageWatermarkFilterResponseList = Shapes::ListShape.new(name: 'ImageWatermarkFilterResponseList')
     ImageWatermarkList = Shapes::ListShape.new(name: 'ImageWatermarkList')
     ImageWatermarkNameRequest = Shapes::StringShape.new(name: 'ImageWatermarkNameRequest')
     ImdsSupportValues = Shapes::StringShape.new(name: 'ImdsSupportValues')
@@ -12348,6 +12352,7 @@ module Aws::EC2
     ImageCriterion.add_member(:image_names, Shapes::ShapeRef.new(shape: ImageNameList, location_name: "imageNameSet"))
     ImageCriterion.add_member(:deprecation_time_condition, Shapes::ShapeRef.new(shape: DeprecationTimeCondition, location_name: "deprecationTimeCondition"))
     ImageCriterion.add_member(:creation_date_condition, Shapes::ShapeRef.new(shape: CreationDateCondition, location_name: "creationDateCondition"))
+    ImageCriterion.add_member(:image_watermarks, Shapes::ShapeRef.new(shape: ImageWatermarkFilterResponseList, location_name: "imageWatermarkSet"))
     ImageCriterion.struct_class = Types::ImageCriterion
 
     ImageCriterionList.member = Shapes::ShapeRef.new(shape: ImageCriterion, location_name: "item")
@@ -12357,6 +12362,7 @@ module Aws::EC2
     ImageCriterionRequest.add_member(:image_names, Shapes::ShapeRef.new(shape: ImageNameCriteriaRequestList, location_name: "ImageName"))
     ImageCriterionRequest.add_member(:deprecation_time_condition, Shapes::ShapeRef.new(shape: DeprecationTimeConditionRequest, location_name: "DeprecationTimeCondition"))
     ImageCriterionRequest.add_member(:creation_date_condition, Shapes::ShapeRef.new(shape: CreationDateConditionRequest, location_name: "CreationDateCondition"))
+    ImageCriterionRequest.add_member(:image_watermarks, Shapes::ShapeRef.new(shape: ImageWatermarkFilterRequestList, location_name: "ImageWatermark"))
     ImageCriterionRequest.struct_class = Types::ImageCriterionRequest
 
     ImageCriterionRequestList.member = Shapes::ShapeRef.new(shape: ImageCriterionRequest, location_name: "ImageCriterion")
@@ -12473,6 +12479,22 @@ module Aws::EC2
     ImageWatermark.add_member(:watermark_creation_time, Shapes::ShapeRef.new(shape: MillisecondDateTime, location_name: "watermarkCreationTime"))
     ImageWatermark.struct_class = Types::ImageWatermark
 
+    ImageWatermarkFilterRequest.add_member(:watermark_key, Shapes::ShapeRef.new(shape: String, location_name: "WatermarkKey"))
+    ImageWatermarkFilterRequest.add_member(:source_image_region, Shapes::ShapeRef.new(shape: String, location_name: "SourceImageRegion"))
+    ImageWatermarkFilterRequest.add_member(:maximum_days_since_source_image_created, Shapes::ShapeRef.new(shape: Integer, location_name: "MaximumDaysSinceSourceImageCreated"))
+    ImageWatermarkFilterRequest.add_member(:maximum_days_since_watermark_created, Shapes::ShapeRef.new(shape: Integer, location_name: "MaximumDaysSinceWatermarkCreated"))
+    ImageWatermarkFilterRequest.struct_class = Types::ImageWatermarkFilterRequest
+
+    ImageWatermarkFilterRequestList.member = Shapes::ShapeRef.new(shape: ImageWatermarkFilterRequest, location_name: "item")
+
+    ImageWatermarkFilterResponse.add_member(:watermark_key, Shapes::ShapeRef.new(shape: String, location_name: "watermarkKey"))
+    ImageWatermarkFilterResponse.add_member(:source_image_region, Shapes::ShapeRef.new(shape: String, location_name: "sourceImageRegion"))
+    ImageWatermarkFilterResponse.add_member(:maximum_days_since_source_image_created, Shapes::ShapeRef.new(shape: Integer, location_name: "maximumDaysSinceSourceImageCreated"))
+    ImageWatermarkFilterResponse.add_member(:maximum_days_since_watermark_created, Shapes::ShapeRef.new(shape: Integer, location_name: "maximumDaysSinceWatermarkCreated"))
+    ImageWatermarkFilterResponse.struct_class = Types::ImageWatermarkFilterResponse
+
+    ImageWatermarkFilterResponseList.member = Shapes::ShapeRef.new(shape: ImageWatermarkFilterResponse, location_name: "item")
+
     ImageWatermarkList.member = Shapes::ShapeRef.new(shape: ImageWatermark, location_name: "item")
 
     ImportClientVpnClientCertificateRevocationListRequest.add_member(:client_vpn_endpoint_id, Shapes::ShapeRef.new(shape: ClientVpnEndpointId, required: true, location_name: "ClientVpnEndpointId"))

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

@@ -48873,6 +48873,16 @@ module Aws::EC2
     #   The maximum age for allowed images.
     #   @return [Types::CreationDateCondition]
     #
+    # @!attribute [rw] image_watermarks
+    #   The watermark criteria that an AMI must match to be allowed. An AMI
+    #   is allowed if it carries at least one watermark that satisfies an
+    #   ImageWatermarkFilter. A watermark satisfies a filter when all
+    #   specified fields in the ImageWatermarkFilter match the corresponding
+    #   values on the watermark of the AMI.
+    #
+    #   Maximum: 50 values
+    #   @return [Array<Types::ImageWatermarkFilterResponse>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImageCriterion AWS API Documentation
     #
     class ImageCriterion < Struct.new(
@@ -48880,7 +48890,8 @@ module Aws::EC2
       :marketplace_product_codes,
       :image_names,
       :deprecation_time_condition,
-      :creation_date_condition)
+      :creation_date_condition,
+      :image_watermarks)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -48903,6 +48914,8 @@ module Aws::EC2
     #
     # * 50 values for `MarketplaceProductCodes`
     #
+    # * 50 values for `ImageWatermarks`
+    #
     # For more information, see [How Allowed AMIs works][1] in the *Amazon
     # EC2 User Guide*.
     #
@@ -48970,6 +48983,16 @@ module Aws::EC2
     #   The maximum age for allowed images.
     #   @return [Types::CreationDateConditionRequest]
     #
+    # @!attribute [rw] image_watermarks
+    #   The watermark criteria that an AMI must match to be allowed. An AMI
+    #   is allowed if it carries at least one watermark that satisfies an
+    #   ImageWatermarkFilter. A watermark satisfies a filter when all
+    #   specified fields in the ImageWatermarkFilter match the corresponding
+    #   values on the watermark of the AMI.
+    #
+    #   Maximum: 50 values
+    #   @return [Array<Types::ImageWatermarkFilterRequest>]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImageCriterionRequest AWS API Documentation
     #
     class ImageCriterionRequest < Struct.new(
@@ -48977,7 +49000,8 @@ module Aws::EC2
       :marketplace_product_codes,
       :image_names,
       :deprecation_time_condition,
-      :creation_date_condition)
+      :creation_date_condition,
+      :image_watermarks)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -49394,6 +49418,84 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # The watermark filter criteria for an allowed image. Each entry can
+    # specify one or more fields. All specified fields must match the same
+    # watermark on the image.
+    #
+    # @!attribute [rw] watermark_key
+    #   The `accountId:name` of the watermark. Supports wildcards (`*`,
+    #   `?`).
+    #   @return [String]
+    #
+    # @!attribute [rw] source_image_region
+    #   The Region where the watermark was originally created. Supports
+    #   wildcards (`*`, `?`).
+    #   @return [String]
+    #
+    # @!attribute [rw] maximum_days_since_source_image_created
+    #   The maximum number of days that have elapsed since the source image
+    #   was created.
+    #
+    #   Constraints: Minimum value of 0. Maximum value of 2147483647.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] maximum_days_since_watermark_created
+    #   The maximum number of days that have elapsed since the watermark was
+    #   attached to the image.
+    #
+    #   Constraints: Minimum value of 0. Maximum value of 2147483647.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImageWatermarkFilterRequest AWS API Documentation
+    #
+    class ImageWatermarkFilterRequest < Struct.new(
+      :watermark_key,
+      :source_image_region,
+      :maximum_days_since_source_image_created,
+      :maximum_days_since_watermark_created)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # The watermark filter criteria for an allowed image. Each entry can
+    # specify one or more fields. All specified fields must match the same
+    # watermark on the image.
+    #
+    # @!attribute [rw] watermark_key
+    #   The `accountId:name` of the watermark. Supports wildcards (`*`,
+    #   `?`).
+    #   @return [String]
+    #
+    # @!attribute [rw] source_image_region
+    #   The Region where the watermark was originally created. Supports
+    #   wildcards (`*`, `?`).
+    #   @return [String]
+    #
+    # @!attribute [rw] maximum_days_since_source_image_created
+    #   The maximum number of days that have elapsed since the source image
+    #   was created.
+    #
+    #   Constraints: Minimum value of 0. Maximum value of 2147483647.
+    #   @return [Integer]
+    #
+    # @!attribute [rw] maximum_days_since_watermark_created
+    #   The maximum number of days that have elapsed since the watermark was
+    #   attached to the image.
+    #
+    #   Constraints: Minimum value of 0. Maximum value of 2147483647.
+    #   @return [Integer]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImageWatermarkFilterResponse AWS API Documentation
+    #
+    class ImageWatermarkFilterResponse < Struct.new(
+      :watermark_key,
+      :source_image_region,
+      :maximum_days_since_source_image_created,
+      :maximum_days_since_watermark_created)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] client_vpn_endpoint_id
     #   The ID of the Client VPN endpoint to which the client certificate
     #   revocation list applies.
@@ -64540,6 +64642,10 @@ module Aws::EC2
     #
     #   * Connect
     #
+    #   * VPN Concentrator
+    #
+    #   * Client VPN
+    #
     #   You must first delete all transit gateway attachments configured
     #   prior to modifying the ASN on the transit gateway.
     #   @return [Integer]

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.624.0'
+  GEM_VERSION = '1.625.0'
 
 end
 

data/sig/client.rbs

@@ -13204,7 +13204,15 @@ module Aws
                                                                    }?,
                                                                    creation_date_condition: {
                                                                      maximum_days_since_created: ::Integer?
-                                                                   }?
+                                                                   }?,
+                                                                   image_watermarks: Array[
+                                                                     {
+                                                                       watermark_key: ::String?,
+                                                                       source_image_region: ::String?,
+                                                                       maximum_days_since_source_image_created: ::Integer?,
+                                                                       maximum_days_since_watermark_created: ::Integer?
+                                                                     }
+                                                                   ]?
                                                                  }
                                                                ],
                                                                ?dry_run: bool

data/sig/types.rbs

@@ -10790,6 +10790,7 @@ module Aws::EC2
       attr_accessor image_names: ::Array[::String]
       attr_accessor deprecation_time_condition: Types::DeprecationTimeCondition
       attr_accessor creation_date_condition: Types::CreationDateCondition
+      attr_accessor image_watermarks: ::Array[Types::ImageWatermarkFilterResponse]
       SENSITIVE: []
     end
 
@@ -10799,6 +10800,7 @@ module Aws::EC2
       attr_accessor image_names: ::Array[::String]
       attr_accessor deprecation_time_condition: Types::DeprecationTimeConditionRequest
       attr_accessor creation_date_condition: Types::CreationDateConditionRequest
+      attr_accessor image_watermarks: ::Array[Types::ImageWatermarkFilterRequest]
       SENSITIVE: []
     end
 
@@ -10898,6 +10900,22 @@ module Aws::EC2
       SENSITIVE: []
     end
 
+    class ImageWatermarkFilterRequest
+      attr_accessor watermark_key: ::String
+      attr_accessor source_image_region: ::String
+      attr_accessor maximum_days_since_source_image_created: ::Integer
+      attr_accessor maximum_days_since_watermark_created: ::Integer
+      SENSITIVE: []
+    end
+
+    class ImageWatermarkFilterResponse
+      attr_accessor watermark_key: ::String
+      attr_accessor source_image_region: ::String
+      attr_accessor maximum_days_since_source_image_created: ::Integer
+      attr_accessor maximum_days_since_watermark_created: ::Integer
+      SENSITIVE: []
+    end
+
     class ImportClientVpnClientCertificateRevocationListRequest
       attr_accessor client_vpn_endpoint_id: ::String
       attr_accessor certificate_revocation_list: ::String

metadata

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