override buildinparameters

Author: kai-ion

generated/src/aws-cpp-sdk-s3/source/S3Client.cpp

@@ -7,7 +7,6 @@
 #include <aws/core/auth/AWSCredentialsProviderChain.h>
 #include <aws/core/client/CoreErrors.h>
 #include <aws/core/client/RetryStrategy.h>
-#include <aws/core/config/EndpointResolver.h>
 #include <aws/core/http/HttpClient.h>
 #include <aws/core/http/HttpClientFactory.h>
 #include <aws/core/http/HttpResponse.h>
@@ -306,10 +305,7 @@ void S3Client::init(const S3::S3ClientConfiguration& config) {
     m_clientConfiguration.executor = m_clientConfiguration.configFactories.executorCreateFn();
   }
   AWS_CHECK_PTR(SERVICE_NAME, m_endpointProvider);
-  m_endpointProvider->InitBuiltInParameters(config);
-  if (config.endpointOverride.empty()) {
-    Aws::Config::EndpointResolver::EndpointSource("s3", config.profileName, *m_endpointProvider);
-  }
+  m_endpointProvider->InitBuiltInParameters(config, "s3");
 }
 
 void S3Client::OverrideEndpoint(const Aws::String& endpoint) {

src/aws-cpp-sdk-core/include/aws/core/endpoint/BuiltInParameters.h

@@ -26,6 +26,8 @@ namespace Aws
 
             virtual void SetFromClientConfiguration(const Client::ClientConfiguration& config);
             virtual void SetFromClientConfiguration(const Client::GenericClientConfiguration& config);
+            virtual void SetFromClientConfiguration(const Client::ClientConfiguration& config, const Aws::String& serviceName);
+            virtual void SetFromClientConfiguration(const Client::GenericClientConfiguration& config, const Aws::String& serviceName);
 
             virtual void OverrideEndpoint(const Aws::String& endpoint, const Aws::Http::Scheme& scheme = Aws::Http::Scheme::HTTPS);
 

src/aws-cpp-sdk-core/include/aws/core/endpoint/DefaultEndpointProvider.h

@@ -67,6 +67,11 @@ namespace Aws
                 m_builtInParameters.SetFromClientConfiguration(config);
             }
 
+            void InitBuiltInParameters(const ClientConfigurationT& config, const Aws::String& serviceName) override
+            {
+                m_builtInParameters.SetFromClientConfiguration(config, serviceName);
+            }
+
             /**
              * Default implementation of the ResolveEndpoint
              */

src/aws-cpp-sdk-core/include/aws/core/endpoint/EndpointProviderBase.h

@@ -49,6 +49,14 @@ namespace Aws
              */
             virtual void InitBuiltInParameters(const ClientConfigurationT& config) = 0;
 
+            /**
+             * Initialize client context parameters from a ClientConfiguration with service name
+             */
+            virtual void InitBuiltInParameters(const ClientConfigurationT& config, const Aws::String&)
+            {
+                InitBuiltInParameters(config);
+            }
+
             /**
              * Function to override endpoint, i.e. to set built-in parameter "AWS::Endpoint"
              */

src/aws-cpp-sdk-core/source/endpoint/BuiltInParameters.cpp

@@ -5,6 +5,7 @@
 
 #include <aws/core/endpoint/BuiltInParameters.h>
 #include <aws/core/utils/logging/LogMacros.h>
+#include <aws/core/config/EndpointResolver.h>
 
 static const char ENDPOINT_BUILTIN_LOG_TAG[] = "EndpointBuiltInParameters";
 
@@ -78,6 +79,51 @@ namespace Endpoint
         return SetFromClientConfiguration(static_cast<const Client::ClientConfiguration&>(config));
     }
 
+    void BuiltInParameters::SetFromClientConfiguration(const Client::ClientConfiguration& config, const Aws::String& serviceName)
+    {
+        bool forceFIPS = false;
+        static const char* AWS_REGION = "Region";
+        if (!config.region.empty()) {
+            static const char* FIPS_PREFIX = "fips-";
+            static const char* FIPS_SUFFIX = "-fips";
+            if (config.region.rfind(FIPS_PREFIX, 0) == 0) {
+                Aws::String regionOverride = config.region.substr(strlen(FIPS_PREFIX));
+                forceFIPS = true;
+                SetStringParameter(AWS_REGION, regionOverride);
+            } else if (StringEndsWith(config.region, FIPS_SUFFIX)) {
+                Aws::String regionOverride = config.region.substr(0, config.region.size() - strlen(FIPS_SUFFIX));
+                forceFIPS = true;
+                SetStringParameter(AWS_REGION, regionOverride);
+            } else {
+                SetStringParameter(AWS_REGION, config.region);
+            }
+        }
+
+        static const char* AWS_USE_FIPS = "UseFIPS";
+        SetBooleanParameter(AWS_USE_FIPS, config.useFIPS || forceFIPS);
+
+        static const char* AWS_USE_DUAL_STACK = "UseDualStack";
+        SetBooleanParameter(AWS_USE_DUAL_STACK, config.useDualStack);
+
+        if (!config.endpointOverride.empty()) {
+            OverrideEndpoint(config.endpointOverride, config.scheme);
+            if (config.region.empty()) {
+                AWS_LOGSTREAM_WARN(ENDPOINT_BUILTIN_LOG_TAG,
+                                   "Endpoint is overridden but region is not set. "
+                                   "Region is required my many endpoint rule sets to resolve the endpoint. "
+                                   "And it is required to compute an aws signature.");
+                SetStringParameter(AWS_REGION, "region-not-set");
+            }
+        } else if (!serviceName.empty()) {
+            Aws::Config::EndpointResolver::EndpointSource(serviceName, config.profileName, *this);
+        }
+    }
+
+    void BuiltInParameters::SetFromClientConfiguration(const Client::GenericClientConfiguration& config, const Aws::String& serviceName)
+    {
+        return SetFromClientConfiguration(static_cast<const Client::ClientConfiguration&>(config), serviceName);
+    }
+
     const BuiltInParameters::EndpointParameter& BuiltInParameters::GetParameter(const Aws::String& name) const
     {
         const auto foundIt = std::find_if(m_params.begin(), m_params.end(),

tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientSourceHeaders.vm

@@ -24,7 +24,6 @@
 #end
 \#include <aws/${metadata.projectName}/${metadata.classNamePrefix}ErrorMarshaller.h>
 #if($serviceModel.endpointRules)
-\#include <aws/core/config/EndpointResolver.h>
 \#include <aws/${metadata.projectName}/${metadata.classNamePrefix}EndpointProvider.h>
 #else
 #if($arnEndpointSupported)

tools/code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/ServiceClientSourceInit.vm

@@ -346,10 +346,7 @@ void ${className}::init(const ${clientConfigurationCls}& config)
   }
 #if($serviceModel.endpointRules)
   AWS_CHECK_PTR(SERVICE_NAME, m_endpointProvider);
-  m_endpointProvider->InitBuiltInParameters(config);
-  if (config.endpointOverride.empty()) {
-    Aws::Config::EndpointResolver::EndpointSource("${metadata.signingName}", config.profileName, *m_endpointProvider);
-  }
+  m_endpointProvider->InitBuiltInParameters(config, "${metadata.signingName}");
 #if($AdditionalServiceSpecificConfigLoadString)
   ${AdditionalServiceSpecificConfigLoadString}
 #end##if($AdditionalServiceSpecificConfigLoadString)