From 58d1f3119ea7ae741bf96226a84fedc9f7f5f7ea Mon Sep 17 00:00:00 2001 From: Soumava Bera Date: Fri, 22 Nov 2024 15:39:51 -0500 Subject: [PATCH] updates --- .../include/aws/core/client/AWSClient.h | 3 -- .../include/aws/core/http/HttpRequest.h | 1 + .../smithy/client/AwsSmithyClientBase.h | 18 +++++----- .../source/client/AWSClient.cpp | 5 +-- .../source/http/HttpRequest.cpp | 2 +- .../smithy/client/AwsSmithyClientBase.cpp | 3 -- .../cpp/AbstractServiceRequestHeader.vm | 3 ++ .../velocity/cpp/ServiceClientSourceInit.vm | 34 ++++++++----------- .../ServiceClientSourceLegacyConstructors.vm | 30 ++++++++-------- 9 files changed, 44 insertions(+), 55 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 f6bf2da8b43..749ac31c8ae 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 @@ -321,8 +321,6 @@ namespace Aws std::shared_ptr MakeHttpRequest(std::shared_ptr& request) const; Aws::String m_region; - void SetFeatureHeaders(Aws::Http::HeaderValueCollection&& headers); - /** * Adds "X-Amzn-Trace-Id" header with the value of _X_AMZN_TRACE_ID if both * environment variables AWS_LAMBDA_FUNCTION_NAME and _X_AMZN_TRACE_ID are set. @@ -358,7 +356,6 @@ namespace Aws Aws::String m_serviceName = "AWSBaseClient"; Aws::Client::RequestCompressionConfig m_requestCompressionConfig; Aws::Vector> m_interceptors; - Aws::Http::HeaderValueCollection m_featureHeaders; }; AWS_CORE_API Aws::String GetAuthorizationHeader(const Aws::Http::HttpRequest& httpRequest); diff --git a/src/aws-cpp-sdk-core/include/aws/core/http/HttpRequest.h b/src/aws-cpp-sdk-core/include/aws/core/http/HttpRequest.h index bb1f7c26817..3cf8712bafb 100644 --- a/src/aws-cpp-sdk-core/include/aws/core/http/HttpRequest.h +++ b/src/aws-cpp-sdk-core/include/aws/core/http/HttpRequest.h @@ -63,6 +63,7 @@ namespace Aws extern AWS_CORE_API const char CHUNKED_VALUE[]; extern AWS_CORE_API const char AWS_CHUNKED_VALUE[]; extern AWS_CORE_API const char X_AMZN_ERROR_TYPE[]; + extern AWS_CORE_API const char X_AMZN_QUERY_MODE[]; class HttpRequest; class HttpResponse; diff --git a/src/aws-cpp-sdk-core/include/smithy/client/AwsSmithyClientBase.h b/src/aws-cpp-sdk-core/include/smithy/client/AwsSmithyClientBase.h index 0fe8c0fee5e..0540c9afb9c 100644 --- a/src/aws-cpp-sdk-core/include/smithy/client/AwsSmithyClientBase.h +++ b/src/aws-cpp-sdk-core/include/smithy/client/AwsSmithyClientBase.h @@ -158,17 +158,15 @@ namespace client virtual SelectAuthSchemeOptionOutcome SelectAuthSchemeOption(const AwsSmithyClientAsyncRequestContext& ctx) const = 0; virtual SigningOutcome SignRequest(std::shared_ptr httpRequest, const AuthSchemeOption& targetAuthSchemeOption) const = 0; virtual bool AdjustClockSkew(HttpResponseOutcome& outcome, const AuthSchemeOption& authSchemeOption) const = 0; - void SetFeatureHeaders(Aws::Http::HeaderValueCollection&& headers); - protected: - Aws::UniquePtr m_clientConfig; - Aws::String m_serviceName; - Aws::String m_userAgent; + protected: + Aws::UniquePtr m_clientConfig; + Aws::String m_serviceName; + Aws::String m_userAgent; - std::shared_ptr m_httpClient; - std::shared_ptr m_errorMarshaller; - Aws::Vector> m_interceptors{}; - Aws::Http::HeaderValueCollection m_featureHeaders; + std::shared_ptr m_httpClient; + std::shared_ptr m_errorMarshaller; + Aws::Vector> m_interceptors{}; }; -} // namespace client + } // namespace client } // namespace smithy diff --git a/src/aws-cpp-sdk-core/source/client/AWSClient.cpp b/src/aws-cpp-sdk-core/source/client/AWSClient.cpp index 6f7db5cedea..0c33a43e8bf 100644 --- a/src/aws-cpp-sdk-core/source/client/AWSClient.cpp +++ b/src/aws-cpp-sdk-core/source/client/AWSClient.cpp @@ -881,7 +881,6 @@ void AWSClient::BuildHttpRequest(const Aws::AmazonWebServiceRequest& request, co //do headers first since the request likely will set content-length as its own header. AddHeadersToRequest(httpRequest, request.GetHeaders()); AddHeadersToRequest(httpRequest, request.GetAdditionalCustomHeaders()); - AddHeadersToRequest(httpRequest, m_featureHeaders); if (request.IsEventStreamRequest()) { @@ -1049,6 +1048,4 @@ void AWSClient::AppendRecursionDetectionHeader(std::shared_ptrSetHeaderValue(Aws::Http::X_AMZN_TRACE_ID_HEADER, xAmznTraceIdVal); -} - -void AWSClient::SetFeatureHeaders(Aws::Http::HeaderValueCollection&& headers) { m_featureHeaders = std::move(headers); } +} \ No newline at end of file diff --git a/src/aws-cpp-sdk-core/source/http/HttpRequest.cpp b/src/aws-cpp-sdk-core/source/http/HttpRequest.cpp index ee23f0262d5..00a9bda9bfe 100644 --- a/src/aws-cpp-sdk-core/source/http/HttpRequest.cpp +++ b/src/aws-cpp-sdk-core/source/http/HttpRequest.cpp @@ -42,7 +42,7 @@ namespace Aws const char X_AMZN_TRACE_ID_HEADER[] = "X-Amzn-Trace-Id"; const char ALLOCATION_TAG[] = "HttpRequestConversion"; const char X_AMZN_ERROR_TYPE[] = "x-amzn-errortype"; - + const char X_AMZN_QUERY_MODE[] = "x-amzn-query-mode"; std::shared_ptr HttpRequest::ToCrtHttpRequest() { auto request = Aws::MakeShared(ALLOCATION_TAG); diff --git a/src/aws-cpp-sdk-core/source/smithy/client/AwsSmithyClientBase.cpp b/src/aws-cpp-sdk-core/source/smithy/client/AwsSmithyClientBase.cpp index 3394da30a1b..6d8c565d2a5 100644 --- a/src/aws-cpp-sdk-core/source/smithy/client/AwsSmithyClientBase.cpp +++ b/src/aws-cpp-sdk-core/source/smithy/client/AwsSmithyClientBase.cpp @@ -63,7 +63,6 @@ AwsSmithyClientBase::BuildHttpRequest(const std::shared_ptrGetHeaders()); AddHeadersToRequest(httpRequest, pRequest->GetAdditionalCustomHeaders()); - AddHeadersToRequest(httpRequest, m_featureHeaders); if (pRequest->IsEventStreamRequest()) { @@ -95,8 +94,6 @@ AwsSmithyClientBase::BuildHttpRequest(const std::shared_ptr(ALLOCATION_TAG, bearerTokenProvider), - #if ($metadata.awsQueryCompatible) +#if ($metadata.awsQueryCompatible) Aws::MakeShared<${metadata.classNamePrefix}ErrorMarshaller>(ALLOCATION_TAG, true)), - #else +#else Aws::MakeShared<${metadata.classNamePrefix}ErrorMarshaller>(ALLOCATION_TAG)), - #end +#end #foreach($ctorMemberInit in $ctorMemberInitList) ${ctorMemberInit}#if( $foreach.hasNext ), @@ -209,11 +209,11 @@ ${clsWSpace} ${clsWSpace} ${ctorArgument}#if( $foreach.hasNext ),#else) :#end ${signerWSpace} ${signerCtorArg}#if( $foreach.hasNext ), #else#end #end), - #if ($metadata.awsQueryCompatible) +#if ($metadata.awsQueryCompatible) Aws::MakeShared<${metadata.classNamePrefix}ErrorMarshaller>(ALLOCATION_TAG, true)), - #else +#else Aws::MakeShared<${metadata.classNamePrefix}ErrorMarshaller>(ALLOCATION_TAG)), - #end +#end #foreach($ctorMemberInit in $ctorMemberInitList) ${ctorMemberInit}#if( $foreach.hasNext ), #else#end @@ -252,11 +252,11 @@ ${clsWSpace} ${clsWSpace} ${ctorArgument}#if( $foreach.hasNext ),#else) :#end ${signerWSpace} ${signerCtorArg}#if( $foreach.hasNext ), #else#end #end), - #if ($metadata.awsQueryCompatible) +#if ($metadata.awsQueryCompatible) Aws::MakeShared<${metadata.classNamePrefix}ErrorMarshaller>(ALLOCATION_TAG, true)), - #else +#else Aws::MakeShared<${metadata.classNamePrefix}ErrorMarshaller>(ALLOCATION_TAG)), - #end +#end #foreach($ctorMemberInit in $ctorMemberInitList) ${ctorMemberInit}#if( $foreach.hasNext ), #else#end @@ -295,11 +295,11 @@ ${clsWSpace} ${clsWSpace} ${ctorArgument}#if( $foreach.hasNext ),#else) :#end ${signerWSpace} ${signerCtorArg}#if( $foreach.hasNext ), #else#end #end), - #if ($metadata.awsQueryCompatible) +#if ($metadata.awsQueryCompatible) Aws::MakeShared<${metadata.classNamePrefix}ErrorMarshaller>(ALLOCATION_TAG, true)), - #else +#else Aws::MakeShared<${metadata.classNamePrefix}ErrorMarshaller>(ALLOCATION_TAG)), - #end +#end #foreach($ctorMemberInit in $ctorMemberInitList) ${ctorMemberInit}#if( $foreach.hasNext ), #else#end @@ -325,11 +325,11 @@ ${clsWSpace} ${clsWSpace} ${ctorArgument}#if( $foreach.hasNext ),#else) :#end #end BASECLASS(clientConfiguration, signerProvider, - #if ($metadata.awsQueryCompatible) +#if ($metadata.awsQueryCompatible) Aws::MakeShared<${metadata.classNamePrefix}ErrorMarshaller>(ALLOCATION_TAG, true)), - #else +#else Aws::MakeShared<${metadata.classNamePrefix}ErrorMarshaller>(ALLOCATION_TAG)), - #end +#end ${virtualAddressingInit} { init(m_clientConfiguration); @@ -420,9 +420,6 @@ void ${className}::init(const ${clientConfigurationCls}& config) m_enableHostPrefixInjection = config.enableHostPrefixInjection; #end##if($metadata.hasEndpointTrait) #end##-#if($serviceModel.endpointRules) -#if ($metadata.awsQueryCompatible) - SetFeatureHeaders({{"x-amzn-query-mode","True"}}); -#end } #if(!$serviceModel.endpointRules && $metadata.hasEndpointDiscoveryTrait) @@ -468,7 +465,6 @@ void ${className}::Load${metadata.classNamePrefix}SpecificConfig(const Aws::Clie } } #end - void ${className}::OverrideEndpoint(const Aws::String& endpoint) { #if($serviceModel.endpointRules) diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientSourceLegacyConstructors.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientSourceLegacyConstructors.vm index 1962461e4a8..b5f5495d1ab 100644 --- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientSourceLegacyConstructors.vm +++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientSourceLegacyConstructors.vm @@ -84,11 +84,11 @@ #end BASECLASS(clientConfiguration, Aws::MakeShared<${signerToMake}>(ALLOCATION_TAG, bearerTokenProvider), - #if ($metadata.awsQueryCompatible) +#if ($metadata.awsQueryCompatible) Aws::MakeShared<${metadata.classNamePrefix}ErrorMarshaller>(ALLOCATION_TAG, true)), - #else +#else Aws::MakeShared<${metadata.classNamePrefix}ErrorMarshaller>(ALLOCATION_TAG)), - #end +#end m_clientConfiguration(clientConfiguration${signPayloadsClientConfigParam}${virtualAddressingInit}${USEast1RegionalEndpointInitString})#if($ctorMemberInitList.isEmpty()) #else,#end #foreach($ctorMemberInit in $ctorMemberInitList) @@ -126,11 +126,11 @@ ${clsWSpace} ${clsWSpace} ${ctorArgument}#if( $foreach.hasNext ),#else) :#end ${signerWSpace} ${signerCtorArg}#if( $foreach.hasNext ), #else#end #end), - #if ($metadata.awsQueryCompatible) +#if ($metadata.awsQueryCompatible) Aws::MakeShared<${metadata.classNamePrefix}ErrorMarshaller>(ALLOCATION_TAG, true)), - #else +#else Aws::MakeShared<${metadata.classNamePrefix}ErrorMarshaller>(ALLOCATION_TAG)), - #end +#end m_clientConfiguration(clientConfiguration${signPayloadsClientConfigParam}${virtualAddressingInit}${USEast1RegionalEndpointInitString})#if($ctorMemberInitList.isEmpty())#else, #end #foreach($ctorMemberInit in $ctorMemberInitList) @@ -168,11 +168,11 @@ ${clsWSpace} ${clsWSpace} ${ctorArgument}#if( $foreach.hasNext ),#else) :#end ${signerWSpace} ${signerCtorArg}#if( $foreach.hasNext ), #else#end #end), - #if ($metadata.awsQueryCompatible) +#if ($metadata.awsQueryCompatible) Aws::MakeShared<${metadata.classNamePrefix}ErrorMarshaller>(ALLOCATION_TAG, true)), - #else +#else Aws::MakeShared<${metadata.classNamePrefix}ErrorMarshaller>(ALLOCATION_TAG)), - #end +#end m_clientConfiguration(clientConfiguration${signPayloadsClientConfigParam}${virtualAddressingInit}${USEast1RegionalEndpointInitString})#if($ctorMemberInitList.isEmpty())#else, #end #foreach($ctorMemberInit in $ctorMemberInitList) @@ -210,11 +210,11 @@ ${clsWSpace} ${clsWSpace} ${ctorArgument}#if( $foreach.hasNext ),#else) :#end ${signerWSpace} ${signerCtorArg}#if( $foreach.hasNext ), #else#end #end), - #if ($metadata.awsQueryCompatible) +#if ($metadata.awsQueryCompatible) Aws::MakeShared<${metadata.classNamePrefix}ErrorMarshaller>(ALLOCATION_TAG, true)), - #else +#else Aws::MakeShared<${metadata.classNamePrefix}ErrorMarshaller>(ALLOCATION_TAG)), - #end +#end m_clientConfiguration(clientConfiguration${signPayloadsClientConfigParam}${virtualAddressingInit}${USEast1RegionalEndpointInitString})#if($ctorMemberInitList.isEmpty())#else, #end #foreach($ctorMemberInit in $ctorMemberInitList) @@ -242,11 +242,11 @@ ${clsWSpace} ${clsWSpace} ${ctorArgument}#if( $foreach.hasNext ),#else) :#end #end BASECLASS(clientConfiguration, signerProvider, - #if ($metadata.awsQueryCompatible) +#if ($metadata.awsQueryCompatible) Aws::MakeShared<${metadata.classNamePrefix}ErrorMarshaller>(ALLOCATION_TAG, true)), - #else +#else Aws::MakeShared<${metadata.classNamePrefix}ErrorMarshaller>(ALLOCATION_TAG)), - #end +#end m_clientConfiguration(clientConfiguration${signPayloadsClientConfigParam}${virtualAddressingInit}${USEast1RegionalEndpointInitString}) { init(m_clientConfiguration);