Updated EndpointDiscoveryHandler to use correct sync/async versions for getting credentials.

Author: ashishdhingra

sdk/src/Core/Amazon.Runtime/Pipeline/Handlers/EndpointDiscoveryHandler.cs

@@ -38,7 +38,9 @@ public override void InvokeSync(IExecutionContext executionContext)
         {
             var requestContext = executionContext.RequestContext;
             var regionalEndpoint = requestContext.Request.Endpoint;
-            PreInvoke(executionContext);
+            var immutableCredentials = (requestContext.Identity as AWSCredentials)?.GetCredentials();
+
+            PreInvoke(executionContext, immutableCredentials);
 
             try
             {
@@ -49,7 +51,7 @@ public override void InvokeSync(IExecutionContext executionContext)
             {        
                 if (IsInvalidEndpointException(exception))
                 {
-                    EvictCacheKeyForRequest(requestContext, regionalEndpoint);
+                    EvictCacheKeyForRequest(requestContext, regionalEndpoint, immutableCredentials);
                 }
 
                 throw;
@@ -69,7 +71,9 @@ public override async System.Threading.Tasks.Task<T> InvokeAsync<T>(IExecutionCo
         {
             var requestContext = executionContext.RequestContext;
             var regionalEndpoint = requestContext.Request.Endpoint;
-            PreInvoke(executionContext);
+            var immutableCredentials = await ((requestContext.Identity as AWSCredentials)?.GetCredentialsAsync()).ConfigureAwait(false);
+
+            PreInvoke(executionContext, immutableCredentials);
 
             try
             {
@@ -80,7 +84,7 @@ public override async System.Threading.Tasks.Task<T> InvokeAsync<T>(IExecutionCo
                 var capturedException = System.Runtime.ExceptionServices.ExceptionDispatchInfo.Capture(exception);
                 if (IsInvalidEndpointException(capturedException.SourceException))
                 {
-                    EvictCacheKeyForRequest(requestContext, regionalEndpoint);
+                    EvictCacheKeyForRequest(requestContext, regionalEndpoint, immutableCredentials);
                 }
 
                 capturedException.Throw();
@@ -94,22 +98,22 @@ public override async System.Threading.Tasks.Task<T> InvokeAsync<T>(IExecutionCo
         /// Resolves the endpoint to be used for the current request
         /// before invoking the next handler.
         /// </summary>
-        /// <param name="executionContext">The execution context, it contains the
-        /// request and response context.</param>                
-        protected static void PreInvoke(IExecutionContext executionContext)
+        /// <param name="executionContext">The execution context, it contains the request and response context.</param>        
+        /// <param name="credentials">The AWS credentials for the account making the service call.</param>
+        protected static void PreInvoke(IExecutionContext executionContext, ImmutableCredentials credentials)
         {    
-            DiscoverEndpoints(executionContext.RequestContext, false);
+            DiscoverEndpoints(executionContext.RequestContext, false, credentials);
         }
 
-        public static void EvictCacheKeyForRequest(IRequestContext requestContext, Uri regionalEndpoint)
+        public static void EvictCacheKeyForRequest(IRequestContext requestContext, Uri regionalEndpoint, ImmutableCredentials credentials)
         {
-            DiscoverEndpoints(requestContext, true);
+            DiscoverEndpoints(requestContext, true, credentials);
             requestContext.Request.Endpoint = regionalEndpoint;
         }
 
-        public static void DiscoverEndpoints(IRequestContext requestContext, bool evictCacheKey)
+        public static void DiscoverEndpoints(IRequestContext requestContext, bool evictCacheKey, ImmutableCredentials credentials)
         {
-            var discoveryEndpoints = ProcessEndpointDiscovery(requestContext, evictCacheKey, requestContext.Request.Endpoint);
+            var discoveryEndpoints = ProcessEndpointDiscovery(requestContext, evictCacheKey, requestContext.Request.Endpoint, credentials);
             if (discoveryEndpoints != null)
             {
                 foreach (var endpoint in discoveryEndpoints)
@@ -130,12 +134,11 @@ public static void DiscoverEndpoints(IRequestContext requestContext, bool evictC
             }
         }
 
-        private static IEnumerable<DiscoveryEndpointBase> ProcessEndpointDiscovery(IRequestContext requestContext, bool evictCacheKey, Uri evictUri)
+        private static IEnumerable<DiscoveryEndpointBase> ProcessEndpointDiscovery(IRequestContext requestContext, bool evictCacheKey, Uri evictUri, ImmutableCredentials credentials)
         {    
             var options = requestContext.Options;
-            var immutableCredentials = (requestContext.Identity as AWSCredentials)?.GetCredentials();
 
-            if (options.EndpointDiscoveryMarshaller != null && options.EndpointOperation != null && immutableCredentials != null)
+            if (options.EndpointDiscoveryMarshaller != null && options.EndpointOperation != null && credentials != null)
             {
                 //Endpoint discovery is supported by this operation and we have an endpoint operation available to use                
                 var endpointDiscoveryData = options.EndpointDiscoveryMarshaller.Marshall(requestContext.OriginalRequest);
@@ -144,7 +147,7 @@ private static IEnumerable<DiscoveryEndpointBase> ProcessEndpointDiscovery(IRequ
                 {
                     operationName = AWSSDKUtils.ExtractOperationName(requestContext.RequestName);
                 }
-                return options.EndpointOperation(new EndpointOperationContext(immutableCredentials.AccessKey, operationName, endpointDiscoveryData, evictCacheKey, evictUri));
+                return options.EndpointOperation(new EndpointOperationContext(credentials.AccessKey, operationName, endpointDiscoveryData, evictCacheKey, evictUri));
             }
 
             return null;