Skip to content

Commit 7ac960d

Browse files
author
awstools
committed
feat(client-ec2): 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 parent 95b84bb commit 7ac960d

35 files changed

+2013
-1099
lines changed

‎clients/client-ec2/src/commands/CreateFleetCommand.ts

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,23 @@ export interface CreateFleetCommandOutput extends CreateFleetResult, __MetadataB
9494
* GroupId: "STRING_VALUE",
9595
* AvailabilityZone: "STRING_VALUE",
9696
* },
97+
* BlockDeviceMappings: [ // FleetBlockDeviceMappingRequestList
98+
* { // FleetBlockDeviceMappingRequest
99+
* DeviceName: "STRING_VALUE",
100+
* VirtualName: "STRING_VALUE",
101+
* Ebs: { // FleetEbsBlockDeviceRequest
102+
* Encrypted: true || false,
103+
* DeleteOnTermination: true || false,
104+
* Iops: Number("int"),
105+
* Throughput: Number("int"),
106+
* KmsKeyId: "STRING_VALUE",
107+
* SnapshotId: "STRING_VALUE",
108+
* VolumeSize: Number("int"),
109+
* VolumeType: "standard" || "io1" || "io2" || "gp2" || "sc1" || "st1" || "gp3",
110+
* },
111+
* NoDevice: "STRING_VALUE",
112+
* },
113+
* ],
97114
* InstanceRequirements: { // InstanceRequirementsRequest
98115
* VCpuCount: { // VCpuCountRangeRequest
99116
* Min: Number("int"), // required
@@ -303,6 +320,23 @@ export interface CreateFleetCommandOutput extends CreateFleetResult, __MetadataB
303320
* // },
304321
* // },
305322
* // ImageId: "STRING_VALUE",
323+
* // BlockDeviceMappings: [ // BlockDeviceMappingResponseList
324+
* // { // BlockDeviceMappingResponse
325+
* // DeviceName: "STRING_VALUE",
326+
* // VirtualName: "STRING_VALUE",
327+
* // Ebs: { // EbsBlockDeviceResponse
328+
* // Encrypted: true || false,
329+
* // DeleteOnTermination: true || false,
330+
* // Iops: Number("int"),
331+
* // Throughput: Number("int"),
332+
* // KmsKeyId: "STRING_VALUE",
333+
* // SnapshotId: "STRING_VALUE",
334+
* // VolumeSize: Number("int"),
335+
* // VolumeType: "standard" || "io1" || "io2" || "gp2" || "sc1" || "st1" || "gp3",
336+
* // },
337+
* // NoDevice: "STRING_VALUE",
338+
* // },
339+
* // ],
306340
* // },
307341
* // },
308342
* // Lifecycle: "spot" || "on-demand",
@@ -407,6 +441,23 @@ export interface CreateFleetCommandOutput extends CreateFleetResult, __MetadataB
407441
* // },
408442
* // },
409443
* // ImageId: "STRING_VALUE",
444+
* // BlockDeviceMappings: [
445+
* // {
446+
* // DeviceName: "STRING_VALUE",
447+
* // VirtualName: "STRING_VALUE",
448+
* // Ebs: {
449+
* // Encrypted: true || false,
450+
* // DeleteOnTermination: true || false,
451+
* // Iops: Number("int"),
452+
* // Throughput: Number("int"),
453+
* // KmsKeyId: "STRING_VALUE",
454+
* // SnapshotId: "STRING_VALUE",
455+
* // VolumeSize: Number("int"),
456+
* // VolumeType: "standard" || "io1" || "io2" || "gp2" || "sc1" || "st1" || "gp3",
457+
* // },
458+
* // NoDevice: "STRING_VALUE",
459+
* // },
460+
* // ],
410461
* // },
411462
* // },
412463
* // Lifecycle: "spot" || "on-demand",

‎clients/client-ec2/src/commands/CreateLaunchTemplateCommand.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ export interface CreateLaunchTemplateCommandOutput extends CreateLaunchTemplateR
3535
* <p>Creates a launch template.</p>
3636
* <p>A launch template contains the parameters to launch an instance. When you launch an
3737
* instance using <a>RunInstances</a>, you can specify a launch template instead
38-
* of providing the launch parameters in the request. For more information, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html">Launch
39-
* an instance from a launch template</a> in the
38+
* of providing the launch parameters in the request. For more information, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html">Store
39+
* instance launch parameters in Amazon EC2 launch templates</a> in the
4040
* <i>Amazon EC2 User Guide</i>.</p>
4141
* <p>To clone an existing launch template as the basis for a new launch template, use the
4242
* Amazon EC2 console. The API, SDKs, and CLI do not support cloning a template. For more
43-
* information, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html#create-launch-template-from-existing-launch-template">Create a launch template from an existing launch template</a> in the
43+
* information, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/create-launch-template.html#create-launch-template-from-existing-launch-template">Create a launch template from an existing launch template</a> in the
4444
* <i>Amazon EC2 User Guide</i>.</p>
4545
* @example
4646
* Use a bare-bones client and the command you need to make an API call.

‎clients/client-ec2/src/commands/CreateLaunchTemplateVersionCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export interface CreateLaunchTemplateVersionCommandOutput extends CreateLaunchTe
4141
* <p>Launch templates are immutable; after you create a launch template, you can't modify
4242
* it. Instead, you can create a new version of the launch template that includes the
4343
* changes that you require.</p>
44-
* <p>For more information, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-launch-templates.html#manage-launch-template-versions">Modify a launch template (manage launch template versions)</a> in the
44+
* <p>For more information, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/manage-launch-template-versions.html">Modify a launch template (manage launch template versions)</a> in the
4545
* <i>Amazon EC2 User Guide</i>.</p>
4646
* @example
4747
* Use a bare-bones client and the command you need to make an API call.

‎clients/client-ec2/src/commands/CreateLocalGatewayRouteTableVirtualInterfaceGroupAssociationCommand.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@ import { MetadataBearer as __MetadataBearer } from "@smithy/types";
66

77
import { EC2ClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../EC2Client";
88
import { commonParams } from "../endpoint/EndpointParameters";
9-
import {
10-
CreateLocalGatewayRouteTableVirtualInterfaceGroupAssociationRequest,
11-
CreateLocalGatewayRouteTableVirtualInterfaceGroupAssociationResult,
12-
} from "../models/models_1";
9+
import { CreateLocalGatewayRouteTableVirtualInterfaceGroupAssociationRequest } from "../models/models_1";
10+
import { CreateLocalGatewayRouteTableVirtualInterfaceGroupAssociationResult } from "../models/models_2";
1311
import {
1412
de_CreateLocalGatewayRouteTableVirtualInterfaceGroupAssociationCommand,
1513
se_CreateLocalGatewayRouteTableVirtualInterfaceGroupAssociationCommand,

‎clients/client-ec2/src/commands/CreateLocalGatewayRouteTableVpcAssociationCommand.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ import { MetadataBearer as __MetadataBearer } from "@smithy/types";
66

77
import { EC2ClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../EC2Client";
88
import { commonParams } from "../endpoint/EndpointParameters";
9-
import { CreateLocalGatewayRouteTableVpcAssociationRequest } from "../models/models_1";
10-
import { CreateLocalGatewayRouteTableVpcAssociationResult } from "../models/models_2";
9+
import {
10+
CreateLocalGatewayRouteTableVpcAssociationRequest,
11+
CreateLocalGatewayRouteTableVpcAssociationResult,
12+
} from "../models/models_2";
1113
import {
1214
de_CreateLocalGatewayRouteTableVpcAssociationCommand,
1315
se_CreateLocalGatewayRouteTableVpcAssociationCommand,

‎clients/client-ec2/src/commands/DeleteCarrierGatewayCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { MetadataBearer as __MetadataBearer } from "@smithy/types";
66

77
import { EC2ClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../EC2Client";
88
import { commonParams } from "../endpoint/EndpointParameters";
9-
import { DeleteCarrierGatewayRequest, DeleteCarrierGatewayResult } from "../models/models_2";
9+
import { DeleteCarrierGatewayRequest, DeleteCarrierGatewayResult } from "../models/models_3";
1010
import { de_DeleteCarrierGatewayCommand, se_DeleteCarrierGatewayCommand } from "../protocols/Aws_ec2";
1111

1212
/**

‎clients/client-ec2/src/commands/DeleteClientVpnEndpointCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { MetadataBearer as __MetadataBearer } from "@smithy/types";
66

77
import { EC2ClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../EC2Client";
88
import { commonParams } from "../endpoint/EndpointParameters";
9-
import { DeleteClientVpnEndpointRequest, DeleteClientVpnEndpointResult } from "../models/models_2";
9+
import { DeleteClientVpnEndpointRequest, DeleteClientVpnEndpointResult } from "../models/models_3";
1010
import { de_DeleteClientVpnEndpointCommand, se_DeleteClientVpnEndpointCommand } from "../protocols/Aws_ec2";
1111

1212
/**

‎clients/client-ec2/src/commands/DeleteFleetsCommand.ts

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,18 @@ export interface DeleteFleetsCommandInput extends DeleteFleetsRequest {}
2828
export interface DeleteFleetsCommandOutput extends DeleteFleetsResult, __MetadataBearer {}
2929

3030
/**
31-
* <p>Deletes the specified EC2 Fleets.</p>
32-
* <p>After you delete an EC2 Fleet, it launches no new instances.</p>
33-
* <p>You must also specify whether a deleted EC2 Fleet should terminate its instances. If you
34-
* choose to terminate the instances, the EC2 Fleet enters the <code>deleted_terminating</code>
35-
* state. Otherwise, the EC2 Fleet enters the <code>deleted_running</code> state, and the instances
36-
* continue to run until they are interrupted or you terminate them manually.</p>
37-
* <p>For <code>instant</code> fleets, EC2 Fleet must terminate the instances when the fleet is
38-
* deleted. Up to 1000 instances can be terminated in a single request to delete
39-
* <code>instant</code> fleets. A deleted <code>instant</code> fleet with running instances
40-
* is not supported.</p>
31+
* <p>Deletes the specified EC2 Fleet request.</p>
32+
* <p>After you delete an EC2 Fleet request, it launches no new instances.</p>
33+
* <p>You must also specify whether a deleted EC2 Fleet request should terminate its instances. If
34+
* you choose to terminate the instances, the EC2 Fleet request enters the
35+
* <code>deleted_terminating</code> state. Otherwise, it enters the
36+
* <code>deleted_running</code> state, and the instances continue to run until they are
37+
* interrupted or you terminate them manually.</p>
38+
* <p>A deleted <code>instant</code> fleet with running instances is not supported. When you
39+
* delete an <code>instant</code> fleet, Amazon EC2 automatically terminates all its instances. For
40+
* fleets with more than 1000 instances, the deletion request might fail. If your fleet has
41+
* more than 1000 instances, first terminate most of the instances manually, leaving 1000 or
42+
* fewer. Then delete the fleet, and the remaining instances will be terminated automatically.</p>
4143
* <p class="title">
4244
* <b>Restrictions</b>
4345
* </p>
@@ -59,8 +61,8 @@ export interface DeleteFleetsCommandOutput extends DeleteFleetsResult, __Metadat
5961
* deleted.</p>
6062
* </li>
6163
* </ul>
62-
* <p>For more information, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/manage-ec2-fleet.html#delete-fleet">Delete an EC2
63-
* Fleet</a> in the <i>Amazon EC2 User Guide</i>.</p>
64+
* <p>For more information, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/delete-fleet.html">Delete an EC2 Fleet request and the instances
65+
* in the fleet</a> in the <i>Amazon EC2 User Guide</i>.</p>
6466
* @example
6567
* Use a bare-bones client and the command you need to make an API call.
6668
* ```javascript

‎clients/client-ec2/src/commands/DeleteLaunchTemplateVersionsCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export interface DeleteLaunchTemplateVersionsCommandOutput
3737
* <p>You can delete up to 200 launch template versions in a single request. To delete more
3838
* than 200 versions in a single request, use <a>DeleteLaunchTemplate</a>, which
3939
* deletes the launch template and all of its versions.</p>
40-
* <p>For more information, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/manage-launch-template-versions.html#delete-launch-template-version">Delete a launch template version</a> in the
40+
* <p>For more information, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/delete-launch-template.html#delete-launch-template-version">Delete a launch template version</a> in the
4141
* <i>Amazon EC2 User Guide</i>.</p>
4242
* @example
4343
* Use a bare-bones client and the command you need to make an API call.

‎clients/client-ec2/src/commands/DeregisterImageCommand.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { MetadataBearer as __MetadataBearer } from "@smithy/types";
66

77
import { EC2ClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../EC2Client";
88
import { commonParams } from "../endpoint/EndpointParameters";
9-
import { DeregisterImageRequest } from "../models/models_3";
9+
import { DeregisterImageRequest, DeregisterImageResult } from "../models/models_3";
1010
import { de_DeregisterImageCommand, se_DeregisterImageCommand } from "../protocols/Aws_ec2";
1111

1212
/**
@@ -25,7 +25,7 @@ export interface DeregisterImageCommandInput extends DeregisterImageRequest {}
2525
*
2626
* The output of {@link DeregisterImageCommand}.
2727
*/
28-
export interface DeregisterImageCommandOutput extends __MetadataBearer {}
28+
export interface DeregisterImageCommandOutput extends DeregisterImageResult, __MetadataBearer {}
2929

3030
/**
3131
* <p>Deregisters the specified AMI. After you deregister an AMI, it can't be used to launch new

‎clients/client-ec2/src/commands/DescribeFastSnapshotRestoresCommand.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import { MetadataBearer as __MetadataBearer } from "@smithy/types";
66

77
import { EC2ClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../EC2Client";
88
import { commonParams } from "../endpoint/EndpointParameters";
9-
import { DescribeFastSnapshotRestoresRequest, DescribeFastSnapshotRestoresResult } from "../models/models_3";
9+
import { DescribeFastSnapshotRestoresRequest } from "../models/models_3";
10+
import { DescribeFastSnapshotRestoresResult } from "../models/models_4";
1011
import { de_DescribeFastSnapshotRestoresCommand, se_DescribeFastSnapshotRestoresCommand } from "../protocols/Aws_ec2";
1112

1213
/**

‎clients/client-ec2/src/commands/DescribeFleetHistoryCommand.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ import { MetadataBearer as __MetadataBearer } from "@smithy/types";
66

77
import { EC2ClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../EC2Client";
88
import { commonParams } from "../endpoint/EndpointParameters";
9-
import { DescribeFleetHistoryRequest } from "../models/models_3";
10-
import { DescribeFleetHistoryResult } from "../models/models_4";
9+
import { DescribeFleetHistoryRequest, DescribeFleetHistoryResult } from "../models/models_4";
1110
import { de_DescribeFleetHistoryCommand, se_DescribeFleetHistoryCommand } from "../protocols/Aws_ec2";
1211

1312
/**

‎clients/client-ec2/src/commands/DescribeFleetsCommand.ts

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,23 @@ export interface DescribeFleetsCommandOutput extends DescribeFleetsResult, __Met
168168
* // },
169169
* // },
170170
* // ImageId: "STRING_VALUE",
171+
* // BlockDeviceMappings: [ // BlockDeviceMappingResponseList
172+
* // { // BlockDeviceMappingResponse
173+
* // DeviceName: "STRING_VALUE",
174+
* // VirtualName: "STRING_VALUE",
175+
* // Ebs: { // EbsBlockDeviceResponse
176+
* // Encrypted: true || false,
177+
* // DeleteOnTermination: true || false,
178+
* // Iops: Number("int"),
179+
* // Throughput: Number("int"),
180+
* // KmsKeyId: "STRING_VALUE",
181+
* // SnapshotId: "STRING_VALUE",
182+
* // VolumeSize: Number("int"),
183+
* // VolumeType: "standard" || "io1" || "io2" || "gp2" || "sc1" || "st1" || "gp3",
184+
* // },
185+
* // NoDevice: "STRING_VALUE",
186+
* // },
187+
* // ],
171188
* // },
172189
* // ],
173190
* // },
@@ -312,6 +329,23 @@ export interface DescribeFleetsCommandOutput extends DescribeFleetsResult, __Met
312329
* // },
313330
* // },
314331
* // ImageId: "STRING_VALUE",
332+
* // BlockDeviceMappings: [
333+
* // {
334+
* // DeviceName: "STRING_VALUE",
335+
* // VirtualName: "STRING_VALUE",
336+
* // Ebs: {
337+
* // Encrypted: true || false,
338+
* // DeleteOnTermination: true || false,
339+
* // Iops: Number("int"),
340+
* // Throughput: Number("int"),
341+
* // KmsKeyId: "STRING_VALUE",
342+
* // SnapshotId: "STRING_VALUE",
343+
* // VolumeSize: Number("int"),
344+
* // VolumeType: "standard" || "io1" || "io2" || "gp2" || "sc1" || "st1" || "gp3",
345+
* // },
346+
* // NoDevice: "STRING_VALUE",
347+
* // },
348+
* // ],
315349
* // },
316350
* // },
317351
* // Lifecycle: "spot" || "on-demand",
@@ -416,6 +450,23 @@ export interface DescribeFleetsCommandOutput extends DescribeFleetsResult, __Met
416450
* // },
417451
* // },
418452
* // ImageId: "STRING_VALUE",
453+
* // BlockDeviceMappings: [
454+
* // {
455+
* // DeviceName: "STRING_VALUE",
456+
* // VirtualName: "STRING_VALUE",
457+
* // Ebs: {
458+
* // Encrypted: true || false,
459+
* // DeleteOnTermination: true || false,
460+
* // Iops: Number("int"),
461+
* // Throughput: Number("int"),
462+
* // KmsKeyId: "STRING_VALUE",
463+
* // SnapshotId: "STRING_VALUE",
464+
* // VolumeSize: Number("int"),
465+
* // VolumeType: "standard" || "io1" || "io2" || "gp2" || "sc1" || "st1" || "gp3",
466+
* // },
467+
* // NoDevice: "STRING_VALUE",
468+
* // },
469+
* // ],
419470
* // },
420471
* // },
421472
* // Lifecycle: "spot" || "on-demand",

‎clients/client-ec2/src/commands/DescribeNetworkInterfacesCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export interface DescribeNetworkInterfacesCommandOutput extends DescribeNetworkI
3232
* <p>If you have a large number of network interfaces, the operation fails unless
3333
* you use pagination or one of the following filters: <code>group-id</code>,
3434
* <code>mac-address</code>, <code>private-dns-name</code>, <code>private-ip-address</code>,
35-
* <code>private-dns-name</code>, <code>subnet-id</code>, or <code>vpc-id</code>.</p>
35+
* <code>subnet-id</code>, or <code>vpc-id</code>.</p>
3636
* <important>
3737
* <p>We strongly recommend using only paginated requests. Unpaginated requests are
3838
* susceptible to throttling and timeouts.</p>

‎clients/client-ec2/src/commands/DescribeRegionsCommand.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import { MetadataBearer as __MetadataBearer } from "@smithy/types";
66

77
import { EC2ClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../EC2Client";
88
import { commonParams } from "../endpoint/EndpointParameters";
9-
import { DescribeRegionsRequest, DescribeRegionsResult } from "../models/models_4";
9+
import { DescribeRegionsRequest } from "../models/models_4";
10+
import { DescribeRegionsResult } from "../models/models_5";
1011
import { de_DescribeRegionsCommand, se_DescribeRegionsCommand } from "../protocols/Aws_ec2";
1112

1213
/**

‎clients/client-ec2/src/commands/DescribeReplaceRootVolumeTasksCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { MetadataBearer as __MetadataBearer } from "@smithy/types";
66

77
import { EC2ClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../EC2Client";
88
import { commonParams } from "../endpoint/EndpointParameters";
9-
import { DescribeReplaceRootVolumeTasksRequest, DescribeReplaceRootVolumeTasksResult } from "../models/models_4";
9+
import { DescribeReplaceRootVolumeTasksRequest, DescribeReplaceRootVolumeTasksResult } from "../models/models_5";
1010
import {
1111
de_DescribeReplaceRootVolumeTasksCommand,
1212
se_DescribeReplaceRootVolumeTasksCommand,

0 commit comments

Comments
 (0)