Merge pull request #1662 from aws/millem/maybe-fix-lemmy-i-hope

Fixed issue where handler.prepare() was being invoked after credential resolution.

Author: millems

core/aws-core/src/main/java/software/amazon/awssdk/awscore/internal/AwsExecutionContextBuilder.java

@@ -176,13 +176,9 @@ private static <InputT extends SdkRequest, OutputT extends SdkResponse> Executio
         ExecutionAttributes clientOverrideExecutionAttributes,
         ExecutionAttributes requestOverrideExecutionAttributes) {
 
-        if (clientOverrideExecutionAttributes != null) {
-            executionAttributes = clientOverrideExecutionAttributes.merge(executionAttributes);
-        }
 
-        if (requestOverrideExecutionAttributes != null) {
-            executionAttributes = requestOverrideExecutionAttributes.merge(executionAttributes);
-        }
+        executionAttributes.putAbsentAttributes(requestOverrideExecutionAttributes);
+        executionAttributes.putAbsentAttributes(clientOverrideExecutionAttributes);
 
         return executionAttributes;
     }

core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/ExecutionAttributes.java

@@ -76,6 +76,15 @@ public ExecutionAttributes merge(ExecutionAttributes lowerPrecedenceExecutionAtt
         return new ExecutionAttributes(copiedAttributes);
     }
 
+    /**
+     * Add the provided attributes to this attribute, if the provided attribute does not exist.
+     */
+    public void putAbsentAttributes(ExecutionAttributes lowerPrecedenceExecutionAttributes) {
+        if (lowerPrecedenceExecutionAttributes != null) {
+            lowerPrecedenceExecutionAttributes.getAttributes().forEach(attributes::putIfAbsent);
+        }
+    }
+
     /**
      * Set the provided attribute in this collection of attributes if it does not already exist in the collection.
      */

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/handler/BaseAsyncClientHandler.java

@@ -34,6 +34,7 @@
 import software.amazon.awssdk.core.http.Crc32Validation;
 import software.amazon.awssdk.core.http.ExecutionContext;
 import software.amazon.awssdk.core.http.HttpResponseHandler;
+import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
 import software.amazon.awssdk.core.interceptor.InterceptorContext;
 import software.amazon.awssdk.core.internal.InternalCoreExecutionAttribute;
 import software.amazon.awssdk.core.internal.http.AmazonAsyncHttpClient;
@@ -88,51 +89,47 @@ public <InputT extends SdkRequest, OutputT extends SdkResponse, ReturnT> Complet
         AsyncResponseTransformer<OutputT, ReturnT> asyncResponseTransformer) {
 
         return measureApiCallSuccess(executionParams, () -> {
-            // Running beforeExecution interceptors and modifyRequest interceptors.
-            ExecutionContext context = invokeInterceptorsAndCreateExecutionContext(executionParams);
+            if (executionParams.getCombinedResponseHandler() != null) {
+                // There is no support for catching errors in a body for streaming responses. Our codegen must never
+                // attempt to do this.
+                throw new IllegalArgumentException("A streaming 'asyncResponseTransformer' may not be used when a "
+                                                   + "'combinedResponseHandler' has been specified in a "
+                                                   + "ClientExecutionParams object.");
+            }
 
-            TransformingAsyncResponseHandler<Response<ReturnT>> combinedResponseHandler =
-                createStreamingCombinedResponseHandler(executionParams, asyncResponseTransformer, context);
+            ExecutionAttributes executionAttributes = executionParams.executionAttributes();
+            executionAttributes.putAttribute(InternalCoreExecutionAttribute.EXECUTION_ATTEMPT, 1);
 
-            return doExecute(executionParams, context, combinedResponseHandler);
-        });
-    }
+            AsyncStreamingResponseHandler<OutputT, ReturnT> asyncStreamingResponseHandler =
+                new AsyncStreamingResponseHandler<>(asyncResponseTransformer);
 
-    private <InputT extends SdkRequest, OutputT extends SdkResponse, ReturnT> TransformingAsyncResponseHandler<Response<ReturnT>>
-        createStreamingCombinedResponseHandler(ClientExecutionParams<InputT, OutputT> executionParams,
-                                               AsyncResponseTransformer<OutputT, ReturnT> asyncResponseTransformer,
-                                               ExecutionContext context) {
-        if (executionParams.getCombinedResponseHandler() != null) {
-            // There is no support for catching errors in a body for streaming responses. Our codegen must never
-            // attempt to do this.
-            throw new IllegalArgumentException("A streaming 'asyncResponseTransformer' may not be used when a "
-                                               + "'combinedResponseHandler' has been specified in a "
-                                               + "ClientExecutionParams object.");
-        }
+            // For streaming requests, prepare() should be called as early as possible to avoid NPE in client
+            // See https://github.com/aws/aws-sdk-java-v2/issues/1268. We do this with a wrapper that caches the prepare
+            // result until the execution attempt number changes. This guarantees that prepare is only called once per
+            // execution.
+            TransformingAsyncResponseHandler<ReturnT> wrappedAsyncStreamingResponseHandler =
+                IdempotentAsyncResponseHandler.create(
+                    asyncStreamingResponseHandler,
+                    () -> executionAttributes.getAttribute(InternalCoreExecutionAttribute.EXECUTION_ATTEMPT),
+                    Integer::equals);
+            wrappedAsyncStreamingResponseHandler.prepare();
 
-        AsyncStreamingResponseHandler<OutputT, ReturnT> asyncStreamingResponseHandler =
-            new AsyncStreamingResponseHandler<>(asyncResponseTransformer);
+            // Running beforeExecution interceptors and modifyRequest interceptors.
+            ExecutionContext context = invokeInterceptorsAndCreateExecutionContext(executionParams);
 
-        // For streaming requests, prepare() should be called as early as possible to avoid NPE in client
-        // See https://github.com/aws/aws-sdk-java-v2/issues/1268. We do this with a wrapper that caches the prepare
-        // result until the execution attempt number changes. This guarantees that prepare is only called once per
-        // execution.
-        TransformingAsyncResponseHandler<ReturnT> wrappedAsyncStreamingResponseHandler =
-            IdempotentAsyncResponseHandler.create(
-                asyncStreamingResponseHandler,
-                () -> context.executionAttributes().getAttribute(InternalCoreExecutionAttribute.EXECUTION_ATTEMPT),
-                Integer::equals);
-        wrappedAsyncStreamingResponseHandler.prepare();
+            HttpResponseHandler<OutputT> decoratedResponseHandlers =
+                decorateResponseHandlers(executionParams.getResponseHandler(), context);
 
-        HttpResponseHandler<OutputT> decoratedResponseHandlers =
-            decorateResponseHandlers(executionParams.getResponseHandler(), context);
+            asyncStreamingResponseHandler.responseHandler(decoratedResponseHandlers);
 
-        asyncStreamingResponseHandler.responseHandler(decoratedResponseHandlers);
+            TransformingAsyncResponseHandler<? extends SdkException> errorHandler =
+                resolveErrorResponseHandler(executionParams.getErrorResponseHandler(), context, crc32Validator);
 
-        TransformingAsyncResponseHandler<? extends SdkException> errorHandler =
-            resolveErrorResponseHandler(executionParams.getErrorResponseHandler(), context, crc32Validator);
+            TransformingAsyncResponseHandler<Response<ReturnT>> combinedResponseHandler =
+                new CombinedResponseAsyncHttpResponseHandler<>(wrappedAsyncStreamingResponseHandler, errorHandler);
 
-        return new CombinedResponseAsyncHttpResponseHandler<>(wrappedAsyncStreamingResponseHandler, errorHandler);
+            return doExecute(executionParams, context, combinedResponseHandler);
+        });
     }
 
     private <InputT extends SdkRequest, OutputT extends SdkResponse> TransformingAsyncResponseHandler<Response<OutputT>>