From 50c323f00ad827037efefc7e71a9086bf171c3d2 Mon Sep 17 00:00:00 2001 From: Soumava Bera Date: Wed, 10 Jul 2024 22:21:34 +0000 Subject: [PATCH] minimalize fix for delay loading issue in windows builds --- src/aws-cpp-sdk-core/include/aws/core/client/AWSClient.h | 2 -- src/aws-cpp-sdk-core/source/client/AWSClient.cpp | 8 -------- tests/aws-cpp-sdk-s3-unit-tests/S3UnitTests.cpp | 4 ++-- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/aws-cpp-sdk-core/include/aws/core/client/AWSClient.h b/src/aws-cpp-sdk-core/include/aws/core/client/AWSClient.h index 3e379f8d4c9..5963155e62f 100644 --- a/src/aws-cpp-sdk-core/include/aws/core/client/AWSClient.h +++ b/src/aws-cpp-sdk-core/include/aws/core/client/AWSClient.h @@ -54,8 +54,6 @@ namespace Aws { AWS_CORE_API extern const char SIGV4_SIGNER[]; AWS_CORE_API extern const char NULL_SIGNER[]; - AWS_CORE_API const char* GetSigner(); - AWS_CORE_API const char* GetNullSigner(); } class AmazonWebServiceRequest; diff --git a/src/aws-cpp-sdk-core/source/client/AWSClient.cpp b/src/aws-cpp-sdk-core/source/client/AWSClient.cpp index ac52aa0c446..8615786ebb0 100644 --- a/src/aws-cpp-sdk-core/source/client/AWSClient.cpp +++ b/src/aws-cpp-sdk-core/source/client/AWSClient.cpp @@ -70,14 +70,6 @@ static const std::chrono::milliseconds TIME_DIFF_MAX = std::chrono::minutes(4); //-4 Minutes static const std::chrono::milliseconds TIME_DIFF_MIN = std::chrono::minutes(-4); - -AWS_CORE_API const char* Aws::Auth::GetSigner(){ - return Aws::Auth::SIGV4_SIGNER; -} -AWS_CORE_API const char* Aws::Auth::GetNullSigner(){ - return Aws::Auth::NULL_SIGNER; -} - CoreErrors AWSClient::GuessBodylessErrorType(Aws::Http::HttpResponseCode responseCode) { switch (responseCode) diff --git a/tests/aws-cpp-sdk-s3-unit-tests/S3UnitTests.cpp b/tests/aws-cpp-sdk-s3-unit-tests/S3UnitTests.cpp index bb2fa19eab4..7e2cabfac8b 100644 --- a/tests/aws-cpp-sdk-s3-unit-tests/S3UnitTests.cpp +++ b/tests/aws-cpp-sdk-s3-unit-tests/S3UnitTests.cpp @@ -255,9 +255,9 @@ TEST_F(S3UnitTest, S3EmbeddedErrorTestNonOKResponse) { _mockHttpClient->AddResponseToReturn(mockResponse); - auto endpointResolutionOutcome = _s3Client->accessEndpointProvider()->ResolveEndpoint(request.GetEndpointContextParams()); //_s3Client->OverrideEndpoint("s3.amazonaws.com"); + auto endpointResolutionOutcome = _s3Client->accessEndpointProvider()->ResolveEndpoint(request.GetEndpointContextParams()); - const auto response = std::static_pointer_cast(_s3Client)->Aws::Client::AWSXMLClient::MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_PUT, Aws::Auth::GetSigner()); + const auto response = std::static_pointer_cast(_s3Client)->Aws::Client::AWSXMLClient::MakeRequest(request, endpointResolutionOutcome.GetResult(), Aws::Http::HttpMethod::HTTP_PUT, "dummy"); EXPECT_TRUE(response.GetError().GetExceptionName() == "InvalidAction");