ignore endpoint discovery for endpoint override

cmake/sdksCommon.cmake

@@ -114,6 +114,7 @@ list(APPEND SDK_TEST_PROJECT_LIST "sqs:tests/aws-cpp-sdk-sqs-integration-tests")
 list(APPEND SDK_TEST_PROJECT_LIST "sqs:tests/aws-cpp-sdk-sqs-unit-tests")
 list(APPEND SDK_TEST_PROJECT_LIST "transfer:tests/aws-cpp-sdk-transfer-tests")
 list(APPEND SDK_TEST_PROJECT_LIST "text-to-speech:tests/aws-cpp-sdk-text-to-speech-tests,tests/aws-cpp-sdk-polly-sample")
+list(APPEND SDK_TEST_PROJECT_LIST "timestream-query:tests/aws-cpp-sdk-timestream-query-unit-tests")
 list(APPEND SDK_TEST_PROJECT_LIST "transcribestreaming:tests/aws-cpp-sdk-transcribestreaming-integ-tests")
 list(APPEND SDK_TEST_PROJECT_LIST "eventbridge:tests/aws-cpp-sdk-eventbridge-tests")
 list(APPEND SDK_TEST_PROJECT_LIST "dsql:tests/aws-cpp-sdk-dsql-unit-tests")

generated/src/aws-cpp-sdk-timestream-query/source/TimestreamQueryClient.cpp

@@ -226,7 +226,7 @@ CancelQueryOutcome TimestreamQueryClient::CancelQuery(const CancelQueryRequest&
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "CancelQuery" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -295,7 +295,7 @@ CreateScheduledQueryOutcome TimestreamQueryClient::CreateScheduledQuery(const Cr
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "CreateScheduledQuery" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -364,7 +364,7 @@ DeleteScheduledQueryOutcome TimestreamQueryClient::DeleteScheduledQuery(const De
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "DeleteScheduledQuery" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -433,7 +433,7 @@ DescribeAccountSettingsOutcome TimestreamQueryClient::DescribeAccountSettings(co
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "DescribeAccountSettings" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -528,7 +528,7 @@ DescribeScheduledQueryOutcome TimestreamQueryClient::DescribeScheduledQuery(cons
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "DescribeScheduledQuery" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -597,7 +597,7 @@ ExecuteScheduledQueryOutcome TimestreamQueryClient::ExecuteScheduledQuery(const
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "ExecuteScheduledQuery" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -666,7 +666,7 @@ ListScheduledQueriesOutcome TimestreamQueryClient::ListScheduledQueries(const Li
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "ListScheduledQueries" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -735,7 +735,7 @@ ListTagsForResourceOutcome TimestreamQueryClient::ListTagsForResource(const List
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "ListTagsForResource" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -804,7 +804,7 @@ PrepareQueryOutcome TimestreamQueryClient::PrepareQuery(const PrepareQueryReques
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "PrepareQuery" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -873,7 +873,7 @@ QueryOutcome TimestreamQueryClient::Query(const QueryRequest& request) const
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "Query" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -942,7 +942,7 @@ TagResourceOutcome TimestreamQueryClient::TagResource(const TagResourceRequest&
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "TagResource" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -1011,7 +1011,7 @@ UntagResourceOutcome TimestreamQueryClient::UntagResource(const UntagResourceReq
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "UntagResource" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -1080,7 +1080,7 @@ UpdateAccountSettingsOutcome TimestreamQueryClient::UpdateAccountSettings(const
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "UpdateAccountSettings" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -1149,7 +1149,7 @@ UpdateScheduledQueryOutcome TimestreamQueryClient::UpdateScheduledQuery(const Up
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "UpdateScheduledQuery" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"

generated/src/aws-cpp-sdk-timestream-write/source/TimestreamWriteClient.cpp

@@ -230,7 +230,7 @@ CreateBatchLoadTaskOutcome TimestreamWriteClient::CreateBatchLoadTask(const Crea
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "CreateBatchLoadTask" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -299,7 +299,7 @@ CreateDatabaseOutcome TimestreamWriteClient::CreateDatabase(const CreateDatabase
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "CreateDatabase" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -368,7 +368,7 @@ CreateTableOutcome TimestreamWriteClient::CreateTable(const CreateTableRequest&
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "CreateTable" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -437,7 +437,7 @@ DeleteDatabaseOutcome TimestreamWriteClient::DeleteDatabase(const DeleteDatabase
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "DeleteDatabase" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -506,7 +506,7 @@ DeleteTableOutcome TimestreamWriteClient::DeleteTable(const DeleteTableRequest&
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "DeleteTable" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -575,7 +575,7 @@ DescribeBatchLoadTaskOutcome TimestreamWriteClient::DescribeBatchLoadTask(const
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "DescribeBatchLoadTask" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -644,7 +644,7 @@ DescribeDatabaseOutcome TimestreamWriteClient::DescribeDatabase(const DescribeDa
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "DescribeDatabase" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -739,7 +739,7 @@ DescribeTableOutcome TimestreamWriteClient::DescribeTable(const DescribeTableReq
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "DescribeTable" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -808,7 +808,7 @@ ListBatchLoadTasksOutcome TimestreamWriteClient::ListBatchLoadTasks(const ListBa
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "ListBatchLoadTasks" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -877,7 +877,7 @@ ListDatabasesOutcome TimestreamWriteClient::ListDatabases(const ListDatabasesReq
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "ListDatabases" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -946,7 +946,7 @@ ListTablesOutcome TimestreamWriteClient::ListTables(const ListTablesRequest& req
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "ListTables" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -1015,7 +1015,7 @@ ListTagsForResourceOutcome TimestreamWriteClient::ListTagsForResource(const List
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "ListTagsForResource" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -1084,7 +1084,7 @@ ResumeBatchLoadTaskOutcome TimestreamWriteClient::ResumeBatchLoadTask(const Resu
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "ResumeBatchLoadTask" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -1153,7 +1153,7 @@ TagResourceOutcome TimestreamWriteClient::TagResource(const TagResourceRequest&
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "TagResource" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -1222,7 +1222,7 @@ UntagResourceOutcome TimestreamWriteClient::UntagResource(const UntagResourceReq
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "UntagResource" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -1291,7 +1291,7 @@ UpdateDatabaseOutcome TimestreamWriteClient::UpdateDatabase(const UpdateDatabase
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "UpdateDatabase" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -1360,7 +1360,7 @@ UpdateTableOutcome TimestreamWriteClient::UpdateTable(const UpdateTableRequest&
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "UpdateTable" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -1429,7 +1429,7 @@ WriteRecordsOutcome TimestreamWriteClient::WriteRecords(const WriteRecordsReques
               }
           }
       }
-      else
+      else if (m_clientConfiguration.endpointOverride.empty())
       {
           Aws::String errorMessage = R"(Unable to perform "WriteRecords" without endpoint discovery. )"
               R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"

tests/aws-cpp-sdk-timestream-query-unit-tests/CMakeLists.txt

@@ -0,0 +1,33 @@
+add_project(aws-cpp-sdk-timestream-query-unit-tests
+        "Unit Tests for the Timestream Query SDK Client"
+        aws-cpp-sdk-timestream-query
+        testing-resources
+        aws_test_main
+        aws-cpp-sdk-core)
+
+add_definitions(-DRESOURCES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/resources")
+
+if(MSVC AND BUILD_SHARED_LIBS)
+    add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1)
+endif()
+
+enable_testing()
+
+if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
+    add_library(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/TimeStreamQueryUnitTests.cpp)
+else()
+    add_executable(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/TimeStreamQueryUnitTests.cpp)
+endif()
+
+set_compiler_flags(${PROJECT_NAME})
+set_compiler_warnings(${PROJECT_NAME})
+
+target_link_libraries(${PROJECT_NAME} ${PROJECT_LIBS})
+
+if(MSVC AND BUILD_SHARED_LIBS)
+    set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "/DELAYLOAD:aws-cpp-sdk-timestream-query.dll /DELAYLOAD:aws-cpp-sdk-core.dll")
+    target_link_libraries(${PROJECT_NAME} delayimp.lib)
+endif()
+
+include(GoogleTest)
+gtest_add_tests(TARGET ${PROJECT_NAME})