Skip to content

Commit 752ea12

Browse files
author
awstools
committed
feat(client-ec2): Added "future" allocation type for future dated capacity reservation
1 parent e81ee56 commit 752ea12

26 files changed

+73
-100
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ export interface AssignIpv6AddressesCommandInput extends AssignIpv6AddressesRequ
2828
export interface AssignIpv6AddressesCommandOutput extends AssignIpv6AddressesResult, __MetadataBearer {}
2929

3030
/**
31-
* <p>Assigns the specified IPv6 addresses to the specified network interface. You can
32-
* specify specific IPv6 addresses, or you can specify the number of IPv6
33-
* addresses to be automatically assigned from the subnet's IPv6 CIDR block range.
31+
* <p>Assigns one or more IPv6 addresses to the specified network interface. You can
32+
* specify one or more specific IPv6 addresses, or you can specify the number of IPv6
33+
* addresses to be automatically assigned from within the subnet's IPv6 CIDR block range.
3434
* You can assign as many IPv6 addresses to a network interface as you can assign private
35-
* IPv4 addresses, and the limit varies by instance type.</p>
35+
* IPv4 addresses, and the limit varies per instance type.</p>
3636
* <p>You must specify either the IPv6 addresses or the IPv6 address count in the request. </p>
3737
* <p>You can optionally use Prefix Delegation on the network interface. You must specify
3838
* either the IPV6 Prefix Delegation prefixes, or the IPv6 Prefix Delegation count. For

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ export interface AssignPrivateIpAddressesCommandInput extends AssignPrivateIpAdd
2828
export interface AssignPrivateIpAddressesCommandOutput extends AssignPrivateIpAddressesResult, __MetadataBearer {}
2929

3030
/**
31-
* <p>Assigns the specified secondary private IP addresses to the specified network interface.</p>
32-
* <p>You can specify specific secondary IP addresses, or you can specify the number
33-
* of secondary IP addresses to be automatically assigned from the subnet's CIDR block range.
31+
* <p>Assigns one or more secondary private IP addresses to the specified network interface.</p>
32+
* <p>You can specify one or more specific secondary IP addresses, or you can specify the number
33+
* of secondary IP addresses to be automatically assigned within the subnet's CIDR block range.
3434
* The number of secondary IP addresses that you can assign to an instance varies by instance type.
3535
* For more information about Elastic IP addresses, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html">Elastic IP Addresses</a> in the <i>Amazon EC2 User Guide</i>.</p>
3636
* <p>When you move a secondary private IP address to another network interface, any Elastic IP address

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ export interface CancelCapacityReservationCommandOutput extends CancelCapacityRe
4343
* duration has elapsed. You can't cancel a future-dated Capacity Reservation during the commitment duration.</p>
4444
* </li>
4545
* </ul>
46-
* <note>
47-
* <p>You can't modify or cancel a Capacity Block. For more information, see <a href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-capacity-blocks.html">Capacity Blocks for ML</a>.</p>
48-
* </note>
4946
* <p>If a future-dated Capacity Reservation enters the <code>delayed</code> state, the commitment
5047
* duration is waived, and you can cancel it as soon as it enters the <code>active</code> state.</p>
5148
* <p>Instances running in the reserved capacity continue running until you stop them. Stopped

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,11 @@ export interface CopySnapshotCommandOutput extends CopySnapshotResult, __Metadat
4040
* however, you can specify a different KMS key. To copy an encrypted
4141
* snapshot that has been shared from another account, you must have permissions for the KMS key
4242
* used to encrypt the snapshot.</p>
43-
* <p>Snapshots copied to an Outpost are encrypted by default using the default encryption key
44-
* for the Region, or a different key that you specify in the request using <b>KmsKeyId</b>. Outposts do not support unencrypted snapshots. For more information,
45-
* see <a href="https://docs.aws.amazon.com/ebs/latest/userguide/snapshots-outposts.html#ami">Amazon EBS
46-
* local snapshots on Outposts</a> in the <i>Amazon EBS User Guide</i>.</p>
43+
* <p>Snapshots copied to an Outpost are encrypted by default using the default
44+
* encryption key for the Region, or a different key that you specify in the request using
45+
* <b>KmsKeyId</b>. Outposts do not support unencrypted
46+
* snapshots. For more information, <a href="https://docs.aws.amazon.com/ebs/latest/userguide/snapshots-outposts.html#ami">
47+
* Amazon EBS local snapshots on Outposts</a> in the <i>Amazon EBS User Guide</i>.</p>
4748
* <p>Snapshots created by copying another snapshot have an arbitrary volume ID that should not
4849
* be used for any purpose.</p>
4950
* <p>For more information, see <a href="https://docs.aws.amazon.com/ebs/latest/userguide/ebs-copy-snapshot.html">Copy an Amazon EBS snapshot</a> in the

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ export interface CreateCapacityReservationBySplittingCommandOutput
9696
* // PlacementGroupArn: "STRING_VALUE",
9797
* // CapacityAllocations: [ // CapacityAllocations
9898
* // { // CapacityAllocation
99-
* // AllocationType: "used",
99+
* // AllocationType: "used" || "future",
100100
* // Count: Number("int"),
101101
* // },
102102
* // ],
@@ -138,7 +138,7 @@ export interface CreateCapacityReservationBySplittingCommandOutput
138138
* // PlacementGroupArn: "STRING_VALUE",
139139
* // CapacityAllocations: [
140140
* // {
141-
* // AllocationType: "used",
141+
* // AllocationType: "used" || "future",
142142
* // Count: Number("int"),
143143
* // },
144144
* // ],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ export interface CreateCapacityReservationCommandOutput extends CreateCapacityRe
120120
* // PlacementGroupArn: "STRING_VALUE",
121121
* // CapacityAllocations: [ // CapacityAllocations
122122
* // { // CapacityAllocation
123-
* // AllocationType: "used",
123+
* // AllocationType: "used" || "future",
124124
* // Count: Number("int"),
125125
* // },
126126
* // ],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export interface CreateManagedPrefixListCommandInput extends CreateManagedPrefix
2828
export interface CreateManagedPrefixListCommandOutput extends CreateManagedPrefixListResult, __MetadataBearer {}
2929

3030
/**
31-
* <p>Creates a managed prefix list. You can specify entries for the prefix list.
31+
* <p>Creates a managed prefix list. You can specify one or more entries for the prefix list.
3232
* Each entry consists of a CIDR block and an optional description.</p>
3333
* @example
3434
* Use a bare-bones client and the command you need to make an API call.

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ export interface CreateSnapshotCommandOutput extends Snapshot, __MetadataBearer
3838
* Region as the volume.</p>
3939
* </li>
4040
* <li>
41-
* <p>If the source volume is in a Local Zone, you can create the snapshot in the same Local
42-
* Zone or in its parent Amazon Web Services Region.</p>
41+
* <p>If the source volume is in a Local Zone, you can create the snapshot in the same
42+
* Local Zone or in parent Amazon Web Services Region.</p>
4343
* </li>
4444
* <li>
4545
* <p>If the source volume is on an Outpost, you can create the snapshot on the same
@@ -60,7 +60,8 @@ export interface CreateSnapshotCommandOutput extends Snapshot, __MetadataBearer
6060
* that you stop the instance before taking the snapshot.</p>
6161
* <p>Snapshots that are taken from encrypted volumes are automatically encrypted. Volumes that
6262
* are created from encrypted snapshots are also automatically encrypted. Your encrypted volumes
63-
* and any associated snapshots always remain protected. For more information, see <a href="https://docs.aws.amazon.com/ebs/latest/userguide/ebs-encryption.html">Amazon EBS encryption</a>
63+
* and any associated snapshots always remain protected. For more information,
64+
* <a href="https://docs.aws.amazon.com/ebs/latest/userguide/ebs-encryption.html">Amazon EBS encryption</a>
6465
* in the <i>Amazon EBS User Guide</i>.</p>
6566
* @example
6667
* Use a bare-bones client and the command you need to make an API call.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export interface CreateSnapshotsCommandOutput extends CreateSnapshotsResult, __M
4141
* </li>
4242
* <li>
4343
* <p>If the source instance is in a Local Zone, you can create the snapshots in the same
44-
* Local Zone or in its parent Amazon Web Services Region.</p>
44+
* Local Zone or in parent Amazon Web Services Region.</p>
4545
* </li>
4646
* <li>
4747
* <p>If the source instance is on an Outpost, you can create the snapshots on the same

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ export interface DeleteSnapshotCommandOutput extends __MetadataBearer {}
3535
* regardless of which prior snapshots have been deleted, all active snapshots will have access
3636
* to all the information needed to restore the volume.</p>
3737
* <p>You cannot delete a snapshot of the root device of an EBS volume used by a registered AMI.
38-
* You must first deregister the AMI before you can delete the snapshot.</p>
38+
* You must first de-register the AMI before you can delete the snapshot.</p>
3939
* <p>For more information, see <a href="https://docs.aws.amazon.com/ebs/latest/userguide/ebs-deleting-snapshot.html">Delete an Amazon EBS snapshot</a> in the
4040
* <i>Amazon EBS User Guide</i>.</p>
4141
* @example

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,6 @@ export interface DescribeCapacityBlockOfferingsCommandOutput
3535
/**
3636
* <p>Describes Capacity Block offerings available for purchase in the Amazon Web Services Region that you're currently using. With Capacity Blocks, you purchase a
3737
* specific instance type for a period of time.</p>
38-
* <p>To search for an available Capacity Block offering, you specify a reservation duration
39-
* and instance count. You must select one of the following options.</p>
40-
* <ul>
41-
* <li>
42-
* <p>For reservation durations<b> 1-day increments
43-
* up 14 days and 7-day increments up to 182 days total</b>
44-
* </p>
45-
* </li>
46-
* <li>
47-
* <p>For instance count<b> 1, 2, 4, 8, 16, 32, or
48-
* 64 instances</b>
49-
* </p>
50-
* </li>
51-
* </ul>
5238
* @example
5339
* Use a bare-bones client and the command you need to make an API call.
5440
* ```javascript

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ export interface DescribeCapacityReservationsCommandOutput
9090
* // PlacementGroupArn: "STRING_VALUE",
9191
* // CapacityAllocations: [ // CapacityAllocations
9292
* // { // CapacityAllocation
93-
* // AllocationType: "used",
93+
* // AllocationType: "used" || "future",
9494
* // Count: Number("int"),
9595
* // },
9696
* // ],

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ export interface DescribeInstanceTopologyCommandOutput extends DescribeInstanceT
6969
* <li>
7070
* <p>
7171
* <code>trn1.2xlarge</code> | <code>trn1.32xlarge</code> |
72-
* <code>trn1n.32xlarge</code> | <code>trn2.48xlarge</code> |
73-
* <code>trn2u.48xlarge</code>
72+
* <code>trn1n.32xlarge</code>
7473
* </p>
7574
* </li>
7675
* </ul>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export interface DescribeNetworkInterfacesCommandInput extends DescribeNetworkIn
2828
export interface DescribeNetworkInterfacesCommandOutput extends DescribeNetworkInterfacesResult, __MetadataBearer {}
2929

3030
/**
31-
* <p>Describes the specified network interfaces or all your network interfaces.</p>
31+
* <p>Describes one or more of your network interfaces.</p>
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>,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export interface MoveCapacityReservationInstancesCommandOutput
103103
* // PlacementGroupArn: "STRING_VALUE",
104104
* // CapacityAllocations: [ // CapacityAllocations
105105
* // { // CapacityAllocation
106-
* // AllocationType: "used",
106+
* // AllocationType: "used" || "future",
107107
* // Count: Number("int"),
108108
* // },
109109
* // ],
@@ -145,7 +145,7 @@ export interface MoveCapacityReservationInstancesCommandOutput
145145
* // PlacementGroupArn: "STRING_VALUE",
146146
* // CapacityAllocations: [
147147
* // {
148-
* // AllocationType: "used",
148+
* // AllocationType: "used" || "future",
149149
* // Count: Number("int"),
150150
* // },
151151
* // ],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export interface PurchaseCapacityBlockCommandOutput extends PurchaseCapacityBloc
8686
* // PlacementGroupArn: "STRING_VALUE",
8787
* // CapacityAllocations: [ // CapacityAllocations
8888
* // { // CapacityAllocation
89-
* // AllocationType: "used",
89+
* // AllocationType: "used" || "future",
9090
* // Count: Number("int"),
9191
* // },
9292
* // ],

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export interface UnassignIpv6AddressesCommandInput extends UnassignIpv6Addresses
2828
export interface UnassignIpv6AddressesCommandOutput extends UnassignIpv6AddressesResult, __MetadataBearer {}
2929

3030
/**
31-
* <p>Unassigns the specified IPv6 addresses or Prefix Delegation prefixes from a network interface.</p>
31+
* <p>Unassigns one or more IPv6 addresses IPv4 Prefix Delegation prefixes from a network interface.</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/UnassignPrivateIpAddressesCommand.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export interface UnassignPrivateIpAddressesCommandInput extends UnassignPrivateI
2828
export interface UnassignPrivateIpAddressesCommandOutput extends __MetadataBearer {}
2929

3030
/**
31-
* <p>Unassigns the specified secondary private IP addresses or IPv4 Prefix Delegation prefixes from a
31+
* <p>Unassigns one or more secondary private IP addresses, or IPv4 Prefix Delegation prefixes from a
3232
* network interface.</p>
3333
* @example
3434
* Use a bare-bones client and the command you need to make an API call.

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3742,6 +3742,7 @@ export type AllocationStrategy = (typeof AllocationStrategy)[keyof typeof Alloca
37423742
* @enum
37433743
*/
37443744
export const AllocationType = {
3745+
future: "future",
37453746
used: "used",
37463747
} as const;
37473748

@@ -3902,7 +3903,7 @@ export interface AssignIpv6AddressesRequest {
39023903
Ipv6PrefixCount?: number | undefined;
39033904

39043905
/**
3905-
* <p>One or more IPv6 prefixes assigned to the network interface. You can't use this option if you use the <code>Ipv6PrefixCount</code> option.</p>
3906+
* <p>One or more IPv6 prefixes assigned to the network interface. You cannot use this option if you use the <code>Ipv6PrefixCount</code> option.</p>
39063907
* @public
39073908
*/
39083909
Ipv6Prefixes?: string[] | undefined;
@@ -3960,13 +3961,13 @@ export interface AssignIpv6AddressesResult {
39603961
*/
39613962
export interface AssignPrivateIpAddressesRequest {
39623963
/**
3963-
* <p>One or more IPv4 prefixes assigned to the network interface. You can't use this option if you use the <code>Ipv4PrefixCount</code> option.</p>
3964+
* <p>One or more IPv4 prefixes assigned to the network interface. You cannot use this option if you use the <code>Ipv4PrefixCount</code> option.</p>
39643965
* @public
39653966
*/
39663967
Ipv4Prefixes?: string[] | undefined;
39673968

39683969
/**
3969-
* <p>The number of IPv4 prefixes that Amazon Web Services automatically assigns to the network interface. You can't use this option if you use the <code>Ipv4 Prefixes</code> option.</p>
3970+
* <p>The number of IPv4 prefixes that Amazon Web Services automatically assigns to the network interface. You cannot use this option if you use the <code>Ipv4 Prefixes</code> option.</p>
39703971
* @public
39713972
*/
39723973
Ipv4PrefixCount?: number | undefined;

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4246,13 +4246,10 @@ export interface InstanceRequirementsRequest {
42464246
* <p>The accelerator types that must be on the instance type.</p>
42474247
* <ul>
42484248
* <li>
4249-
* <p>For instance types with FPGA accelerators, specify <code>fpga</code>.</p>
4249+
* <p>To include instance types with GPU hardware, specify <code>gpu</code>.</p>
42504250
* </li>
42514251
* <li>
4252-
* <p>For instance types with GPU accelerators, specify <code>gpu</code>.</p>
4253-
* </li>
4254-
* <li>
4255-
* <p>For instance types with Inference accelerators, specify <code>inference</code>.</p>
4252+
* <p>To include instance types with FPGA hardware, specify <code>fpga</code>.</p>
42564253
* </li>
42574254
* </ul>
42584255
* <p>Default: Any accelerator type</p>
@@ -5829,13 +5826,10 @@ export interface InstanceRequirements {
58295826
* <p>The accelerator types that must be on the instance type.</p>
58305827
* <ul>
58315828
* <li>
5832-
* <p>For instance types with FPGA accelerators, specify <code>fpga</code>.</p>
5833-
* </li>
5834-
* <li>
58355829
* <p>For instance types with GPU accelerators, specify <code>gpu</code>.</p>
58365830
* </li>
58375831
* <li>
5838-
* <p>For instance types with Inference accelerators, specify <code>inference</code>.</p>
5832+
* <p>For instance types with FPGA accelerators, specify <code>fpga</code>.</p>
58395833
* </li>
58405834
* </ul>
58415835
* <p>Default: Any accelerator type</p>
@@ -9667,7 +9661,7 @@ export interface InstanceIpv6AddressRequest {
96679661
}
96689662

96699663
/**
9670-
* <p>Describes the IPv6 prefix option for a network interface.</p>
9664+
* <p>Describes the IPv4 prefix option for a network interface.</p>
96719665
* @public
96729666
*/
96739667
export interface Ipv6PrefixSpecificationRequest {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1312,7 +1312,7 @@ export interface CreateNetworkInterfaceRequest {
13121312
PrivateIpAddress?: string | undefined;
13131313

13141314
/**
1315-
* <p>The IDs of the security groups.</p>
1315+
* <p>The IDs of one or more security groups.</p>
13161316
* @public
13171317
*/
13181318
Groups?: string[] | undefined;

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11839,17 +11839,6 @@ export interface DescribeNetworkInterfacesRequest {
1183911839
* </li>
1184011840
* <li>
1184111841
* <p>
11842-
* <code>operator.managed</code> - A Boolean that indicates whether this is a
11843-
* managed network interface.</p>
11844-
* </li>
11845-
* <li>
11846-
* <p>
11847-
* <code>operator.principal</code> - The principal that manages the network
11848-
* interface. Only valid for managed network interfaces, where <code>managed</code>
11849-
* is <code>true</code>.</p>
11850-
* </li>
11851-
* <li>
11852-
* <p>
1185311842
* <code>owner-id</code> - The Amazon Web Services account ID of the network interface owner.</p>
1185411843
* </li>
1185511844
* <li>

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2943,9 +2943,8 @@ export interface InstanceNetworkInterfaceSpecification {
29432943
PrivateIpAddresses?: PrivateIpAddressSpecification[] | undefined;
29442944

29452945
/**
2946-
* <p>The number of secondary private IPv4 addresses. You can’t specify this parameter and
2947-
* also specify a secondary private IP address using the <code>PrivateIpAddress</code>
2948-
* parameter.</p>
2946+
* <p>The number of secondary private IPv4 addresses. You can't specify this option and specify more than one private IP address using the private IP addresses option. You cannot specify this option if you're
2947+
* launching more than one instance in a <a href="https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_RunInstances.html">RunInstances</a> request.</p>
29492948
* @public
29502949
*/
29512950
SecondaryPrivateIpAddressCount?: number | undefined;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8501,7 +8501,7 @@ export interface InstanceBlockDeviceMappingSpecification {
85018501
VirtualName?: string | undefined;
85028502

85038503
/**
8504-
* <p>Suppresses the specified device included in the block device mapping.</p>
8504+
* <p>suppress the specified device included in the block device mapping.</p>
85058505
* @public
85068506
*/
85078507
NoDevice?: string | undefined;

0 commit comments

Comments
 (0)