Skip to content

codegen to add AWS namespace to Client #3736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kai-ion wants to merge 1 commit into
base: main
Choose a base branch
from
Open

codegen to add AWS namespace to Client #3736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...n/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientSourceInit.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
#if($metadata.hasEndpointDiscoveryTrait && !$serviceModel.endpointRules)
#set($AdditionalServiceSpecificConfigLoadString = "Load${metadata.classNamePrefix}SpecificConfig(config);")
#end
#set($clientConfigurationNamespace = "Client")
#set($clientConfigurationNamespace = "Aws::Client")
#set($defaultCredentialsProviderChainParam = "Aws::MakeShared<DefaultAWSCredentialsProviderChain>(ALLOCATION_TAG, clientConfiguration.credentialProviderConfig)")
#set($s3ExpressIdentityProviderParam = "clientConfiguration.identityProviderSupplier(*this)")
#set($simpleCredentialsProviderParam = "Aws::MakeShared<SimpleAWSCredentialsProvider>(ALLOCATION_TAG, credentials)")
Expand Down
2 changes: 1 addition & 1 deletion ...m/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientSourceLegacyConstructors.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
#if($metadata.hasEndpointDiscoveryTrait && !$serviceModel.endpointRules)
#set($AdditionalServiceSpecificConfigLoadString = "Load${metadata.classNamePrefix}SpecificConfig(config);")
#end
#set($clientConfigurationNamespace = "Client")
#set($clientConfigurationNamespace = "Aws::Client")
#set($defaultCredentialsProviderChainParam = "Aws::MakeShared<DefaultAWSCredentialsProviderChain>(ALLOCATION_TAG, clientConfiguration.credentialProviderConfig)")
#set($simpleCredentialsProviderParam = "Aws::MakeShared<SimpleAWSCredentialsProvider>(ALLOCATION_TAG, credentials)")
#set($hasEventStreamInputOperation = $serviceModel.hasStreamingRequestShapes())
Expand Down
4 changes: 2 additions & 2 deletions ...amazonaws/util/awsclientgenerator/velocity/cpp/common/ServiceClientConfigurationHeader.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ namespace ${rootNamespace}
}

#end
${metadata.classNamePrefix}ClientConfiguration(const Client::ClientConfigurationInitValues &configuration = {});
${metadata.classNamePrefix}ClientConfiguration(const Aws::Client::ClientConfigurationInitValues &configuration = {});

/**
* Create a configuration based on settings in the aws configuration file for the given profile name.
Expand All @@ -128,7 +128,7 @@ namespace ${rootNamespace}
#set($classNamePrefix = $metadata.classNamePrefix)
#set($clsPrefixWSpace = $classNamePrefix.replaceAll(".", " "))
#set($earlyClose = $serviceModel.metadata.serviceId != "S3")
${classNamePrefix}ClientConfiguration(const Client::ClientConfiguration& config#if($earlyClose));#else,
${classNamePrefix}ClientConfiguration(const Aws::Client::ClientConfiguration& config#if($earlyClose));#else,
#end
#if($serviceModel.metadata.serviceId == "S3")
${clsPrefixWSpace} Client::AWSAuthV4Signer::PayloadSigningPolicy iPayloadSigningPolicy = Client::AWSAuthV4Signer::PayloadSigningPolicy::Never,
Expand Down
4 changes: 2 additions & 2 deletions ...amazonaws/util/awsclientgenerator/velocity/cpp/common/ServiceClientConfigurationSource.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ void ${metadata.classNamePrefix}ClientConfiguration::Load${serviceNamespace}Spec
#end
}

${metadata.classNamePrefix}ClientConfiguration::${metadata.classNamePrefix}ClientConfiguration(const Client::ClientConfigurationInitValues &configuration)
${metadata.classNamePrefix}ClientConfiguration::${metadata.classNamePrefix}ClientConfiguration(const Aws::Client::ClientConfigurationInitValues &configuration)
: BaseClientConfigClass(configuration)#if($metadata.hasEndpointDiscoveryTrait), enableEndpointDiscovery(ClientConfiguration::enableEndpointDiscovery)#end${nl}{
Load${serviceNamespace}SpecificConfig(this->profileName);
}
Expand All @@ -171,7 +171,7 @@ ${metadata.classNamePrefix}ClientConfiguration::${metadata.classNamePrefix}Clien
#set($classNamePrefix = $metadata.classNamePrefix)
#set($clsPrefixWSpace = $classNamePrefix.replaceAll(".", " "))
#set($earlyClose = $serviceModel.metadata.serviceId != "S3")
${classNamePrefix}ClientConfiguration::${classNamePrefix}ClientConfiguration(const Client::ClientConfiguration& config#if($earlyClose))#else,
${classNamePrefix}ClientConfiguration::${classNamePrefix}ClientConfiguration(const Aws::Client::ClientConfiguration& config#if($earlyClose))#else,
#end
#if($serviceModel.metadata.serviceId == "S3")
${clsPrefixWSpace} ${clsPrefixWSpace}Client::AWSAuthV4Signer::PayloadSigningPolicy iPayloadSigningPolicy,
Expand Down
12 changes: 6 additions & 6 deletions ...urces/com/amazonaws/util/awsclientgenerator/velocity/cpp/smithy/SmithyClientSourceInit.vm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ ${className}::${className}(const std::shared_ptr<AWSCredentialsProvider>& creden

/* Legacy constructors due deprecation */
#if($serviceModel.metadata.serviceId == "S3")
${className}::${className}(const Client::ClientConfiguration& clientConfiguration,
${className}::${className}(const Aws::Client::ClientConfiguration& clientConfiguration,
Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy signPayloads /*= Never*/,
bool useVirtualAddressing /*= true*/,
Aws::S3::US_EAST_1_REGIONAL_ENDPOINT_OPTION USEast1RegionalEndPointOption):
Expand Down Expand Up @@ -208,7 +208,7 @@ ${className}::${className}(const Client::ClientConfiguration& clientConfiguratio

${className}::${className}(
const Aws::Auth::AWSCredentials& credentials,
const Client::ClientConfiguration& clientConfiguration,
const Aws::Client::ClientConfiguration& clientConfiguration,
Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy signPayloads /*= Never*/,
bool useVirtualAddressing /*= true*/,
Aws::S3::US_EAST_1_REGIONAL_ENDPOINT_OPTION USEast1RegionalEndPointOption):
Expand Down Expand Up @@ -238,7 +238,7 @@ ${className}::${className}(

${className}::${className}(
const std::shared_ptr<Aws::Auth::AWSCredentialsProvider>& credentialsProvider,
const Client::ClientConfiguration& clientConfiguration,
const Aws::Client::ClientConfiguration& clientConfiguration,
Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy signPayloads /*= Never*/,
bool useVirtualAddressing /*= true*/,
Aws::S3::US_EAST_1_REGIONAL_ENDPOINT_OPTION USEast1RegionalEndPointOption):
Expand Down Expand Up @@ -291,7 +291,7 @@ ${className}::${className}(const ${className} &rhs) :
S3Client::S3Client(${className} &&rhs) noexcept :
AwsSmithyClientT(std::move(rhs)) {}
#else
${className}::${className}(const Client::ClientConfiguration& clientConfiguration) :
${className}::${className}(const Aws::Client::ClientConfiguration& clientConfiguration) :
AwsSmithyClientT(clientConfiguration,
GetServiceName(),
"${metadata.serviceId}",
Expand All @@ -315,7 +315,7 @@ ${className}::${className}(const Client::ClientConfiguration& clientConfiguratio
{}

${className}::${className}(const AWSCredentials& credentials,
const Client::ClientConfiguration& clientConfiguration) :
const Aws::Client::ClientConfiguration& clientConfiguration) :
AwsSmithyClientT(clientConfiguration,
GetServiceName(),
"${metadata.serviceId}",
Expand Down Expand Up @@ -344,7 +344,7 @@ ${className}::${className}(const AWSCredentials& credentials,
{}

${className}::${className}(const std::shared_ptr<AWSCredentialsProvider>& credentialsProvider,
const Client::ClientConfiguration& clientConfiguration) :
const Aws::Client::ClientConfiguration& clientConfiguration) :
AwsSmithyClientT(clientConfiguration,
GetServiceName(),
"${metadata.serviceId}",
Expand Down