merge conflict fix

VERSION

@@ -1 +1 @@
-1.11.464
+1.11.465

generated/smoke-tests/acm/ACMSmokeTests.cpp

@@ -0,0 +1,62 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+#include <aws/core/utils/memory/AWSMemory.h>
+#include <aws/core/client/ClientConfiguration.h>
+#include <aws/core/client/CoreErrors.h>
+#include <aws/core/utils/UnreferencedParam.h>
+#include <utility>
+#include <aws/core/auth/AWSCredentialsProviderChain.h>
+#include <aws/core/http/HttpTypes.h>
+#include <aws/core/client/AsyncCallerContext.h>
+#include <aws/core/utils/Outcome.h>
+#include <aws/core/utils/logging/LogMacros.h>
+#include <algorithm>
+#include <aws/testing/AwsCppSdkGTestSuite.h>
+#include <aws/testing/AwsTestHelpers.h>
+#include <aws/acm/model/ListCertificatesRequest.h>
+#include <aws/acm/ACMClient.h>
+#include <aws/acm/model/GetCertificateRequest.h>
+#include <aws/core/utils/memory/stl/AWSString.h>
+
+namespace ACMSmokeTest{
+using namespace Aws::Auth;
+using namespace Aws::Http;
+using namespace Aws::Client;
+
+using namespace Aws::ACM;
+using namespace Aws::ACM::Model;
+class ACMSmokeTestSuite : public Aws::Testing::AwsCppSdkGTestSuite {
+    public:
+    static const char ALLOCATION_TAG[];
+};
+const char ACMSmokeTestSuite::ALLOCATION_TAG[] = "ACMSmokeTest";
+TEST_F(ACMSmokeTestSuite, ListCertificatesSuccess )
+{
+    Aws::ACM::ACMClientConfiguration clientConfiguration;
+    clientConfiguration.region = "us-west-2";
+    clientConfiguration.useFIPS = false;
+    clientConfiguration.useDualStack = false;
+    auto clientSp = Aws::MakeShared<ACMClient>(ALLOCATION_TAG, clientConfiguration);
+    //populate input params
+
+    ListCertificatesRequest input;
+    auto outcome = clientSp->ListCertificates(input);
+    EXPECT_TRUE( outcome.IsSuccess());
+}
+TEST_F(ACMSmokeTestSuite, GetCertificateFailure )
+{
+    Aws::ACM::ACMClientConfiguration clientConfiguration;
+    clientConfiguration.region = "us-west-2";
+    clientConfiguration.useFIPS = false;
+    clientConfiguration.useDualStack = false;
+    auto clientSp = Aws::MakeShared<ACMClient>(ALLOCATION_TAG, clientConfiguration);
+    //populate input params
+
+    GetCertificateRequest input;
+    input.SetCertificateArn("arn:aws:acm:region:123456789012:certificate/12345678-1234-1234-1234-123456789012");
+    auto outcome = clientSp->GetCertificate(input);
+    EXPECT_FALSE( outcome.IsSuccess());
+}
+}

generated/smoke-tests/acm/CMakeLists.txt

@@ -0,0 +1,41 @@
+add_project(acm-smoke-tests
+"Tests for the AWS ACM C++ SDK"
+testing-resources
+aws-cpp-sdk-acm
+aws-cpp-sdk-core
+)
+file(GLOB AWS_ACM_GENERATED_SMOKE_TEST_SRC
+"${CMAKE_CURRENT_SOURCE_DIR}/../RunTests.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
+)
+if(MSVC AND BUILD_SHARED_LIBS)
+    add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1)
+endif()
+
+if (CMAKE_CROSSCOMPILING)
+    set(AUTORUN_UNIT_TESTS OFF)
+endif()
+
+if (AUTORUN_UNIT_TESTS)
+    enable_testing()
+endif()
+
+if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
+    add_library(${PROJECT_NAME} "${AWS_ACM_GENERATED_SMOKE_TEST_SRC}")
+else()
+    add_executable(${PROJECT_NAME} "${AWS_ACM_GENERATED_SMOKE_TEST_SRC}")
+endif()
+
+set_compiler_flags(${PROJECT_NAME})
+set_compiler_warnings(${PROJECT_NAME})
+
+target_include_directories(${PROJECT_NAME} PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../src/aws-cpp-sdk-acm/include)
+
+target_link_libraries(${PROJECT_NAME}
+    ${PROJECT_LIBS})
+
+if(NOT CMAKE_CROSSCOMPILING)
+    SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
+endif()
+

generated/smoke-tests/apigateway/APIGatewaySmokeTests.cpp

@@ -0,0 +1,46 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+#include <aws/core/utils/memory/AWSMemory.h>
+#include <aws/core/client/ClientConfiguration.h>
+#include <aws/core/client/CoreErrors.h>
+#include <aws/core/utils/UnreferencedParam.h>
+#include <utility>
+#include <aws/core/auth/AWSCredentialsProviderChain.h>
+#include <aws/core/http/HttpTypes.h>
+#include <aws/core/client/AsyncCallerContext.h>
+#include <aws/core/utils/Outcome.h>
+#include <aws/core/utils/logging/LogMacros.h>
+#include <algorithm>
+#include <aws/testing/AwsCppSdkGTestSuite.h>
+#include <aws/testing/AwsTestHelpers.h>
+#include <aws/apigateway/model/GetDomainNamesRequest.h>
+#include <aws/apigateway/APIGatewayClient.h>
+
+namespace APIGatewaySmokeTest{
+using namespace Aws::Auth;
+using namespace Aws::Http;
+using namespace Aws::Client;
+
+using namespace Aws::APIGateway;
+using namespace Aws::APIGateway::Model;
+class APIGatewaySmokeTestSuite : public Aws::Testing::AwsCppSdkGTestSuite {
+    public:
+    static const char ALLOCATION_TAG[];
+};
+const char APIGatewaySmokeTestSuite::ALLOCATION_TAG[] = "APIGatewaySmokeTest";
+TEST_F(APIGatewaySmokeTestSuite, GetDomainNamesSuccess )
+{
+    Aws::APIGateway::APIGatewayClientConfiguration clientConfiguration;
+    clientConfiguration.region = "us-west-2";
+    clientConfiguration.useFIPS = false;
+    clientConfiguration.useDualStack = false;
+    auto clientSp = Aws::MakeShared<APIGatewayClient>(ALLOCATION_TAG, clientConfiguration);
+    //populate input params
+
+    GetDomainNamesRequest input;
+    auto outcome = clientSp->GetDomainNames(input);
+    EXPECT_TRUE( outcome.IsSuccess());
+}
+}

generated/smoke-tests/apigateway/CMakeLists.txt

@@ -0,0 +1,41 @@
+add_project(apigateway-smoke-tests
+"Tests for the AWS APIGATEWAY C++ SDK"
+testing-resources
+aws-cpp-sdk-apigateway
+aws-cpp-sdk-core
+)
+file(GLOB AWS_APIGATEWAY_GENERATED_SMOKE_TEST_SRC
+"${CMAKE_CURRENT_SOURCE_DIR}/../RunTests.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
+)
+if(MSVC AND BUILD_SHARED_LIBS)
+    add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1)
+endif()
+
+if (CMAKE_CROSSCOMPILING)
+    set(AUTORUN_UNIT_TESTS OFF)
+endif()
+
+if (AUTORUN_UNIT_TESTS)
+    enable_testing()
+endif()
+
+if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
+    add_library(${PROJECT_NAME} "${AWS_APIGATEWAY_GENERATED_SMOKE_TEST_SRC}")
+else()
+    add_executable(${PROJECT_NAME} "${AWS_APIGATEWAY_GENERATED_SMOKE_TEST_SRC}")
+endif()
+
+set_compiler_flags(${PROJECT_NAME})
+set_compiler_warnings(${PROJECT_NAME})
+
+target_include_directories(${PROJECT_NAME} PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../src/aws-cpp-sdk-apigateway/include)
+
+target_link_libraries(${PROJECT_NAME}
+    ${PROJECT_LIBS})
+
+if(NOT CMAKE_CROSSCOMPILING)
+    SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
+endif()
+

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

@@ -0,0 +1,47 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+#include <aws/core/utils/memory/AWSMemory.h>
+#include <aws/core/client/ClientConfiguration.h>
+#include <aws/core/client/CoreErrors.h>
+#include <aws/core/utils/UnreferencedParam.h>
+#include <utility>
+#include <aws/core/auth/AWSCredentialsProviderChain.h>
+#include <aws/core/http/HttpTypes.h>
+#include <aws/core/client/AsyncCallerContext.h>
+#include <aws/core/utils/Outcome.h>
+#include <aws/core/utils/logging/LogMacros.h>
+#include <algorithm>
+#include <aws/testing/AwsCppSdkGTestSuite.h>
+#include <aws/testing/AwsTestHelpers.h>
+#include <aws/application-autoscaling/model/DescribeScalableTargetsRequest.h>
+#include <aws/application-autoscaling/ApplicationAutoScalingClient.h>
+
+namespace ApplicationAutoScalingSmokeTest{
+using namespace Aws::Auth;
+using namespace Aws::Http;
+using namespace Aws::Client;
+
+using namespace Aws::ApplicationAutoScaling;
+using namespace Aws::ApplicationAutoScaling::Model;
+class ApplicationAutoScalingSmokeTestSuite : public Aws::Testing::AwsCppSdkGTestSuite {
+    public:
+    static const char ALLOCATION_TAG[];
+};
+const char ApplicationAutoScalingSmokeTestSuite::ALLOCATION_TAG[] = "ApplicationAutoScalingSmokeTest";
+TEST_F(ApplicationAutoScalingSmokeTestSuite, DescribeScalableTargetsSuccess )
+{
+    Aws::ApplicationAutoScaling::ApplicationAutoScalingClientConfiguration clientConfiguration;
+    clientConfiguration.region = "us-west-2";
+    clientConfiguration.useFIPS = false;
+    clientConfiguration.useDualStack = false;
+    auto clientSp = Aws::MakeShared<ApplicationAutoScalingClient>(ALLOCATION_TAG, clientConfiguration);
+    //populate input params
+
+    DescribeScalableTargetsRequest input;
+    input.SetServiceNamespace({ServiceNamespace::ec2});
+    auto outcome = clientSp->DescribeScalableTargets(input);
+    EXPECT_TRUE( outcome.IsSuccess());
+}
+}

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

@@ -0,0 +1,41 @@
+add_project(application-autoscaling-smoke-tests
+"Tests for the AWS APPLICATION-AUTOSCALING C++ SDK"
+testing-resources
+aws-cpp-sdk-application-autoscaling
+aws-cpp-sdk-core
+)
+file(GLOB AWS_APPLICATION-AUTOSCALING_GENERATED_SMOKE_TEST_SRC
+"${CMAKE_CURRENT_SOURCE_DIR}/../RunTests.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
+)
+if(MSVC AND BUILD_SHARED_LIBS)
+    add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1)
+endif()
+
+if (CMAKE_CROSSCOMPILING)
+    set(AUTORUN_UNIT_TESTS OFF)
+endif()
+
+if (AUTORUN_UNIT_TESTS)
+    enable_testing()
+endif()
+
+if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
+    add_library(${PROJECT_NAME} "${AWS_APPLICATION-AUTOSCALING_GENERATED_SMOKE_TEST_SRC}")
+else()
+    add_executable(${PROJECT_NAME} "${AWS_APPLICATION-AUTOSCALING_GENERATED_SMOKE_TEST_SRC}")
+endif()
+
+set_compiler_flags(${PROJECT_NAME})
+set_compiler_warnings(${PROJECT_NAME})
+
+target_include_directories(${PROJECT_NAME} PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../src/aws-cpp-sdk-application-autoscaling/include)
+
+target_link_libraries(${PROJECT_NAME}
+    ${PROJECT_LIBS})
+
+if(NOT CMAKE_CROSSCOMPILING)
+    SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
+endif()
+

generated/smoke-tests/appstream/AppStreamSmokeTests.cpp

@@ -0,0 +1,46 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0.
+ */
+#include <aws/core/utils/memory/AWSMemory.h>
+#include <aws/core/client/ClientConfiguration.h>
+#include <aws/core/client/CoreErrors.h>
+#include <aws/core/utils/UnreferencedParam.h>
+#include <utility>
+#include <aws/core/auth/AWSCredentialsProviderChain.h>
+#include <aws/core/http/HttpTypes.h>
+#include <aws/core/client/AsyncCallerContext.h>
+#include <aws/core/utils/Outcome.h>
+#include <aws/core/utils/logging/LogMacros.h>
+#include <algorithm>
+#include <aws/testing/AwsCppSdkGTestSuite.h>
+#include <aws/testing/AwsTestHelpers.h>
+#include <aws/appstream/AppStreamClient.h>
+#include <aws/appstream/model/DescribeStacksRequest.h>
+
+namespace AppStreamSmokeTest{
+using namespace Aws::Auth;
+using namespace Aws::Http;
+using namespace Aws::Client;
+
+using namespace Aws::AppStream;
+using namespace Aws::AppStream::Model;
+class AppStreamSmokeTestSuite : public Aws::Testing::AwsCppSdkGTestSuite {
+    public:
+    static const char ALLOCATION_TAG[];
+};
+const char AppStreamSmokeTestSuite::ALLOCATION_TAG[] = "AppStreamSmokeTest";
+TEST_F(AppStreamSmokeTestSuite, DescribeStacksSuccess )
+{
+    Aws::AppStream::AppStreamClientConfiguration clientConfiguration;
+    clientConfiguration.region = "us-west-2";
+    clientConfiguration.useFIPS = false;
+    clientConfiguration.useDualStack = false;
+    auto clientSp = Aws::MakeShared<AppStreamClient>(ALLOCATION_TAG, clientConfiguration);
+    //populate input params
+
+    DescribeStacksRequest input;
+    auto outcome = clientSp->DescribeStacks(input);
+    EXPECT_TRUE( outcome.IsSuccess());
+}
+}

generated/smoke-tests/appstream/CMakeLists.txt

@@ -0,0 +1,41 @@
+add_project(appstream-smoke-tests
+"Tests for the AWS APPSTREAM C++ SDK"
+testing-resources
+aws-cpp-sdk-appstream
+aws-cpp-sdk-core
+)
+file(GLOB AWS_APPSTREAM_GENERATED_SMOKE_TEST_SRC
+"${CMAKE_CURRENT_SOURCE_DIR}/../RunTests.cpp"
+"${CMAKE_CURRENT_SOURCE_DIR}/*.cpp"
+)
+if(MSVC AND BUILD_SHARED_LIBS)
+    add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1)
+endif()
+
+if (CMAKE_CROSSCOMPILING)
+    set(AUTORUN_UNIT_TESTS OFF)
+endif()
+
+if (AUTORUN_UNIT_TESTS)
+    enable_testing()
+endif()
+
+if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
+    add_library(${PROJECT_NAME} "${AWS_APPSTREAM_GENERATED_SMOKE_TEST_SRC}")
+else()
+    add_executable(${PROJECT_NAME} "${AWS_APPSTREAM_GENERATED_SMOKE_TEST_SRC}")
+endif()
+
+set_compiler_flags(${PROJECT_NAME})
+set_compiler_warnings(${PROJECT_NAME})
+
+target_include_directories(${PROJECT_NAME} PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../src/aws-cpp-sdk-appstream/include)
+
+target_link_libraries(${PROJECT_NAME}
+    ${PROJECT_LIBS})
+
+if(NOT CMAKE_CROSSCOMPILING)
+    SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${PROJECT_NAME})
+endif()
+