Skip to content

Commit e9ce0a0

Browse files
sbera87sbera87
committed
merge conflict fix
2 parents 8e78bc6 + ddc4966 commit e9ce0a0

File tree

414 files changed

+22023
-1849
lines changed

Some content is hidden

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

414 files changed

+22023
-1849
lines changed

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.11.464
1+
1.11.465

‎crt/aws-crt-cpp‎

‎generated/smoke-tests/acm/ACMSmokeTests.cpp‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
#include <aws/core/utils/memory/AWSMemory.h>
6+
#include <aws/core/client/ClientConfiguration.h>
7+
#include <aws/core/client/CoreErrors.h>
8+
#include <aws/core/utils/UnreferencedParam.h>
9+
#include <utility>
10+
#include <aws/core/auth/AWSCredentialsProviderChain.h>
11+
#include <aws/core/http/HttpTypes.h>
12+
#include <aws/core/client/AsyncCallerContext.h>
13+
#include <aws/core/utils/Outcome.h>
14+
#include <aws/core/utils/logging/LogMacros.h>
15+
#include <algorithm>
16+
#include <aws/testing/AwsCppSdkGTestSuite.h>
17+
#include <aws/testing/AwsTestHelpers.h>
18+
#include <aws/acm/model/ListCertificatesRequest.h>
19+
#include <aws/acm/ACMClient.h>
20+
#include <aws/acm/model/GetCertificateRequest.h>
21+
#include <aws/core/utils/memory/stl/AWSString.h>
22+
23+
namespace ACMSmokeTest{
24+
using namespace Aws::Auth;
25+
using namespace Aws::Http;
26+
using namespace Aws::Client;
27+
28+
using namespace Aws::ACM;
29+
using namespace Aws::ACM::Model;
30+
class ACMSmokeTestSuite : public Aws::Testing::AwsCppSdkGTestSuite {
31+
public:
32+
static const char ALLOCATION_TAG[];
33+
};
34+
const char ACMSmokeTestSuite::ALLOCATION_TAG[] = "ACMSmokeTest";
35+
TEST_F(ACMSmokeTestSuite, ListCertificatesSuccess )
36+
{
37+
Aws::ACM::ACMClientConfiguration clientConfiguration;
38+
clientConfiguration.region = "us-west-2";
39+
clientConfiguration.useFIPS = false;
40+
clientConfiguration.useDualStack = false;
41+
auto clientSp = Aws::MakeShared<ACMClient>(ALLOCATION_TAG, clientConfiguration);
42+
//populate input params
43+
44+
ListCertificatesRequest input;
45+
auto outcome = clientSp->ListCertificates(input);
46+
EXPECT_TRUE( outcome.IsSuccess());
47+
}
48+
TEST_F(ACMSmokeTestSuite, GetCertificateFailure )
49+
{
50+
Aws::ACM::ACMClientConfiguration clientConfiguration;
51+
clientConfiguration.region = "us-west-2";
52+
clientConfiguration.useFIPS = false;
53+
clientConfiguration.useDualStack = false;
54+
auto clientSp = Aws::MakeShared<ACMClient>(ALLOCATION_TAG, clientConfiguration);
55+
//populate input params
56+
57+
GetCertificateRequest input;
58+
input.SetCertificateArn("arn:aws:acm:region:123456789012:certificate/12345678-1234-1234-1234-123456789012");
59+
auto outcome = clientSp->GetCertificate(input);
60+
EXPECT_FALSE( outcome.IsSuccess());
61+
}
62+
}

‎generated/smoke-tests/acm/CMakeLists.txt‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
add_project(acm-smoke-tests
2+
"Tests for the AWS ACM C++ SDK"
3+
testing-resources
4+
aws-cpp-sdk-acm
5+
aws-cpp-sdk-core
6+
)
7+
file(GLOB AWS_ACM_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_ACM_GENERATED_SMOKE_TEST_SRC}")
25+
else()
26+
add_executable(${PROJECT_NAME} "${AWS_ACM_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-acm/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+

‎generated/smoke-tests/apigateway/APIGatewaySmokeTests.cpp‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
#include <aws/core/utils/memory/AWSMemory.h>
6+
#include <aws/core/client/ClientConfiguration.h>
7+
#include <aws/core/client/CoreErrors.h>
8+
#include <aws/core/utils/UnreferencedParam.h>
9+
#include <utility>
10+
#include <aws/core/auth/AWSCredentialsProviderChain.h>
11+
#include <aws/core/http/HttpTypes.h>
12+
#include <aws/core/client/AsyncCallerContext.h>
13+
#include <aws/core/utils/Outcome.h>
14+
#include <aws/core/utils/logging/LogMacros.h>
15+
#include <algorithm>
16+
#include <aws/testing/AwsCppSdkGTestSuite.h>
17+
#include <aws/testing/AwsTestHelpers.h>
18+
#include <aws/apigateway/model/GetDomainNamesRequest.h>
19+
#include <aws/apigateway/APIGatewayClient.h>
20+
21+
namespace APIGatewaySmokeTest{
22+
using namespace Aws::Auth;
23+
using namespace Aws::Http;
24+
using namespace Aws::Client;
25+
26+
using namespace Aws::APIGateway;
27+
using namespace Aws::APIGateway::Model;
28+
class APIGatewaySmokeTestSuite : public Aws::Testing::AwsCppSdkGTestSuite {
29+
public:
30+
static const char ALLOCATION_TAG[];
31+
};
32+
const char APIGatewaySmokeTestSuite::ALLOCATION_TAG[] = "APIGatewaySmokeTest";
33+
TEST_F(APIGatewaySmokeTestSuite, GetDomainNamesSuccess )
34+
{
35+
Aws::APIGateway::APIGatewayClientConfiguration clientConfiguration;
36+
clientConfiguration.region = "us-west-2";
37+
clientConfiguration.useFIPS = false;
38+
clientConfiguration.useDualStack = false;
39+
auto clientSp = Aws::MakeShared<APIGatewayClient>(ALLOCATION_TAG, clientConfiguration);
40+
//populate input params
41+
42+
GetDomainNamesRequest input;
43+
auto outcome = clientSp->GetDomainNames(input);
44+
EXPECT_TRUE( outcome.IsSuccess());
45+
}
46+
}

‎generated/smoke-tests/apigateway/CMakeLists.txt‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
add_project(apigateway-smoke-tests
2+
"Tests for the AWS APIGATEWAY C++ SDK"
3+
testing-resources
4+
aws-cpp-sdk-apigateway
5+
aws-cpp-sdk-core
6+
)
7+
file(GLOB AWS_APIGATEWAY_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_APIGATEWAY_GENERATED_SMOKE_TEST_SRC}")
25+
else()
26+
add_executable(${PROJECT_NAME} "${AWS_APIGATEWAY_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-apigateway/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+

‎generated/smoke-tests/application-autoscaling/ApplicationAutoScalingSmokeTests.cpp‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
#include <aws/core/utils/memory/AWSMemory.h>
6+
#include <aws/core/client/ClientConfiguration.h>
7+
#include <aws/core/client/CoreErrors.h>
8+
#include <aws/core/utils/UnreferencedParam.h>
9+
#include <utility>
10+
#include <aws/core/auth/AWSCredentialsProviderChain.h>
11+
#include <aws/core/http/HttpTypes.h>
12+
#include <aws/core/client/AsyncCallerContext.h>
13+
#include <aws/core/utils/Outcome.h>
14+
#include <aws/core/utils/logging/LogMacros.h>
15+
#include <algorithm>
16+
#include <aws/testing/AwsCppSdkGTestSuite.h>
17+
#include <aws/testing/AwsTestHelpers.h>
18+
#include <aws/application-autoscaling/model/DescribeScalableTargetsRequest.h>
19+
#include <aws/application-autoscaling/ApplicationAutoScalingClient.h>
20+
21+
namespace ApplicationAutoScalingSmokeTest{
22+
using namespace Aws::Auth;
23+
using namespace Aws::Http;
24+
using namespace Aws::Client;
25+
26+
using namespace Aws::ApplicationAutoScaling;
27+
using namespace Aws::ApplicationAutoScaling::Model;
28+
class ApplicationAutoScalingSmokeTestSuite : public Aws::Testing::AwsCppSdkGTestSuite {
29+
public:
30+
static const char ALLOCATION_TAG[];
31+
};
32+
const char ApplicationAutoScalingSmokeTestSuite::ALLOCATION_TAG[] = "ApplicationAutoScalingSmokeTest";
33+
TEST_F(ApplicationAutoScalingSmokeTestSuite, DescribeScalableTargetsSuccess )
34+
{
35+
Aws::ApplicationAutoScaling::ApplicationAutoScalingClientConfiguration clientConfiguration;
36+
clientConfiguration.region = "us-west-2";
37+
clientConfiguration.useFIPS = false;
38+
clientConfiguration.useDualStack = false;
39+
auto clientSp = Aws::MakeShared<ApplicationAutoScalingClient>(ALLOCATION_TAG, clientConfiguration);
40+
//populate input params
41+
42+
DescribeScalableTargetsRequest input;
43+
input.SetServiceNamespace({ServiceNamespace::ec2});
44+
auto outcome = clientSp->DescribeScalableTargets(input);
45+
EXPECT_TRUE( outcome.IsSuccess());
46+
}
47+
}

‎generated/smoke-tests/application-autoscaling/CMakeLists.txt‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
add_project(application-autoscaling-smoke-tests
2+
"Tests for the AWS APPLICATION-AUTOSCALING C++ SDK"
3+
testing-resources
4+
aws-cpp-sdk-application-autoscaling
5+
aws-cpp-sdk-core
6+
)
7+
file(GLOB AWS_APPLICATION-AUTOSCALING_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_APPLICATION-AUTOSCALING_GENERATED_SMOKE_TEST_SRC}")
25+
else()
26+
add_executable(${PROJECT_NAME} "${AWS_APPLICATION-AUTOSCALING_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-application-autoscaling/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+

‎generated/smoke-tests/appstream/AppStreamSmokeTests.cpp‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
/**
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* SPDX-License-Identifier: Apache-2.0.
4+
*/
5+
#include <aws/core/utils/memory/AWSMemory.h>
6+
#include <aws/core/client/ClientConfiguration.h>
7+
#include <aws/core/client/CoreErrors.h>
8+
#include <aws/core/utils/UnreferencedParam.h>
9+
#include <utility>
10+
#include <aws/core/auth/AWSCredentialsProviderChain.h>
11+
#include <aws/core/http/HttpTypes.h>
12+
#include <aws/core/client/AsyncCallerContext.h>
13+
#include <aws/core/utils/Outcome.h>
14+
#include <aws/core/utils/logging/LogMacros.h>
15+
#include <algorithm>
16+
#include <aws/testing/AwsCppSdkGTestSuite.h>
17+
#include <aws/testing/AwsTestHelpers.h>
18+
#include <aws/appstream/AppStreamClient.h>
19+
#include <aws/appstream/model/DescribeStacksRequest.h>
20+
21+
namespace AppStreamSmokeTest{
22+
using namespace Aws::Auth;
23+
using namespace Aws::Http;
24+
using namespace Aws::Client;
25+
26+
using namespace Aws::AppStream;
27+
using namespace Aws::AppStream::Model;
28+
class AppStreamSmokeTestSuite : public Aws::Testing::AwsCppSdkGTestSuite {
29+
public:
30+
static const char ALLOCATION_TAG[];
31+
};
32+
const char AppStreamSmokeTestSuite::ALLOCATION_TAG[] = "AppStreamSmokeTest";
33+
TEST_F(AppStreamSmokeTestSuite, DescribeStacksSuccess )
34+
{
35+
Aws::AppStream::AppStreamClientConfiguration clientConfiguration;
36+
clientConfiguration.region = "us-west-2";
37+
clientConfiguration.useFIPS = false;
38+
clientConfiguration.useDualStack = false;
39+
auto clientSp = Aws::MakeShared<AppStreamClient>(ALLOCATION_TAG, clientConfiguration);
40+
//populate input params
41+
42+
DescribeStacksRequest input;
43+
auto outcome = clientSp->DescribeStacks(input);
44+
EXPECT_TRUE( outcome.IsSuccess());
45+
}
46+
}

‎generated/smoke-tests/appstream/CMakeLists.txt‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
add_project(appstream-smoke-tests
2+
"Tests for the AWS APPSTREAM C++ SDK"
3+
testing-resources
4+
aws-cpp-sdk-appstream
5+
aws-cpp-sdk-core
6+
)
7+
file(GLOB AWS_APPSTREAM_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_APPSTREAM_GENERATED_SMOKE_TEST_SRC}")
25+
else()
26+
add_executable(${PROJECT_NAME} "${AWS_APPSTREAM_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-appstream/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+

0 commit comments

Comments
 (0)