aws-sdk-ec2 1.450.0 → 1.451.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cfc2713df2791836117e0645f8d70d719af91828a8ce406f187196faa552956
-  data.tar.gz: 8eb7d7743cc6ab220eea905d959716d84775cd38971b5dfa6ee7f7cd84edec56
+  metadata.gz: 16e74014b6f1e1387fd83bd97bede3ede98e3d1d7c3fb4410dace6678e426596
+  data.tar.gz: 2d7ba5199968e244df5562a7e9dfe2808384b530036ac7db90c9df8d16e218de
 SHA512:
-  metadata.gz: e72e2c60f3ecf42df7b2109aae11fff024c7b5ebdb1994af48891fd4a3651c98cf2f6f8884db8470779ed78d27cbc5bf1a17ccf06ee17a661a50b0f0170f46d1
-  data.tar.gz: 518c09399e4b341b00497ecc19458a49d5b04ff1fe38bc2d49aed35762f5ebe2b9c7aee5021bf4168af621724469cf806a3dda2537532e1642d6fd68df6033ce
+  metadata.gz: 69d1ceaff24e9867bccef931192b5e16dd721be0097345df896bc8e7309c765cfd959eed06ececbb89d299d1fb8ee0a2cf14191c361489424079c15b31bdf0eb
+  data.tar.gz: dc098d33d87fb5f1b180f78a3c4ad9b9bcc697a7ef2d6bd9765cdd215dda331af658c6a38e57ad8f44fde732431dcb0a02f25c2f348ec17a44ac7f3895b0ef50

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Unreleased Changes
 ------------------
 
+1.451.0 (2024-04-23)
+------------------
+
+* Feature - This release introduces EC2 AMI Deregistration Protection, a new AMI property that can be enabled by customers to protect an AMI against an unintended deregistration. This release also enables the AMI owners to view the AMI 'LastLaunchedTime' in DescribeImages API.
+
 1.450.0 (2024-04-17)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.450.0
+1.451.0

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

@@ -6050,8 +6050,8 @@ module Aws::EC2
     #   supported. For more information about NetBIOS node types, see [RFC
     #   2132][2].
     #
-    # * `ipv6-preferred-lease-time` - A value (in seconds, minutes, hours,
-    #   or years) for how frequently a running instance with an IPv6
+    # * `ipv6-address-preferred-lease-time` - A value (in seconds, minutes,
+    #   hours, or years) for how frequently a running instance with an IPv6
     #   assigned to it goes through DHCPv6 lease renewal. Acceptable values
     #   are between 140 and 2147483647 seconds (approximately 68 years). If
     #   no value is entered, the default lease time is 140 seconds. If you
@@ -8126,11 +8126,11 @@ module Aws::EC2
     # For more information, see [Launch an instance from a launch
     # template][1] in the *Amazon Elastic Compute Cloud User Guide*.
     #
-    # If you want to clone an existing launch template as the basis for
-    # creating a new launch template, you can use the Amazon EC2 console.
-    # The API, SDKs, and CLI do not support cloning a template. For more
-    # information, see [Create a launch template from an existing launch
-    # template][2] in the *Amazon Elastic Compute Cloud User Guide*.
+    # To clone an existing launch template as the basis for a new launch
+    # template, use the Amazon EC2 console. The API, SDKs, and CLI do not
+    # support cloning a template. For more information, see [Create a launch
+    # template from an existing launch template][2] in the *Amazon Elastic
+    # Compute Cloud User Guide*.
     #
     #
     #
@@ -8167,12 +8167,10 @@ module Aws::EC2
     #   The tags to apply to the launch template on creation. To tag the
     #   launch template, the resource type must be `launch-template`.
     #
-    #   <note markdown="1"> To specify the tags for the resources that are created when an
+    #   To specify the tags for the resources that are created when an
     #   instance is launched, you must use the `TagSpecifications` parameter
     #   in the [launch template data][1] structure.
     #
-    #    </note>
-    #
     #
     #
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestLaunchTemplateData.html
@@ -8499,17 +8497,18 @@ module Aws::EC2
       req.send_request(options)
     end
 
-    # Creates a new version of a launch template. You can specify an
-    # existing version of launch template from which to base the new
-    # version.
+    # Creates a new version of a launch template. You must specify an
+    # existing launch template, either by name or ID. You can determine
+    # whether the new version inherits parameters from a source version, and
+    # add or overwrite parameters as needed.
     #
     # Launch template versions are numbered in the order in which they are
-    # created. You cannot specify, change, or replace the numbering of
+    # created. You can't specify, change, or replace the numbering of
     # launch template versions.
     #
     # Launch templates are immutable; after you create a launch template,
     # you can't modify it. Instead, you can create a new version of the
-    # launch template that includes any changes you require.
+    # launch template that includes the changes that you require.
     #
     # For more information, see [Modify a launch template (manage launch
     # template versions)][1] in the *Amazon Elastic Compute Cloud User
@@ -8539,22 +8538,27 @@ module Aws::EC2
     # @option params [String] :launch_template_id
     #   The ID of the launch template.
     #
-    #   You must specify either the `LaunchTemplateId` or the
-    #   `LaunchTemplateName`, but not both.
+    #   You must specify either the launch template ID or the launch template
+    #   name, but not both.
     #
     # @option params [String] :launch_template_name
     #   The name of the launch template.
     #
-    #   You must specify the `LaunchTemplateName` or the `LaunchTemplateId`,
-    #   but not both.
+    #   You must specify either the launch template ID or the launch template
+    #   name, but not both.
     #
     # @option params [String] :source_version
-    #   The version number of the launch template version on which to base the
-    #   new version. The new version inherits the same launch parameters as
-    #   the source version, except for parameters that you specify in
-    #   `LaunchTemplateData`. Snapshots applied to the block device mapping
-    #   are ignored when creating a new version unless they are explicitly
-    #   included.
+    #   The version of the launch template on which to base the new version.
+    #   Snapshots applied to the block device mapping are ignored when
+    #   creating a new version unless they are explicitly included.
+    #
+    #   If you specify this parameter, the new version inherits the launch
+    #   parameters from the source version. If you specify additional launch
+    #   parameters for the new version, they overwrite any corresponding
+    #   launch parameters inherited from the source version.
+    #
+    #   If you omit this parameter, the new version contains only the launch
+    #   parameters that you specify for the new version.
     #
     # @option params [String] :version_description
     #   A description for the version of the launch template.
@@ -16374,14 +16378,14 @@ module Aws::EC2
     # @option params [String] :launch_template_id
     #   The ID of the launch template.
     #
-    #   You must specify either the `LaunchTemplateId` or the
-    #   `LaunchTemplateName`, but not both.
+    #   You must specify either the launch template ID or the launch template
+    #   name, but not both.
     #
     # @option params [String] :launch_template_name
     #   The name of the launch template.
     #
-    #   You must specify either the `LaunchTemplateName` or the
-    #   `LaunchTemplateId`, but not both.
+    #   You must specify either the launch template ID or the launch template
+    #   name, but not both.
     #
     # @return [Types::DeleteLaunchTemplateResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -16465,14 +16469,14 @@ module Aws::EC2
     # @option params [String] :launch_template_id
     #   The ID of the launch template.
     #
-    #   You must specify either the `LaunchTemplateId` or the
-    #   `LaunchTemplateName`, but not both.
+    #   You must specify either the launch template ID or the launch template
+    #   name, but not both.
     #
     # @option params [String] :launch_template_name
     #   The name of the launch template.
     #
-    #   You must specify either the `LaunchTemplateName` or the
-    #   `LaunchTemplateId`, but not both.
+    #   You must specify either the launch template ID or the launch template
+    #   name, but not both.
     #
     # @option params [required, Array<String>] :versions
     #   The version numbers of one or more launch template versions to delete.
@@ -23360,6 +23364,7 @@ module Aws::EC2
     #   * {Types::ImageAttribute#uefi_data #uefi_data} => Types::AttributeValue
     #   * {Types::ImageAttribute#last_launched_time #last_launched_time} => Types::AttributeValue
     #   * {Types::ImageAttribute#imds_support #imds_support} => Types::AttributeValue
+    #   * {Types::ImageAttribute#deregistration_protection #deregistration_protection} => Types::AttributeValue
     #
     #
     # @example Example: To describe the launch permissions for an AMI
@@ -23384,7 +23389,7 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   resp = client.describe_image_attribute({
-    #     attribute: "description", # required, accepts description, kernel, ramdisk, launchPermission, productCodes, blockDeviceMapping, sriovNetSupport, bootMode, tpmSupport, uefiData, lastLaunchedTime, imdsSupport
+    #     attribute: "description", # required, accepts description, kernel, ramdisk, launchPermission, productCodes, blockDeviceMapping, sriovNetSupport, bootMode, tpmSupport, uefiData, lastLaunchedTime, imdsSupport, deregistrationProtection
     #     image_id: "ImageId", # required
     #     dry_run: false,
     #   })
@@ -23422,6 +23427,7 @@ module Aws::EC2
     #   resp.uefi_data #=> <Hash,Array,String,Numeric,Boolean,IO,Set,nil>
     #   resp.last_launched_time #=> <Hash,Array,String,Numeric,Boolean,IO,Set,nil>
     #   resp.imds_support #=> <Hash,Array,String,Numeric,Boolean,IO,Set,nil>
+    #   resp.deregistration_protection #=> <Hash,Array,String,Numeric,Boolean,IO,Set,nil>
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeImageAttribute AWS API Documentation
     #
@@ -23445,6 +23451,9 @@ module Aws::EC2
     # image will eventually return an error indicating that the AMI ID
     # cannot be found.
     #
+    # We strongly recommend using only paginated requests. Unpaginated
+    # requests are susceptible to throttling and timeouts.
+    #
     # <note markdown="1"> The order of the elements in the response, including those within
     # nested structures, might vary. Applications should not assume the
     # elements appear in a particular order.
@@ -23741,6 +23750,8 @@ module Aws::EC2
     #   resp.images[0].deprecation_time #=> String
     #   resp.images[0].imds_support #=> String, one of "v2.0"
     #   resp.images[0].source_instance_id #=> String
+    #   resp.images[0].deregistration_protection #=> String
+    #   resp.images[0].last_launched_time #=> String
     #   resp.next_token #=> String
     #
     #
@@ -25254,6 +25265,9 @@ module Aws::EC2
     # the call fails. If you describe instances and specify only instance
     # IDs that are in an unaffected zone, the call works normally.
     #
+    # We strongly recommend using only paginated requests. Unpaginated
+    # requests are susceptible to throttling and timeouts.
+    #
     # <note markdown="1"> The order of the elements in the response, including those within
     # nested structures, might vary. Applications should not assume the
     # elements appear in a particular order.
@@ -26762,8 +26776,8 @@ module Aws::EC2
     #   The ID of the launch template.
     #
     #   To describe one or more versions of a specified launch template, you
-    #   must specify either the `LaunchTemplateId` or the
-    #   `LaunchTemplateName`, but not both.
+    #   must specify either the launch template ID or the launch template
+    #   name, but not both.
     #
     #   To describe all the latest or default launch template versions in your
     #   account, you must omit this parameter.
@@ -26772,8 +26786,8 @@ module Aws::EC2
     #   The name of the launch template.
     #
     #   To describe one or more versions of a specified launch template, you
-    #   must specify either the `LaunchTemplateName` or the
-    #   `LaunchTemplateId`, but not both.
+    #   must specify either the launch template name or the launch template
+    #   ID, but not both.
     #
     #   To describe all the latest or default launch template versions in your
     #   account, you must omit this parameter.
@@ -29795,6 +29809,9 @@ module Aws::EC2
     # `mac-address`, `private-dns-name`, `private-ip-address`,
     # `private-dns-name`, `subnet-id`, or `vpc-id`.
     #
+    # We strongly recommend using only paginated requests. Unpaginated
+    # requests are susceptible to throttling and timeouts.
+    #
     # @option params [Array<Types::Filter>] :filters
     #   One or more filters.
     #
@@ -32240,6 +32257,9 @@ module Aws::EC2
     # For more information about EBS snapshots, see [Amazon EBS
     # snapshots][2] in the *Amazon EBS User Guide*.
     #
+    # We strongly recommend using only paginated requests. Unpaginated
+    # requests are susceptible to throttling and timeouts.
+    #
     #
     #
     # [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/Query-Requests.html#api-pagination
@@ -33981,6 +34001,9 @@ module Aws::EC2
     # For more information about tags, see [Tag your Amazon EC2
     # resources][1] in the *Amazon Elastic Compute Cloud User Guide*.
     #
+    # We strongly recommend using only paginated requests. Unpaginated
+    # requests are susceptible to throttling and timeouts.
+    #
     # <note markdown="1"> The order of the elements in the response, including those within
     # nested structures, might vary. Applications should not assume the
     # elements appear in a particular order.
@@ -34004,16 +34027,8 @@ module Aws::EC2
     #
     #   * `resource-id` - The ID of the resource.
     #
-    #   * `resource-type` - The resource type (`customer-gateway` \|
-    #     `dedicated-host` \| `dhcp-options` \| `elastic-ip` \| `fleet` \|
-    #     `fpga-image` \| `host-reservation` \| `image` \| `instance` \|
-    #     `internet-gateway` \| `key-pair` \| `launch-template` \|
-    #     `natgateway` \| `network-acl` \| `network-interface` \|
-    #     `placement-group` \| `reserved-instances` \| `route-table` \|
-    #     `security-group` \| `snapshot` \| `spot-instances-request` \|
-    #     `subnet` \| `volume` \| `vpc` \| `vpc-endpoint` \|
-    #     `vpc-endpoint-service` \| `vpc-peering-connection` \|
-    #     `vpn-connection` \| `vpn-gateway`).
+    #   * `resource-type` - The resource type. For a list of possible values,
+    #     see [TagSpecification][1].
     #
     #   * `tag`:&lt;key&gt; - The key/value combination of the tag. For
     #     example, specify "tag:Owner" for the filter name and "TeamA" for
@@ -34021,6 +34036,10 @@ module Aws::EC2
     #
     #   * `value` - The tag value.
     #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_TagSpecification.html
+    #
     # @option params [Integer] :max_results
     #   The maximum number of items to return for this request. This value can
     #   be between 5 and 1000. To get the next page of items, make another
@@ -36026,6 +36045,9 @@ module Aws::EC2
     # For more information about EBS volumes, see [Amazon EBS volumes][2] in
     # the *Amazon EBS User Guide*.
     #
+    # We strongly recommend using only paginated requests. Unpaginated
+    # requests are susceptible to throttling and timeouts.
+    #
     # <note markdown="1"> The order of the elements in the response, including those within
     # nested structures, might vary. Applications should not assume the
     # elements appear in a particular order.
@@ -38552,6 +38574,54 @@ module Aws::EC2
       req.send_request(options)
     end
 
+    # Disables deregistration protection for an AMI. When deregistration
+    # protection is disabled, the AMI can be deregistered.
+    #
+    # If you chose to include a 24-hour cooldown period when you enabled
+    # deregistration protection for the AMI, then, when you disable
+    # 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*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/deregister-ami.html#ami-deregistration-protection
+    #
+    # @option params [required, String] :image_id
+    #   The ID of the AMI.
+    #
+    # @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 [Types::DisableImageDeregistrationProtectionResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::DisableImageDeregistrationProtectionResult#return #return} => String
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.disable_image_deregistration_protection({
+    #     image_id: "ImageId", # required
+    #     dry_run: false,
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.return #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DisableImageDeregistrationProtection AWS API Documentation
+    #
+    # @overload disable_image_deregistration_protection(params = {})
+    # @param [Hash] params ({})
+    def disable_image_deregistration_protection(params = {}, options = {})
+      req = build_request(:disable_image_deregistration_protection, params)
+      req.send_request(options)
+    end
+
     # Disable the IPAM account. For more information, see [Enable
     # integration with Organizations][1] in the *Amazon VPC IPAM User
     # Guide*.
@@ -40096,6 +40166,57 @@ module Aws::EC2
       req.send_request(options)
     end
 
+    # Enables deregistration protection for an AMI. When deregistration
+    # protection is enabled, the AMI can't be deregistered.
+    #
+    # 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*.
+    #
+    #
+    #
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/deregister-ami.html#ami-deregistration-protection
+    #
+    # @option params [required, String] :image_id
+    #   The ID of the AMI.
+    #
+    # @option params [Boolean] :with_cooldown
+    #   If `true`, enforces deregistration protection for 24 hours after
+    #   deregistration protection is disabled.
+    #
+    # @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 [Types::EnableImageDeregistrationProtectionResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
+    #
+    #   * {Types::EnableImageDeregistrationProtectionResult#return #return} => String
+    #
+    # @example Request syntax with placeholder values
+    #
+    #   resp = client.enable_image_deregistration_protection({
+    #     image_id: "ImageId", # required
+    #     with_cooldown: false,
+    #     dry_run: false,
+    #   })
+    #
+    # @example Response structure
+    #
+    #   resp.return #=> String
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/EnableImageDeregistrationProtection AWS API Documentation
+    #
+    # @overload enable_image_deregistration_protection(params = {})
+    # @param [Hash] params ({})
+    def enable_image_deregistration_protection(params = {}, options = {})
+      req = build_request(:enable_image_deregistration_protection, params)
+      req.send_request(options)
+    end
+
     # Enable an Organizations member account as the IPAM admin account. You
     # cannot select the Organizations management account as the IPAM admin
     # account. For more information, see [Enable integration with
@@ -48141,14 +48262,14 @@ module Aws::EC2
     # @option params [String] :launch_template_id
     #   The ID of the launch template.
     #
-    #   You must specify either the `LaunchTemplateId` or the
-    #   `LaunchTemplateName`, but not both.
+    #   You must specify either the launch template ID or the launch template
+    #   name, but not both.
     #
     # @option params [String] :launch_template_name
     #   The name of the launch template.
     #
-    #   You must specify either the `LaunchTemplateName` or the
-    #   `LaunchTemplateId`, but not both.
+    #   You must specify either the launch template ID or the launch template
+    #   name, but not both.
     #
     # @option params [String] :default_version
     #   The version number of the launch template to set as the default
@@ -56131,10 +56252,9 @@ module Aws::EC2
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html
     #
     # @option params [Types::LaunchTemplateSpecification] :launch_template
-    #   The launch template to use to launch the instances. Any parameters
-    #   that you specify in RunInstances override the same parameters in the
-    #   launch template. You can specify either the name or ID of a launch
-    #   template, but not both.
+    #   The launch template. Any additional parameters that you specify for
+    #   the new instance overwrite the corresponding parameters included in
+    #   the launch template.
     #
     # @option params [Types::InstanceMarketOptionsRequest] :instance_market_options
     #   The market (purchasing) option for the instances.
@@ -59142,7 +59262,7 @@ module Aws::EC2
         params: params,
         config: config)
       context[:gem_name] = 'aws-sdk-ec2'
-      context[:gem_version] = '1.450.0'
+      context[:gem_version] = '1.451.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -1168,6 +1168,8 @@ module Aws::EC2
     DisableImageBlockPublicAccessResult = Shapes::StructureShape.new(name: 'DisableImageBlockPublicAccessResult')
     DisableImageDeprecationRequest = Shapes::StructureShape.new(name: 'DisableImageDeprecationRequest')
     DisableImageDeprecationResult = Shapes::StructureShape.new(name: 'DisableImageDeprecationResult')
+    DisableImageDeregistrationProtectionRequest = Shapes::StructureShape.new(name: 'DisableImageDeregistrationProtectionRequest')
+    DisableImageDeregistrationProtectionResult = Shapes::StructureShape.new(name: 'DisableImageDeregistrationProtectionResult')
     DisableImageRequest = Shapes::StructureShape.new(name: 'DisableImageRequest')
     DisableImageResult = Shapes::StructureShape.new(name: 'DisableImageResult')
     DisableIpamOrganizationAdminAccountRequest = Shapes::StructureShape.new(name: 'DisableIpamOrganizationAdminAccountRequest')
@@ -1300,6 +1302,8 @@ module Aws::EC2
     EnableImageBlockPublicAccessResult = Shapes::StructureShape.new(name: 'EnableImageBlockPublicAccessResult')
     EnableImageDeprecationRequest = Shapes::StructureShape.new(name: 'EnableImageDeprecationRequest')
     EnableImageDeprecationResult = Shapes::StructureShape.new(name: 'EnableImageDeprecationResult')
+    EnableImageDeregistrationProtectionRequest = Shapes::StructureShape.new(name: 'EnableImageDeregistrationProtectionRequest')
+    EnableImageDeregistrationProtectionResult = Shapes::StructureShape.new(name: 'EnableImageDeregistrationProtectionResult')
     EnableImageRequest = Shapes::StructureShape.new(name: 'EnableImageRequest')
     EnableImageResult = Shapes::StructureShape.new(name: 'EnableImageResult')
     EnableIpamOrganizationAdminAccountRequest = Shapes::StructureShape.new(name: 'EnableIpamOrganizationAdminAccountRequest')
@@ -8017,6 +8021,13 @@ module Aws::EC2
     DisableImageDeprecationResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
     DisableImageDeprecationResult.struct_class = Types::DisableImageDeprecationResult
 
+    DisableImageDeregistrationProtectionRequest.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, required: true, location_name: "ImageId"))
+    DisableImageDeregistrationProtectionRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    DisableImageDeregistrationProtectionRequest.struct_class = Types::DisableImageDeregistrationProtectionRequest
+
+    DisableImageDeregistrationProtectionResult.add_member(:return, Shapes::ShapeRef.new(shape: String, location_name: "return"))
+    DisableImageDeregistrationProtectionResult.struct_class = Types::DisableImageDeregistrationProtectionResult
+
     DisableImageRequest.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, required: true, location_name: "ImageId"))
     DisableImageRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     DisableImageRequest.struct_class = Types::DisableImageRequest
@@ -8461,6 +8472,14 @@ module Aws::EC2
     EnableImageDeprecationResult.add_member(:return, Shapes::ShapeRef.new(shape: Boolean, location_name: "return"))
     EnableImageDeprecationResult.struct_class = Types::EnableImageDeprecationResult
 
+    EnableImageDeregistrationProtectionRequest.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, required: true, location_name: "ImageId"))
+    EnableImageDeregistrationProtectionRequest.add_member(:with_cooldown, Shapes::ShapeRef.new(shape: Boolean, location_name: "WithCooldown"))
+    EnableImageDeregistrationProtectionRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
+    EnableImageDeregistrationProtectionRequest.struct_class = Types::EnableImageDeregistrationProtectionRequest
+
+    EnableImageDeregistrationProtectionResult.add_member(:return, Shapes::ShapeRef.new(shape: String, location_name: "return"))
+    EnableImageDeregistrationProtectionResult.struct_class = Types::EnableImageDeregistrationProtectionResult
+
     EnableImageRequest.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, required: true, location_name: "ImageId"))
     EnableImageRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     EnableImageRequest.struct_class = Types::EnableImageRequest
@@ -9617,6 +9636,8 @@ module Aws::EC2
     Image.add_member(:deprecation_time, Shapes::ShapeRef.new(shape: String, location_name: "deprecationTime"))
     Image.add_member(:imds_support, Shapes::ShapeRef.new(shape: ImdsSupportValues, location_name: "imdsSupport"))
     Image.add_member(:source_instance_id, Shapes::ShapeRef.new(shape: String, location_name: "sourceInstanceId"))
+    Image.add_member(:deregistration_protection, Shapes::ShapeRef.new(shape: String, location_name: "deregistrationProtection"))
+    Image.add_member(:last_launched_time, Shapes::ShapeRef.new(shape: String, location_name: "lastLaunchedTime"))
     Image.struct_class = Types::Image
 
     ImageAttribute.add_member(:block_device_mappings, Shapes::ShapeRef.new(shape: BlockDeviceMappingList, location_name: "blockDeviceMapping"))
@@ -9632,6 +9653,7 @@ module Aws::EC2
     ImageAttribute.add_member(:uefi_data, Shapes::ShapeRef.new(shape: AttributeValue, location_name: "uefiData"))
     ImageAttribute.add_member(:last_launched_time, Shapes::ShapeRef.new(shape: AttributeValue, location_name: "lastLaunchedTime"))
     ImageAttribute.add_member(:imds_support, Shapes::ShapeRef.new(shape: AttributeValue, location_name: "imdsSupport"))
+    ImageAttribute.add_member(:deregistration_protection, Shapes::ShapeRef.new(shape: AttributeValue, location_name: "deregistrationProtection"))
     ImageAttribute.struct_class = Types::ImageAttribute
 
     ImageDiskContainer.add_member(:description, Shapes::ShapeRef.new(shape: String, location_name: "Description"))
@@ -19426,6 +19448,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: DisableImageDeprecationResult)
       end)
 
+      api.add_operation(:disable_image_deregistration_protection, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "DisableImageDeregistrationProtection"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: DisableImageDeregistrationProtectionRequest)
+        o.output = Shapes::ShapeRef.new(shape: DisableImageDeregistrationProtectionResult)
+      end)
+
       api.add_operation(:disable_ipam_organization_admin_account, Seahorse::Model::Operation.new.tap do |o|
         o.name = "DisableIpamOrganizationAdminAccount"
         o.http_method = "POST"
@@ -19666,6 +19696,14 @@ module Aws::EC2
         o.output = Shapes::ShapeRef.new(shape: EnableImageDeprecationResult)
       end)
 
+      api.add_operation(:enable_image_deregistration_protection, Seahorse::Model::Operation.new.tap do |o|
+        o.name = "EnableImageDeregistrationProtection"
+        o.http_method = "POST"
+        o.http_request_uri = "/"
+        o.input = Shapes::ShapeRef.new(shape: EnableImageDeregistrationProtectionRequest)
+        o.output = Shapes::ShapeRef.new(shape: EnableImageDeregistrationProtectionResult)
+      end)
+
       api.add_operation(:enable_ipam_organization_admin_account, Seahorse::Model::Operation.new.tap do |o|
         o.name = "EnableIpamOrganizationAdminAccount"
         o.http_method = "POST"

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

@@ -5374,6 +5374,20 @@ module Aws::EC2
       end
     end
 
+    class DisableImageDeregistrationProtection
+      def self.build(context)
+        unless context.config.regional_endpoint
+          endpoint = context.config.endpoint.to_s
+        end
+        Aws::EC2::EndpointParameters.new(
+          region: context.config.region,
+          use_dual_stack: context.config.use_dualstack_endpoint,
+          use_fips: context.config.use_fips_endpoint,
+          endpoint: endpoint,
+        )
+      end
+    end
+
     class DisableIpamOrganizationAdminAccount
       def self.build(context)
         unless context.config.regional_endpoint
@@ -5794,6 +5808,20 @@ module Aws::EC2
       end
     end
 
+    class EnableImageDeregistrationProtection
+      def self.build(context)
+        unless context.config.regional_endpoint
+          endpoint = context.config.endpoint.to_s
+        end
+        Aws::EC2::EndpointParameters.new(
+          region: context.config.region,
+          use_dual_stack: context.config.use_dualstack_endpoint,
+          use_fips: context.config.use_fips_endpoint,
+          endpoint: endpoint,
+        )
+      end
+    end
+
     class EnableIpamOrganizationAdminAccount
       def self.build(context)
         unless context.config.regional_endpoint

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

@@ -272,6 +272,28 @@ module Aws::EC2
       data[:source_instance_id]
     end
 
+    # Indicates whether deregistration protection is enabled for the AMI.
+    # @return [String]
+    def deregistration_protection
+      data[:deregistration_protection]
+    end
+
+    # The date and time, in [ISO 8601 date-time format][1], when the AMI was
+    # last used to launch an EC2 instance. When the AMI is used to launch an
+    # instance, there is a 24-hour delay before that usage is reported.
+    #
+    # <note markdown="1"> `lastLaunchedTime` data is available starting April 2017.
+    #
+    #  </note>
+    #
+    #
+    #
+    # [1]: http://www.iso.org/iso/iso8601
+    # @return [String]
+    def last_launched_time
+      data[:last_launched_time]
+    end
+
     # @!endgroup
 
     # @return [Client]
@@ -553,7 +575,7 @@ module Aws::EC2
     # @example Request syntax with placeholder values
     #
     #   image.describe_attribute({
-    #     attribute: "description", # required, accepts description, kernel, ramdisk, launchPermission, productCodes, blockDeviceMapping, sriovNetSupport, bootMode, tpmSupport, uefiData, lastLaunchedTime, imdsSupport
+    #     attribute: "description", # required, accepts description, kernel, ramdisk, launchPermission, productCodes, blockDeviceMapping, sriovNetSupport, bootMode, tpmSupport, uefiData, lastLaunchedTime, imdsSupport, deregistrationProtection
     #     dry_run: false,
     #   })
     # @param [Hash] options ({})

data/lib/aws-sdk-ec2/plugins/endpoints.rb

@@ -824,6 +824,8 @@ module Aws::EC2
             Aws::EC2::Endpoints::DisableImageBlockPublicAccess.build(context)
           when :disable_image_deprecation
             Aws::EC2::Endpoints::DisableImageDeprecation.build(context)
+          when :disable_image_deregistration_protection
+            Aws::EC2::Endpoints::DisableImageDeregistrationProtection.build(context)
           when :disable_ipam_organization_admin_account
             Aws::EC2::Endpoints::DisableIpamOrganizationAdminAccount.build(context)
           when :disable_serial_console_access
@@ -884,6 +886,8 @@ module Aws::EC2
             Aws::EC2::Endpoints::EnableImageBlockPublicAccess.build(context)
           when :enable_image_deprecation
             Aws::EC2::Endpoints::EnableImageDeprecation.build(context)
+          when :enable_image_deregistration_protection
+            Aws::EC2::Endpoints::EnableImageDeregistrationProtection.build(context)
           when :enable_ipam_organization_admin_account
             Aws::EC2::Endpoints::EnableIpamOrganizationAdminAccount.build(context)
           when :enable_reachability_analyzer_organization_sharing

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

@@ -517,10 +517,9 @@ module Aws::EC2
     #
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html
     # @option options [Types::LaunchTemplateSpecification] :launch_template
-    #   The launch template to use to launch the instances. Any parameters
-    #   that you specify in RunInstances override the same parameters in the
-    #   launch template. You can specify either the name or ID of a launch
-    #   template, but not both.
+    #   The launch template. Any additional parameters that you specify for
+    #   the new instance overwrite the corresponding parameters included in
+    #   the launch template.
     # @option options [Types::InstanceMarketOptionsRequest] :instance_market_options
     #   The market (purchasing) option for the instances.
     #

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

@@ -747,10 +747,9 @@ module Aws::EC2
     #
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateTags.html
     # @option options [Types::LaunchTemplateSpecification] :launch_template
-    #   The launch template to use to launch the instances. Any parameters
-    #   that you specify in RunInstances override the same parameters in the
-    #   launch template. You can specify either the name or ID of a launch
-    #   template, but not both.
+    #   The launch template. Any additional parameters that you specify for
+    #   the new instance overwrite the corresponding parameters included in
+    #   the launch template.
     # @option options [Types::InstanceMarketOptionsRequest] :instance_market_options
     #   The market (purchasing) option for the instances.
     #

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

@@ -2676,14 +2676,13 @@ module Aws::EC2
     #   @return [String]
     #
     # @!attribute [rw] certificate_s3_object_key
-    #   The key of the Amazon S3 object ey where the certificate,
-    #   certificate chain, and encrypted private key bundle is stored. The
-    #   object key is formated as follows: `role_arn`/`certificate_arn`.
+    #   The key of the Amazon S3 object where the certificate, certificate
+    #   chain, and encrypted private key bundle are stored. The object key
+    #   is formatted as follows: `role_arn`/`certificate_arn`.
     #   @return [String]
     #
     # @!attribute [rw] encryption_kms_key_id
-    #   The ID of the KMS customer master key (CMK) used to encrypt the
-    #   private key.
+    #   The ID of the KMS key used to encrypt the private key.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/AssociatedRole AWS API Documentation
@@ -8935,12 +8934,10 @@ module Aws::EC2
     #   The tags to apply to the launch template on creation. To tag the
     #   launch template, the resource type must be `launch-template`.
     #
-    #   <note markdown="1"> To specify the tags for the resources that are created when an
+    #   To specify the tags for the resources that are created when an
     #   instance is launched, you must use the `TagSpecifications` parameter
     #   in the [launch template data][1] structure.
     #
-    #    </note>
-    #
     #
     #
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RequestLaunchTemplateData.html
@@ -9000,24 +8997,29 @@ module Aws::EC2
     # @!attribute [rw] launch_template_id
     #   The ID of the launch template.
     #
-    #   You must specify either the `LaunchTemplateId` or the
-    #   `LaunchTemplateName`, but not both.
+    #   You must specify either the launch template ID or the launch
+    #   template name, but not both.
     #   @return [String]
     #
     # @!attribute [rw] launch_template_name
     #   The name of the launch template.
     #
-    #   You must specify the `LaunchTemplateName` or the `LaunchTemplateId`,
-    #   but not both.
+    #   You must specify either the launch template ID or the launch
+    #   template name, but not both.
     #   @return [String]
     #
     # @!attribute [rw] source_version
-    #   The version number of the launch template version on which to base
-    #   the new version. The new version inherits the same launch parameters
-    #   as the source version, except for parameters that you specify in
-    #   `LaunchTemplateData`. Snapshots applied to the block device mapping
-    #   are ignored when creating a new version unless they are explicitly
-    #   included.
+    #   The version of the launch template on which to base the new version.
+    #   Snapshots applied to the block device mapping are ignored when
+    #   creating a new version unless they are explicitly included.
+    #
+    #   If you specify this parameter, the new version inherits the launch
+    #   parameters from the source version. If you specify additional launch
+    #   parameters for the new version, they overwrite any corresponding
+    #   launch parameters inherited from the source version.
+    #
+    #   If you omit this parameter, the new version contains only the launch
+    #   parameters that you specify for the new version.
     #   @return [String]
     #
     # @!attribute [rw] version_description
@@ -14127,15 +14129,15 @@ module Aws::EC2
     # @!attribute [rw] launch_template_id
     #   The ID of the launch template.
     #
-    #   You must specify either the `LaunchTemplateId` or the
-    #   `LaunchTemplateName`, but not both.
+    #   You must specify either the launch template ID or the launch
+    #   template name, but not both.
     #   @return [String]
     #
     # @!attribute [rw] launch_template_name
     #   The name of the launch template.
     #
-    #   You must specify either the `LaunchTemplateName` or the
-    #   `LaunchTemplateId`, but not both.
+    #   You must specify either the launch template ID or the launch
+    #   template name, but not both.
     #   @return [String]
     #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DeleteLaunchTemplateRequest AWS API Documentation
@@ -14170,15 +14172,15 @@ module Aws::EC2
     # @!attribute [rw] launch_template_id
     #   The ID of the launch template.
     #
-    #   You must specify either the `LaunchTemplateId` or the
-    #   `LaunchTemplateName`, but not both.
+    #   You must specify either the launch template ID or the launch
+    #   template name, but not both.
     #   @return [String]
     #
     # @!attribute [rw] launch_template_name
     #   The name of the launch template.
     #
-    #   You must specify either the `LaunchTemplateName` or the
-    #   `LaunchTemplateId`, but not both.
+    #   You must specify either the launch template ID or the launch
+    #   template name, but not both.
     #   @return [String]
     #
     # @!attribute [rw] versions
@@ -21395,8 +21397,8 @@ module Aws::EC2
     #   The ID of the launch template.
     #
     #   To describe one or more versions of a specified launch template, you
-    #   must specify either the `LaunchTemplateId` or the
-    #   `LaunchTemplateName`, but not both.
+    #   must specify either the launch template ID or the launch template
+    #   name, but not both.
     #
     #   To describe all the latest or default launch template versions in
     #   your account, you must omit this parameter.
@@ -21406,8 +21408,8 @@ module Aws::EC2
     #   The name of the launch template.
     #
     #   To describe one or more versions of a specified launch template, you
-    #   must specify either the `LaunchTemplateName` or the
-    #   `LaunchTemplateId`, but not both.
+    #   must specify either the launch template name or the launch template
+    #   ID, but not both.
     #
     #   To describe all the latest or default launch template versions in
     #   your account, you must omit this parameter.
@@ -23065,7 +23067,7 @@ module Aws::EC2
     end
 
     # @!attribute [rw] network_interfaces
-    #   Information about one or more network interfaces.
+    #   Information about the network interfaces.
     #   @return [Array<Types::NetworkInterface>]
     #
     # @!attribute [rw] next_token
@@ -25481,16 +25483,8 @@ module Aws::EC2
     #
     #   * `resource-id` - The ID of the resource.
     #
-    #   * `resource-type` - The resource type (`customer-gateway` \|
-    #     `dedicated-host` \| `dhcp-options` \| `elastic-ip` \| `fleet` \|
-    #     `fpga-image` \| `host-reservation` \| `image` \| `instance` \|
-    #     `internet-gateway` \| `key-pair` \| `launch-template` \|
-    #     `natgateway` \| `network-acl` \| `network-interface` \|
-    #     `placement-group` \| `reserved-instances` \| `route-table` \|
-    #     `security-group` \| `snapshot` \| `spot-instances-request` \|
-    #     `subnet` \| `volume` \| `vpc` \| `vpc-endpoint` \|
-    #     `vpc-endpoint-service` \| `vpc-peering-connection` \|
-    #     `vpn-connection` \| `vpn-gateway`).
+    #   * `resource-type` - The resource type. For a list of possible
+    #     values, see [TagSpecification][1].
     #
     #   * `tag`:&lt;key&gt; - The key/value combination of the tag. For
     #     example, specify "tag:Owner" for the filter name and "TeamA"
@@ -25498,6 +25492,10 @@ module Aws::EC2
     #     "Owner=TeamA".
     #
     #   * `value` - The tag value.
+    #
+    #
+    #
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_TagSpecification.html
     #   @return [Array<Types::Filter>]
     #
     # @!attribute [rw] max_results
@@ -28938,6 +28936,39 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @!attribute [rw] image_id
+    #   The ID of the AMI.
+    #   @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.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DisableImageDeregistrationProtectionRequest AWS API Documentation
+    #
+    class DisableImageDeregistrationProtectionRequest < Struct.new(
+      :image_id,
+      :dry_run)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] return
+    #   Returns `true` if the request succeeds; otherwise, it returns an
+    #   error.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DisableImageDeregistrationProtectionResult AWS API Documentation
+    #
+    class DisableImageDeregistrationProtectionResult < Struct.new(
+      :return)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] image_id
     #   The ID of the AMI.
     #   @return [String]
@@ -31215,6 +31246,45 @@ module Aws::EC2
       include Aws::Structure
     end
 
+    # @!attribute [rw] image_id
+    #   The ID of the AMI.
+    #   @return [String]
+    #
+    # @!attribute [rw] with_cooldown
+    #   If `true`, enforces deregistration protection for 24 hours after
+    #   deregistration protection is disabled.
+    #   @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.
+    #   If you have the required permissions, the error response is
+    #   `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
+    #   @return [Boolean]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/EnableImageDeregistrationProtectionRequest AWS API Documentation
+    #
+    class EnableImageDeregistrationProtectionRequest < Struct.new(
+      :image_id,
+      :with_cooldown,
+      :dry_run)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
+    # @!attribute [rw] return
+    #   Returns `true` if the request succeeds; otherwise, it returns an
+    #   error.
+    #   @return [String]
+    #
+    # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/EnableImageDeregistrationProtectionResult AWS API Documentation
+    #
+    class EnableImageDeregistrationProtectionResult < Struct.new(
+      :return)
+      SENSITIVE = []
+      include Aws::Structure
+    end
+
     # @!attribute [rw] image_id
     #   The ID of the AMI.
     #   @return [String]
@@ -37320,6 +37390,25 @@ module Aws::EC2
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateImage.html
     #   @return [String]
     #
+    # @!attribute [rw] deregistration_protection
+    #   Indicates whether deregistration protection is enabled for the AMI.
+    #   @return [String]
+    #
+    # @!attribute [rw] last_launched_time
+    #   The date and time, in [ISO 8601 date-time format][1], when the AMI
+    #   was last used to launch an EC2 instance. When the AMI is used to
+    #   launch an instance, there is a 24-hour delay before that usage is
+    #   reported.
+    #
+    #   <note markdown="1"> `lastLaunchedTime` data is available starting April 2017.
+    #
+    #    </note>
+    #
+    #
+    #
+    #   [1]: http://www.iso.org/iso/iso8601
+    #   @return [String]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/Image AWS API Documentation
     #
     class Image < Struct.new(
@@ -37353,7 +37442,9 @@ module Aws::EC2
       :tpm_support,
       :deprecation_time,
       :imds_support,
-      :source_instance_id)
+      :source_instance_id,
+      :deregistration_protection,
+      :last_launched_time)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -37445,6 +37536,10 @@ module Aws::EC2
     #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-IMDS-new-instances.html#configure-IMDS-new-instances-ami-configuration
     #   @return [Types::AttributeValue]
     #
+    # @!attribute [rw] deregistration_protection
+    #   Indicates whether deregistration protection is enabled for the AMI.
+    #   @return [Types::AttributeValue]
+    #
     # @see http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/ImageAttribute AWS API Documentation
     #
     class ImageAttribute < Struct.new(
@@ -37460,7 +37555,8 @@ module Aws::EC2
       :tpm_support,
       :uefi_data,
       :last_launched_time,
-      :imds_support)
+      :imds_support,
+      :deregistration_protection)
       SENSITIVE = []
       include Aws::Structure
     end
@@ -45250,31 +45346,29 @@ module Aws::EC2
       include Aws::Structure
     end
 
-    # The launch template to use. You must specify either the launch
-    # template ID or launch template name in the request, but not both.
+    # Describes the launch template to use.
     #
     # @!attribute [rw] launch_template_id
     #   The ID of the launch template.
     #
-    #   You must specify the `LaunchTemplateId` or the `LaunchTemplateName`,
-    #   but not both.
+    #   You must specify either the launch template ID or the launch
+    #   template name, but not both.
     #   @return [String]
     #
     # @!attribute [rw] launch_template_name
     #   The name of the launch template.
     #
-    #   You must specify the `LaunchTemplateName` or the `LaunchTemplateId`,
-    #   but not both.
+    #   You must specify either the launch template ID or the launch
+    #   template name, but not both.
     #   @return [String]
     #
     # @!attribute [rw] version
     #   The launch template version number, `$Latest`, or `$Default`.
     #
-    #   If the value is `$Latest`, Amazon EC2 uses the latest version of the
-    #   launch template.
+    #   A value of `$Latest` uses the latest version of the launch template.
     #
-    #   If the value is `$Default`, Amazon EC2 uses the default version of
-    #   the launch template.
+    #   A value of `$Default` uses the default version of the launch
+    #   template.
     #
     #   Default: The default version of the launch template.
     #   @return [String]
@@ -48493,15 +48587,15 @@ module Aws::EC2
     # @!attribute [rw] launch_template_id
     #   The ID of the launch template.
     #
-    #   You must specify either the `LaunchTemplateId` or the
-    #   `LaunchTemplateName`, but not both.
+    #   You must specify either the launch template ID or the launch
+    #   template name, but not both.
     #   @return [String]
     #
     # @!attribute [rw] launch_template_name
     #   The name of the launch template.
     #
-    #   You must specify either the `LaunchTemplateName` or the
-    #   `LaunchTemplateId`, but not both.
+    #   You must specify either the launch template ID or the launch
+    #   template name, but not both.
     #   @return [String]
     #
     # @!attribute [rw] default_version
@@ -59018,10 +59112,9 @@ module Aws::EC2
     #   @return [Array<Types::TagSpecification>]
     #
     # @!attribute [rw] launch_template
-    #   The launch template to use to launch the instances. Any parameters
-    #   that you specify in RunInstances override the same parameters in the
-    #   launch template. You can specify either the name or ID of a launch
-    #   template, but not both.
+    #   The launch template. Any additional parameters that you specify for
+    #   the new instance overwrite the corresponding parameters included in
+    #   the launch template.
     #   @return [Types::LaunchTemplateSpecification]
     #
     # @!attribute [rw] instance_market_options

data/lib/aws-sdk-ec2.rb

@@ -76,6 +76,6 @@ require_relative 'aws-sdk-ec2/customizations'
 # @!group service
 module Aws::EC2
 
-  GEM_VERSION = '1.450.0'
+  GEM_VERSION = '1.451.0'
 
 end

data/sig/client.rbs

@@ -5581,10 +5581,11 @@ module Aws
         def uefi_data: () -> Types::AttributeValue
         def last_launched_time: () -> Types::AttributeValue
         def imds_support: () -> Types::AttributeValue
+        def deregistration_protection: () -> Types::AttributeValue
       end
       # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/EC2/Client.html#describe_image_attribute-instance_method
       def describe_image_attribute: (
-                                      attribute: ("description" | "kernel" | "ramdisk" | "launchPermission" | "productCodes" | "blockDeviceMapping" | "sriovNetSupport" | "bootMode" | "tpmSupport" | "uefiData" | "lastLaunchedTime" | "imdsSupport"),
+                                      attribute: ("description" | "kernel" | "ramdisk" | "launchPermission" | "productCodes" | "blockDeviceMapping" | "sriovNetSupport" | "bootMode" | "tpmSupport" | "uefiData" | "lastLaunchedTime" | "imdsSupport" | "deregistrationProtection"),
                                       image_id: ::String,
                                       ?dry_run: bool
                                     ) -> _DescribeImageAttributeResponseSuccess
@@ -7870,6 +7871,17 @@ module Aws
                                      ) -> _DisableImageDeprecationResponseSuccess
                                    | (Hash[Symbol, untyped] params, ?Hash[Symbol, untyped] options) -> _DisableImageDeprecationResponseSuccess
 
+      interface _DisableImageDeregistrationProtectionResponseSuccess
+        include ::Seahorse::Client::_ResponseSuccess[Types::DisableImageDeregistrationProtectionResult]
+        def return: () -> ::String
+      end
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/EC2/Client.html#disable_image_deregistration_protection-instance_method
+      def disable_image_deregistration_protection: (
+                                                     image_id: ::String,
+                                                     ?dry_run: bool
+                                                   ) -> _DisableImageDeregistrationProtectionResponseSuccess
+                                                 | (Hash[Symbol, untyped] params, ?Hash[Symbol, untyped] options) -> _DisableImageDeregistrationProtectionResponseSuccess
+
       interface _DisableIpamOrganizationAdminAccountResponseSuccess
         include ::Seahorse::Client::_ResponseSuccess[Types::DisableIpamOrganizationAdminAccountResult]
         def success: () -> bool
@@ -8236,6 +8248,18 @@ module Aws
                                     ) -> _EnableImageDeprecationResponseSuccess
                                   | (Hash[Symbol, untyped] params, ?Hash[Symbol, untyped] options) -> _EnableImageDeprecationResponseSuccess
 
+      interface _EnableImageDeregistrationProtectionResponseSuccess
+        include ::Seahorse::Client::_ResponseSuccess[Types::EnableImageDeregistrationProtectionResult]
+        def return: () -> ::String
+      end
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/EC2/Client.html#enable_image_deregistration_protection-instance_method
+      def enable_image_deregistration_protection: (
+                                                    image_id: ::String,
+                                                    ?with_cooldown: bool,
+                                                    ?dry_run: bool
+                                                  ) -> _EnableImageDeregistrationProtectionResponseSuccess
+                                                | (Hash[Symbol, untyped] params, ?Hash[Symbol, untyped] options) -> _EnableImageDeregistrationProtectionResponseSuccess
+
       interface _EnableIpamOrganizationAdminAccountResponseSuccess
         include ::Seahorse::Client::_ResponseSuccess[Types::EnableIpamOrganizationAdminAccountResult]
         def success: () -> bool

data/sig/image.rbs

@@ -108,6 +108,12 @@ module Aws
       # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/EC2/Image.html#source_instance_id-instance_method
       def source_instance_id: () -> ::String
 
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/EC2/Image.html#deregistration_protection-instance_method
+      def deregistration_protection: () -> ::String
+
+      # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/EC2/Image.html#last_launched_time-instance_method
+      def last_launched_time: () -> ::String
+
       def client: () -> Client
 
       # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/EC2/Image.html#load-instance_method
@@ -160,7 +166,7 @@ module Aws
 
       # https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/EC2/Image.html#describe_attribute-instance_method
       def describe_attribute: (
-                                attribute: ("description" | "kernel" | "ramdisk" | "launchPermission" | "productCodes" | "blockDeviceMapping" | "sriovNetSupport" | "bootMode" | "tpmSupport" | "uefiData" | "lastLaunchedTime" | "imdsSupport"),
+                                attribute: ("description" | "kernel" | "ramdisk" | "launchPermission" | "productCodes" | "blockDeviceMapping" | "sriovNetSupport" | "bootMode" | "tpmSupport" | "uefiData" | "lastLaunchedTime" | "imdsSupport" | "deregistrationProtection"),
                                 ?dry_run: bool
                               ) -> Types::ImageAttribute
                             | (?Hash[Symbol, untyped]) -> Types::ImageAttribute

data/sig/types.rbs

@@ -4533,7 +4533,7 @@ module Aws::EC2
     end
 
     class DescribeImageAttributeRequest
-      attr_accessor attribute: ("description" | "kernel" | "ramdisk" | "launchPermission" | "productCodes" | "blockDeviceMapping" | "sriovNetSupport" | "bootMode" | "tpmSupport" | "uefiData" | "lastLaunchedTime" | "imdsSupport")
+      attr_accessor attribute: ("description" | "kernel" | "ramdisk" | "launchPermission" | "productCodes" | "blockDeviceMapping" | "sriovNetSupport" | "bootMode" | "tpmSupport" | "uefiData" | "lastLaunchedTime" | "imdsSupport" | "deregistrationProtection")
       attr_accessor image_id: ::String
       attr_accessor dry_run: bool
       SENSITIVE: []
@@ -6372,6 +6372,17 @@ module Aws::EC2
       SENSITIVE: []
     end
 
+    class DisableImageDeregistrationProtectionRequest
+      attr_accessor image_id: ::String
+      attr_accessor dry_run: bool
+      SENSITIVE: []
+    end
+
+    class DisableImageDeregistrationProtectionResult
+      attr_accessor return: ::String
+      SENSITIVE: []
+    end
+
     class DisableImageRequest
       attr_accessor image_id: ::String
       attr_accessor dry_run: bool
@@ -6960,6 +6971,18 @@ module Aws::EC2
       SENSITIVE: []
     end
 
+    class EnableImageDeregistrationProtectionRequest
+      attr_accessor image_id: ::String
+      attr_accessor with_cooldown: bool
+      attr_accessor dry_run: bool
+      SENSITIVE: []
+    end
+
+    class EnableImageDeregistrationProtectionResult
+      attr_accessor return: ::String
+      SENSITIVE: []
+    end
+
     class EnableImageRequest
       attr_accessor image_id: ::String
       attr_accessor dry_run: bool
@@ -8397,6 +8420,8 @@ module Aws::EC2
       attr_accessor deprecation_time: ::String
       attr_accessor imds_support: ("v2.0")
       attr_accessor source_instance_id: ::String
+      attr_accessor deregistration_protection: ::String
+      attr_accessor last_launched_time: ::String
       SENSITIVE: []
     end
 
@@ -8414,6 +8439,7 @@ module Aws::EC2
       attr_accessor uefi_data: Types::AttributeValue
       attr_accessor last_launched_time: Types::AttributeValue
       attr_accessor imds_support: Types::AttributeValue
+      attr_accessor deregistration_protection: Types::AttributeValue
       SENSITIVE: []
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-ec2
 version: !ruby/object:Gem::Version
-  version: 1.450.0
+  version: 1.451.0
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-17 00:00:00.000000000 Z
+date: 2024-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core