From 188e4a86931de62d86a68c3f2a3aa15e53170c91 Mon Sep 17 00:00:00 2001 From: sbiscigl Date: Sat, 30 May 2026 15:29:03 -0400 Subject: [PATCH] fix standlone client building --- .../velocity/cpp/ServiceClientSourceInit.vm | 4 +++- .../velocity/cpp/StreamRequestSource.vm | 10 ++++++++-- .../velocity/cpp/cbor/CborRequestSource.vm | 10 ++++++++-- .../velocity/cpp/json/JsonRequestSource.vm | 10 ++++++++-- .../velocity/cpp/queryxml/QueryRequestSource.vm | 10 ++++++++-- .../s3/PutBucketNotificationConfigurationRequest.vm | 10 ++++++++-- .../velocity/cpp/xml/XmlRequestSource.vm | 10 ++++++++-- 7 files changed, 51 insertions(+), 13 deletions(-) diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientSourceInit.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientSourceInit.vm index 010c819a7a95..fee400b49541 100644 --- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientSourceInit.vm +++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientSourceInit.vm @@ -301,6 +301,7 @@ ${clsWSpace} ${clsWSpace} ${ctorArgument}#if( $foreach.hasNext ),#else) :#end #if($additionalCtorArgs.containsKey($ctorKey))#set($addArgDummy = $standaloneCredsCtor.put($ctorKey, $additionalCtorArgs.get($ctorKey)))#end #end ${className}::${className}(const std::shared_ptr& signerProvider, +${clsWSpace} ${clsWSpace} std::shared_ptr<${metadata.classNamePrefix}EndpointProviderBase> endpointProvider, ${clsWSpace} ${clsWSpace} const ${clientConfigurationCls}& clientConfiguration#if($standaloneCredsCtor.isEmpty())) :#else,#end #foreach($ctorArgument in $specCredsCtor) @@ -310,7 +311,8 @@ ${clsWSpace} ${clsWSpace} ${ctorArgument}#if( $foreach.hasNext ),#else) :#end BASECLASS(clientConfiguration, signerProvider, Aws::MakeShared<${metadata.classNamePrefix}ErrorMarshaller>(ALLOCATION_TAG)), -${virtualAddressingInit} + m_clientConfiguration(clientConfiguration), + m_endpointProvider(endpointProvider ? std::move(endpointProvider) : Aws::MakeShared<${metadata.classNamePrefix}EndpointProvider>(ALLOCATION_TAG)) { init(m_clientConfiguration); } diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/StreamRequestSource.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/StreamRequestSource.vm index 4128ccd1cf7b..3ba3069a042d 100644 --- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/StreamRequestSource.vm +++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/StreamRequestSource.vm @@ -5,7 +5,13 @@ #set($serviceNamespace = $metadata.namespace) \#include \#include -#if($shape.hasQueryStringMembers()) +#set($needsURIHeader = $shape.hasQueryStringMembers()) +#if(!$needsURIHeader) +#foreach($member in $shape.members.entrySet()) +#if($member.value.requiresHeaderEncoding())#set($needsURIHeader = true)#end +#end +#end +#if($needsURIHeader) \#include #end #foreach($header in $typeInfo.sourceIncludes) @@ -20,7 +26,7 @@ using namespace ${rootNamespace}::${serviceNamespace}::Model; using namespace Aws::Utils::Stream; using namespace Aws::Utils; -#if($shape.hasQueryStringMembers()) +#if($needsURIHeader) using namespace Aws::Http; #end using namespace Aws; diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborRequestSource.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborRequestSource.vm index 220eb51eb3e1..be0d8fcb050d 100644 --- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborRequestSource.vm +++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/cbor/CborRequestSource.vm @@ -5,7 +5,13 @@ #set($serviceNamespace = $metadata.namespace) \#include \#include -#if($shape.hasQueryStringMembers()) +#set($needsURIHeader = $shape.hasQueryStringMembers()) +#if(!$needsURIHeader) +#foreach($member in $shape.members.entrySet()) +#if($member.value.requiresHeaderEncoding())#set($needsURIHeader = true)#end +#end +#end +#if($needsURIHeader) \#include #end #if($shape.supportsPresigning) @@ -37,7 +43,7 @@ using namespace ${rootNamespace}::${serviceNamespace}::Model; using namespace Aws::Crt::Cbor; using namespace Aws::Utils; - #if($shape.hasQueryStringMembers()) + #if($needsURIHeader) using namespace Aws::Http; #end diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/json/JsonRequestSource.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/json/JsonRequestSource.vm index 9bd6a21d4dcd..de8687918b40 100644 --- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/json/JsonRequestSource.vm +++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/json/JsonRequestSource.vm @@ -5,7 +5,13 @@ #set($serviceNamespace = $metadata.namespace) \#include \#include -#if($shape.hasQueryStringMembers()) +#set($needsURIHeader = $shape.hasQueryStringMembers()) +#if(!$needsURIHeader) +#foreach($member in $shape.members.entrySet()) +#if($member.value.requiresHeaderEncoding())#set($needsURIHeader = true)#end +#end +#end +#if($needsURIHeader) \#include #end #if($shape.supportsPresigning) @@ -36,7 +42,7 @@ using namespace ${rootNamespace}::${serviceNamespace}::Model; using namespace Aws::Utils::Json; using namespace Aws::Utils; -#if($shape.hasQueryStringMembers()) +#if($needsURIHeader) using namespace Aws::Http; #end diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/queryxml/QueryRequestSource.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/queryxml/QueryRequestSource.vm index 9f43e0856a4e..caf2a6f20711 100644 --- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/queryxml/QueryRequestSource.vm +++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/queryxml/QueryRequestSource.vm @@ -7,7 +7,13 @@ \#include \#include \#include -#if($shape.hasQueryStringMembers()) +#set($needsURIHeader = $shape.hasQueryStringMembers()) +#if(!$needsURIHeader) +#foreach($member in $shape.members.entrySet()) +#if($member.value.requiresHeaderEncoding())#set($needsURIHeader = true)#end +#end +#end +#if($needsURIHeader) \#include #end #if($shape.hasBlobMembers()) @@ -30,7 +36,7 @@ using namespace ${rootNamespace}::${serviceNamespace}::Model; using namespace Aws::Utils; -#if($shape.hasQueryStringMembers()) +#if($needsURIHeader) using namespace Aws::Http; #end diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/PutBucketNotificationConfigurationRequest.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/PutBucketNotificationConfigurationRequest.vm index 264efac67c05..2db16dc3d698 100644 --- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/PutBucketNotificationConfigurationRequest.vm +++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/s3/PutBucketNotificationConfigurationRequest.vm @@ -7,7 +7,13 @@ \#include \#include \#include -#if($shape.hasQueryStringMembers()) +#set($needsURIHeader = $shape.hasQueryStringMembers()) +#if(!$needsURIHeader) +#foreach($member in $shape.members.entrySet()) +#if($member.value.requiresHeaderEncoding())#set($needsURIHeader = true)#end +#end +#end +#if($needsURIHeader) \#include #end #foreach($header in $typeInfo.sourceIncludes) @@ -22,7 +28,7 @@ using namespace ${rootNamespace}::${serviceNamespace}::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; -#if($shape.hasQueryStringMembers()) +#if($needsURIHeader) using namespace Aws::Http; #end diff --git a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/xml/XmlRequestSource.vm b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/xml/XmlRequestSource.vm index 063f7c5e118d..1de8ac0d0998 100644 --- a/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/xml/XmlRequestSource.vm +++ b/tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/xml/XmlRequestSource.vm @@ -12,7 +12,13 @@ \#include \#include \#include -#if($shape.hasQueryStringMembers()) +#set($needsURIHeader = $shape.hasQueryStringMembers()) +#if(!$needsURIHeader) +#foreach($member in $shape.members.entrySet()) +#if($member.value.requiresHeaderEncoding())#set($needsURIHeader = true)#end +#end +#end +#if($needsURIHeader) \#include #end #foreach($header in $typeInfo.sourceIncludes) @@ -40,7 +46,7 @@ using namespace ${rootNamespace}::${serviceNamespace}::Model; using namespace Aws::Utils::Xml; using namespace Aws::Utils; -#if($shape.hasQueryStringMembers()) +#if($needsURIHeader) using namespace Aws::Http; #end