Skip to content

Commit 08bd27c

Browse files
author
awstools
committed
feat(client-ec2): Documentation updates for Elastic Compute Cloud (EC2).
1 parent a8de200 commit 08bd27c

13 files changed

+151
-87
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,15 @@ export interface CancelSpotFleetRequestsCommandOutput extends CancelSpotFleetReq
3434
* <code>cancelled_terminating</code> state. Otherwise, the Spot Fleet request enters
3535
* the <code>cancelled_running</code> state and the instances continue to run until they
3636
* are interrupted or you terminate them manually.</p>
37+
* <p class="title">
38+
* <b>Restrictions</b>
39+
* </p>
40+
* <ul>
41+
* <li>
42+
* <p>You can delete up to 100 fleets in a single request. If you exceed the specified
43+
* number, no fleets are deleted.</p>
44+
* </li>
45+
* </ul>
3746
* @example
3847
* Use a bare-bones client and the command you need to make an API call.
3948
* ```javascript

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

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,28 @@ export interface DeleteFleetsCommandOutput extends DeleteFleetsResult, __Metadat
3434
* state. Otherwise, the EC2 Fleet enters the <code>deleted_running</code> state, and the instances
3535
* continue to run until they are interrupted or you terminate them manually.</p>
3636
* <p>For <code>instant</code> fleets, EC2 Fleet must terminate the instances when the fleet is
37-
* deleted. A deleted <code>instant</code> fleet with running instances is not
38-
* supported.</p>
37+
* deleted. Up to 1000 instances can be terminated in a single request to delete
38+
* <code>instant</code> fleets. A deleted <code>instant</code> fleet with running instances
39+
* is not supported.</p>
3940
* <p class="title">
4041
* <b>Restrictions</b>
4142
* </p>
4243
* <ul>
4344
* <li>
44-
* <p>You can delete up to 25 <code>instant</code> fleets in a single request. If you exceed this
45-
* number, no <code>instant</code> fleets are deleted and an error is returned. There is no
46-
* restriction on the number of fleets of type <code>maintain</code> or <code>request</code> that can be deleted
47-
* in a single request.</p>
45+
* <p>You can delete up to 25 fleets of type <code>instant</code> in a single
46+
* request.</p>
4847
* </li>
4948
* <li>
50-
* <p>Up to 1000 instances can be terminated in a single request to delete
51-
* <code>instant</code> fleets.</p>
49+
* <p>You can delete up to 100 fleets of type <code>maintain</code> or
50+
* <code>request</code> in a single request.</p>
51+
* </li>
52+
* <li>
53+
* <p>You can delete up to 125 fleets in a single request, provided you do not exceed
54+
* the quota for each fleet type, as specified above.</p>
55+
* </li>
56+
* <li>
57+
* <p>If you exceed the specified number of fleets to delete, no fleets are
58+
* deleted.</p>
5259
* </li>
5360
* </ul>
5461
* <p>For more information, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/manage-ec2-fleet.html#delete-fleet">Delete an EC2

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ export interface DescribeInstanceTypeOfferingsCommandOutput
2929
__MetadataBearer {}
3030

3131
/**
32-
* <p>Returns a list of all instance types offered. The results can be filtered by location (Region or Availability
33-
* Zone). If no location is specified, the instance types offered in the current Region are returned.</p>
32+
* <p>Lists the instance types that are offered for the specified location. If no location is specified, the default
33+
* is to list the instance types that are offered in the current Region.</p>
3434
* @example
3535
* Use a bare-bones client and the command you need to make an API call.
3636
* ```javascript

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ export interface DescribeInstanceTypesCommandInput extends DescribeInstanceTypes
2727
export interface DescribeInstanceTypesCommandOutput extends DescribeInstanceTypesResult, __MetadataBearer {}
2828

2929
/**
30-
* <p>Describes the details of the instance types that are offered in a location. The results can be filtered by the
31-
* attributes of the instance types.</p>
30+
* <p>Describes the specified instance types. By default, all instance types for the current Region are described.
31+
* Alternatively, you can filter the results.</p>
3232
* @example
3333
* Use a bare-bones client and the command you need to make an API call.
3434
* ```javascript

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export interface GetConsoleScreenshotCommandOutput extends GetConsoleScreenshotR
3030
* <p>Retrieve a JPG-format screenshot of a running instance to help with
3131
* troubleshooting.</p>
3232
* <p>The returned content is Base64-encoded.</p>
33+
* <p>For more information, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/troubleshoot-unreachable-instance.html#instance-console-console-output">Instance console output</a> in the <i>Amazon EC2 User Guide</i>.</p>
3334
* @example
3435
* Use a bare-bones client and the command you need to make an API call.
3536
* ```javascript

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ export interface ModifyInstanceMetadataDefaultsCommandOutput
3636
* the specified Amazon Web Services
 Region.</p>
3737
* <note>
3838
* <p>To remove a parameter's account-level default setting, specify
39-
* <code>no-preference</code>. At instance launch, the value will come from the
40-
* AMI, or from the launch parameter if specified. For more information, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-options.html#instance-metadata-options-order-of-precedence">Order of precedence for instance metadata options</a> in the
39+
* <code>no-preference</code>. If an account-level setting is cleared with
40+
* <code>no-preference</code>, then the instance launch considers the other
41+
* instance metadata settings. For more information, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-options.html#instance-metadata-options-order-of-precedence">Order of precedence for instance metadata options</a> in the
4142
* <i>Amazon EC2 User Guide</i>.</p>
4243
* </note>
4344
* @example

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7527,6 +7527,7 @@ export interface CancelSpotFleetRequestsRequest {
75277527

75287528
/**
75297529
* <p>The IDs of the Spot Fleet requests.</p>
7530+
* <p>Constraint: You can specify up to 100 IDs in a single request.</p>
75307531
* @public
75317532
*/
75327533
SpotFleetRequestIds: string[] | undefined;

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3761,14 +3761,14 @@ export interface CreateFleetError {
37613761

37623762
/**
37633763
* <p>The error code that indicates why the instance could not be launched. For more
3764-
* information about error codes, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/errors-overview.html.html">Error codes</a>.</p>
3764+
* information about error codes, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/errors-overview.html">Error codes</a>.</p>
37653765
* @public
37663766
*/
37673767
ErrorCode?: string;
37683768

37693769
/**
37703770
* <p>The error message that describes why the instance could not be launched. For more
3771-
* information about error messages, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/errors-overview.html.html">Error codes</a>.</p>
3771+
* information about error messages, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/errors-overview.html">Error codes</a>.</p>
37723772
* @public
37733773
*/
37743774
ErrorMessage?: string;
@@ -7357,8 +7357,7 @@ export interface RequestLaunchTemplateData {
73577357
BlockDeviceMappings?: LaunchTemplateBlockDeviceMappingRequest[];
73587358

73597359
/**
7360-
* <p>One or more network interfaces. If you specify a network interface, you must specify
7361-
* any security groups and subnets as part of the network interface.</p>
7360+
* <p>The network interfaces for the instance.</p>
73627361
* @public
73637362
*/
73647363
NetworkInterfaces?: LaunchTemplateInstanceNetworkInterfaceSpecificationRequest[];
@@ -7513,14 +7512,18 @@ export interface RequestLaunchTemplateData {
75137512
ElasticInferenceAccelerators?: LaunchTemplateElasticInferenceAccelerator[];
75147513

75157514
/**
7516-
* <p>One or more security group IDs. You can create a security group using <a href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html">CreateSecurityGroup</a>.</p>
7515+
* <p>The IDs of the security groups.</p>
7516+
* <p>If you specify a network interface, you must specify any security groups as part of
7517+
* the network interface instead of using this parameter.</p>
75177518
* @public
75187519
*/
75197520
SecurityGroupIds?: string[];
75207521

75217522
/**
7522-
* <p>One or more security group names. For a nondefault VPC, you must use security group
7523+
* <p>The names of the security groups. For a nondefault VPC, you must use security group
75237524
* IDs instead.</p>
7525+
* <p>If you specify a network interface, you must specify any security groups as part of
7526+
* the network interface instead of using this parameter.</p>
75247527
* @public
75257528
*/
75267529
SecurityGroups?: string[];

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8237,6 +8237,8 @@ export interface DeleteFleetsRequest {
82378237

82388238
/**
82398239
* <p>The IDs of the EC2 Fleets.</p>
8240+
* <p>Constraints: In a single request, you can specify up to 25 <code>instant</code> fleet
8241+
* IDs and up to 100 <code>maintain</code> or <code>request</code> fleet IDs. </p>
82408242
* @public
82418243
*/
82428244
FleetIds: string[] | undefined;

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

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3347,6 +3347,27 @@ export interface DescribeInstanceTypeOfferingsRequest {
33473347

33483348
/**
33493349
* <p>The location type.</p>
3350+
* <ul>
3351+
* <li>
3352+
* <p>
3353+
* <code>availability-zone</code> - The Availability Zone. When you specify a location filter, it must be
3354+
* an Availability Zone for the current Region.</p>
3355+
* </li>
3356+
* <li>
3357+
* <p>
3358+
* <code>availability-zone-id</code> - The AZ ID. When you specify a location filter, it must be
3359+
* an AZ ID for the current Region.</p>
3360+
* </li>
3361+
* <li>
3362+
* <p>
3363+
* <code>outpost</code> - The Outpost ARN. When you specify a location filter, it must be an Outpost ARN
3364+
* for the current Region.</p>
3365+
* </li>
3366+
* <li>
3367+
* <p>
3368+
* <code>region</code> - The current Region. If you specify a location filter, it must match the current Region.</p>
3369+
* </li>
3370+
* </ul>
33503371
* @public
33513372
*/
33523373
LocationType?: LocationType;
@@ -3356,13 +3377,12 @@ export interface DescribeInstanceTypeOfferingsRequest {
33563377
* <ul>
33573378
* <li>
33583379
* <p>
3359-
* <code>location</code> - This depends on the location type. For example, if the location type is
3360-
* <code>region</code> (default), the location is the Region code (for example, <code>us-east-2</code>.)</p>
3380+
* <code>instance-type</code> - The instance type. For a list of possible values, see
3381+
* <a href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_Instance.html">Instance</a>.</p>
33613382
* </li>
33623383
* <li>
33633384
* <p>
3364-
* <code>instance-type</code> - The instance type. For example,
3365-
* <code>c5.2xlarge</code>.</p>
3385+
* <code>location</code> - The location. For a list of possible identifiers, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/using-regions-availability-zones.html">Regions and Zones</a>.</p>
33663386
* </li>
33673387
* </ul>
33683388
* @public
@@ -3414,7 +3434,7 @@ export interface InstanceTypeOffering {
34143434
*/
34153435
export interface DescribeInstanceTypeOfferingsResult {
34163436
/**
3417-
* <p>The instance types offered.</p>
3437+
* <p>The instance types offered in the location.</p>
34183438
* @public
34193439
*/
34203440
InstanceTypeOfferings?: InstanceTypeOffering[];
@@ -3440,7 +3460,7 @@ export interface DescribeInstanceTypesRequest {
34403460
DryRun?: boolean;
34413461

34423462
/**
3443-
* <p>The instance types. For more information, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html">Instance types</a> in the <i>Amazon EC2 User Guide</i>.</p>
3463+
* <p>The instance types.</p>
34443464
* @public
34453465
*/
34463466
InstanceTypes?: _InstanceType[];
@@ -4813,7 +4833,7 @@ export interface InstanceTypeInfo {
48134833
*/
48144834
export interface DescribeInstanceTypesResult {
48154835
/**
4816-
* <p>The instance type. For more information, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instance-types.html">Instance types</a> in the <i>Amazon EC2 User Guide</i>.</p>
4836+
* <p>The instance type.</p>
48174837
* @public
48184838
*/
48194839
InstanceTypes?: InstanceTypeInfo[];
@@ -11296,6 +11316,8 @@ export interface SpotFleetTagSpecification {
1129611316
export interface SpotFleetLaunchSpecification {
1129711317
/**
1129811318
* <p>The security groups.</p>
11319+
* <p>If you specify a network interface, you must specify any security groups as part of
11320+
* the network interface instead of using this parameter.</p>
1129911321
* @public
1130011322
*/
1130111323
SecurityGroups?: GroupIdentifier[];
@@ -11360,11 +11382,11 @@ export interface SpotFleetLaunchSpecification {
1136011382
Monitoring?: SpotFleetMonitoring;
1136111383

1136211384
/**
11363-
* <p>One or more network interfaces. If you specify a network interface, you must specify
11364-
* subnet IDs and security group IDs using the network interface.</p>
11385+
* <p>The network interfaces.</p>
1136511386
* <note>
1136611387
* <p>
11367-
* <code>SpotFleetLaunchSpecification</code> currently does not support Elastic Fabric Adapter (EFA). To specify an EFA, you must use <a href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_LaunchTemplateConfig.html">LaunchTemplateConfig</a>.</p>
11388+
* <code>SpotFleetLaunchSpecification</code> does not support Elastic Fabric Adapter (EFA).
11389+
* You must use <a href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_LaunchTemplateConfig.html">LaunchTemplateConfig</a> instead.</p>
1136811390
* </note>
1136911391
* @public
1137011392
*/
@@ -11396,7 +11418,9 @@ export interface SpotFleetLaunchSpecification {
1139611418

1139711419
/**
1139811420
* <p>The IDs of the subnets in which to launch the instances. To specify multiple subnets, separate
11399-
* them using commas; for example, "subnet-1234abcdeexample1, subnet-0987cdef6example2".</p>
11421+
* them using commas; for example, "subnet-1234abcdeexample1, subnet-0987cdef6example2".</p>
11422+
* <p>If you specify a network interface, you must specify any subnets as part of the
11423+
* network interface instead of using this parameter.</p>
1140011424
* @public
1140111425
*/
1140211426
SubnetId?: string;

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5519,11 +5519,10 @@ export interface ModifyInstanceMetadataDefaultsRequest {
55195519
HttpTokens?: MetadataDefaultHttpTokensState;
55205520

55215521
/**
5522-
* <p>The maximum number of hops that the metadata token can travel.</p>
5523-
* <p>Minimum: <code>1</code>
5524-
* </p>
5525-
* <p>Maximum: <code>64</code>
5526-
* </p>
5522+
* <p>The maximum number of hops that the metadata token can travel. To indicate no
5523+
* preference, specify <code>-1</code>.</p>
5524+
* <p>Possible values: Integers from <code>1</code> to <code>64</code>, and <code>-1</code>
5525+
* to indicate no preference</p>
55275526
* @public
55285527
*/
55295528
HttpPutResponseHopLimit?: number;

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

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2897,15 +2897,15 @@ export interface RunInstancesRequest {
28972897
/**
28982898
* <p>The IDs of the security groups. You can create a security group using <a href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateSecurityGroup.html">CreateSecurityGroup</a>.</p>
28992899
* <p>If you specify a network interface, you must specify any security groups as part of
2900-
* the network interface.</p>
2900+
* the network interface instead of using this parameter.</p>
29012901
* @public
29022902
*/
29032903
SecurityGroupIds?: string[];
29042904

29052905
/**
29062906
* <p>[Default VPC] The names of the security groups.</p>
29072907
* <p>If you specify a network interface, you must specify any security groups as part of
2908-
* the network interface.</p>
2908+
* the network interface instead of using this parameter.</p>
29092909
* <p>Default: Amazon EC2 uses the default security group.</p>
29102910
* @public
29112911
*/
@@ -2914,7 +2914,7 @@ export interface RunInstancesRequest {
29142914
/**
29152915
* <p>The ID of the subnet to launch the instance into.</p>
29162916
* <p>If you specify a network interface, you must specify any subnets as part of the
2917-
* network interface.</p>
2917+
* network interface instead of using this parameter.</p>
29182918
* @public
29192919
*/
29202920
SubnetId?: string;
@@ -2996,9 +2996,7 @@ export interface RunInstancesRequest {
29962996
InstanceInitiatedShutdownBehavior?: ShutdownBehavior;
29972997

29982998
/**
2999-
* <p>The network interfaces to associate with the instance. If you specify a network
3000-
* interface, you must specify any security groups and subnets as part of the network
3001-
* interface.</p>
2999+
* <p>The network interfaces to associate with the instance.</p>
30023000
* @public
30033001
*/
30043002
NetworkInterfaces?: InstanceNetworkInterfaceSpecification[];
@@ -3017,29 +3015,19 @@ export interface RunInstancesRequest {
30173015
PrivateIpAddress?: string;
30183016

30193017
/**
3020-
* <p>Deprecated.</p>
3018+
* <p>An elastic GPU to associate with the instance.</p>
30213019
* <note>
3022-
* <p>Amazon Elastic Graphics reached end of life on January 8, 2024. For
3023-
* workloads that require graphics acceleration, we recommend that you use Amazon EC2 G4ad,
3024-
* G4dn, or G5 instances.</p>
3020+
* <p>Amazon Elastic Graphics reached end of life on January 8, 2024.</p>
30253021
* </note>
30263022
* @public
30273023
*/
30283024
ElasticGpuSpecification?: ElasticGpuSpecification[];
30293025

30303026
/**
3031-
* <p>An elastic inference accelerator to associate with the instance. Elastic inference
3032-
* accelerators are a resource you can attach to your Amazon EC2 instances to accelerate
3033-
* your Deep Learning (DL) inference workloads.</p>
3034-
* <p>You cannot specify accelerators from different generations in the same request.</p>
3027+
* <p>An elastic inference accelerator to associate with the instance.</p>
30353028
* <note>
3036-
* <p>Starting April 15, 2023, Amazon Web Services will not onboard new customers to Amazon
3037-
* Elastic Inference (EI), and will help current customers migrate their workloads to
3038-
* options that offer better price and performance. After April 15, 2023, new customers
3039-
* will not be able to launch instances with Amazon EI accelerators in Amazon SageMaker,
3040-
* Amazon ECS, or Amazon EC2. However, customers who have used Amazon EI at least once during
3041-
* the past 30-day period are considered current customers and will be able to continue
3042-
* using the service.</p>
3029+
* <p>Amazon Elastic Inference (EI) is no longer available to new customers. For more
3030+
* information, see <a href="http://aws.amazon.com/machine-learning/elastic-inference/faqs/">Amazon Elastic Inference FAQs</a>.</p>
30433031
* </note>
30443032
* @public
30453033
*/
@@ -3909,7 +3897,8 @@ export interface SearchTransitGatewayRoutesRequest {
39093897
Filters: Filter[] | undefined;
39103898

39113899
/**
3912-
* <p>The maximum number of routes to return.</p>
3900+
* <p>The maximum number of routes to return. If a value is not provided, the default is
3901+
* 1000.</p>
39133902
* @public
39143903
*/
39153904
MaxResults?: number;

0 commit comments

Comments
 (0)