Skip to content

Commit 36382c7

Browse files
This release introduces four new APIs: GetAccountPlanState and UpgradeAccountPlan for AWS account plan management; ListAccountActivities and GetAccountActivity that provide activity tracking capabilities.
Adds support to Capacity Blocks for ML for purchasing EC2 P6e-GB200 UltraServers. Customers can now purchase u-p6e-gb200x72 and u-p6e-gb200x36 UltraServers. Adds new DescribeCapacityBlocks andDescribeCapacityBlockStatus APIs. Adds support for CapacityBlockId to DescribeInstanceTopology. Removing content that refers to an S3 bucket that is no longer in use.
1 parent ff69c6b commit 36382c7

File tree

114 files changed

+7258
-1682
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+7258
-1682
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.11.602
1+
1.11.603
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
add_project(freetier-smoke-tests
2+
"Tests for the AWS FREETIER C++ SDK"
3+
testing-resources
4+
aws-cpp-sdk-freetier
5+
aws-cpp-sdk-core
6+
)
7+
file(GLOB AWS_FREETIER_GENERATED_SMOKE_TEST_SRC
8+
"${CMAKE_CURRENT_SOURCE_DIR}/../RunTests.cpp"
9+
"${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
10+
)
11+
if(MSVC AND BUILD_SHARED_LIBS)
12+
add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1)
13+
endif()
14+
15+
if (CMAKE_CROSSCOMPILING)
16+
set(AUTORUN_UNIT_TESTS OFF)
17+
endif()
18+
19+
if (AUTORUN_UNIT_TESTS)
20+
enable_testing()
21+
endif()
22+
23+
if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
24+
add_library(${PROJECT_NAME} "${AWS_FREETIER_GENERATED_SMOKE_TEST_SRC}")
25+
else()
26+
add_executable(${PROJECT_NAME} "${AWS_FREETIER_GENERATED_SMOKE_TEST_SRC}")
27+
endif()
28+
29+
set_compiler_flags(${PROJECT_NAME})
30+
set_compiler_warnings(${PROJECT_NAME})
31+
32+
target_include_directories(${PROJECT_NAME} PUBLIC
33+
${CMAKE_CURRENT_SOURCE_DIR}/../../src/aws-cpp-sdk-freetier/include)
34+
35+
target_link_libraries(${PROJECT_NAME}
36+
${PROJECT_LIBS})
37+
38+
if(NOT CMAKE_CROSSCOMPILING)
39+
SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
40+
endif()
41+
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
#include <algorithm>
6+
#include <aws/core/auth/AWSCredentialsProviderChain.h>
7+
#include <aws/core/client/AsyncCallerContext.h>
8+
#include <aws/core/client/ClientConfiguration.h>
9+
#include <aws/core/client/CoreErrors.h>
10+
#include <aws/core/http/HttpTypes.h>
11+
#include <aws/core/utils/Outcome.h>
12+
#include <aws/core/utils/UnreferencedParam.h>
13+
#include <aws/core/utils/logging/LogMacros.h>
14+
#include <aws/core/utils/memory/AWSMemory.h>
15+
#include <utility>
16+
#include <aws/testing/AwsCppSdkGTestSuite.h>
17+
#include <aws/testing/AwsTestHelpers.h>
18+
#include <aws/freetier/FreeTierClient.h>
19+
#include <aws/freetier/model/GetAccountActivityRequest.h>
20+
#include <aws/freetier/model/ListAccountActivitiesRequest.h>
21+
22+
namespace FreeTierSmokeTest{
23+
using namespace Aws::Auth;
24+
using namespace Aws::Http;
25+
using namespace Aws::Client;
26+
27+
using namespace Aws::FreeTier;
28+
using namespace Aws::FreeTier::Model;
29+
class FreeTierSmokeTestSuite : public Aws::Testing::AwsCppSdkGTestSuite {
30+
public:
31+
static const char ALLOCATION_TAG[];
32+
};
33+
const char FreeTierSmokeTestSuite::ALLOCATION_TAG[] = "FreeTierSmokeTest";
34+
TEST_F(FreeTierSmokeTestSuite, GetAccountActivitySuccess )
35+
{
36+
Aws::FreeTier::FreeTierClientConfiguration clientConfiguration;
37+
clientConfiguration.region = "us-east-1";
38+
clientConfiguration.useFIPS = false;
39+
clientConfiguration.useDualStack = false;
40+
auto clientSp = Aws::MakeShared<FreeTierClient>(ALLOCATION_TAG, clientConfiguration);
41+
//populate input params
42+
43+
GetAccountActivityRequest input;
44+
input.SetActivityId("d622f48bf4014286a2686ab10cacfb2e");
45+
input.SetLanguageCode({LanguageCode::en-US});
46+
auto outcome = clientSp->GetAccountActivity(input);
47+
EXPECT_TRUE( outcome.IsSuccess());
48+
}
49+
TEST_F(FreeTierSmokeTestSuite, ListAccountActivitiesSuccess )
50+
{
51+
Aws::FreeTier::FreeTierClientConfiguration clientConfiguration;
52+
clientConfiguration.region = "us-east-1";
53+
clientConfiguration.useFIPS = false;
54+
clientConfiguration.useDualStack = false;
55+
auto clientSp = Aws::MakeShared<FreeTierClient>(ALLOCATION_TAG, clientConfiguration);
56+
//populate input params
57+
58+
ListAccountActivitiesRequest input;
59+
input.SetLanguageCode({LanguageCode::en-US});
60+
auto outcome = clientSp->ListAccountActivities(input);
61+
EXPECT_TRUE( outcome.IsSuccess());
62+
}
63+
}

generated/src/aws-cpp-sdk-ec2/include/aws/ec2/EC2Client.h

Lines changed: 71 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7854,10 +7854,10 @@ namespace EC2
78547854

78557855
/**
78567856
* <p>Describes Capacity Block offerings available for purchase in the Amazon Web
7857-
* Services Region that you're currently using. With Capacity Blocks, you purchase
7858-
* a specific instance type for a period of time.</p> <p>To search for an available
7859-
* Capacity Block offering, you specify a reservation duration and instance
7860-
* count.</p><p><h3>See Also:</h3> <a
7857+
* Services Region that you're currently using. With Capacity Blocks, you can
7858+
* purchase a specific GPU instance type or EC2 UltraServer for a period of
7859+
* time.</p> <p>To search for an available Capacity Block offering, you specify a
7860+
* reservation duration and instance count.</p><p><h3>See Also:</h3> <a
78617861
* href="http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeCapacityBlockOfferings">AWS
78627862
* API Reference</a></p>
78637863
*/
@@ -7881,6 +7881,58 @@ namespace EC2
78817881
return SubmitAsync(&EC2Client::DescribeCapacityBlockOfferings, request, handler, context);
78827882
}
78837883

7884+
/**
7885+
* <p>Describes the availability of capacity for the specified Capacity blocks, or
7886+
* all of your Capacity Blocks.</p><p><h3>See Also:</h3> <a
7887+
* href="http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeCapacityBlockStatus">AWS
7888+
* API Reference</a></p>
7889+
*/
7890+
virtual Model::DescribeCapacityBlockStatusOutcome DescribeCapacityBlockStatus(const Model::DescribeCapacityBlockStatusRequest& request = {}) const;
7891+
7892+
/**
7893+
* A Callable wrapper for DescribeCapacityBlockStatus that returns a future to the operation so that it can be executed in parallel to other requests.
7894+
*/
7895+
template<typename DescribeCapacityBlockStatusRequestT = Model::DescribeCapacityBlockStatusRequest>
7896+
Model::DescribeCapacityBlockStatusOutcomeCallable DescribeCapacityBlockStatusCallable(const DescribeCapacityBlockStatusRequestT& request = {}) const
7897+
{
7898+
return SubmitCallable(&EC2Client::DescribeCapacityBlockStatus, request);
7899+
}
7900+
7901+
/**
7902+
* An Async wrapper for DescribeCapacityBlockStatus that queues the request into a thread executor and triggers associated callback when operation has finished.
7903+
*/
7904+
template<typename DescribeCapacityBlockStatusRequestT = Model::DescribeCapacityBlockStatusRequest>
7905+
void DescribeCapacityBlockStatusAsync(const DescribeCapacityBlockStatusResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr, const DescribeCapacityBlockStatusRequestT& request = {}) const
7906+
{
7907+
return SubmitAsync(&EC2Client::DescribeCapacityBlockStatus, request, handler, context);
7908+
}
7909+
7910+
/**
7911+
* <p>Describes details about Capacity Blocks in the Amazon Web Services Region
7912+
* that you're currently using.</p><p><h3>See Also:</h3> <a
7913+
* href="http://docs.aws.amazon.com/goto/WebAPI/ec2-2016-11-15/DescribeCapacityBlocks">AWS
7914+
* API Reference</a></p>
7915+
*/
7916+
virtual Model::DescribeCapacityBlocksOutcome DescribeCapacityBlocks(const Model::DescribeCapacityBlocksRequest& request = {}) const;
7917+
7918+
/**
7919+
* A Callable wrapper for DescribeCapacityBlocks that returns a future to the operation so that it can be executed in parallel to other requests.
7920+
*/
7921+
template<typename DescribeCapacityBlocksRequestT = Model::DescribeCapacityBlocksRequest>
7922+
Model::DescribeCapacityBlocksOutcomeCallable DescribeCapacityBlocksCallable(const DescribeCapacityBlocksRequestT& request = {}) const
7923+
{
7924+
return SubmitCallable(&EC2Client::DescribeCapacityBlocks, request);
7925+
}
7926+
7927+
/**
7928+
* An Async wrapper for DescribeCapacityBlocks that queues the request into a thread executor and triggers associated callback when operation has finished.
7929+
*/
7930+
template<typename DescribeCapacityBlocksRequestT = Model::DescribeCapacityBlocksRequest>
7931+
void DescribeCapacityBlocksAsync(const DescribeCapacityBlocksResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context = nullptr, const DescribeCapacityBlocksRequestT& request = {}) const
7932+
{
7933+
return SubmitAsync(&EC2Client::DescribeCapacityBlocks, request, handler, context);
7934+
}
7935+
78847936
/**
78857937
* <p>Describes a request to assign the billing of the unused capacity of a
78867938
* Capacity Reservation. For more information, see <a
@@ -9233,22 +9285,19 @@ namespace EC2
92339285
* of your EC2 instances within an Availability Zone or Local Zone. You can use
92349286
* this information to determine the relative proximity of your EC2 instances
92359287
* within the Amazon Web Services network to support your tightly coupled
9236-
* workloads.</p> <p class="title"> <b>Limitations</b> </p> <ul> <li> <p>Supported
9237-
* zones</p> <ul> <li> <p>Availability Zone</p> </li> <li> <p>Local Zone</p> </li>
9238-
* </ul> </li> <li> <p>Supported instance types</p> <ul> <li> <p>Returns 3 network
9239-
* nodes in the response</p> <ul> <li> <p> <code>hpc6a.48xlarge</code> |
9240-
* <code>hpc6id.32xlarge</code> | <code>hpc7a.12xlarge</code> |
9241-
* <code>hpc7a.24xlarge</code> | <code>hpc7a.48xlarge</code> |
9242-
* <code>hpc7a.96xlarge</code> | <code>hpc7g.4xlarge</code> |
9243-
* <code>hpc7g.8xlarge</code> | <code>hpc7g.16xlarge</code> </p> </li> <li> <p>
9244-
* <code>p3dn.24xlarge</code> | <code>p4d.24xlarge</code> |
9245-
* <code>p4de.24xlarge</code> | <code>p5.48xlarge</code> |
9246-
* <code>p5e.48xlarge</code> | <code>p5en.48xlarge</code> </p> </li> <li> <p>
9247-
* <code>trn1.2xlarge</code> | <code>trn1.32xlarge</code> |
9248-
* <code>trn1n.32xlarge</code> | <code>trn2.48xlarge</code> |
9249-
* <code>trn2u.48xlarge</code> </p> </li> </ul> </li> <li> <p>Returns 4 network
9250-
* nodes in the response</p> <ul> <li> <p> <code>p6-b200.48xlarge</code> </p> </li>
9251-
* </ul> </li> </ul> </li> </ul> <p>For more information, see <a
9288+
* workloads.</p> <p>Instance topology is supported for specific instance types
9289+
* only. For more information, see <a
9290+
* href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-topology-prerequisites.html">
9291+
* Prerequisites for Amazon EC2 instance topology</a> in the <i>Amazon EC2 User
9292+
* Guide</i>.</p> <p>The Amazon EC2 API follows an eventual consistency
9293+
* model due to the distributed nature of the system supporting it. As a result,
9294+
* when you call the DescribeInstanceTopology API command immediately after
9295+
* launching instances, the response might return a <code>null</code> value for
9296+
* <code>capacityBlockId</code> because the data might not have fully propagated
9297+
* across all subsystems. For more information, see <a
9298+
* href="https://docs.aws.amazon.com/ec2/latest/devguide/eventual-consistency.html">Eventual
9299+
* consistency in the Amazon EC2 API</a> in the <i>Amazon EC2 Developer
9300+
* Guide</i>.</p> <p>For more information, see <a
92529301
* href="https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-instance-topology.html">Amazon
92539302
* EC2 instance topology</a> in the <i>Amazon EC2 User Guide</i>.</p><p><h3>See
92549303
* Also:</h3> <a
@@ -12620,9 +12669,8 @@ namespace EC2
1262012669
* the instance first.</p> <p>When a volume with an Amazon Web Services Marketplace
1262112670
* product code is detached from an instance, the product code is no longer
1262212671
* associated with the instance.</p> <p>You can't detach or force detach volumes
12623-
* that are attached to Amazon ECS or Fargate tasks. Attempting to do this results
12624-
* in the <code>UnsupportedOperationException</code> exception with the
12625-
* <code>Unable to detach volume attached to ECS tasks</code> error message.</p>
12672+
* that are attached to Amazon Web Services-managed resources. Attempting to do
12673+
* this results in the <code>UnsupportedOperationException</code> exception.</p>
1262612674
* <p>For more information, see <a
1262712675
* href="https://docs.aws.amazon.com/ebs/latest/userguide/ebs-detaching-volume.html">Detach
1262812676
* an Amazon EBS volume</a> in the <i>Amazon EBS User Guide</i>.</p><p><h3>See

generated/src/aws-cpp-sdk-ec2/include/aws/ec2/EC2ServiceClientModel.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,8 @@
246246
#include <aws/ec2/model/DescribeCapacityBlockExtensionHistoryResponse.h>
247247
#include <aws/ec2/model/DescribeCapacityBlockExtensionOfferingsResponse.h>
248248
#include <aws/ec2/model/DescribeCapacityBlockOfferingsResponse.h>
249+
#include <aws/ec2/model/DescribeCapacityBlockStatusResponse.h>
250+
#include <aws/ec2/model/DescribeCapacityBlocksResponse.h>
249251
#include <aws/ec2/model/DescribeCapacityReservationBillingRequestsResponse.h>
250252
#include <aws/ec2/model/DescribeCapacityReservationFleetsResponse.h>
251253
#include <aws/ec2/model/DescribeCapacityReservationsResponse.h>
@@ -705,6 +707,7 @@
705707
#include <aws/ec2/model/DescribeFlowLogsRequest.h>
706708
#include <aws/ec2/model/CreateIpamResourceDiscoveryRequest.h>
707709
#include <aws/ec2/model/DescribeFpgaImagesRequest.h>
710+
#include <aws/ec2/model/DescribeCapacityBlockStatusRequest.h>
708711
#include <aws/ec2/model/DescribeVpcPeeringConnectionsRequest.h>
709712
#include <aws/ec2/model/DescribeCapacityReservationsRequest.h>
710713
#include <aws/ec2/model/DescribeServiceLinkVirtualInterfacesRequest.h>
@@ -755,6 +758,7 @@
755758
#include <aws/ec2/model/DescribeCapacityReservationFleetsRequest.h>
756759
#include <aws/ec2/model/ListSnapshotsInRecycleBinRequest.h>
757760
#include <aws/ec2/model/AuthorizeSecurityGroupIngressRequest.h>
761+
#include <aws/ec2/model/DescribeCapacityBlocksRequest.h>
758762
#include <aws/ec2/model/DescribeConversionTasksRequest.h>
759763
#include <aws/ec2/model/DescribeTrafficMirrorFilterRulesRequest.h>
760764
#include <aws/ec2/model/CreateInstanceEventWindowRequest.h>
@@ -1149,6 +1153,8 @@ namespace Aws
11491153
class DescribeCapacityBlockExtensionHistoryRequest;
11501154
class DescribeCapacityBlockExtensionOfferingsRequest;
11511155
class DescribeCapacityBlockOfferingsRequest;
1156+
class DescribeCapacityBlockStatusRequest;
1157+
class DescribeCapacityBlocksRequest;
11521158
class DescribeCapacityReservationBillingRequestsRequest;
11531159
class DescribeCapacityReservationFleetsRequest;
11541160
class DescribeCapacityReservationsRequest;
@@ -1838,6 +1844,8 @@ namespace Aws
18381844
typedef Aws::Utils::Outcome<DescribeCapacityBlockExtensionHistoryResponse, EC2Error> DescribeCapacityBlockExtensionHistoryOutcome;
18391845
typedef Aws::Utils::Outcome<DescribeCapacityBlockExtensionOfferingsResponse, EC2Error> DescribeCapacityBlockExtensionOfferingsOutcome;
18401846
typedef Aws::Utils::Outcome<DescribeCapacityBlockOfferingsResponse, EC2Error> DescribeCapacityBlockOfferingsOutcome;
1847+
typedef Aws::Utils::Outcome<DescribeCapacityBlockStatusResponse, EC2Error> DescribeCapacityBlockStatusOutcome;
1848+
typedef Aws::Utils::Outcome<DescribeCapacityBlocksResponse, EC2Error> DescribeCapacityBlocksOutcome;
18411849
typedef Aws::Utils::Outcome<DescribeCapacityReservationBillingRequestsResponse, EC2Error> DescribeCapacityReservationBillingRequestsOutcome;
18421850
typedef Aws::Utils::Outcome<DescribeCapacityReservationFleetsResponse, EC2Error> DescribeCapacityReservationFleetsOutcome;
18431851
typedef Aws::Utils::Outcome<DescribeCapacityReservationsResponse, EC2Error> DescribeCapacityReservationsOutcome;
@@ -2527,6 +2535,8 @@ namespace Aws
25272535
typedef std::future<DescribeCapacityBlockExtensionHistoryOutcome> DescribeCapacityBlockExtensionHistoryOutcomeCallable;
25282536
typedef std::future<DescribeCapacityBlockExtensionOfferingsOutcome> DescribeCapacityBlockExtensionOfferingsOutcomeCallable;
25292537
typedef std::future<DescribeCapacityBlockOfferingsOutcome> DescribeCapacityBlockOfferingsOutcomeCallable;
2538+
typedef std::future<DescribeCapacityBlockStatusOutcome> DescribeCapacityBlockStatusOutcomeCallable;
2539+
typedef std::future<DescribeCapacityBlocksOutcome> DescribeCapacityBlocksOutcomeCallable;
25302540
typedef std::future<DescribeCapacityReservationBillingRequestsOutcome> DescribeCapacityReservationBillingRequestsOutcomeCallable;
25312541
typedef std::future<DescribeCapacityReservationFleetsOutcome> DescribeCapacityReservationFleetsOutcomeCallable;
25322542
typedef std::future<DescribeCapacityReservationsOutcome> DescribeCapacityReservationsOutcomeCallable;
@@ -3219,6 +3229,8 @@ namespace Aws
32193229
typedef std::function<void(const EC2Client*, const Model::DescribeCapacityBlockExtensionHistoryRequest&, const Model::DescribeCapacityBlockExtensionHistoryOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeCapacityBlockExtensionHistoryResponseReceivedHandler;
32203230
typedef std::function<void(const EC2Client*, const Model::DescribeCapacityBlockExtensionOfferingsRequest&, const Model::DescribeCapacityBlockExtensionOfferingsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeCapacityBlockExtensionOfferingsResponseReceivedHandler;
32213231
typedef std::function<void(const EC2Client*, const Model::DescribeCapacityBlockOfferingsRequest&, const Model::DescribeCapacityBlockOfferingsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeCapacityBlockOfferingsResponseReceivedHandler;
3232+
typedef std::function<void(const EC2Client*, const Model::DescribeCapacityBlockStatusRequest&, const Model::DescribeCapacityBlockStatusOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeCapacityBlockStatusResponseReceivedHandler;
3233+
typedef std::function<void(const EC2Client*, const Model::DescribeCapacityBlocksRequest&, const Model::DescribeCapacityBlocksOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeCapacityBlocksResponseReceivedHandler;
32223234
typedef std::function<void(const EC2Client*, const Model::DescribeCapacityReservationBillingRequestsRequest&, const Model::DescribeCapacityReservationBillingRequestsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeCapacityReservationBillingRequestsResponseReceivedHandler;
32233235
typedef std::function<void(const EC2Client*, const Model::DescribeCapacityReservationFleetsRequest&, const Model::DescribeCapacityReservationFleetsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeCapacityReservationFleetsResponseReceivedHandler;
32243236
typedef std::function<void(const EC2Client*, const Model::DescribeCapacityReservationsRequest&, const Model::DescribeCapacityReservationsOutcome&, const std::shared_ptr<const Aws::Client::AsyncCallerContext>&) > DescribeCapacityReservationsResponseReceivedHandler;

0 commit comments

Comments
 (0)