changing it to just passing in an enum

Author: kai-ion

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

@@ -103,12 +103,8 @@ namespace client
           m_errorMarshaller(std::move(errorMarshaller)),
           m_interceptors({
               Aws::MakeShared<ChecksumInterceptor>("AwsSmithyClientBase", *m_clientConfig),
-              Aws::MakeShared<features::ChunkingInterceptor>("AwsSmithyClientBase", [this]() {
-                  Aws::Client::ClientConfiguration chunkingConfig = *m_clientConfig;
-                  chunkingConfig.httpClientChunkedMode = m_httpClient->IsDefaultAwsHttpClient() ? 
-                      Aws::Client::HttpClientChunkedMode::DEFAULT : m_clientConfig->httpClientChunkedMode;
-                  return chunkingConfig;
-              }())
+              Aws::MakeShared<features::ChunkingInterceptor>("AwsSmithyClientBase", 
+                  m_httpClient->IsDefaultAwsHttpClient() ? Aws::Client::HttpClientChunkedMode::DEFAULT : m_clientConfig->httpClientChunkedMode)
           })
         {
 

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

@@ -139,8 +139,8 @@ class AwsChunkedIOStream : public Aws::IOStream {
  */
 class ChunkingInterceptor : public smithy::interceptor::Interceptor {
 public:
-    explicit ChunkingInterceptor(const Aws::Client::ClientConfiguration& config)
-        : m_httpClientChunkedMode(config.httpClientChunkedMode) {}
+    explicit ChunkingInterceptor(Aws::Client::HttpClientChunkedMode httpClientChunkedMode)
+        : m_httpClientChunkedMode(httpClientChunkedMode) {}
     ~ChunkingInterceptor() override = default;
 
     ModifyRequestOutcome ModifyBeforeSigning(smithy::interceptor::InterceptorContext& context) override {

src/aws-cpp-sdk-core/source/client/AWSClient.cpp

@@ -140,12 +140,8 @@ AWSClient::AWSClient(const Aws::Client::ClientConfiguration& configuration,
     m_enableClockSkewAdjustment(configuration.enableClockSkewAdjustment),
     m_requestCompressionConfig(configuration.requestCompressionConfig),
     m_userAgentInterceptor{Aws::MakeShared<smithy::client::UserAgentInterceptor>(AWS_CLIENT_LOG_TAG, configuration, m_retryStrategy->GetStrategyName(), m_serviceName)},
-    m_interceptors{Aws::MakeShared<smithy::client::ChecksumInterceptor>(AWS_CLIENT_LOG_TAG), Aws::MakeShared<smithy::client::features::ChunkingInterceptor>(AWS_CLIENT_LOG_TAG, [&configuration, this]() {
-        ClientConfiguration chunkingConfig = configuration;
-        chunkingConfig.httpClientChunkedMode = m_httpClient->IsDefaultAwsHttpClient() ? 
-            Aws::Client::HttpClientChunkedMode::DEFAULT : configuration.httpClientChunkedMode;
-        return chunkingConfig;
-    }()), m_userAgentInterceptor}
+    m_interceptors{Aws::MakeShared<smithy::client::ChecksumInterceptor>(AWS_CLIENT_LOG_TAG), Aws::MakeShared<smithy::client::features::ChunkingInterceptor>(AWS_CLIENT_LOG_TAG, 
+        m_httpClient->IsDefaultAwsHttpClient() ? Aws::Client::HttpClientChunkedMode::DEFAULT : configuration.httpClientChunkedMode), m_userAgentInterceptor}
 {
 }
 
@@ -171,12 +167,8 @@ AWSClient::AWSClient(const Aws::Client::ClientConfiguration& configuration,
     m_enableClockSkewAdjustment(configuration.enableClockSkewAdjustment),
     m_requestCompressionConfig(configuration.requestCompressionConfig),
     m_userAgentInterceptor{Aws::MakeShared<smithy::client::UserAgentInterceptor>(AWS_CLIENT_LOG_TAG, configuration, m_retryStrategy->GetStrategyName(), m_serviceName)},
-    m_interceptors{Aws::MakeShared<smithy::client::ChecksumInterceptor>(AWS_CLIENT_LOG_TAG, configuration), Aws::MakeShared<smithy::client::features::ChunkingInterceptor>(AWS_CLIENT_LOG_TAG, [&configuration, this]() {
-        ClientConfiguration chunkingConfig = configuration;
-        chunkingConfig.httpClientChunkedMode = m_httpClient->IsDefaultAwsHttpClient() ? 
-            Aws::Client::HttpClientChunkedMode::DEFAULT : configuration.httpClientChunkedMode;
-        return chunkingConfig;
-    }()), m_userAgentInterceptor}
+    m_interceptors{Aws::MakeShared<smithy::client::ChecksumInterceptor>(AWS_CLIENT_LOG_TAG, configuration), Aws::MakeShared<smithy::client::features::ChunkingInterceptor>(AWS_CLIENT_LOG_TAG, 
+        m_httpClient->IsDefaultAwsHttpClient() ? Aws::Client::HttpClientChunkedMode::DEFAULT : configuration.httpClientChunkedMode), m_userAgentInterceptor}
 {
 }
 

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

@@ -106,12 +106,8 @@ void AwsSmithyClientBase::baseCopyAssign(const AwsSmithyClientBase& other,
 
   m_interceptors = Aws::Vector<std::shared_ptr<interceptor::Interceptor>>{
       Aws::MakeShared<ChecksumInterceptor>("AwsSmithyClientBase", *m_clientConfig),
-      Aws::MakeShared<features::ChunkingInterceptor>("AwsSmithyClientBase", [this]() {
-          Aws::Client::ClientConfiguration chunkingConfig = *m_clientConfig;
-          chunkingConfig.httpClientChunkedMode = m_httpClient->IsDefaultAwsHttpClient() ? 
-              Aws::Client::HttpClientChunkedMode::DEFAULT : m_clientConfig->httpClientChunkedMode;
-          return chunkingConfig;
-      }())
+      Aws::MakeShared<features::ChunkingInterceptor>("AwsSmithyClientBase", 
+          m_httpClient->IsDefaultAwsHttpClient() ? Aws::Client::HttpClientChunkedMode::DEFAULT : m_clientConfig->httpClientChunkedMode)
   };
 
   baseCopyInit();

tests/aws-cpp-sdk-core-tests/utils/stream/ChunkingInterceptorTest.cpp

@@ -136,7 +136,7 @@ TEST_F(ChunkingInterceptorTest, ShouldNotApplyChunkingForCustomHttpClient) {
         config.httpClientChunkedMode = Aws::Client::HttpClientChunkedMode::CLIENT_IMPLEMENTATION;
     }
 
-    ChunkingInterceptor interceptor(config);
+    ChunkingInterceptor interceptor(config.httpClientChunkedMode);
 
     // Create request with checksum (would normally trigger chunking)
     auto request = Aws::MakeShared<StandardHttpRequest>(CHUNKING_TEST_LOG_TAG, "test.com", Http::HttpMethod::HTTP_POST);