added testing for httpclient override

Author: kai-ion

src/aws-cpp-sdk-core/include/smithy/client/AwsSmithyClientBase.h

@@ -21,6 +21,7 @@
 #include <aws/core/utils/Outcome.h>
 #include <aws/core/NoResult.h>
 #include <aws/core/http/HttpClientFactory.h>
+#include <aws/core/http/HttpClient.h>
 #include <aws/core/client/AWSErrorMarshaller.h>
 #include <aws/core/AmazonWebServiceResult.h>
 #include <utility>
@@ -99,12 +100,19 @@ namespace client
           m_serviceName(std::move(serviceName)),
           m_serviceUserAgentName(std::move(serviceUserAgentName)),
           m_httpClient(std::move(httpClient)),
-          m_errorMarshaller(std::move(errorMarshaller)),
-          m_interceptors{
-              Aws::MakeShared<ChecksumInterceptor>("AwsSmithyClientBase", *m_clientConfig),
-              Aws::MakeShared<features::ChunkingInterceptor>("AwsSmithyClientBase", *m_clientConfig)
-          }
+          m_errorMarshaller(std::move(errorMarshaller))
         {
+            // Create modified config for chunking interceptor
+            Aws::Client::ClientConfiguration chunkingConfig(*m_clientConfig);
+            if (!m_httpClient->IsDefaultAwsHttpClient()) {
+                chunkingConfig.httpClientChunkedMode = Aws::Client::HttpClientChunkedMode::CLIENT_IMPLEMENTATION;
+            }
+            
+            m_interceptors = {
+                Aws::MakeShared<ChecksumInterceptor>("AwsSmithyClientBase", *m_clientConfig),
+                Aws::MakeShared<features::ChunkingInterceptor>("AwsSmithyClientBase", chunkingConfig)
+            };
+            
             baseInit();
         }
 

src/aws-cpp-sdk-core/source/smithy/client/AwsSmithyClientBase.cpp

@@ -103,10 +103,17 @@ void AwsSmithyClientBase::baseCopyAssign(const AwsSmithyClientBase& other,
   m_serviceUserAgentName = other.m_serviceUserAgentName;
   m_httpClient = std::move(httpClient);
   m_errorMarshaller = std::move(errorMarshaller);
-  m_interceptors = Aws::Vector<std::shared_ptr<interceptor::Interceptor>>{Aws::MakeShared<ChecksumInterceptor>("AwsSmithyClientBase", *m_clientConfig)};
-  if (m_clientConfig->httpClientChunkedMode == Aws::Client::HttpClientChunkedMode::DEFAULT) {
-      m_interceptors.emplace_back(Aws::MakeShared<features::ChunkingInterceptor>("AwsSmithyClientBase", *m_clientConfig));
+  
+  // Create modified config for chunking interceptor
+  Aws::Client::ClientConfiguration chunkingConfig(*m_clientConfig);
+  if (!m_httpClient->IsDefaultAwsHttpClient()) {
+    chunkingConfig.httpClientChunkedMode = Aws::Client::HttpClientChunkedMode::CLIENT_IMPLEMENTATION;
   }
+  
+  m_interceptors = Aws::Vector<std::shared_ptr<interceptor::Interceptor>>{
+      Aws::MakeShared<ChecksumInterceptor>("AwsSmithyClientBase", *m_clientConfig),
+      Aws::MakeShared<features::ChunkingInterceptor>("AwsSmithyClientBase", chunkingConfig)
+  };
 
   baseCopyInit();
 }