aws-sdk-ec2 1.507.0 → 1.509.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d451c49071f90afe5dc86473fc4cb3e2eceea98fafd4cf25d4d3e080fd456d8c
4
- data.tar.gz: 4c85574dcceb4ee64e069abb67cec426749a23aeb7ce22f8d06d21e864d1ba11
3
+ metadata.gz: 3480fb73277e9a0aa43d2f3daf83132fcb7e66ccd2da80b898231f9e1319a8cf
4
+ data.tar.gz: 8d0fcab303d8b33aa05a3cb1cbed4167a943af1d49c8cc130f1867126c46dc5b
5
5
  SHA512:
6
- metadata.gz: 9283508417e7d4e119cd36b49b43aa9944b6a78e30fdc05c0766f2b765fe223e32f3a0ef5cf7a9ad9cbe7ec81f107a21f1e7d2a7147728ac06da2f590e5b1b61
7
- data.tar.gz: f4a60131eb9dfe16d0783d6de99d87a4935e6116e608ac02305f4721ae7efad5ceb43a9d9c18764322aef4d28dff38cd904ffc8b8af050fa241bf2cc531fe5fd
6
+ metadata.gz: 23ac30cc1e421f8284b9f1803a6045a4bf73757fe55db9382e4574486327f8c88394cc43caa083ff1b03cf2afd47edbd6af0cea2f38d3cae4d37739f6bbb526e
7
+ data.tar.gz: a1eed39ec76b36ef3df58f22beb9f98eeb235cd29de60ca864080985dae0f1c05c08ab0982cd4cf2d0be6694f83724089a823b0d56beb8390e6f4eeb75f13cf8
data/CHANGELOG.md CHANGED
@@ -1,6 +1,16 @@
1
1
  Unreleased Changes
2
2
  ------------------
3
3
 
4
+ 1.509.0 (2025-03-03)
5
+ ------------------
6
+
7
+ * Feature - Update the DescribeVpcs response
8
+
9
+ 1.508.0 (2025-02-26)
10
+ ------------------
11
+
12
+ * 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.
13
+
4
14
  1.507.0 (2025-02-25)
5
15
  ------------------
6
16
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.507.0
1
+ 1.509.0
@@ -6573,6 +6573,24 @@ module Aws::EC2
6573
6573
  # resp.vpc.cidr_block_association_set[0].cidr_block_state.state #=> String, one of "associating", "associated", "disassociating", "disassociated", "failing", "failed"
6574
6574
  # resp.vpc.cidr_block_association_set[0].cidr_block_state.status_message #=> String
6575
6575
  # resp.vpc.is_default #=> Boolean
6576
+ # resp.vpc.encryption_control.vpc_id #=> String
6577
+ # resp.vpc.encryption_control.vpc_encryption_control_id #=> String
6578
+ # resp.vpc.encryption_control.mode #=> String, one of "monitor", "enforce"
6579
+ # resp.vpc.encryption_control.state #=> String, one of "enforce-in-progress", "monitor-in-progress", "enforce-failed", "monitor-failed", "deleting", "deleted", "available"
6580
+ # resp.vpc.encryption_control.state_message #=> String
6581
+ # resp.vpc.encryption_control.resource_exclusions.internet_gateway.state #=> String, one of "enabling", "enabled", "disabling", "disabled"
6582
+ # resp.vpc.encryption_control.resource_exclusions.internet_gateway.state_message #=> String
6583
+ # resp.vpc.encryption_control.resource_exclusions.egress_only_internet_gateway.state #=> String, one of "enabling", "enabled", "disabling", "disabled"
6584
+ # resp.vpc.encryption_control.resource_exclusions.egress_only_internet_gateway.state_message #=> String
6585
+ # resp.vpc.encryption_control.resource_exclusions.nat_gateway.state #=> String, one of "enabling", "enabled", "disabling", "disabled"
6586
+ # resp.vpc.encryption_control.resource_exclusions.nat_gateway.state_message #=> String
6587
+ # resp.vpc.encryption_control.resource_exclusions.virtual_private_gateway.state #=> String, one of "enabling", "enabled", "disabling", "disabled"
6588
+ # resp.vpc.encryption_control.resource_exclusions.virtual_private_gateway.state_message #=> String
6589
+ # resp.vpc.encryption_control.resource_exclusions.vpc_peering.state #=> String, one of "enabling", "enabled", "disabling", "disabled"
6590
+ # resp.vpc.encryption_control.resource_exclusions.vpc_peering.state_message #=> String
6591
+ # resp.vpc.encryption_control.tags #=> Array
6592
+ # resp.vpc.encryption_control.tags[0].key #=> String
6593
+ # resp.vpc.encryption_control.tags[0].value #=> String
6576
6594
  # resp.vpc.tags #=> Array
6577
6595
  # resp.vpc.tags[0].key #=> String
6578
6596
  # resp.vpc.tags[0].value #=> String
@@ -6998,6 +7016,23 @@ module Aws::EC2
6998
7016
  # group_id: "PlacementGroupId",
6999
7017
  # availability_zone: "String",
7000
7018
  # },
7019
+ # block_device_mappings: [
7020
+ # {
7021
+ # device_name: "String",
7022
+ # virtual_name: "String",
7023
+ # ebs: {
7024
+ # encrypted: false,
7025
+ # delete_on_termination: false,
7026
+ # iops: 1,
7027
+ # throughput: 1,
7028
+ # kms_key_id: "KmsKeyId",
7029
+ # snapshot_id: "SnapshotId",
7030
+ # volume_size: 1,
7031
+ # volume_type: "standard", # accepts standard, io1, io2, gp2, sc1, st1, gp3
7032
+ # },
7033
+ # no_device: "String",
7034
+ # },
7035
+ # ],
7001
7036
  # instance_requirements: {
7002
7037
  # v_cpu_count: { # required
7003
7038
  # min: 1, # required
@@ -7149,6 +7184,18 @@ module Aws::EC2
7149
7184
  # resp.errors[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references #=> Array
7150
7185
  # resp.errors[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references[0].instance_family #=> String
7151
7186
  # resp.errors[0].launch_template_and_overrides.overrides.image_id #=> String
7187
+ # resp.errors[0].launch_template_and_overrides.overrides.block_device_mappings #=> Array
7188
+ # resp.errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].device_name #=> String
7189
+ # resp.errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].virtual_name #=> String
7190
+ # resp.errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.encrypted #=> Boolean
7191
+ # resp.errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.delete_on_termination #=> Boolean
7192
+ # resp.errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.iops #=> Integer
7193
+ # resp.errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.throughput #=> Integer
7194
+ # resp.errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.kms_key_id #=> String
7195
+ # resp.errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.snapshot_id #=> String
7196
+ # resp.errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.volume_size #=> Integer
7197
+ # 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"
7198
+ # resp.errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].no_device #=> String
7152
7199
  # resp.errors[0].lifecycle #=> String, one of "spot", "on-demand"
7153
7200
  # resp.errors[0].error_code #=> String
7154
7201
  # resp.errors[0].error_message #=> String
@@ -7207,6 +7254,18 @@ module Aws::EC2
7207
7254
  # resp.instances[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references #=> Array
7208
7255
  # resp.instances[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references[0].instance_family #=> String
7209
7256
  # resp.instances[0].launch_template_and_overrides.overrides.image_id #=> String
7257
+ # resp.instances[0].launch_template_and_overrides.overrides.block_device_mappings #=> Array
7258
+ # resp.instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].device_name #=> String
7259
+ # resp.instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].virtual_name #=> String
7260
+ # resp.instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.encrypted #=> Boolean
7261
+ # resp.instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.delete_on_termination #=> Boolean
7262
+ # resp.instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.iops #=> Integer
7263
+ # resp.instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.throughput #=> Integer
7264
+ # resp.instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.kms_key_id #=> String
7265
+ # resp.instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.snapshot_id #=> String
7266
+ # resp.instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.volume_size #=> Integer
7267
+ # 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"
7268
+ # resp.instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].no_device #=> String
7210
7269
  # resp.instances[0].lifecycle #=> String, one of "spot", "on-demand"
7211
7270
  # resp.instances[0].instance_ids #=> Array
7212
7271
  # resp.instances[0].instance_ids[0] #=> String
@@ -8813,8 +8872,8 @@ module Aws::EC2
8813
8872
  # A launch template contains the parameters to launch an instance. When
8814
8873
  # you launch an instance using RunInstances, you can specify a launch
8815
8874
  # template instead of providing the launch parameters in the request.
8816
- # For more information, see [Launch an instance from a launch
8817
- # template][1] in the *Amazon EC2 User Guide*.
8875
+ # For more information, see [Store instance launch parameters in Amazon
8876
+ # EC2 launch templates][1] in the *Amazon EC2 User Guide*.
8818
8877
  #
8819
8878
  # To clone an existing launch template as the basis for a new launch
8820
8879
  # template, use the Amazon EC2 console. The API, SDKs, and CLI do not
@@ -8825,7 +8884,7 @@ module Aws::EC2
8825
8884
  #
8826
8885
  #
8827
8886
  # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html
8828
- # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html#create-launch-template-from-existing-launch-template
8887
+ # [2]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/create-launch-template.html#create-launch-template-from-existing-launch-template
8829
8888
  #
8830
8889
  # @option params [Boolean] :dry_run
8831
8890
  # Checks whether you have the required permissions for the action,
@@ -9228,7 +9287,7 @@ module Aws::EC2
9228
9287
  #
9229
9288
  #
9230
9289
  #
9231
- # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html#manage-launch-template-versions
9290
+ # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/manage-launch-template-versions.html
9232
9291
  #
9233
9292
  # @option params [Boolean] :dry_run
9234
9293
  # Checks whether you have the required permissions for the action,
@@ -9288,7 +9347,7 @@ module Aws::EC2
9288
9347
  #
9289
9348
  #
9290
9349
  #
9291
- # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html#use-an-ssm-parameter-instead-of-an-ami-id
9350
+ # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/create-launch-template.html#use-an-ssm-parameter-instead-of-an-ami-id
9292
9351
  #
9293
9352
  # @return [Types::CreateLaunchTemplateVersionResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
9294
9353
  #
@@ -15473,6 +15532,24 @@ module Aws::EC2
15473
15532
  # resp.vpc.cidr_block_association_set[0].cidr_block_state.state #=> String, one of "associating", "associated", "disassociating", "disassociated", "failing", "failed"
15474
15533
  # resp.vpc.cidr_block_association_set[0].cidr_block_state.status_message #=> String
15475
15534
  # resp.vpc.is_default #=> Boolean
15535
+ # resp.vpc.encryption_control.vpc_id #=> String
15536
+ # resp.vpc.encryption_control.vpc_encryption_control_id #=> String
15537
+ # resp.vpc.encryption_control.mode #=> String, one of "monitor", "enforce"
15538
+ # resp.vpc.encryption_control.state #=> String, one of "enforce-in-progress", "monitor-in-progress", "enforce-failed", "monitor-failed", "deleting", "deleted", "available"
15539
+ # resp.vpc.encryption_control.state_message #=> String
15540
+ # resp.vpc.encryption_control.resource_exclusions.internet_gateway.state #=> String, one of "enabling", "enabled", "disabling", "disabled"
15541
+ # resp.vpc.encryption_control.resource_exclusions.internet_gateway.state_message #=> String
15542
+ # resp.vpc.encryption_control.resource_exclusions.egress_only_internet_gateway.state #=> String, one of "enabling", "enabled", "disabling", "disabled"
15543
+ # resp.vpc.encryption_control.resource_exclusions.egress_only_internet_gateway.state_message #=> String
15544
+ # resp.vpc.encryption_control.resource_exclusions.nat_gateway.state #=> String, one of "enabling", "enabled", "disabling", "disabled"
15545
+ # resp.vpc.encryption_control.resource_exclusions.nat_gateway.state_message #=> String
15546
+ # resp.vpc.encryption_control.resource_exclusions.virtual_private_gateway.state #=> String, one of "enabling", "enabled", "disabling", "disabled"
15547
+ # resp.vpc.encryption_control.resource_exclusions.virtual_private_gateway.state_message #=> String
15548
+ # resp.vpc.encryption_control.resource_exclusions.vpc_peering.state #=> String, one of "enabling", "enabled", "disabling", "disabled"
15549
+ # resp.vpc.encryption_control.resource_exclusions.vpc_peering.state_message #=> String
15550
+ # resp.vpc.encryption_control.tags #=> Array
15551
+ # resp.vpc.encryption_control.tags[0].key #=> String
15552
+ # resp.vpc.encryption_control.tags[0].value #=> String
15476
15553
  # resp.vpc.tags #=> Array
15477
15554
  # resp.vpc.tags[0].key #=> String
15478
15555
  # resp.vpc.tags[0].value #=> String
@@ -16782,20 +16859,23 @@ module Aws::EC2
16782
16859
  req.send_request(options)
16783
16860
  end
16784
16861
 
16785
- # Deletes the specified EC2 Fleets.
16786
- #
16787
- # After you delete an EC2 Fleet, it launches no new instances.
16862
+ # Deletes the specified EC2 Fleet request.
16788
16863
  #
16789
- # You must also specify whether a deleted EC2 Fleet should terminate its
16790
- # instances. If you choose to terminate the instances, the EC2 Fleet
16791
- # enters the `deleted_terminating` state. Otherwise, the EC2 Fleet
16792
- # enters the `deleted_running` state, and the instances continue to run
16793
- # until they are interrupted or you terminate them manually.
16864
+ # After you delete an EC2 Fleet request, it launches no new instances.
16794
16865
  #
16795
- # For `instant` fleets, EC2 Fleet must terminate the instances when the
16796
- # fleet is deleted. Up to 1000 instances can be terminated in a single
16797
- # request to delete `instant` fleets. A deleted `instant` fleet with
16798
- # running instances is not supported.
16866
+ # You must also specify whether a deleted EC2 Fleet request should
16867
+ # terminate its instances. If you choose to terminate the instances, the
16868
+ # EC2 Fleet request enters the `deleted_terminating` state. Otherwise,
16869
+ # it enters the `deleted_running` state, and the instances continue to
16870
+ # run until they are interrupted or you terminate them manually.
16871
+ #
16872
+ # A deleted `instant` fleet with running instances is not supported.
16873
+ # When you delete an `instant` fleet, Amazon EC2 automatically
16874
+ # terminates all its instances. For fleets with more than 1000
16875
+ # instances, the deletion request might fail. If your fleet has more
16876
+ # than 1000 instances, first terminate most of the instances manually,
16877
+ # leaving 1000 or fewer. Then delete the fleet, and the remaining
16878
+ # instances will be terminated automatically.
16799
16879
  #
16800
16880
  # **Restrictions**
16801
16881
  #
@@ -16811,12 +16891,12 @@ module Aws::EC2
16811
16891
  # * If you exceed the specified number of fleets to delete, no fleets
16812
16892
  # are deleted.
16813
16893
  #
16814
- # For more information, see [Delete an EC2 Fleet][1] in the *Amazon EC2
16815
- # User Guide*.
16894
+ # For more information, see [Delete an EC2 Fleet request and the
16895
+ # instances in the fleet][1] in the *Amazon EC2 User Guide*.
16816
16896
  #
16817
16897
  #
16818
16898
  #
16819
- # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/manage-ec2-fleet.html#delete-fleet
16899
+ # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/delete-fleet.html
16820
16900
  #
16821
16901
  # @option params [Boolean] :dry_run
16822
16902
  # Checks whether you have the required permissions for the action,
@@ -17566,7 +17646,7 @@ module Aws::EC2
17566
17646
  #
17567
17647
  #
17568
17648
  #
17569
- # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/manage-launch-template-versions.html#delete-launch-template-version
17649
+ # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/delete-launch-template.html#delete-launch-template-version
17570
17650
  #
17571
17651
  # @option params [Boolean] :dry_run
17572
17652
  # Checks whether you have the required permissions for the action,
@@ -23932,6 +24012,18 @@ module Aws::EC2
23932
24012
  # resp.fleets[0].launch_template_configs[0].overrides[0].instance_requirements.baseline_performance_factors.cpu.references #=> Array
23933
24013
  # resp.fleets[0].launch_template_configs[0].overrides[0].instance_requirements.baseline_performance_factors.cpu.references[0].instance_family #=> String
23934
24014
  # resp.fleets[0].launch_template_configs[0].overrides[0].image_id #=> String
24015
+ # resp.fleets[0].launch_template_configs[0].overrides[0].block_device_mappings #=> Array
24016
+ # resp.fleets[0].launch_template_configs[0].overrides[0].block_device_mappings[0].device_name #=> String
24017
+ # resp.fleets[0].launch_template_configs[0].overrides[0].block_device_mappings[0].virtual_name #=> String
24018
+ # resp.fleets[0].launch_template_configs[0].overrides[0].block_device_mappings[0].ebs.encrypted #=> Boolean
24019
+ # resp.fleets[0].launch_template_configs[0].overrides[0].block_device_mappings[0].ebs.delete_on_termination #=> Boolean
24020
+ # resp.fleets[0].launch_template_configs[0].overrides[0].block_device_mappings[0].ebs.iops #=> Integer
24021
+ # resp.fleets[0].launch_template_configs[0].overrides[0].block_device_mappings[0].ebs.throughput #=> Integer
24022
+ # resp.fleets[0].launch_template_configs[0].overrides[0].block_device_mappings[0].ebs.kms_key_id #=> String
24023
+ # resp.fleets[0].launch_template_configs[0].overrides[0].block_device_mappings[0].ebs.snapshot_id #=> String
24024
+ # resp.fleets[0].launch_template_configs[0].overrides[0].block_device_mappings[0].ebs.volume_size #=> Integer
24025
+ # 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"
24026
+ # resp.fleets[0].launch_template_configs[0].overrides[0].block_device_mappings[0].no_device #=> String
23935
24027
  # resp.fleets[0].target_capacity_specification.total_target_capacity #=> Integer
23936
24028
  # resp.fleets[0].target_capacity_specification.on_demand_target_capacity #=> Integer
23937
24029
  # resp.fleets[0].target_capacity_specification.spot_target_capacity #=> Integer
@@ -24015,6 +24107,18 @@ module Aws::EC2
24015
24107
  # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references #=> Array
24016
24108
  # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references[0].instance_family #=> String
24017
24109
  # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.image_id #=> String
24110
+ # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.block_device_mappings #=> Array
24111
+ # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].device_name #=> String
24112
+ # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].virtual_name #=> String
24113
+ # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.encrypted #=> Boolean
24114
+ # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.delete_on_termination #=> Boolean
24115
+ # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.iops #=> Integer
24116
+ # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.throughput #=> Integer
24117
+ # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.kms_key_id #=> String
24118
+ # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.snapshot_id #=> String
24119
+ # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.volume_size #=> Integer
24120
+ # 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"
24121
+ # resp.fleets[0].errors[0].launch_template_and_overrides.overrides.block_device_mappings[0].no_device #=> String
24018
24122
  # resp.fleets[0].errors[0].lifecycle #=> String, one of "spot", "on-demand"
24019
24123
  # resp.fleets[0].errors[0].error_code #=> String
24020
24124
  # resp.fleets[0].errors[0].error_message #=> String
@@ -24073,6 +24177,18 @@ module Aws::EC2
24073
24177
  # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references #=> Array
24074
24178
  # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.instance_requirements.baseline_performance_factors.cpu.references[0].instance_family #=> String
24075
24179
  # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.image_id #=> String
24180
+ # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.block_device_mappings #=> Array
24181
+ # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].device_name #=> String
24182
+ # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].virtual_name #=> String
24183
+ # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.encrypted #=> Boolean
24184
+ # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.delete_on_termination #=> Boolean
24185
+ # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.iops #=> Integer
24186
+ # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.throughput #=> Integer
24187
+ # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.kms_key_id #=> String
24188
+ # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.snapshot_id #=> String
24189
+ # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].ebs.volume_size #=> Integer
24190
+ # 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"
24191
+ # resp.fleets[0].instances[0].launch_template_and_overrides.overrides.block_device_mappings[0].no_device #=> String
24076
24192
  # resp.fleets[0].instances[0].lifecycle #=> String, one of "spot", "on-demand"
24077
24193
  # resp.fleets[0].instances[0].instance_ids #=> Array
24078
24194
  # resp.fleets[0].instances[0].instance_ids[0] #=> String
@@ -28777,7 +28893,7 @@ module Aws::EC2
28777
28893
  #
28778
28894
  #
28779
28895
  #
28780
- # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html#use-an-ssm-parameter-instead-of-an-ami-id
28896
+ # [1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/create-launch-template.html#use-an-ssm-parameter-instead-of-an-ami-id
28781
28897
  #
28782
28898
  # @return [Types::DescribeLaunchTemplateVersionsResult] Returns a {Seahorse::Client::Response response} object which responds to the following methods:
28783
28899
  #
@@ -31729,8 +31845,8 @@ module Aws::EC2
31729
31845
  #
31730
31846
  # If you have a large number of network interfaces, the operation fails
31731
31847
  # unless you use pagination or one of the following filters: `group-id`,
31732
- # `mac-address`, `private-dns-name`, `private-ip-address`,
31733
- # `private-dns-name`, `subnet-id`, or `vpc-id`.
31848
+ # `mac-address`, `private-dns-name`, `private-ip-address`, `subnet-id`,
31849
+ # or `vpc-id`.
31734
31850
  #
31735
31851
  # We strongly recommend using only paginated requests. Unpaginated
31736
31852
  # requests are susceptible to throttling and timeouts.
@@ -39965,6 +40081,24 @@ module Aws::EC2
39965
40081
  # resp.vpcs[0].cidr_block_association_set[0].cidr_block_state.state #=> String, one of "associating", "associated", "disassociating", "disassociated", "failing", "failed"
39966
40082
  # resp.vpcs[0].cidr_block_association_set[0].cidr_block_state.status_message #=> String
39967
40083
  # resp.vpcs[0].is_default #=> Boolean
40084
+ # resp.vpcs[0].encryption_control.vpc_id #=> String
40085
+ # resp.vpcs[0].encryption_control.vpc_encryption_control_id #=> String
40086
+ # resp.vpcs[0].encryption_control.mode #=> String, one of "monitor", "enforce"
40087
+ # resp.vpcs[0].encryption_control.state #=> String, one of "enforce-in-progress", "monitor-in-progress", "enforce-failed", "monitor-failed", "deleting", "deleted", "available"
40088
+ # resp.vpcs[0].encryption_control.state_message #=> String
40089
+ # resp.vpcs[0].encryption_control.resource_exclusions.internet_gateway.state #=> String, one of "enabling", "enabled", "disabling", "disabled"
40090
+ # resp.vpcs[0].encryption_control.resource_exclusions.internet_gateway.state_message #=> String
40091
+ # resp.vpcs[0].encryption_control.resource_exclusions.egress_only_internet_gateway.state #=> String, one of "enabling", "enabled", "disabling", "disabled"
40092
+ # resp.vpcs[0].encryption_control.resource_exclusions.egress_only_internet_gateway.state_message #=> String
40093
+ # resp.vpcs[0].encryption_control.resource_exclusions.nat_gateway.state #=> String, one of "enabling", "enabled", "disabling", "disabled"
40094
+ # resp.vpcs[0].encryption_control.resource_exclusions.nat_gateway.state_message #=> String
40095
+ # resp.vpcs[0].encryption_control.resource_exclusions.virtual_private_gateway.state #=> String, one of "enabling", "enabled", "disabling", "disabled"
40096
+ # resp.vpcs[0].encryption_control.resource_exclusions.virtual_private_gateway.state_message #=> String
40097
+ # resp.vpcs[0].encryption_control.resource_exclusions.vpc_peering.state #=> String, one of "enabling", "enabled", "disabling", "disabled"
40098
+ # resp.vpcs[0].encryption_control.resource_exclusions.vpc_peering.state_message #=> String
40099
+ # resp.vpcs[0].encryption_control.tags #=> Array
40100
+ # resp.vpcs[0].encryption_control.tags[0].key #=> String
40101
+ # resp.vpcs[0].encryption_control.tags[0].value #=> String
39968
40102
  # resp.vpcs[0].tags #=> Array
39969
40103
  # resp.vpcs[0].tags[0].key #=> String
39970
40104
  # resp.vpcs[0].tags[0].value #=> String
@@ -49397,6 +49531,23 @@ module Aws::EC2
49397
49531
  # group_id: "PlacementGroupId",
49398
49532
  # availability_zone: "String",
49399
49533
  # },
49534
+ # block_device_mappings: [
49535
+ # {
49536
+ # device_name: "String",
49537
+ # virtual_name: "String",
49538
+ # ebs: {
49539
+ # encrypted: false,
49540
+ # delete_on_termination: false,
49541
+ # iops: 1,
49542
+ # throughput: 1,
49543
+ # kms_key_id: "KmsKeyId",
49544
+ # snapshot_id: "SnapshotId",
49545
+ # volume_size: 1,
49546
+ # volume_type: "standard", # accepts standard, io1, io2, gp2, sc1, st1, gp3
49547
+ # },
49548
+ # no_device: "String",
49549
+ # },
49550
+ # ],
49400
49551
  # instance_requirements: {
49401
49552
  # v_cpu_count: { # required
49402
49553
  # min: 1, # required
@@ -51487,7 +51638,7 @@ module Aws::EC2
51487
51638
  # @option params [String] :client_token
51488
51639
  # Unique, case-sensitive identifier you provide to ensure the
51489
51640
  # idempotency of the request. For more information, see [Ensuring
51490
- # idempotency][1].
51641
+ # idempotency in Amazon EC2 API requests][1].
51491
51642
  #
51492
51643
  # Constraint: Maximum 128 ASCII characters.
51493
51644
  #
@@ -63229,7 +63380,7 @@ module Aws::EC2
63229
63380
  tracer: tracer
63230
63381
  )
63231
63382
  context[:gem_name] = 'aws-sdk-ec2'
63232
- context[:gem_version] = '1.507.0'
63383
+ context[:gem_version] = '1.509.0'
63233
63384
  Seahorse::Client::Request.new(handlers, context)
63234
63385
  end
63235
63386
 
@@ -238,6 +238,8 @@ module Aws::EC2
238
238
  BlockDeviceMapping = Shapes::StructureShape.new(name: 'BlockDeviceMapping')
239
239
  BlockDeviceMappingList = Shapes::ListShape.new(name: 'BlockDeviceMappingList')
240
240
  BlockDeviceMappingRequestList = Shapes::ListShape.new(name: 'BlockDeviceMappingRequestList')
241
+ BlockDeviceMappingResponse = Shapes::StructureShape.new(name: 'BlockDeviceMappingResponse')
242
+ BlockDeviceMappingResponseList = Shapes::ListShape.new(name: 'BlockDeviceMappingResponseList')
241
243
  BlockPublicAccessMode = Shapes::StringShape.new(name: 'BlockPublicAccessMode')
242
244
  BlockPublicAccessStates = Shapes::StructureShape.new(name: 'BlockPublicAccessStates')
243
245
  Boolean = Shapes::BooleanShape.new(name: 'Boolean')
@@ -810,6 +812,7 @@ module Aws::EC2
810
812
  DeprovisionPublicIpv4PoolCidrResult = Shapes::StructureShape.new(name: 'DeprovisionPublicIpv4PoolCidrResult')
811
813
  DeprovisionedAddressSet = Shapes::ListShape.new(name: 'DeprovisionedAddressSet')
812
814
  DeregisterImageRequest = Shapes::StructureShape.new(name: 'DeregisterImageRequest')
815
+ DeregisterImageResult = Shapes::StructureShape.new(name: 'DeregisterImageResult')
813
816
  DeregisterInstanceEventNotificationAttributesRequest = Shapes::StructureShape.new(name: 'DeregisterInstanceEventNotificationAttributesRequest')
814
817
  DeregisterInstanceEventNotificationAttributesResult = Shapes::StructureShape.new(name: 'DeregisterInstanceEventNotificationAttributesResult')
815
818
  DeregisterInstanceTagAttributeRequest = Shapes::StructureShape.new(name: 'DeregisterInstanceTagAttributeRequest')
@@ -1331,6 +1334,7 @@ module Aws::EC2
1331
1334
  DrainSeconds = Shapes::IntegerShape.new(name: 'DrainSeconds')
1332
1335
  DynamicRoutingValue = Shapes::StringShape.new(name: 'DynamicRoutingValue')
1333
1336
  EbsBlockDevice = Shapes::StructureShape.new(name: 'EbsBlockDevice')
1337
+ EbsBlockDeviceResponse = Shapes::StructureShape.new(name: 'EbsBlockDeviceResponse')
1334
1338
  EbsEncryptionSupport = Shapes::StringShape.new(name: 'EbsEncryptionSupport')
1335
1339
  EbsInfo = Shapes::StructureShape.new(name: 'EbsInfo')
1336
1340
  EbsInstanceBlockDevice = Shapes::StructureShape.new(name: 'EbsInstanceBlockDevice')
@@ -1485,11 +1489,14 @@ module Aws::EC2
1485
1489
  FirewallStatefulRule = Shapes::StructureShape.new(name: 'FirewallStatefulRule')
1486
1490
  FirewallStatelessRule = Shapes::StructureShape.new(name: 'FirewallStatelessRule')
1487
1491
  FleetActivityStatus = Shapes::StringShape.new(name: 'FleetActivityStatus')
1492
+ FleetBlockDeviceMappingRequest = Shapes::StructureShape.new(name: 'FleetBlockDeviceMappingRequest')
1493
+ FleetBlockDeviceMappingRequestList = Shapes::ListShape.new(name: 'FleetBlockDeviceMappingRequestList')
1488
1494
  FleetCapacityReservation = Shapes::StructureShape.new(name: 'FleetCapacityReservation')
1489
1495
  FleetCapacityReservationSet = Shapes::ListShape.new(name: 'FleetCapacityReservationSet')
1490
1496
  FleetCapacityReservationTenancy = Shapes::StringShape.new(name: 'FleetCapacityReservationTenancy')
1491
1497
  FleetCapacityReservationUsageStrategy = Shapes::StringShape.new(name: 'FleetCapacityReservationUsageStrategy')
1492
1498
  FleetData = Shapes::StructureShape.new(name: 'FleetData')
1499
+ FleetEbsBlockDeviceRequest = Shapes::StructureShape.new(name: 'FleetEbsBlockDeviceRequest')
1493
1500
  FleetEventType = Shapes::StringShape.new(name: 'FleetEventType')
1494
1501
  FleetExcessCapacityTerminationPolicy = Shapes::StringShape.new(name: 'FleetExcessCapacityTerminationPolicy')
1495
1502
  FleetId = Shapes::StringShape.new(name: 'FleetId')
@@ -3344,6 +3351,13 @@ module Aws::EC2
3344
3351
  VpcClassicLink = Shapes::StructureShape.new(name: 'VpcClassicLink')
3345
3352
  VpcClassicLinkIdList = Shapes::ListShape.new(name: 'VpcClassicLinkIdList')
3346
3353
  VpcClassicLinkList = Shapes::ListShape.new(name: 'VpcClassicLinkList')
3354
+ VpcEncryptionControl = Shapes::StructureShape.new(name: 'VpcEncryptionControl')
3355
+ VpcEncryptionControlExclusion = Shapes::StructureShape.new(name: 'VpcEncryptionControlExclusion')
3356
+ VpcEncryptionControlExclusionState = Shapes::StringShape.new(name: 'VpcEncryptionControlExclusionState')
3357
+ VpcEncryptionControlExclusions = Shapes::StructureShape.new(name: 'VpcEncryptionControlExclusions')
3358
+ VpcEncryptionControlId = Shapes::StringShape.new(name: 'VpcEncryptionControlId')
3359
+ VpcEncryptionControlMode = Shapes::StringShape.new(name: 'VpcEncryptionControlMode')
3360
+ VpcEncryptionControlState = Shapes::StringShape.new(name: 'VpcEncryptionControlState')
3347
3361
  VpcEndpoint = Shapes::StructureShape.new(name: 'VpcEndpoint')
3348
3362
  VpcEndpointAssociation = Shapes::StructureShape.new(name: 'VpcEndpointAssociation')
3349
3363
  VpcEndpointAssociationSet = Shapes::ListShape.new(name: 'VpcEndpointAssociationSet')
@@ -4200,6 +4214,14 @@ module Aws::EC2
4200
4214
 
4201
4215
  BlockDeviceMappingRequestList.member = Shapes::ShapeRef.new(shape: BlockDeviceMapping, location_name: "BlockDeviceMapping")
4202
4216
 
4217
+ BlockDeviceMappingResponse.add_member(:device_name, Shapes::ShapeRef.new(shape: String, location_name: "deviceName"))
4218
+ BlockDeviceMappingResponse.add_member(:virtual_name, Shapes::ShapeRef.new(shape: String, location_name: "virtualName"))
4219
+ BlockDeviceMappingResponse.add_member(:ebs, Shapes::ShapeRef.new(shape: EbsBlockDeviceResponse, location_name: "ebs"))
4220
+ BlockDeviceMappingResponse.add_member(:no_device, Shapes::ShapeRef.new(shape: String, location_name: "noDevice"))
4221
+ BlockDeviceMappingResponse.struct_class = Types::BlockDeviceMappingResponse
4222
+
4223
+ BlockDeviceMappingResponseList.member = Shapes::ShapeRef.new(shape: BlockDeviceMappingResponse, location_name: "item")
4224
+
4203
4225
  BlockPublicAccessStates.add_member(:internet_gateway_block_mode, Shapes::ShapeRef.new(shape: BlockPublicAccessMode, location_name: "internetGatewayBlockMode"))
4204
4226
  BlockPublicAccessStates.struct_class = Types::BlockPublicAccessStates
4205
4227
 
@@ -6632,6 +6654,8 @@ module Aws::EC2
6632
6654
  DeregisterImageRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "dryRun"))
6633
6655
  DeregisterImageRequest.struct_class = Types::DeregisterImageRequest
6634
6656
 
6657
+ DeregisterImageResult.struct_class = Types::DeregisterImageResult
6658
+
6635
6659
  DeregisterInstanceEventNotificationAttributesRequest.add_member(:dry_run, Shapes::ShapeRef.new(shape: Boolean, location_name: "DryRun"))
6636
6660
  DeregisterInstanceEventNotificationAttributesRequest.add_member(:instance_tag_attribute, Shapes::ShapeRef.new(shape: DeregisterInstanceTagAttributeRequest, required: true, location_name: "InstanceTagAttribute"))
6637
6661
  DeregisterInstanceEventNotificationAttributesRequest.struct_class = Types::DeregisterInstanceEventNotificationAttributesRequest
@@ -8860,6 +8884,16 @@ module Aws::EC2
8860
8884
  EbsBlockDevice.add_member(:encrypted, Shapes::ShapeRef.new(shape: Boolean, location_name: "encrypted"))
8861
8885
  EbsBlockDevice.struct_class = Types::EbsBlockDevice
8862
8886
 
8887
+ EbsBlockDeviceResponse.add_member(:encrypted, Shapes::ShapeRef.new(shape: Boolean, location_name: "encrypted"))
8888
+ EbsBlockDeviceResponse.add_member(:delete_on_termination, Shapes::ShapeRef.new(shape: Boolean, location_name: "deleteOnTermination"))
8889
+ EbsBlockDeviceResponse.add_member(:iops, Shapes::ShapeRef.new(shape: Integer, location_name: "iops"))
8890
+ EbsBlockDeviceResponse.add_member(:throughput, Shapes::ShapeRef.new(shape: Integer, location_name: "throughput"))
8891
+ EbsBlockDeviceResponse.add_member(:kms_key_id, Shapes::ShapeRef.new(shape: KmsKeyId, location_name: "kmsKeyId"))
8892
+ EbsBlockDeviceResponse.add_member(:snapshot_id, Shapes::ShapeRef.new(shape: SnapshotId, location_name: "snapshotId"))
8893
+ EbsBlockDeviceResponse.add_member(:volume_size, Shapes::ShapeRef.new(shape: Integer, location_name: "volumeSize"))
8894
+ EbsBlockDeviceResponse.add_member(:volume_type, Shapes::ShapeRef.new(shape: VolumeType, location_name: "volumeType"))
8895
+ EbsBlockDeviceResponse.struct_class = Types::EbsBlockDeviceResponse
8896
+
8863
8897
  EbsInfo.add_member(:ebs_optimized_support, Shapes::ShapeRef.new(shape: EbsOptimizedSupport, location_name: "ebsOptimizedSupport"))
8864
8898
  EbsInfo.add_member(:encryption_support, Shapes::ShapeRef.new(shape: EbsEncryptionSupport, location_name: "encryptionSupport"))
8865
8899
  EbsInfo.add_member(:ebs_optimized_info, Shapes::ShapeRef.new(shape: EbsOptimizedInfo, location_name: "ebsOptimizedInfo"))
@@ -9419,6 +9453,14 @@ module Aws::EC2
9419
9453
  FirewallStatelessRule.add_member(:priority, Shapes::ShapeRef.new(shape: Priority, location_name: "priority"))
9420
9454
  FirewallStatelessRule.struct_class = Types::FirewallStatelessRule
9421
9455
 
9456
+ FleetBlockDeviceMappingRequest.add_member(:device_name, Shapes::ShapeRef.new(shape: String, location_name: "DeviceName"))
9457
+ FleetBlockDeviceMappingRequest.add_member(:virtual_name, Shapes::ShapeRef.new(shape: String, location_name: "VirtualName"))
9458
+ FleetBlockDeviceMappingRequest.add_member(:ebs, Shapes::ShapeRef.new(shape: FleetEbsBlockDeviceRequest, location_name: "Ebs"))
9459
+ FleetBlockDeviceMappingRequest.add_member(:no_device, Shapes::ShapeRef.new(shape: String, location_name: "NoDevice"))
9460
+ FleetBlockDeviceMappingRequest.struct_class = Types::FleetBlockDeviceMappingRequest
9461
+
9462
+ FleetBlockDeviceMappingRequestList.member = Shapes::ShapeRef.new(shape: FleetBlockDeviceMappingRequest, location_name: "BlockDeviceMapping")
9463
+
9422
9464
  FleetCapacityReservation.add_member(:capacity_reservation_id, Shapes::ShapeRef.new(shape: CapacityReservationId, location_name: "capacityReservationId"))
9423
9465
  FleetCapacityReservation.add_member(:availability_zone_id, Shapes::ShapeRef.new(shape: String, location_name: "availabilityZoneId"))
9424
9466
  FleetCapacityReservation.add_member(:instance_type, Shapes::ShapeRef.new(shape: InstanceType, location_name: "instanceType"))
@@ -9457,6 +9499,16 @@ module Aws::EC2
9457
9499
  FleetData.add_member(:context, Shapes::ShapeRef.new(shape: String, location_name: "context"))
9458
9500
  FleetData.struct_class = Types::FleetData
9459
9501
 
9502
+ FleetEbsBlockDeviceRequest.add_member(:encrypted, Shapes::ShapeRef.new(shape: Boolean, location_name: "Encrypted"))
9503
+ FleetEbsBlockDeviceRequest.add_member(:delete_on_termination, Shapes::ShapeRef.new(shape: Boolean, location_name: "DeleteOnTermination"))
9504
+ FleetEbsBlockDeviceRequest.add_member(:iops, Shapes::ShapeRef.new(shape: Integer, location_name: "Iops"))
9505
+ FleetEbsBlockDeviceRequest.add_member(:throughput, Shapes::ShapeRef.new(shape: Integer, location_name: "Throughput"))
9506
+ FleetEbsBlockDeviceRequest.add_member(:kms_key_id, Shapes::ShapeRef.new(shape: KmsKeyId, location_name: "KmsKeyId"))
9507
+ FleetEbsBlockDeviceRequest.add_member(:snapshot_id, Shapes::ShapeRef.new(shape: SnapshotId, location_name: "SnapshotId"))
9508
+ FleetEbsBlockDeviceRequest.add_member(:volume_size, Shapes::ShapeRef.new(shape: Integer, location_name: "VolumeSize"))
9509
+ FleetEbsBlockDeviceRequest.add_member(:volume_type, Shapes::ShapeRef.new(shape: VolumeType, location_name: "VolumeType"))
9510
+ FleetEbsBlockDeviceRequest.struct_class = Types::FleetEbsBlockDeviceRequest
9511
+
9460
9512
  FleetIdSet.member = Shapes::ShapeRef.new(shape: FleetId)
9461
9513
 
9462
9514
  FleetLaunchTemplateConfig.add_member(:launch_template_specification, Shapes::ShapeRef.new(shape: FleetLaunchTemplateSpecification, location_name: "launchTemplateSpecification"))
@@ -9480,6 +9532,7 @@ module Aws::EC2
9480
9532
  FleetLaunchTemplateOverrides.add_member(:placement, Shapes::ShapeRef.new(shape: PlacementResponse, location_name: "placement"))
9481
9533
  FleetLaunchTemplateOverrides.add_member(:instance_requirements, Shapes::ShapeRef.new(shape: InstanceRequirements, location_name: "instanceRequirements"))
9482
9534
  FleetLaunchTemplateOverrides.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, location_name: "imageId"))
9535
+ FleetLaunchTemplateOverrides.add_member(:block_device_mappings, Shapes::ShapeRef.new(shape: BlockDeviceMappingResponseList, location_name: "blockDeviceMappingSet"))
9483
9536
  FleetLaunchTemplateOverrides.struct_class = Types::FleetLaunchTemplateOverrides
9484
9537
 
9485
9538
  FleetLaunchTemplateOverridesList.member = Shapes::ShapeRef.new(shape: FleetLaunchTemplateOverrides, location_name: "item")
@@ -9493,6 +9546,7 @@ module Aws::EC2
9493
9546
  FleetLaunchTemplateOverridesRequest.add_member(:weighted_capacity, Shapes::ShapeRef.new(shape: Double, location_name: "WeightedCapacity"))
9494
9547
  FleetLaunchTemplateOverridesRequest.add_member(:priority, Shapes::ShapeRef.new(shape: Double, location_name: "Priority"))
9495
9548
  FleetLaunchTemplateOverridesRequest.add_member(:placement, Shapes::ShapeRef.new(shape: Placement, location_name: "Placement"))
9549
+ FleetLaunchTemplateOverridesRequest.add_member(:block_device_mappings, Shapes::ShapeRef.new(shape: FleetBlockDeviceMappingRequestList, location_name: "BlockDeviceMapping"))
9496
9550
  FleetLaunchTemplateOverridesRequest.add_member(:instance_requirements, Shapes::ShapeRef.new(shape: InstanceRequirementsRequest, location_name: "InstanceRequirements"))
9497
9551
  FleetLaunchTemplateOverridesRequest.add_member(:image_id, Shapes::ShapeRef.new(shape: ImageId, location_name: "ImageId"))
9498
9552
  FleetLaunchTemplateOverridesRequest.struct_class = Types::FleetLaunchTemplateOverridesRequest
@@ -16508,6 +16562,7 @@ module Aws::EC2
16508
16562
  Vpc.add_member(:ipv_6_cidr_block_association_set, Shapes::ShapeRef.new(shape: VpcIpv6CidrBlockAssociationSet, location_name: "ipv6CidrBlockAssociationSet"))
16509
16563
  Vpc.add_member(:cidr_block_association_set, Shapes::ShapeRef.new(shape: VpcCidrBlockAssociationSet, location_name: "cidrBlockAssociationSet"))
16510
16564
  Vpc.add_member(:is_default, Shapes::ShapeRef.new(shape: Boolean, location_name: "isDefault"))
16565
+ Vpc.add_member(:encryption_control, Shapes::ShapeRef.new(shape: VpcEncryptionControl, location_name: "encryptionControl"))
16511
16566
  Vpc.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
16512
16567
  Vpc.add_member(:block_public_access_states, Shapes::ShapeRef.new(shape: BlockPublicAccessStates, location_name: "blockPublicAccessStates"))
16513
16568
  Vpc.add_member(:vpc_id, Shapes::ShapeRef.new(shape: String, location_name: "vpcId"))
@@ -16567,6 +16622,26 @@ module Aws::EC2
16567
16622
 
16568
16623
  VpcClassicLinkList.member = Shapes::ShapeRef.new(shape: VpcClassicLink, location_name: "item")
16569
16624
 
16625
+ VpcEncryptionControl.add_member(:vpc_id, Shapes::ShapeRef.new(shape: VpcId, location_name: "vpcId"))
16626
+ VpcEncryptionControl.add_member(:vpc_encryption_control_id, Shapes::ShapeRef.new(shape: VpcEncryptionControlId, location_name: "vpcEncryptionControlId"))
16627
+ VpcEncryptionControl.add_member(:mode, Shapes::ShapeRef.new(shape: VpcEncryptionControlMode, location_name: "mode"))
16628
+ VpcEncryptionControl.add_member(:state, Shapes::ShapeRef.new(shape: VpcEncryptionControlState, location_name: "state"))
16629
+ VpcEncryptionControl.add_member(:state_message, Shapes::ShapeRef.new(shape: String, location_name: "stateMessage"))
16630
+ VpcEncryptionControl.add_member(:resource_exclusions, Shapes::ShapeRef.new(shape: VpcEncryptionControlExclusions, location_name: "resourceExclusions"))
16631
+ VpcEncryptionControl.add_member(:tags, Shapes::ShapeRef.new(shape: TagList, location_name: "tagSet"))
16632
+ VpcEncryptionControl.struct_class = Types::VpcEncryptionControl
16633
+
16634
+ VpcEncryptionControlExclusion.add_member(:state, Shapes::ShapeRef.new(shape: VpcEncryptionControlExclusionState, location_name: "state"))
16635
+ VpcEncryptionControlExclusion.add_member(:state_message, Shapes::ShapeRef.new(shape: String, location_name: "stateMessage"))
16636
+ VpcEncryptionControlExclusion.struct_class = Types::VpcEncryptionControlExclusion
16637
+
16638
+ VpcEncryptionControlExclusions.add_member(:internet_gateway, Shapes::ShapeRef.new(shape: VpcEncryptionControlExclusion, location_name: "internetGateway"))
16639
+ VpcEncryptionControlExclusions.add_member(:egress_only_internet_gateway, Shapes::ShapeRef.new(shape: VpcEncryptionControlExclusion, location_name: "egressOnlyInternetGateway"))
16640
+ VpcEncryptionControlExclusions.add_member(:nat_gateway, Shapes::ShapeRef.new(shape: VpcEncryptionControlExclusion, location_name: "natGateway"))
16641
+ VpcEncryptionControlExclusions.add_member(:virtual_private_gateway, Shapes::ShapeRef.new(shape: VpcEncryptionControlExclusion, location_name: "virtualPrivateGateway"))
16642
+ VpcEncryptionControlExclusions.add_member(:vpc_peering, Shapes::ShapeRef.new(shape: VpcEncryptionControlExclusion, location_name: "vpcPeering"))
16643
+ VpcEncryptionControlExclusions.struct_class = Types::VpcEncryptionControlExclusions
16644
+
16570
16645
  VpcEndpoint.add_member(:vpc_endpoint_id, Shapes::ShapeRef.new(shape: String, location_name: "vpcEndpointId"))
16571
16646
  VpcEndpoint.add_member(:vpc_endpoint_type, Shapes::ShapeRef.new(shape: VpcEndpointType, location_name: "vpcEndpointType"))
16572
16647
  VpcEndpoint.add_member(:vpc_id, Shapes::ShapeRef.new(shape: String, location_name: "vpcId"))
@@ -18616,7 +18691,7 @@ module Aws::EC2
18616
18691
  o.http_method = "POST"
18617
18692
  o.http_request_uri = "/"
18618
18693
  o.input = Shapes::ShapeRef.new(shape: DeregisterImageRequest)
18619
- o.output = Shapes::ShapeRef.new(shape: Shapes::StructureShape.new(struct_class: Aws::EmptyStructure))
18694
+ o.output = Shapes::ShapeRef.new(shape: DeregisterImageResult)
18620
18695
  end)
18621
18696
 
18622
18697
  api.add_operation(:deregister_instance_event_notification_attributes, Seahorse::Model::Operation.new.tap do |o|
@@ -613,7 +613,7 @@ module Aws::EC2
613
613
  # without actually making the request, and provides an error response.
614
614
  # If you have the required permissions, the error response is
615
615
  # `DryRunOperation`. Otherwise, it is `UnauthorizedOperation`.
616
- # @return [EmptyStructure]
616
+ # @return [Types::DeregisterImageResult]
617
617
  def deregister(options = {})
618
618
  options = options.merge(image_id: @id)
619
619
  resp = Aws::Plugins::UserAgent.metric('RESOURCE_MODEL') do