Skip to content

Commit b623f24

Browse files
author
awstools
committed
feat(client-ec2): This release allows IMDS support to be set to v2-only on an existing AMI, so that all future instances launched from that AMI will use IMDSv2 by default.
1 parent af22194 commit b623f24

16 files changed

+435
-375
lines changed

clients/client-ec2/src/EC2.ts

+30-22
Original file line numberDiff line numberDiff line change
@@ -4691,9 +4691,9 @@ export class EC2 extends EC2Client {
46914691

46924692
/**
46934693
* <p>Cancels the specified Spot Fleet requests.</p>
4694-
* <p>After you cancel a Spot Fleet request, the Spot Fleet launches no new Spot Instances.
4695-
* You must specify whether the Spot Fleet should also terminate its Spot Instances. If you
4696-
* terminate the instances, the Spot Fleet request enters the
4694+
* <p>After you cancel a Spot Fleet request, the Spot Fleet launches no new instances.</p>
4695+
* <p>You must also specify whether a canceled Spot Fleet request should terminate its instances. If you
4696+
* choose to terminate the instances, the Spot Fleet request enters the
46974697
* <code>cancelled_terminating</code> state. Otherwise, the Spot Fleet request enters
46984698
* the <code>cancelled_running</code> state and the instances continue to run until they
46994699
* are interrupted or you terminate them manually.</p>
@@ -8265,9 +8265,9 @@ export class EC2 extends EC2Client {
82658265
}
82668266

82678267
/**
8268-
* <p>Deletes the specified EC2 Fleet.</p>
8268+
* <p>Deletes the specified EC2 Fleets.</p>
82698269
* <p>After you delete an EC2 Fleet, it launches no new instances.</p>
8270-
* <p>You must specify whether a deleted EC2 Fleet should also terminate its instances. If you
8270+
* <p>You must also specify whether a deleted EC2 Fleet should terminate its instances. If you
82718271
* choose to terminate the instances, the EC2 Fleet enters the <code>deleted_terminating</code>
82728272
* state. Otherwise, the EC2 Fleet enters the <code>deleted_running</code> state, and the instances
82738273
* continue to run until they are interrupted or you terminate them manually.</p>
@@ -14318,12 +14318,12 @@ export class EC2 extends EC2Client {
1431814318
* with a filter to look for instances where the instance lifecycle is
1431914319
* <code>spot</code>.</p>
1432014320
* <p>We recommend that you set <code>MaxResults</code> to a value between 5 and 1000 to
14321-
* limit the number of results returned. This paginates the output, which makes the list
14322-
* more manageable and returns the results faster. If the list of results exceeds your
14323-
* <code>MaxResults</code> value, then that number of results is returned along with a
14321+
* limit the number of items returned. This paginates the output, which makes the list
14322+
* more manageable and returns the items faster. If the list of items exceeds your
14323+
* <code>MaxResults</code> value, then that number of items is returned along with a
1432414324
* <code>NextToken</code> value that can be passed to a subsequent
1432514325
* <code>DescribeSpotInstanceRequests</code> request to retrieve the remaining
14326-
* results.</p>
14326+
* items.</p>
1432714327
* <p>Spot Instance requests are deleted four hours after they are canceled and their instances are
1432814328
* terminated.</p>
1432914329
*/
@@ -19047,7 +19047,14 @@ export class EC2 extends EC2Client {
1904719047
}
1904819048

1904919049
/**
19050-
* <p>Import single or multi-volume disk images or EBS snapshots into an Amazon Machine Image (AMI).</p>
19050+
* <note>
19051+
* <p>To import your virtual machines (VMs) with a console-based experience, you can use the
19052+
* <i>Import virtual machine images to Amazon Web Services</i> template in the <a href="https://console.aws.amazon.com/migrationhub/orchestrator">Migration Hub Orchestrator console</a>. For more
19053+
* information, see the <a href="https://docs.aws.amazon.com/migrationhub-orchestrator/latest/userguide/import-vm-images.html">
19054+
* <i>Migration Hub Orchestrator User Guide</i>
19055+
* </a>.</p>
19056+
* </note>
19057+
* <p>Import single or multi-volume disk images or EBS snapshots into an Amazon Machine Image (AMI).</p>
1905119058
* <important>
1905219059
* <p>Amazon Web Services VM Import/Export strongly recommends specifying a value for either the
1905319060
* <code>--license-type</code> or <code>--usage-operation</code> parameter when you create a new
@@ -19767,9 +19774,9 @@ export class EC2 extends EC2Client {
1976719774
}
1976819775

1976919776
/**
19770-
* <p>Modifies the specified attribute of the specified AMI. You can specify only one attribute at a time.
19771-
* You can use the <code>Attribute</code> parameter to specify the attribute or one of the following parameters:
19772-
* <code>Description</code> or <code>LaunchPermission</code>.</p>
19777+
* <p>Modifies the specified attribute of the specified AMI. You can specify only one attribute at a time.</p>
19778+
* <p>To specify the attribute, you can use the <code>Attribute</code> parameter, or one of the following parameters:
19779+
* <code>Description</code>, <code>ImdsSupport</code>, or <code>LaunchPermission</code>.</p>
1977319780
* <p>Images with an Amazon Web Services Marketplace product code cannot be made public.</p>
1977419781
* <p>To enable the SriovNetSupport enhanced networking attribute of an image, enable SriovNetSupport on an instance
1977519782
* and create an AMI from the instance.</p>
@@ -21445,15 +21452,16 @@ export class EC2 extends EC2Client {
2144521452
* addresses when queried from instances in the peer VPC.</p>
2144621453
* </li>
2144721454
* </ul>
21448-
* <p>If the peered VPCs are in the same Amazon Web Services account, you can enable DNS resolution
21449-
* for queries from the local VPC. This ensures that queries from the local VPC resolve to private IP
21450-
* addresses in the peer VPC. This option is not available if the peered VPCs are in different
21451-
* different Amazon Web Services accounts or different Regions. For peered VPCs in different
21452-
* Amazon Web Services accounts, each Amazon Web Services account owner must initiate a separate request
21453-
* to modify the peering connection options. For inter-region peering connections, you must use the
21454-
* Region for the requester VPC to modify the requester VPC peering options and the Region for the
21455-
* accepter VPC to modify the accepter VPC peering options. To verify which VPCs are the accepter and
21456-
* the requester for a VPC peering connection, use the <a>DescribeVpcPeeringConnections</a> command.</p>
21455+
* <p>If the peered VPCs are in the same Amazon Web Services account, you can enable DNS
21456+
* resolution for queries from the local VPC. This ensures that queries from the local VPC
21457+
* resolve to private IP addresses in the peer VPC. This option is not available if the
21458+
* peered VPCs are in different Amazon Web Services accounts or different Regions. For
21459+
* peered VPCs in different Amazon Web Services accounts, each Amazon Web Services account
21460+
* owner must initiate a separate request to modify the peering connection options. For
21461+
* inter-region peering connections, you must use the Region for the requester VPC to
21462+
* modify the requester VPC peering options and the Region for the accepter VPC to modify
21463+
* the accepter VPC peering options. To verify which VPCs are the accepter and the
21464+
* requester for a VPC peering connection, use the <a>DescribeVpcPeeringConnections</a> command.</p>
2145721465
*/
2145821466
public modifyVpcPeeringConnectionOptions(
2145921467
args: ModifyVpcPeeringConnectionOptionsCommandInput,

clients/client-ec2/src/commands/CancelSpotFleetRequestsCommand.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ export interface CancelSpotFleetRequestsCommandOutput extends CancelSpotFleetReq
3636

3737
/**
3838
* <p>Cancels the specified Spot Fleet requests.</p>
39-
* <p>After you cancel a Spot Fleet request, the Spot Fleet launches no new Spot Instances.
40-
* You must specify whether the Spot Fleet should also terminate its Spot Instances. If you
41-
* terminate the instances, the Spot Fleet request enters the
39+
* <p>After you cancel a Spot Fleet request, the Spot Fleet launches no new instances.</p>
40+
* <p>You must also specify whether a canceled Spot Fleet request should terminate its instances. If you
41+
* choose to terminate the instances, the Spot Fleet request enters the
4242
* <code>cancelled_terminating</code> state. Otherwise, the Spot Fleet request enters
4343
* the <code>cancelled_running</code> state and the instances continue to run until they
4444
* are interrupted or you terminate them manually.</p>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ export interface DeleteFleetsCommandInput extends DeleteFleetsRequest {}
3232
export interface DeleteFleetsCommandOutput extends DeleteFleetsResult, __MetadataBearer {}
3333

3434
/**
35-
* <p>Deletes the specified EC2 Fleet.</p>
35+
* <p>Deletes the specified EC2 Fleets.</p>
3636
* <p>After you delete an EC2 Fleet, it launches no new instances.</p>
37-
* <p>You must specify whether a deleted EC2 Fleet should also terminate its instances. If you
37+
* <p>You must also specify whether a deleted EC2 Fleet should terminate its instances. If you
3838
* choose to terminate the instances, the EC2 Fleet enters the <code>deleted_terminating</code>
3939
* state. Otherwise, the EC2 Fleet enters the <code>deleted_running</code> state, and the instances
4040
* continue to run until they are interrupted or you terminate them manually.</p>

clients/client-ec2/src/commands/DescribeSpotInstanceRequestsCommand.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ export interface DescribeSpotInstanceRequestsCommandOutput
4545
* with a filter to look for instances where the instance lifecycle is
4646
* <code>spot</code>.</p>
4747
* <p>We recommend that you set <code>MaxResults</code> to a value between 5 and 1000 to
48-
* limit the number of results returned. This paginates the output, which makes the list
49-
* more manageable and returns the results faster. If the list of results exceeds your
50-
* <code>MaxResults</code> value, then that number of results is returned along with a
48+
* limit the number of items returned. This paginates the output, which makes the list
49+
* more manageable and returns the items faster. If the list of items exceeds your
50+
* <code>MaxResults</code> value, then that number of items is returned along with a
5151
* <code>NextToken</code> value that can be passed to a subsequent
5252
* <code>DescribeSpotInstanceRequests</code> request to retrieve the remaining
53-
* results.</p>
53+
* items.</p>
5454
* <p>Spot Instance requests are deleted four hours after they are canceled and their instances are
5555
* terminated.</p>
5656
* @example

clients/client-ec2/src/commands/ImportImageCommand.ts

+8-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,14 @@ export interface ImportImageCommandInput extends ImportImageRequest {}
3232
export interface ImportImageCommandOutput extends ImportImageResult, __MetadataBearer {}
3333

3434
/**
35-
* <p>Import single or multi-volume disk images or EBS snapshots into an Amazon Machine Image (AMI).</p>
35+
* <note>
36+
* <p>To import your virtual machines (VMs) with a console-based experience, you can use the
37+
* <i>Import virtual machine images to Amazon Web Services</i> template in the <a href="https://console.aws.amazon.com/migrationhub/orchestrator">Migration Hub Orchestrator console</a>. For more
38+
* information, see the <a href="https://docs.aws.amazon.com/migrationhub-orchestrator/latest/userguide/import-vm-images.html">
39+
* <i>Migration Hub Orchestrator User Guide</i>
40+
* </a>.</p>
41+
* </note>
42+
* <p>Import single or multi-volume disk images or EBS snapshots into an Amazon Machine Image (AMI).</p>
3643
* <important>
3744
* <p>Amazon Web Services VM Import/Export strongly recommends specifying a value for either the
3845
* <code>--license-type</code> or <code>--usage-operation</code> parameter when you create a new

clients/client-ec2/src/commands/ModifyImageAttributeCommand.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ export interface ModifyImageAttributeCommandInput extends ModifyImageAttributeRe
3030
export interface ModifyImageAttributeCommandOutput extends __MetadataBearer {}
3131

3232
/**
33-
* <p>Modifies the specified attribute of the specified AMI. You can specify only one attribute at a time.
34-
* You can use the <code>Attribute</code> parameter to specify the attribute or one of the following parameters:
35-
* <code>Description</code> or <code>LaunchPermission</code>.</p>
33+
* <p>Modifies the specified attribute of the specified AMI. You can specify only one attribute at a time.</p>
34+
* <p>To specify the attribute, you can use the <code>Attribute</code> parameter, or one of the following parameters:
35+
* <code>Description</code>, <code>ImdsSupport</code>, or <code>LaunchPermission</code>.</p>
3636
* <p>Images with an Amazon Web Services Marketplace product code cannot be made public.</p>
3737
* <p>To enable the SriovNetSupport enhanced networking attribute of an image, enable SriovNetSupport on an instance
3838
* and create an AMI from the instance.</p>

clients/client-ec2/src/commands/ModifyVpcPeeringConnectionOptionsCommand.ts

+10-9
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,16 @@ export interface ModifyVpcPeeringConnectionOptionsCommandOutput
5353
* addresses when queried from instances in the peer VPC.</p>
5454
* </li>
5555
* </ul>
56-
* <p>If the peered VPCs are in the same Amazon Web Services account, you can enable DNS resolution
57-
* for queries from the local VPC. This ensures that queries from the local VPC resolve to private IP
58-
* addresses in the peer VPC. This option is not available if the peered VPCs are in different
59-
* different Amazon Web Services accounts or different Regions. For peered VPCs in different
60-
* Amazon Web Services accounts, each Amazon Web Services account owner must initiate a separate request
61-
* to modify the peering connection options. For inter-region peering connections, you must use the
62-
* Region for the requester VPC to modify the requester VPC peering options and the Region for the
63-
* accepter VPC to modify the accepter VPC peering options. To verify which VPCs are the accepter and
64-
* the requester for a VPC peering connection, use the <a>DescribeVpcPeeringConnections</a> command.</p>
56+
* <p>If the peered VPCs are in the same Amazon Web Services account, you can enable DNS
57+
* resolution for queries from the local VPC. This ensures that queries from the local VPC
58+
* resolve to private IP addresses in the peer VPC. This option is not available if the
59+
* peered VPCs are in different Amazon Web Services accounts or different Regions. For
60+
* peered VPCs in different Amazon Web Services accounts, each Amazon Web Services account
61+
* owner must initiate a separate request to modify the peering connection options. For
62+
* inter-region peering connections, you must use the Region for the requester VPC to
63+
* modify the requester VPC peering options and the Region for the accepter VPC to modify
64+
* the accepter VPC peering options. To verify which VPCs are the accepter and the
65+
* requester for a VPC peering connection, use the <a>DescribeVpcPeeringConnections</a> command.</p>
6566
* @example
6667
* Use a bare-bones client and the command you need to make an API call.
6768
* ```javascript

clients/client-ec2/src/models/models_0.ts

+8-9
Original file line numberDiff line numberDiff line change
@@ -2343,10 +2343,8 @@ export interface AllocateHostsRequest {
23432343

23442344
/**
23452345
* <p>Indicates whether to enable or disable host maintenance for the Dedicated Host. For
2346-
* more information, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/dedicated-hosts-maintenance.html"> Host
2346+
* more information, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/dedicated-hosts-maintenance.html">Host
23472347
* maintenance</a> in the <i>Amazon EC2 User Guide</i>.</p>
2348-
* <p>Default: <code>on</code>
2349-
* </p>
23502348
*/
23512349
HostMaintenance?: HostMaintenance | string;
23522350
}
@@ -5419,10 +5417,9 @@ export interface CancelReservedInstancesListingResult {
54195417
*/
54205418
export interface CancelSpotFleetRequestsRequest {
54215419
/**
5422-
* <p>Checks whether you have the required permissions for the action, without actually
5423-
* making the request, and provides an error response. If you have the required
5424-
* permissions, the error response is <code>DryRunOperation</code>. Otherwise, it is
5425-
* <code>UnauthorizedOperation</code>.</p>
5420+
* <p>Checks whether you have the required permissions for the action, without actually making the request,
5421+
* and provides an error response. If you have the required permissions, the error response is <code>DryRunOperation</code>.
5422+
* Otherwise, it is <code>UnauthorizedOperation</code>.</p>
54265423
*/
54275424
DryRun?: boolean;
54285425

@@ -5432,8 +5429,10 @@ export interface CancelSpotFleetRequestsRequest {
54325429
SpotFleetRequestIds: string[] | undefined;
54335430

54345431
/**
5435-
* <p>Indicates whether to terminate instances for a Spot Fleet request if it is canceled
5436-
* successfully.</p>
5432+
* <p>Indicates whether to terminate the associated instances when the Spot Fleet request is canceled.
5433+
* The default is to terminate the instances.</p>
5434+
* <p>To let the instances continue to run after the Spot Fleet request is canceled, specify
5435+
* <code>no-terminate-instances</code>.</p>
54375436
*/
54385437
TerminateInstances: boolean | undefined;
54395438
}

clients/client-ec2/src/models/models_1.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -1591,6 +1591,8 @@ export interface Placement {
15911591
export interface FleetLaunchTemplateOverridesRequest {
15921592
/**
15931593
* <p>The instance type.</p>
1594+
* <p>
1595+
* <code>mac1.metal</code> is not supported as a launch template override.</p>
15941596
* <note>
15951597
* <p>If you specify <code>InstanceType</code>, you can't specify
15961598
* <code>InstanceRequirements</code>.</p>
@@ -1648,7 +1650,7 @@ export interface FleetLaunchTemplateOverridesRequest {
16481650
* identify instance types with those attributes.</p>
16491651
* <note>
16501652
* <p>If you specify <code>InstanceRequirements</code>, you can't specify
1651-
* <code>InstanceType</code>.</p>
1653+
* <code>InstanceType</code>.</p>
16521654
* </note>
16531655
*/
16541656
InstanceRequirements?: InstanceRequirementsRequest;
@@ -2643,6 +2645,8 @@ export interface PlacementResponse {
26432645
export interface FleetLaunchTemplateOverrides {
26442646
/**
26452647
* <p>The instance type.</p>
2648+
* <p>
2649+
* <code>mac1.metal</code> is not supported as a launch template override.</p>
26462650
* <note>
26472651
* <p>If you specify <code>InstanceType</code>, you can't specify
26482652
* <code>InstanceRequirements</code>.</p>

clients/client-ec2/src/models/models_2.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -5368,10 +5368,10 @@ export interface DeleteFleetsRequest {
53685368
FleetIds: string[] | undefined;
53695369

53705370
/**
5371-
* <p>Indicates whether to terminate the instances when the EC2 Fleet is deleted. The default is to
5371+
* <p>Indicates whether to terminate the associated instances when the EC2 Fleet is deleted. The default is to
53725372
* terminate the instances.</p>
53735373
* <p>To let the instances continue to run after the EC2 Fleet is deleted, specify
5374-
* <code>NoTerminateInstances</code>. Supported only for fleets of type
5374+
* <code>no-terminate-instances</code>. Supported only for fleets of type
53755375
* <code>maintain</code> and <code>request</code>.</p>
53765376
* <p>For <code>instant</code> fleets, you cannot specify <code>NoTerminateInstances</code>. A
53775377
* deleted <code>instant</code> fleet with running instances is not supported.</p>

0 commit comments

Comments
 (0)