Skip to content

Commit c2b1f75

Browse files
sbisciglsbiscigl
committed
ignore endpoint discovery for endpoint override
1 parent 2f1d7ec commit c2b1f75

File tree

7 files changed

+160
-34
lines changed

7 files changed

+160
-34
lines changed

‎cmake/sdksCommon.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ list(APPEND SDK_TEST_PROJECT_LIST "sqs:tests/aws-cpp-sdk-sqs-integration-tests")
114114
list(APPEND SDK_TEST_PROJECT_LIST "sqs:tests/aws-cpp-sdk-sqs-unit-tests")
115115
list(APPEND SDK_TEST_PROJECT_LIST "transfer:tests/aws-cpp-sdk-transfer-tests")
116116
list(APPEND SDK_TEST_PROJECT_LIST "text-to-speech:tests/aws-cpp-sdk-text-to-speech-tests,tests/aws-cpp-sdk-polly-sample")
117+
list(APPEND SDK_TEST_PROJECT_LIST "timestream-query:tests/aws-cpp-sdk-timestream-query-unit-tests")
117118
list(APPEND SDK_TEST_PROJECT_LIST "transcribestreaming:tests/aws-cpp-sdk-transcribestreaming-integ-tests")
118119
list(APPEND SDK_TEST_PROJECT_LIST "eventbridge:tests/aws-cpp-sdk-eventbridge-tests")
119120
list(APPEND SDK_TEST_PROJECT_LIST "dsql:tests/aws-cpp-sdk-dsql-unit-tests")

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ CancelQueryOutcome TimestreamQueryClient::CancelQuery(const CancelQueryRequest&
226226
}
227227
}
228228
}
229-
else
229+
else if (m_clientConfiguration.endpointOverride.empty())
230230
{
231231
Aws::String errorMessage = R"(Unable to perform "CancelQuery" without endpoint discovery. )"
232232
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -295,7 +295,7 @@ CreateScheduledQueryOutcome TimestreamQueryClient::CreateScheduledQuery(const Cr
295295
}
296296
}
297297
}
298-
else
298+
else if (m_clientConfiguration.endpointOverride.empty())
299299
{
300300
Aws::String errorMessage = R"(Unable to perform "CreateScheduledQuery" without endpoint discovery. )"
301301
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -364,7 +364,7 @@ DeleteScheduledQueryOutcome TimestreamQueryClient::DeleteScheduledQuery(const De
364364
}
365365
}
366366
}
367-
else
367+
else if (m_clientConfiguration.endpointOverride.empty())
368368
{
369369
Aws::String errorMessage = R"(Unable to perform "DeleteScheduledQuery" without endpoint discovery. )"
370370
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -433,7 +433,7 @@ DescribeAccountSettingsOutcome TimestreamQueryClient::DescribeAccountSettings(co
433433
}
434434
}
435435
}
436-
else
436+
else if (m_clientConfiguration.endpointOverride.empty())
437437
{
438438
Aws::String errorMessage = R"(Unable to perform "DescribeAccountSettings" without endpoint discovery. )"
439439
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -528,7 +528,7 @@ DescribeScheduledQueryOutcome TimestreamQueryClient::DescribeScheduledQuery(cons
528528
}
529529
}
530530
}
531-
else
531+
else if (m_clientConfiguration.endpointOverride.empty())
532532
{
533533
Aws::String errorMessage = R"(Unable to perform "DescribeScheduledQuery" without endpoint discovery. )"
534534
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -597,7 +597,7 @@ ExecuteScheduledQueryOutcome TimestreamQueryClient::ExecuteScheduledQuery(const
597597
}
598598
}
599599
}
600-
else
600+
else if (m_clientConfiguration.endpointOverride.empty())
601601
{
602602
Aws::String errorMessage = R"(Unable to perform "ExecuteScheduledQuery" without endpoint discovery. )"
603603
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -666,7 +666,7 @@ ListScheduledQueriesOutcome TimestreamQueryClient::ListScheduledQueries(const Li
666666
}
667667
}
668668
}
669-
else
669+
else if (m_clientConfiguration.endpointOverride.empty())
670670
{
671671
Aws::String errorMessage = R"(Unable to perform "ListScheduledQueries" without endpoint discovery. )"
672672
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -735,7 +735,7 @@ ListTagsForResourceOutcome TimestreamQueryClient::ListTagsForResource(const List
735735
}
736736
}
737737
}
738-
else
738+
else if (m_clientConfiguration.endpointOverride.empty())
739739
{
740740
Aws::String errorMessage = R"(Unable to perform "ListTagsForResource" without endpoint discovery. )"
741741
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -804,7 +804,7 @@ PrepareQueryOutcome TimestreamQueryClient::PrepareQuery(const PrepareQueryReques
804804
}
805805
}
806806
}
807-
else
807+
else if (m_clientConfiguration.endpointOverride.empty())
808808
{
809809
Aws::String errorMessage = R"(Unable to perform "PrepareQuery" without endpoint discovery. )"
810810
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -873,7 +873,7 @@ QueryOutcome TimestreamQueryClient::Query(const QueryRequest& request) const
873873
}
874874
}
875875
}
876-
else
876+
else if (m_clientConfiguration.endpointOverride.empty())
877877
{
878878
Aws::String errorMessage = R"(Unable to perform "Query" without endpoint discovery. )"
879879
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -942,7 +942,7 @@ TagResourceOutcome TimestreamQueryClient::TagResource(const TagResourceRequest&
942942
}
943943
}
944944
}
945-
else
945+
else if (m_clientConfiguration.endpointOverride.empty())
946946
{
947947
Aws::String errorMessage = R"(Unable to perform "TagResource" without endpoint discovery. )"
948948
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -1011,7 +1011,7 @@ UntagResourceOutcome TimestreamQueryClient::UntagResource(const UntagResourceReq
10111011
}
10121012
}
10131013
}
1014-
else
1014+
else if (m_clientConfiguration.endpointOverride.empty())
10151015
{
10161016
Aws::String errorMessage = R"(Unable to perform "UntagResource" without endpoint discovery. )"
10171017
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -1080,7 +1080,7 @@ UpdateAccountSettingsOutcome TimestreamQueryClient::UpdateAccountSettings(const
10801080
}
10811081
}
10821082
}
1083-
else
1083+
else if (m_clientConfiguration.endpointOverride.empty())
10841084
{
10851085
Aws::String errorMessage = R"(Unable to perform "UpdateAccountSettings" without endpoint discovery. )"
10861086
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -1149,7 +1149,7 @@ UpdateScheduledQueryOutcome TimestreamQueryClient::UpdateScheduledQuery(const Up
11491149
}
11501150
}
11511151
}
1152-
else
1152+
else if (m_clientConfiguration.endpointOverride.empty())
11531153
{
11541154
Aws::String errorMessage = R"(Unable to perform "UpdateScheduledQuery" without endpoint discovery. )"
11551155
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ CreateBatchLoadTaskOutcome TimestreamWriteClient::CreateBatchLoadTask(const Crea
230230
}
231231
}
232232
}
233-
else
233+
else if (m_clientConfiguration.endpointOverride.empty())
234234
{
235235
Aws::String errorMessage = R"(Unable to perform "CreateBatchLoadTask" without endpoint discovery. )"
236236
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -299,7 +299,7 @@ CreateDatabaseOutcome TimestreamWriteClient::CreateDatabase(const CreateDatabase
299299
}
300300
}
301301
}
302-
else
302+
else if (m_clientConfiguration.endpointOverride.empty())
303303
{
304304
Aws::String errorMessage = R"(Unable to perform "CreateDatabase" without endpoint discovery. )"
305305
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -368,7 +368,7 @@ CreateTableOutcome TimestreamWriteClient::CreateTable(const CreateTableRequest&
368368
}
369369
}
370370
}
371-
else
371+
else if (m_clientConfiguration.endpointOverride.empty())
372372
{
373373
Aws::String errorMessage = R"(Unable to perform "CreateTable" without endpoint discovery. )"
374374
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -437,7 +437,7 @@ DeleteDatabaseOutcome TimestreamWriteClient::DeleteDatabase(const DeleteDatabase
437437
}
438438
}
439439
}
440-
else
440+
else if (m_clientConfiguration.endpointOverride.empty())
441441
{
442442
Aws::String errorMessage = R"(Unable to perform "DeleteDatabase" without endpoint discovery. )"
443443
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -506,7 +506,7 @@ DeleteTableOutcome TimestreamWriteClient::DeleteTable(const DeleteTableRequest&
506506
}
507507
}
508508
}
509-
else
509+
else if (m_clientConfiguration.endpointOverride.empty())
510510
{
511511
Aws::String errorMessage = R"(Unable to perform "DeleteTable" without endpoint discovery. )"
512512
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -575,7 +575,7 @@ DescribeBatchLoadTaskOutcome TimestreamWriteClient::DescribeBatchLoadTask(const
575575
}
576576
}
577577
}
578-
else
578+
else if (m_clientConfiguration.endpointOverride.empty())
579579
{
580580
Aws::String errorMessage = R"(Unable to perform "DescribeBatchLoadTask" without endpoint discovery. )"
581581
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -644,7 +644,7 @@ DescribeDatabaseOutcome TimestreamWriteClient::DescribeDatabase(const DescribeDa
644644
}
645645
}
646646
}
647-
else
647+
else if (m_clientConfiguration.endpointOverride.empty())
648648
{
649649
Aws::String errorMessage = R"(Unable to perform "DescribeDatabase" without endpoint discovery. )"
650650
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -739,7 +739,7 @@ DescribeTableOutcome TimestreamWriteClient::DescribeTable(const DescribeTableReq
739739
}
740740
}
741741
}
742-
else
742+
else if (m_clientConfiguration.endpointOverride.empty())
743743
{
744744
Aws::String errorMessage = R"(Unable to perform "DescribeTable" without endpoint discovery. )"
745745
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -808,7 +808,7 @@ ListBatchLoadTasksOutcome TimestreamWriteClient::ListBatchLoadTasks(const ListBa
808808
}
809809
}
810810
}
811-
else
811+
else if (m_clientConfiguration.endpointOverride.empty())
812812
{
813813
Aws::String errorMessage = R"(Unable to perform "ListBatchLoadTasks" without endpoint discovery. )"
814814
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -877,7 +877,7 @@ ListDatabasesOutcome TimestreamWriteClient::ListDatabases(const ListDatabasesReq
877877
}
878878
}
879879
}
880-
else
880+
else if (m_clientConfiguration.endpointOverride.empty())
881881
{
882882
Aws::String errorMessage = R"(Unable to perform "ListDatabases" without endpoint discovery. )"
883883
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -946,7 +946,7 @@ ListTablesOutcome TimestreamWriteClient::ListTables(const ListTablesRequest& req
946946
}
947947
}
948948
}
949-
else
949+
else if (m_clientConfiguration.endpointOverride.empty())
950950
{
951951
Aws::String errorMessage = R"(Unable to perform "ListTables" without endpoint discovery. )"
952952
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -1015,7 +1015,7 @@ ListTagsForResourceOutcome TimestreamWriteClient::ListTagsForResource(const List
10151015
}
10161016
}
10171017
}
1018-
else
1018+
else if (m_clientConfiguration.endpointOverride.empty())
10191019
{
10201020
Aws::String errorMessage = R"(Unable to perform "ListTagsForResource" without endpoint discovery. )"
10211021
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -1084,7 +1084,7 @@ ResumeBatchLoadTaskOutcome TimestreamWriteClient::ResumeBatchLoadTask(const Resu
10841084
}
10851085
}
10861086
}
1087-
else
1087+
else if (m_clientConfiguration.endpointOverride.empty())
10881088
{
10891089
Aws::String errorMessage = R"(Unable to perform "ResumeBatchLoadTask" without endpoint discovery. )"
10901090
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -1153,7 +1153,7 @@ TagResourceOutcome TimestreamWriteClient::TagResource(const TagResourceRequest&
11531153
}
11541154
}
11551155
}
1156-
else
1156+
else if (m_clientConfiguration.endpointOverride.empty())
11571157
{
11581158
Aws::String errorMessage = R"(Unable to perform "TagResource" without endpoint discovery. )"
11591159
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -1222,7 +1222,7 @@ UntagResourceOutcome TimestreamWriteClient::UntagResource(const UntagResourceReq
12221222
}
12231223
}
12241224
}
1225-
else
1225+
else if (m_clientConfiguration.endpointOverride.empty())
12261226
{
12271227
Aws::String errorMessage = R"(Unable to perform "UntagResource" without endpoint discovery. )"
12281228
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -1291,7 +1291,7 @@ UpdateDatabaseOutcome TimestreamWriteClient::UpdateDatabase(const UpdateDatabase
12911291
}
12921292
}
12931293
}
1294-
else
1294+
else if (m_clientConfiguration.endpointOverride.empty())
12951295
{
12961296
Aws::String errorMessage = R"(Unable to perform "UpdateDatabase" without endpoint discovery. )"
12971297
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -1360,7 +1360,7 @@ UpdateTableOutcome TimestreamWriteClient::UpdateTable(const UpdateTableRequest&
13601360
}
13611361
}
13621362
}
1363-
else
1363+
else if (m_clientConfiguration.endpointOverride.empty())
13641364
{
13651365
Aws::String errorMessage = R"(Unable to perform "UpdateTable" without endpoint discovery. )"
13661366
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"
@@ -1429,7 +1429,7 @@ WriteRecordsOutcome TimestreamWriteClient::WriteRecords(const WriteRecordsReques
14291429
}
14301430
}
14311431
}
1432-
else
1432+
else if (m_clientConfiguration.endpointOverride.empty())
14331433
{
14341434
Aws::String errorMessage = R"(Unable to perform "WriteRecords" without endpoint discovery. )"
14351435
R"(Make sure your environment variable "AWS_ENABLE_ENDPOINT_DISCOVERY", )"

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
add_project(aws-cpp-sdk-timestream-query-unit-tests
2+
"Unit Tests for the Timestream Query SDK Client"
3+
aws-cpp-sdk-timestream-query
4+
testing-resources
5+
aws_test_main
6+
aws-cpp-sdk-core)
7+
8+
add_definitions(-DRESOURCES_DIR="${CMAKE_CURRENT_SOURCE_DIR}/resources")
9+
10+
if(MSVC AND BUILD_SHARED_LIBS)
11+
add_definitions(-DGTEST_LINKED_AS_SHARED_LIBRARY=1)
12+
endif()
13+
14+
enable_testing()
15+
16+
if(PLATFORM_ANDROID AND BUILD_SHARED_LIBS)
17+
add_library(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/TimeStreamQueryUnitTests.cpp)
18+
else()
19+
add_executable(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/TimeStreamQueryUnitTests.cpp)
20+
endif()
21+
22+
set_compiler_flags(${PROJECT_NAME})
23+
set_compiler_warnings(${PROJECT_NAME})
24+
25+
target_link_libraries(${PROJECT_NAME} ${PROJECT_LIBS})
26+
27+
if(MSVC AND BUILD_SHARED_LIBS)
28+
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "/DELAYLOAD:aws-cpp-sdk-timestream-query.dll /DELAYLOAD:aws-cpp-sdk-core.dll")
29+
target_link_libraries(${PROJECT_NAME} delayimp.lib)
30+
endif()
31+
32+
include(GoogleTest)
33+
gtest_add_tests(TARGET ${PROJECT_NAME})

0 commit comments

Comments
 (0)