Skip to content

Commit

Permalink
merge from main
Browse files Browse the repository at this point in the history
  • Loading branch information
@sbera87
sbera87 committed Jan 31, 2025
1 parent 6032dc0 commit 5af3458
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 18 deletions.
17 changes: 13 additions & 4 deletions generated/src/aws-cpp-sdk-ec2/include/aws/ec2/EC2Client.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1527,8 +1527,11 @@ namespace EC2
* <ul> <li> <p> <code>assessing</code> </p> </li> <li> <p> <code>active</code> and
* there is no commitment duration or the commitment duration has elapsed. You
* can't cancel a future-dated Capacity Reservation during the commitment
* duration.</p> </li> </ul> <p>If a future-dated Capacity Reservation enters the
* <code>delayed</code> state, the commitment duration is waived, and you can
* duration.</p> </li> </ul> <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> <p>If a future-dated Capacity Reservation enters
* the <code>delayed</code> state, the commitment duration is waived, and you can
* cancel it as soon as it enters the <code>active</code> state.</p> <p>Instances
* running in the reserved capacity continue running until you stop them. Stopped
* instances that target the Capacity Reservation can no longer launch. Modify
Expand Down Expand Up @@ -7413,7 +7416,12 @@ namespace EC2
/**
* <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 specific instance type for a period of time.</p><p><h3>See Also:</h3> <a
* a specific instance type for a period of time.</p> <p>To search for an available
* Capacity Block offering, you specify a reservation duration and instance count.
* You must select one of the following options.</p> <ul> <li> <p>For reservation
* durations<b> 1-day increments up 14 days and 7-day increments up to 182 days
* total</b> </p> </li> <li> <p>For instance count<b> 1, 2, 4, 8, 16, 32, or 64
* instances</b> </p> </li> </ul><p><h3>See Also:</h3> <a
* href="http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeCapacityBlockOfferings">AWS
* API Reference</a></p>
*/
Expand Down Expand Up @@ -8794,7 +8802,8 @@ namespace EC2
* <code>p4d.24xlarge</code> | <code>p4de.24xlarge</code> |
* <code>p5.48xlarge</code> | <code>p5e.48xlarge</code> |
* <code>p5en.48xlarge</code> </p> </li> <li> <p> <code>trn1.2xlarge</code> |
* <code>trn1.32xlarge</code> | <code>trn1n.32xlarge</code> </p> </li> </ul> </li>
* <code>trn1.32xlarge</code> | <code>trn1n.32xlarge</code> |
* <code>trn2.48xlarge</code> | <code>trn2u.48xlarge</code> </p> </li> </ul> </li>
* </ul> <p>For more information, see <a
* href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-topology.html">Amazon
* EC2 instance topology</a> in the <i>Amazon EC2 User Guide</i>.</p><p><h3>See
Expand Down
2 changes: 1 addition & 1 deletion ...rated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceBlockDeviceMappingSpecification.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ namespace Model

///@{
/**
* <p>suppress the specified device included in the block device mapping.</p>
* <p>Suppresses the specified device included in the block device mapping.</p>
*/
inline const Aws::String& GetNoDevice() const{ return m_noDevice; }
inline bool NoDeviceHasBeenSet() const { return m_noDeviceHasBeenSet; }
Expand Down
7 changes: 4 additions & 3 deletions generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceRequirements.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -386,9 +386,10 @@ namespace Model
///@{
/**
* <p>The accelerator types that must be on the instance type.</p> <ul> <li> <p>For
* instance types with GPU accelerators, specify <code>gpu</code>.</p> </li> <li>
* <p>For instance types with FPGA accelerators, specify <code>fpga</code>.</p>
* </li> </ul> <p>Default: Any accelerator type</p>
* instance types with FPGA accelerators, specify <code>fpga</code>.</p> </li> <li>
* <p>For instance types with GPU accelerators, specify <code>gpu</code>.</p> </li>
* <li> <p>For instance types with Inference accelerators, specify
* <code>inference</code>.</p> </li> </ul> <p>Default: Any accelerator type</p>
*/
inline const Aws::Vector<AcceleratorType>& GetAcceleratorTypes() const{ return m_acceleratorTypes; }
inline bool AcceleratorTypesHasBeenSet() const { return m_acceleratorTypesHasBeenSet; }
Expand Down
9 changes: 5 additions & 4 deletions generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceRequirementsRequest.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,10 +384,11 @@ namespace Model

///@{
/**
* <p>The accelerator types that must be on the instance type.</p> <ul> <li> <p>To
* include instance types with GPU hardware, specify <code>gpu</code>.</p> </li>
* <li> <p>To include instance types with FPGA hardware, specify
* <code>fpga</code>.</p> </li> </ul> <p>Default: Any accelerator type</p>
* <p>The accelerator types that must be on the instance type.</p> <ul> <li> <p>For
* instance types with FPGA accelerators, specify <code>fpga</code>.</p> </li> <li>
* <p>For instance types with GPU accelerators, specify <code>gpu</code>.</p> </li>
* <li> <p>For instance types with Inference accelerators, specify
* <code>inference</code>.</p> </li> </ul> <p>Default: Any accelerator type</p>
*/
inline const Aws::Vector<AcceleratorType>& GetAcceleratorTypes() const{ return m_acceleratorTypes; }
inline bool AcceleratorTypesHasBeenSet() const { return m_acceleratorTypesHasBeenSet; }
Expand Down
12 changes: 6 additions & 6 deletions tools/code-generation/smithy/api-descriptions/ec2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10254,7 +10254,7 @@
"target": "com.amazonaws.ec2#CancelCapacityReservationResult"
},
"traits": {
"smithy.api#documentation": "<p>Cancels the specified Capacity Reservation, releases the reserved capacity, and changes \n\t\t\tthe Capacity Reservation's state to <code>cancelled</code>.</p>\n <p>You can cancel a Capacity Reservation that is in the following states:</p>\n <ul>\n <li>\n <p>\n <code>assessing</code>\n </p>\n </li>\n <li>\n <p>\n <code>active</code> and there is no commitment duration or the commitment \n\t\t\t\t\tduration has elapsed. You can't cancel a future-dated Capacity Reservation during the commitment duration.</p>\n </li>\n </ul>\n <p>If a future-dated Capacity Reservation enters the <code>delayed</code> state, the commitment \n\t\t\tduration is waived, and you can cancel it as soon as it enters the <code>active</code> state.</p>\n <p>Instances running in the reserved capacity continue running until you stop them. Stopped\n\t\t\tinstances that target the Capacity Reservation can no longer launch. Modify these instances to either\n\t\t\ttarget a different Capacity Reservation, launch On-Demand Instance capacity, or run in any open Capacity Reservation\n\t\t\tthat has matching attributes and sufficient capacity.</p>"
"smithy.api#documentation": "<p>Cancels the specified Capacity Reservation, releases the reserved capacity, and changes \n\t\t\tthe Capacity Reservation's state to <code>cancelled</code>.</p>\n <p>You can cancel a Capacity Reservation that is in the following states:</p>\n <ul>\n <li>\n <p>\n <code>assessing</code>\n </p>\n </li>\n <li>\n <p>\n <code>active</code> and there is no commitment duration or the commitment \n\t\t\t\t\tduration has elapsed. You can't cancel a future-dated Capacity Reservation during the commitment duration.</p>\n </li>\n </ul>\n <note>\n <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>\n </note>\n <p>If a future-dated Capacity Reservation enters the <code>delayed</code> state, the commitment \n\t\t\tduration is waived, and you can cancel it as soon as it enters the <code>active</code> state.</p>\n <p>Instances running in the reserved capacity continue running until you stop them. Stopped\n\t\t\tinstances that target the Capacity Reservation can no longer launch. Modify these instances to either\n\t\t\ttarget a different Capacity Reservation, launch On-Demand Instance capacity, or run in any open Capacity Reservation\n\t\t\tthat has matching attributes and sufficient capacity.</p>"
}
},
"com.amazonaws.ec2#CancelCapacityReservationFleetError": {
Expand Down Expand Up @@ -29701,7 +29701,7 @@
"target": "com.amazonaws.ec2#DescribeCapacityBlockOfferingsResult"
},
"traits": {
"smithy.api#documentation": "<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\n\t\t\tspecific instance type for a period of time.</p>",
"smithy.api#documentation": "<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\n\t\t\tspecific instance type for a period of time.</p>\n <p>To search for an available Capacity Block offering, you specify a reservation duration\n and instance count. You must select one of the following options.</p>\n <ul>\n <li>\n <p>For reservation durations<b> 1-day increments\n up 14 days and 7-day increments up to 182 days total</b>\n </p>\n </li>\n <li>\n <p>For instance count<b> 1, 2, 4, 8, 16, 32, or\n 64 instances</b>\n </p>\n </li>\n </ul>",
"smithy.api#paginated": {
"inputToken": "NextToken",
"outputToken": "NextToken",
Expand Down Expand Up @@ -34182,7 +34182,7 @@
"target": "com.amazonaws.ec2#DescribeInstanceTopologyResult"
},
"traits": {
"smithy.api#documentation": "<p>Describes a tree-based hierarchy that represents the physical host placement of your\n EC2 instances within an Availability Zone or Local Zone. You can use this information to\n determine the relative proximity of your EC2 instances within the Amazon Web Services network to\n support your tightly coupled workloads.</p>\n <p class=\"title\">\n <b>Limitations</b>\n </p>\n <ul>\n <li>\n <p>Supported zones</p>\n <ul>\n <li>\n <p>Availability Zone</p>\n </li>\n <li>\n <p>Local Zone</p>\n </li>\n </ul>\n </li>\n <li>\n <p>Supported instance types</p>\n <ul>\n <li>\n <p>\n <code>hpc6a.48xlarge</code> | <code>hpc6id.32xlarge</code> |\n <code>hpc7a.12xlarge</code> | <code>hpc7a.24xlarge</code> |\n <code>hpc7a.48xlarge</code> | <code>hpc7a.96xlarge</code> |\n <code>hpc7g.4xlarge</code> | <code>hpc7g.8xlarge</code> |\n <code>hpc7g.16xlarge</code>\n </p>\n </li>\n <li>\n <p>\n <code>p3dn.24xlarge</code> | <code>p4d.24xlarge</code> |\n <code>p4de.24xlarge</code> | <code>p5.48xlarge</code> |\n <code>p5e.48xlarge</code> | <code>p5en.48xlarge</code>\n </p>\n </li>\n <li>\n <p>\n <code>trn1.2xlarge</code> | <code>trn1.32xlarge</code> |\n <code>trn1n.32xlarge</code>\n </p>\n </li>\n </ul>\n </li>\n </ul>\n <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-topology.html\">Amazon EC2 instance\n topology</a> in the <i>Amazon EC2 User Guide</i>.</p>",
"smithy.api#documentation": "<p>Describes a tree-based hierarchy that represents the physical host placement of your\n EC2 instances within an Availability Zone or Local Zone. You can use this information to\n determine the relative proximity of your EC2 instances within the Amazon Web Services network to\n support your tightly coupled workloads.</p>\n <p class=\"title\">\n <b>Limitations</b>\n </p>\n <ul>\n <li>\n <p>Supported zones</p>\n <ul>\n <li>\n <p>Availability Zone</p>\n </li>\n <li>\n <p>Local Zone</p>\n </li>\n </ul>\n </li>\n <li>\n <p>Supported instance types</p>\n <ul>\n <li>\n <p>\n <code>hpc6a.48xlarge</code> | <code>hpc6id.32xlarge</code> |\n <code>hpc7a.12xlarge</code> | <code>hpc7a.24xlarge</code> |\n <code>hpc7a.48xlarge</code> | <code>hpc7a.96xlarge</code> |\n <code>hpc7g.4xlarge</code> | <code>hpc7g.8xlarge</code> |\n <code>hpc7g.16xlarge</code>\n </p>\n </li>\n <li>\n <p>\n <code>p3dn.24xlarge</code> | <code>p4d.24xlarge</code> |\n <code>p4de.24xlarge</code> | <code>p5.48xlarge</code> |\n <code>p5e.48xlarge</code> | <code>p5en.48xlarge</code>\n </p>\n </li>\n <li>\n <p>\n <code>trn1.2xlarge</code> | <code>trn1.32xlarge</code> |\n <code>trn1n.32xlarge</code> | <code>trn2.48xlarge</code> |\n <code>trn2u.48xlarge</code>\n </p>\n </li>\n </ul>\n </li>\n </ul>\n <p>For more information, see <a href=\"https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-topology.html\">Amazon EC2 instance\n topology</a> in the <i>Amazon EC2 User Guide</i>.</p>",
"smithy.api#paginated": {
"inputToken": "NextToken",
"outputToken": "NextToken",
Expand Down Expand Up @@ -62418,7 +62418,7 @@
"target": "com.amazonaws.ec2#String",
"traits": {
"aws.protocols#ec2QueryName": "NoDevice",
"smithy.api#documentation": "<p>suppress the specified device included in the block device mapping.</p>",
"smithy.api#documentation": "<p>Suppresses the specified device included in the block device mapping.</p>",
"smithy.api#xmlName": "noDevice"
}
}
Expand Down Expand Up @@ -64330,7 +64330,7 @@
"target": "com.amazonaws.ec2#AcceleratorTypeSet",
"traits": {
"aws.protocols#ec2QueryName": "AcceleratorTypeSet",
"smithy.api#documentation": "<p>The accelerator types that must be on the instance type.</p>\n <ul>\n <li>\n <p>For instance types with GPU accelerators, specify <code>gpu</code>.</p>\n </li>\n <li>\n <p>For instance types with FPGA accelerators, specify <code>fpga</code>.</p>\n </li>\n </ul>\n <p>Default: Any accelerator type</p>",
"smithy.api#documentation": "<p>The accelerator types that must be on the instance type.</p>\n <ul>\n <li>\n <p>For instance types with FPGA accelerators, specify <code>fpga</code>.</p>\n </li>\n <li>\n <p>For instance types with GPU accelerators, specify <code>gpu</code>.</p>\n </li>\n <li>\n <p>For instance types with Inference accelerators, specify <code>inference</code>.</p>\n </li>\n </ul>\n <p>Default: Any accelerator type</p>",
"smithy.api#xmlName": "acceleratorTypeSet"
}
},
Expand Down Expand Up @@ -64513,7 +64513,7 @@
"AcceleratorTypes": {
"target": "com.amazonaws.ec2#AcceleratorTypeSet",
"traits": {
"smithy.api#documentation": "<p>The accelerator types that must be on the instance type.</p>\n <ul>\n <li>\n <p>To include instance types with GPU hardware, specify <code>gpu</code>.</p>\n </li>\n <li>\n <p>To include instance types with FPGA hardware, specify <code>fpga</code>.</p>\n </li>\n </ul>\n <p>Default: Any accelerator type</p>",
"smithy.api#documentation": "<p>The accelerator types that must be on the instance type.</p>\n <ul>\n <li>\n <p>For instance types with FPGA accelerators, specify <code>fpga</code>.</p>\n </li>\n <li>\n <p>For instance types with GPU accelerators, specify <code>gpu</code>.</p>\n </li>\n <li>\n <p>For instance types with Inference accelerators, specify <code>inference</code>.</p>\n </li>\n </ul>\n <p>Default: Any accelerator type</p>",
"smithy.api#xmlName": "AcceleratorType"
}
},
Expand Down

0 comments on commit 5af3458

Please sign in to comment.