aws-sdk-ec2 1.507.0 → 1.508.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d451c49071f90afe5dc86473fc4cb3e2eceea98fafd4cf25d4d3e080fd456d8c
-  data.tar.gz: 4c85574dcceb4ee64e069abb67cec426749a23aeb7ce22f8d06d21e864d1ba11
+  metadata.gz: 678fcbcf29be678cf2869ea51625d3ffcb23c8e071a23811f4c205e8df05daa7
+  data.tar.gz: 7f158ca4f18c8760026afc735a3d0641dd3e06d39f5e3cc43222d8d9ccbded6f
 SHA512:
-  metadata.gz: 9283508417e7d4e119cd36b49b43aa9944b6a78e30fdc05c0766f2b765fe223e32f3a0ef5cf7a9ad9cbe7ec81f107a21f1e7d2a7147728ac06da2f590e5b1b61
-  data.tar.gz: f4a60131eb9dfe16d0783d6de99d87a4935e6116e608ac02305f4721ae7efad5ceb43a9d9c18764322aef4d28dff38cd904ffc8b8af050fa241bf2cc531fe5fd
+  metadata.gz: 9e68abee19500d200f7c7b85b27af1006b41327a7bd5d9873fa4b705c090dccd40436d85bfbbbb25a50745dcfdcaa986bc3c849980ab13d236872ebeb9113317
+  data.tar.gz: adc62a526b8fbd320a042898b8e41669c6a7bf14738d5b1a69613bb33d9cd1155c45f3cbbaccfc0ef8bdc743d99575d013111f954487b4080929e44e96b17267

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 Unreleased Changes
 ------------------
 
+1.508.0 (2025-02-26)
+------------------
+
+* Feature - Amazon EC2 Fleet customers can now override the Block Device Mapping specified in the Launch Template when creating a new Fleet request, saving the effort of creating and associating new Launch Templates to customize the Block Device Mapping.
+
 1.507.0 (2025-02-25)
 ------------------
 

data/VERSION

@@ -1 +1 @@
-1.507.0
+1.508.0

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

@@ -6998,6 +6998,23 @@ module Aws::EC2
     #               group_id: "PlacementGroupId",
     #               availability_zone: "String",
     #             },
+    #             block_device_mappings: [
+    #               {
+    #                 device_name: "String",
+    #                 virtual_name: "String",
+    #                 ebs: {
+    #                   encrypted: false,
+    #                   delete_on_termination: false,
+    #                   iops: 1,
+    #                   throughput: 1,
+    #                   kms_key_id: "KmsKeyId",
+    #                   snapshot_id: "SnapshotId",
+    #                   volume_size: 1,
+    #                   volume_type: "standard", # accepts standard, io1, io2, gp2, sc1, st1, gp3
+    #                 },
+    #                 no_device: "String",
+    #               },
+    #             ],
     #             instance_requirements: {
     #               v_cpu_count: { # required
     #                 min: 1, # required
@@ -7149,6 +7166,18 @@ module Aws::EC2
     #   resp.errors[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references #=> Array
     #   resp.errors[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references[0].instance_family #=> String
     #   resp.errors[0].launch_template_and_overrides.overrides.image_id #=> String
+    #   resp.errors[0].launch_template_and_overrides.overrides.block_device_mappings #=> Array
+    #   resp.errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].device_name #=> String
+    #   resp.errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].virtual_name #=> String
+    #   resp.errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.encrypted #=> Boolean
+    #   resp.errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.delete_on_termination #=> Boolean
+    #   resp.errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.iops #=> Integer
+    #   resp.errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.throughput #=> Integer
+    #   resp.errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.kms_key_id #=> String
+    #   resp.errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.snapshot_id #=> String
+    #   resp.errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.volume_size #=> Integer
+    #   resp.errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.volume_type #=> String, one of "standard", "io1", "io2", "gp2", "sc1", "st1", "gp3"
+    #   resp.errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].no_device #=> String
     #   resp.errors[0].lifecycle #=> String, one of "spot", "on-demand"
     #   resp.errors[0].error_code #=> String
     #   resp.errors[0].error_message #=> String
@@ -7207,6 +7236,18 @@ module Aws::EC2
     #   resp.instances[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references #=> Array
     #   resp.instances[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references[0].instance_family #=> String
     #   resp.instances[0].launch_template_and_overrides.overrides.image_id #=> String
+    #   resp.instances[0].launch_template_and_overrides.overrides.block_device_mappings #=> Array
+    #   resp.instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].device_name #=> String
+    #   resp.instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].virtual_name #=> String
+    #   resp.instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.encrypted #=> Boolean
+    #   resp.instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.delete_on_termination #=> Boolean
+    #   resp.instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.iops #=> Integer
+    #   resp.instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.throughput #=> Integer
+    #   resp.instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.kms_key_id #=> String
+    #   resp.instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.snapshot_id #=> String
+    #   resp.instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.volume_size #=> Integer
+    #   resp.instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.volume_type #=> String, one of "standard", "io1", "io2", "gp2", "sc1", "st1", "gp3"
+    #   resp.instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].no_device #=> String
     #   resp.instances[0].lifecycle #=> String, one of "spot", "on-demand"
     #   resp.instances[0].instance_ids #=> Array
     #   resp.instances[0].instance_ids[0] #=> String
@@ -8813,8 +8854,8 @@ module Aws::EC2
     # A launch template contains the parameters to launch an instance. When
     # you launch an instance using RunInstances, you can specify a launch
     # template instead of providing the launch parameters in the request.
-    # For more information, see [Launch an instance from a launch
-    # template][1] in the *Amazon EC2 User Guide*.
+    # For more information, see [Store instance launch parameters in Amazon
+    # EC2 launch templates][1] in the *Amazon EC2 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
@@ -8825,7 +8866,7 @@ module Aws::EC2
     #
     #
     # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html
-    # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html#create-launch-template-from-existing-launch-template
+    # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/create-launch-template.html#create-launch-template-from-existing-launch-template
     #
     # @option params [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
@@ -9228,7 +9269,7 @@ module Aws::EC2
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html#manage-launch-template-versions
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/manage-launch-template-versions.html
     #
     # @option params [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
@@ -9288,7 +9329,7 @@ module Aws::EC2
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html#use-an-ssm-parameter-instead-of-an-ami-id
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/create-launch-template.html#use-an-ssm-parameter-instead-of-an-ami-id
     #
     # @return [Types::CreateLaunchTemplateVersionResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -16782,20 +16823,23 @@ module Aws::EC2
       req.send_request(options)
     end
 
-    # Deletes the specified EC2 Fleets.
-    #
-    # After you delete an EC2 Fleet, it launches no new instances.
+    # Deletes the specified EC2 Fleet request.
     #
-    # You must also specify whether a deleted EC2 Fleet should terminate its
-    # instances. If you choose to terminate the instances, the EC2 Fleet
-    # enters the `deleted_terminating` state. Otherwise, the EC2 Fleet
-    # enters the `deleted_running` state, and the instances continue to run
-    # until they are interrupted or you terminate them manually.
+    # After you delete an EC2 Fleet request, it launches no new instances.
     #
-    # For `instant` fleets, EC2 Fleet must terminate the instances when the
-    # fleet is deleted. Up to 1000 instances can be terminated in a single
-    # request to delete `instant` fleets. A deleted `instant` fleet with
-    # running instances is not supported.
+    # You must also specify whether a deleted EC2 Fleet request should
+    # terminate its instances. If you choose to terminate the instances, the
+    # EC2 Fleet request enters the `deleted_terminating` state. Otherwise,
+    # it enters the `deleted_running` state, and the instances continue to
+    # run until they are interrupted or you terminate them manually.
+    #
+    # A deleted `instant` fleet with running instances is not supported.
+    # When you delete an `instant` fleet, Amazon EC2 automatically
+    # terminates all its instances. For fleets with more than 1000
+    # instances, the deletion request might fail. If your fleet has more
+    # than 1000 instances, first terminate most of the instances manually,
+    # leaving 1000 or fewer. Then delete the fleet, and the remaining
+    # instances will be terminated automatically.
     #
     # **Restrictions**
     #
@@ -16811,12 +16855,12 @@ module Aws::EC2
     # * If you exceed the specified number of fleets to delete, no fleets
     #   are deleted.
     #
-    # For more information, see [Delete an EC2 Fleet][1] in the *Amazon EC2
-    # User Guide*.
+    # For more information, see [Delete an EC2 Fleet request and the
+    # instances in the fleet][1] in the *Amazon EC2 User Guide*.
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/manage-ec2-fleet.html#delete-fleet
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/delete-fleet.html
     #
     # @option params [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
@@ -17566,7 +17610,7 @@ module Aws::EC2
     #
     #
     #
-    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/manage-launch-template-versions.html#delete-launch-template-version
+    # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/delete-launch-template.html#delete-launch-template-version
     #
     # @option params [Boolean] :dry_run
     #   Checks whether you have the required permissions for the action,
@@ -23932,6 +23976,18 @@ module Aws::EC2
     #   resp.fleets[0].launch_template_configs[0].overrides[0].instance_requirements.baseline_performance_factors.cpu.references #=> Array
     #   resp.fleets[0].launch_template_configs[0].overrides[0].instance_requirements.baseline_performance_factors.cpu.references[0].instance_family #=> String
     #   resp.fleets[0].launch_template_configs[0].overrides[0].image_id #=> String
+    #   resp.fleets[0].launch_template_configs[0].overrides[0].block_device_mappings #=> Array
+    #   resp.fleets[0].launch_template_configs[0].overrides[0].block_device_mappings[0].device_name #=> String
+    #   resp.fleets[0].launch_template_configs[0].overrides[0].block_device_mappings[0].virtual_name #=> String
+    #   resp.fleets[0].launch_template_configs[0].overrides[0].block_device_mappings[0].ebs.encrypted #=> Boolean
+    #   resp.fleets[0].launch_template_configs[0].overrides[0].block_device_mappings[0].ebs.delete_on_termination #=> Boolean
+    #   resp.fleets[0].launch_template_configs[0].overrides[0].block_device_mappings[0].ebs.iops #=> Integer
+    #   resp.fleets[0].launch_template_configs[0].overrides[0].block_device_mappings[0].ebs.throughput #=> Integer
+    #   resp.fleets[0].launch_template_configs[0].overrides[0].block_device_mappings[0].ebs.kms_key_id #=> String
+    #   resp.fleets[0].launch_template_configs[0].overrides[0].block_device_mappings[0].ebs.snapshot_id #=> String
+    #   resp.fleets[0].launch_template_configs[0].overrides[0].block_device_mappings[0].ebs.volume_size #=> Integer
+    #   resp.fleets[0].launch_template_configs[0].overrides[0].block_device_mappings[0].ebs.volume_type #=> String, one of "standard", "io1", "io2", "gp2", "sc1", "st1", "gp3"
+    #   resp.fleets[0].launch_template_configs[0].overrides[0].block_device_mappings[0].no_device #=> String
     #   resp.fleets[0].target_capacity_specification.total_target_capacity #=> Integer
     #   resp.fleets[0].target_capacity_specification.on_demand_target_capacity #=> Integer
     #   resp.fleets[0].target_capacity_specification.spot_target_capacity #=> Integer
@@ -24015,6 +24071,18 @@ module Aws::EC2
     #   resp.fleets[0].errors[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references #=> Array
     #   resp.fleets[0].errors[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references[0].instance_family #=> String
     #   resp.fleets[0].errors[0].launch_template_and_overrides.overrides.image_id #=> String
+    #   resp.fleets[0].errors[0].launch_template_and_overrides.overrides.block_device_mappings #=> Array
+    #   resp.fleets[0].errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].device_name #=> String
+    #   resp.fleets[0].errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].virtual_name #=> String
+    #   resp.fleets[0].errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.encrypted #=> Boolean
+    #   resp.fleets[0].errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.delete_on_termination #=> Boolean
+    #   resp.fleets[0].errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.iops #=> Integer
+    #   resp.fleets[0].errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.throughput #=> Integer
+    #   resp.fleets[0].errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.kms_key_id #=> String
+    #   resp.fleets[0].errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.snapshot_id #=> String
+    #   resp.fleets[0].errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.volume_size #=> Integer
+    #   resp.fleets[0].errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.volume_type #=> String, one of "standard", "io1", "io2", "gp2", "sc1", "st1", "gp3"
+    #   resp.fleets[0].errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].no_device #=> String
     #   resp.fleets[0].errors[0].lifecycle #=> String, one of "spot", "on-demand"
     #   resp.fleets[0].errors[0].error_code #=> String
     #   resp.fleets[0].errors[0].error_message #=> String
@@ -24073,6 +24141,18 @@ module Aws::EC2
     #   resp.fleets[0].instances[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references #=> Array
     #   resp.fleets[0].instances[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references[0].instance_family #=> String
     #   resp.fleets[0].instances[0].launch_template_and_overrides.overrides.image_id #=> String
+    #   resp.fleets[0].instances[0].launch_template_and_overrides.overrides.block_device_mappings #=> Array
+    #   resp.fleets[0].instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].device_name #=> String
+    #   resp.fleets[0].instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].virtual_name #=> String
+    #   resp.fleets[0].instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.encrypted #=> Boolean
+    #   resp.fleets[0].instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.delete_on_termination #=> Boolean
+    #   resp.fleets[0].instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.iops #=> Integer
+    #   resp.fleets[0].instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.throughput #=> Integer
+    #   resp.fleets[0].instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.kms_key_id #=> String
+    #   resp.fleets[0].instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.snapshot_id #=> String
+    #   resp.fleets[0].instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.volume_size #=> Integer
+    #   resp.fleets[0].instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.volume_type #=> String, one of "standard", "io1", "io2", "gp2", "sc1", "st1", "gp3"
+    #   resp.fleets[0].instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].no_device #=> String
     #   resp.fleets[0].instances[0].lifecycle #=> String, one of "spot", "on-demand"
     #   resp.fleets[0].instances[0].instance_ids #=> Array
     #   resp.fleets[0].instances[0].instance_ids[0] #=> String
@@ -28777,7 +28857,7 @@ module Aws::EC2
     #
     #
     #
-    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html#use-an-ssm-parameter-instead-of-an-ami-id
+    #   [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/create-launch-template.html#use-an-ssm-parameter-instead-of-an-ami-id
     #
     # @return [Types::DescribeLaunchTemplateVersionsResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
     #
@@ -31729,8 +31809,8 @@ module Aws::EC2
     #
     # If you have a large number of network interfaces, the operation fails
     # unless you use pagination or one of the following filters: `group-id`,
-    # `mac-address`, `private-dns-name`, `private-ip-address`,
-    # `private-dns-name`, `subnet-id`, or `vpc-id`.
+    # `mac-address`, `private-dns-name`, `private-ip-address`, `subnet-id`,
+    # or `vpc-id`.
     #
     # We strongly recommend using only paginated requests. Unpaginated
     # requests are susceptible to throttling and timeouts.
@@ -49397,6 +49477,23 @@ module Aws::EC2
     #               group_id: "PlacementGroupId",
     #               availability_zone: "String",
     #             },
+    #             block_device_mappings: [
+    #               {
+    #                 device_name: "String",
+    #                 virtual_name: "String",
+    #                 ebs: {
+    #                   encrypted: false,
+    #                   delete_on_termination: false,
+    #                   iops: 1,
+    #                   throughput: 1,
+    #                   kms_key_id: "KmsKeyId",
+    #                   snapshot_id: "SnapshotId",
+    #                   volume_size: 1,
+    #                   volume_type: "standard", # accepts standard, io1, io2, gp2, sc1, st1, gp3
+    #                 },
+    #                 no_device: "String",
+    #               },
+    #             ],
     #             instance_requirements: {
     #               v_cpu_count: { # required
     #                 min: 1, # required
@@ -51487,7 +51584,7 @@ module Aws::EC2
     # @option params [String] :client_token
     #   Unique, case-sensitive identifier you provide to ensure the
     #   idempotency of the request. For more information, see [Ensuring
-    #   idempotency][1].
+    #   idempotency in Amazon EC2 API requests][1].
     #
     #   Constraint: Maximum 128 ASCII characters.
     #
@@ -63229,7 +63326,7 @@ module Aws::EC2
         tracer: tracer
       )
       context[:gem_name] = 'aws-sdk-ec2'
-      context[:gem_version] = '1.507.0'
+      context[:gem_version] = '1.508.0'
       Seahorse::Client::Request.new(handlers, context)
     end
 

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

@@ -238,6 +238,8 @@ module Aws::EC2
     BlockDeviceMapping = Shapes::StructureShape.new(name: 'BlockDeviceMapping')
     BlockDeviceMappingList = Shapes::ListShape.new(name: 'BlockDeviceMappingList')
     BlockDeviceMappingRequestList = Shapes::ListShape.new(name: 'BlockDeviceMappingRequestList')
+    BlockDeviceMappingResponse = Shapes::StructureShape.new(name: 'BlockDeviceMappingResponse')
+    BlockDeviceMappingResponseList = Shapes::ListShape.new(name: 'BlockDeviceMappingResponseList')
     BlockPublicAccessMode = Shapes::StringShape.new(name: 'BlockPublicAccessMode')
     BlockPublicAccessStates = Shapes::StructureShape.new(name: 'BlockPublicAccessStates')
     Boolean = Shapes::BooleanShape.new(name: 'Boolean')
@@ -810,6 +812,7 @@ module Aws::EC2
     DeprovisionPublicIpv4PoolCidrResult = Shapes::StructureShape.new(name: 'DeprovisionPublicIpv4PoolCidrResult')
     DeprovisionedAddressSet = Shapes::ListShape.new(name: 'DeprovisionedAddressSet')
     DeregisterImageRequest = Shapes::StructureShape.new(name: 'DeregisterImageRequest')
+    DeregisterImageResult = Shapes::StructureShape.new(name: 'DeregisterImageResult')
     DeregisterInstanceEventNotificationAttributesRequest = Shapes::StructureShape.new(name: 'DeregisterInstanceEventNotificationAttributesRequest')
     DeregisterInstanceEventNotificationAttributesResult = Shapes::StructureShape.new(name: 'DeregisterInstanceEventNotificationAttributesResult')
     DeregisterInstanceTagAttributeRequest = Shapes::StructureShape.new(name: 'DeregisterInstanceTagAttributeRequest')
@@ -1331,6 +1334,7 @@ module Aws::EC2
     DrainSeconds = Shapes::IntegerShape.new(name: 'DrainSeconds')
     DynamicRoutingValue = Shapes::StringShape.new(name: 'DynamicRoutingValue')
     EbsBlockDevice = Shapes::StructureShape.new(name: 'EbsBlockDevice')
+    EbsBlockDeviceResponse = Shapes::StructureShape.new(name: 'EbsBlockDeviceResponse')
     EbsEncryptionSupport = Shapes::StringShape.new(name: 'EbsEncryptionSupport')
     EbsInfo = Shapes::StructureShape.new(name: 'EbsInfo')
     EbsInstanceBlockDevice = Shapes::StructureShape.new(name: 'EbsInstanceBlockDevice')
@@ -1485,11 +1489,14 @@ module Aws::EC2
     FirewallStatefulRule = Shapes::StructureShape.new(name: 'FirewallStatefulRule')
     FirewallStatelessRule = Shapes::StructureShape.new(name: 'FirewallStatelessRule')
     FleetActivityStatus = Shapes::StringShape.new(name: 'FleetActivityStatus')
+    FleetBlockDeviceMappingRequest = Shapes::StructureShape.new(name: 'FleetBlockDeviceMappingRequest')
+    FleetBlockDeviceMappingRequestList = Shapes::ListShape.new(name: 'FleetBlockDeviceMappingRequestList')
     FleetCapacityReservation = Shapes::StructureShape.new(name: 'FleetCapacityReservation')
     FleetCapacityReservationSet = Shapes::ListShape.new(name: 'FleetCapacityReservationSet')
     FleetCapacityReservationTenancy = Shapes::StringShape.new(name: 'FleetCapacityReservationTenancy')
     FleetCapacityReservationUsageStrategy = Shapes::StringShape.new(name: 'FleetCapacityReservationUsageStrategy')
     FleetData = Shapes::StructureShape.new(name: 'FleetData')
+    FleetEbsBlockDeviceRequest = Shapes::StructureShape.new(name: 'FleetEbsBlockDeviceRequest')
     FleetEventType = Shapes::StringShape.new(name: 'FleetEventType')
     FleetExcessCapacityTerminationPolicy = Shapes::StringShape.new(name: 'FleetExcessCapacityTerminationPolicy')
     FleetId = Shapes::StringShape.new(name: 'FleetId')
@@ -4200,6 +4207,14 @@ module Aws::EC2
 
     BlockDeviceMappingRequestList.member = Shapes::ShapeRef.new(shape: BlockDeviceMapping, location_name: "BlockDeviceMapping")
 
+    BlockDeviceMappingResponse.add_member(:device_name, Shapes::ShapeRef.new(shape: String, location_name: "deviceName"))
+    BlockDeviceMappingResponse.add_member(:virtual_name, Shapes::ShapeRef.new(shape: String, location_name: "virtualName"))
+    BlockDeviceMappingResponse.add_member(:ebs, Shapes::ShapeRef.new(shape: EbsBlockDeviceResponse, location_name: "ebs"))
+    BlockDeviceMappingResponse.add_member(:no_device, Shapes::ShapeRef.new(shape: String, location_name: "noDevice"))
+    BlockDeviceMappingResponse.struct_class = Types::BlockDeviceMappingResponse
+
+    BlockDeviceMappingResponseList.member = Shapes::ShapeRef.new(shape: BlockDeviceMappingResponse, location_name: "item")
+
     BlockPublicAccessStates.add_member(:internet_gateway_block_mode, Shapes::ShapeRef.new(shape: BlockPublicAccessMode, location_name: "internetGatewayBlockMode"))
     BlockPublicAccessStates.struct_class = Types::BlockPublicAccessStates
 
@@ -6632,6 +6647,8 @@ module Aws::EC2
     DeregisterImageRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
     DeregisterImageRequest.struct_class = Types::DeregisterImageRequest
 
+    DeregisterImageResult.struct_class = Types::DeregisterImageResult
+
     DeregisterInstanceEventNotificationAttributesRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
     DeregisterInstanceEventNotificationAttributesRequest.add_member(:instance_tag_attribute, Shapes::ShapeRef.new(shape: DeregisterInstanceTagAttributeRequest, required: true, location_name: "InstanceTagAttribute"))
     DeregisterInstanceEventNotificationAttributesRequest.struct_class = Types::DeregisterInstanceEventNotificationAttributesRequest
@@ -8860,6 +8877,16 @@ module Aws::EC2
     EbsBlockDevice.add_member(:encrypted, Shapes::ShapeRef.new(shape: Boolean, location_name: "encrypted"))
     EbsBlockDevice.struct_class = Types::EbsBlockDevice
 
+    EbsBlockDeviceResponse.add_member(:encrypted, Shapes::ShapeRef.new(shape: Boolean, location_name: "encrypted"))
+    EbsBlockDeviceResponse.add_member(:delete_on_termination, Shapes::ShapeRef.new(shape: Boolean, location_name: "deleteOnTermination"))
+    EbsBlockDeviceResponse.add_member(:iops, Shapes::ShapeRef.new(shape: Integer, location_name: "iops"))
+    EbsBlockDeviceResponse.add_member(:throughput, Shapes::ShapeRef.new(shape: Integer, location_name: "throughput"))
+    EbsBlockDeviceResponse.add_member(:kms_key_id, Shapes::ShapeRef.new(shape: KmsKeyId, location_name: "kmsKeyId"))
+    EbsBlockDeviceResponse.add_member(:snapshot_id, Shapes::ShapeRef.new(shape: SnapshotId, location_name: "snapshotId"))
+    EbsBlockDeviceResponse.add_member(:volume_size, Shapes::ShapeRef.new(shape: Integer, location_name: "volumeSize"))
+    EbsBlockDeviceResponse.add_member(:volume_type, Shapes::ShapeRef.new(shape: VolumeType, location_name: "volumeType"))
+    EbsBlockDeviceResponse.struct_class = Types::EbsBlockDeviceResponse
+
     EbsInfo.add_member(:ebs_optimized_support, Shapes::ShapeRef.new(shape: EbsOptimizedSupport, location_name: "ebsOptimizedSupport"))
     EbsInfo.add_member(:encryption_support, Shapes::ShapeRef.new(shape: EbsEncryptionSupport, location_name: "encryptionSupport"))
     EbsInfo.add_member(:ebs_optimized_info, Shapes::ShapeRef.new(shape: EbsOptimizedInfo, location_name: "ebsOptimizedInfo"))
@@ -9419,6 +9446,14 @@ module Aws::EC2
     FirewallStatelessRule.add_member(:priority, Shapes::ShapeRef.new(shape: Priority, location_name: "priority"))
     FirewallStatelessRule.struct_class = Types::FirewallStatelessRule
 
+    FleetBlockDeviceMappingRequest.add_member(:device_name, Shapes::ShapeRef.new(shape: String, location_name: "DeviceName"))
+    FleetBlockDeviceMappingRequest.add_member(:virtual_name, Shapes::ShapeRef.new(shape: String, location_name: "VirtualName"))
+    FleetBlockDeviceMappingRequest.add_member(:ebs, Shapes::ShapeRef.new(shape: FleetEbsBlockDeviceRequest, location_name: "Ebs"))
+    FleetBlockDeviceMappingRequest.add_member(:no_device, Shapes::ShapeRef.new(shape: String, location_name: "NoDevice"))
+    FleetBlockDeviceMappingRequest.struct_class = Types::FleetBlockDeviceMappingRequest
+
+    FleetBlockDeviceMappingRequestList.member = Shapes::ShapeRef.new(shape: FleetBlockDeviceMappingRequest, location_name: "BlockDeviceMapping")
+
     FleetCapacityReservation.add_member(:capacity_reservation_id, Shapes::ShapeRef.new(shape: CapacityReservationId, location_name: "capacityReservationId"))
     FleetCapacityReservation.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZoneId"))
     FleetCapacityReservation.add_member(:instance_type, Shapes::ShapeRef.new(shape: InstanceType, location_name: "instanceType"))
@@ -9457,6 +9492,16 @@ module Aws::EC2
     FleetData.add_member(:context, Shapes::ShapeRef.new(shape: String, location_name: "context"))
     FleetData.struct_class = Types::FleetData
 
+    FleetEbsBlockDeviceRequest.add_member(:encrypted, Shapes::ShapeRef.new(shape: Boolean, location_name: "Encrypted"))
+    FleetEbsBlockDeviceRequest.add_member(:delete_on_termination, Shapes::ShapeRef.new(shape: Boolean, location_name: "DeleteOnTermination"))
+    FleetEbsBlockDeviceRequest.add_member(:iops, Shapes::ShapeRef.new(shape: Integer, location_name: "Iops"))
+    FleetEbsBlockDeviceRequest.add_member(:throughput, Shapes::ShapeRef.new(shape: Integer, location_name: "Throughput"))
+    FleetEbsBlockDeviceRequest.add_member(:kms_key_id, Shapes::ShapeRef.new(shape: KmsKeyId, location_name: "KmsKeyId"))
+    FleetEbsBlockDeviceRequest.add_member(:snapshot_id, Shapes::ShapeRef.new(shape: SnapshotId, location_name: "SnapshotId"))
+    FleetEbsBlockDeviceRequest.add_member(:volume_size, Shapes::ShapeRef.new(shape: Integer, location_name: "VolumeSize"))
+    FleetEbsBlockDeviceRequest.add_member(:volume_type, Shapes::ShapeRef.new(shape: VolumeType, location_name: "VolumeType"))
+    FleetEbsBlockDeviceRequest.struct_class = Types::FleetEbsBlockDeviceRequest
+
     FleetIdSet.member = Shapes::ShapeRef.new(shape: FleetId)
 
     FleetLaunchTemplateConfig.add_member(:launch_template_specification, Shapes::ShapeRef.new(shape: FleetLaunchTemplateSpecification, location_name: "launchTemplateSpecification"))
@@ -9480,6 +9525,7 @@ module Aws::EC2
     FleetLaunchTemplateOverrides.add_member(:placement, Shapes::ShapeRef.new(shape: PlacementResponse, location_name: "placement"))
     FleetLaunchTemplateOverrides.add_member(:instance_requirements, Shapes::ShapeRef.new(shape: InstanceRequirements, location_name: "instanceRequirements"))
     FleetLaunchTemplateOverrides.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, location_name: "imageId"))
+    FleetLaunchTemplateOverrides.add_member(:block_device_mappings, Shapes::ShapeRef.new(shape: BlockDeviceMappingResponseList, location_name: "blockDeviceMappingSet"))
     FleetLaunchTemplateOverrides.struct_class = Types::FleetLaunchTemplateOverrides
 
     FleetLaunchTemplateOverridesList.member = Shapes::ShapeRef.new(shape: FleetLaunchTemplateOverrides, location_name: "item")
@@ -9493,6 +9539,7 @@ module Aws::EC2
     FleetLaunchTemplateOverridesRequest.add_member(:weighted_capacity, Shapes::ShapeRef.new(shape: Double, location_name: "WeightedCapacity"))
     FleetLaunchTemplateOverridesRequest.add_member(:priority, Shapes::ShapeRef.new(shape: Double, location_name: "Priority"))
     FleetLaunchTemplateOverridesRequest.add_member(:placement, Shapes::ShapeRef.new(shape: Placement, location_name: "Placement"))
+    FleetLaunchTemplateOverridesRequest.add_member(:block_device_mappings, Shapes::ShapeRef.new(shape: FleetBlockDeviceMappingRequestList, location_name: "BlockDeviceMapping"))
     FleetLaunchTemplateOverridesRequest.add_member(:instance_requirements, Shapes::ShapeRef.new(shape: InstanceRequirementsRequest, location_name: "InstanceRequirements"))
     FleetLaunchTemplateOverridesRequest.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, location_name: "ImageId"))
     FleetLaunchTemplateOverridesRequest.struct_class = Types::FleetLaunchTemplateOverridesRequest
@@ -18616,7 +18663,7 @@ module Aws::EC2
         o.http_method = "POST"
         o.http_request_uri = "/"
         o.input = Shapes::ShapeRef.new(shape: DeregisterImageRequest)
-        o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
+        o.output = Shapes::ShapeRef.new(shape: DeregisterImageResult)
       end)
 
       api.add_operation(:deregister_instance_event_notification_attributes, Seahorse::Model::Operation.new.tap do |o|

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

@@ -613,7 +613,7 @@ module Aws::EC2
     #   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 [EmptyStructure]
+    # @return [Types::DeregisterImageResult]
     def deregister(options = {})
       options = options.merge(image_id: @id)
       resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do