move interceptor validation after error parsing

Author: sbiscigl

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

@@ -619,16 +619,6 @@ HttpResponseOutcome AWSClient::AttemptOneRequest(const std::shared_ptr<Aws::Http
         *m_telemetryProvider->getMeter(this->GetServiceClientName(), {}),
         {{TracingUtils::SMITHY_METHOD_DIMENSION, request.GetServiceRequestName()},{TracingUtils::SMITHY_SERVICE_DIMENSION, this->GetServiceClientName()}});
 
-    context.SetTransmitResponse(httpResponse);
-    for (const auto& interceptor : m_interceptors)
-    {
-        const auto modifiedRequest = interceptor->ModifyBeforeDeserialization(context);
-        if (!modifiedRequest.IsSuccess())
-        {
-            return modifiedRequest.GetError();
-        }
-    }
-
     if (DoesResponseGenerateError(httpResponse) )
     {
         AWS_LOGSTREAM_DEBUG(AWS_CLIENT_LOG_TAG, "Request returned error. Attempting to generate appropriate error codes from response");
@@ -643,6 +633,14 @@ HttpResponseOutcome AWSClient::AttemptOneRequest(const std::shared_ptr<Aws::Http
         return HttpResponseOutcome(std::move(error) );
     }
 
+    context.SetTransmitResponse(httpResponse);
+    for (const auto& interceptor : m_interceptors) {
+      const auto modifiedRequest = interceptor->ModifyBeforeDeserialization(context);
+      if (!modifiedRequest.IsSuccess()) {
+        return modifiedRequest.GetError();
+      }
+    }
+
     AWS_LOGSTREAM_DEBUG(AWS_CLIENT_LOG_TAG, "Request returned successful response.");
 
     return HttpResponseOutcome(std::move(httpResponse));

tests/aws-cpp-sdk-s3-unit-tests/S3UnitTests.cpp

@@ -1,21 +1,23 @@
-#include <gtest/gtest.h>
 #include <aws/core/Aws.h>
 #include <aws/core/auth/AWSCredentials.h>
 #include <aws/core/client/RetryStrategy.h>
 #include <aws/core/utils/HashingUtils.h>
 #include <aws/core/utils/base64/Base64.h>
 #include <aws/core/utils/crypto/CRC64.h>
 #include <aws/s3/S3Client.h>
+#include <aws/s3/S3ErrorMarshaller.h>
+#include <aws/s3/model/CopyObjectRequest.h>
 #include <aws/s3/model/DeleteObjectsRequest.h>
+#include <aws/s3/model/GetObjectRequest.h>
+#include <aws/s3/model/HeadBucketRequest.h>
+#include <aws/s3/model/ListObjectsV2Request.h>
 #include <aws/s3/model/PutObjectRequest.h>
-#include <aws/s3/model/CopyObjectRequest.h>
-#include <aws/testing/mocks/http/MockHttpClient.h>
 #include <aws/testing/AwsTestHelpers.h>
 #include <aws/testing/MemoryTesting.h>
+#include <aws/testing/mocks/http/MockHttpClient.h>
+#include <gtest/gtest.h>
+
 #include <memory>
-#include <aws/s3/S3ErrorMarshaller.h>
-#include <aws/s3/model/HeadBucketRequest.h>
-#include <aws/s3/model/ListObjectsV2Request.h>
 
 using namespace Aws;
 using namespace Aws::Client;
@@ -705,3 +707,22 @@ TEST_F(S3UnitTest, ListObjectsV2PaginatorShouldHaveCMetric) {
     [](const Aws::String& value) { return value.find("m/") != Aws::String::npos && value.find("C") != Aws::String::npos; });
   EXPECT_TRUE(businessMetrics != userAgentParsed.end());
 }
+
+TEST_F(S3UnitTest, TestGetObjectTimeoutShouldReturnTimeoutError) {
+  auto request = GetObjectRequest().WithBucket("test-bucket").WithKey("test-key");
+
+  auto mockRequest = Aws::MakeShared<Standard::StandardHttpRequest>(ALLOCATION_TAG, "test-bucket.s3.amazonaws.com/", HttpMethod::HTTP_GET);
+  mockRequest->SetResponseStreamFactory(
+      []() -> IOStream* { return Aws::New<StringStream>(ALLOCATION_TAG, "", std::ios_base::in | std::ios_base::binary); });
+  auto mockResponse = Aws::MakeShared<Standard::StandardHttpResponse>(ALLOCATION_TAG, mockRequest);
+  mockResponse->SetResponseCode(HttpResponseCode::NETWORK_CONNECT_TIMEOUT);
+  mockResponse->AddHeader("x-amz-checksum-crc32", "1f2e4daa");
+  _mockHttpClient->AddResponseToReturn(mockResponse,
+                                       [](Aws::IOStream& response) -> void { response << "The distance between what is said"; });
+
+  const auto response = _s3Client->GetObject(request);
+  EXPECT_FALSE(response.IsSuccess());
+  const auto& error = response.GetError();
+  EXPECT_EQ(error.GetResponseCode(), HttpResponseCode::NETWORK_CONNECT_TIMEOUT);
+  EXPECT_TRUE(error.ShouldRetry());
+}