Deprecate IS_DISCOVERED_ENDPOINT, add SKIP_ENDPOINT_RESOLUTION attribute

codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules/EndpointResolverInterceptorSpec.java

@@ -172,8 +172,8 @@ private MethodSpec modifyRequestMethod(String endpointAuthSchemeStrategyFieldNam
         String providerVar = "provider";
 
         b.addStatement("$T result = context.request()", SdkRequest.class);
-        // We skip resolution if the source of the endpoint is the endpoint discovery call
-        b.beginControlFlow("if ($1T.endpointIsDiscovered(executionAttributes))",
+        // We skip resolution if endpoint resolution should be skipped (e.g., endpoint discovery or pre-signed URLs)
+        b.beginControlFlow("if ($1T.skipEndpointResolution(executionAttributes))",
                            endpointRulesSpecUtils.rulesRuntimeClassName("AwsEndpointProviderUtils"));
         b.addStatement("return result");
         b.endControlFlow();

codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules/RequestEndpointInterceptorSpec.java

@@ -64,8 +64,8 @@ private MethodSpec modifyHttpRequestMethod() {
                                          .addParameter(ExecutionAttributes.class, "executionAttributes");
 
 
-        // We skip setting the endpoint here if the source of the endpoint is the endpoint discovery call
-        b.beginControlFlow("if ($1T.endpointIsDiscovered(executionAttributes))",
+        // We skip setting the endpoint here if endpoint resolution should be skipped
+        b.beginControlFlow("if ($1T.skipEndpointResolution(executionAttributes))",
                            endpointRulesSpecUtils.rulesRuntimeClassName("AwsEndpointProviderUtils"))
          .addStatement("return context.httpRequest()")
          .endControlFlow().build();

codegen/src/main/resources/software/amazon/awssdk/codegen/rules/AwsEndpointProviderUtils.java.resource

@@ -66,11 +66,24 @@ public final class AwsEndpointProviderUtils {
     /**
      * True if the the {@link SdkInternalExecutionAttribute#IS_DISCOVERED_ENDPOINT} attribute is present and its value
      * is {@code true}, {@code false} otherwise.
+     *
+     * @deprecated Use {@link #skipEndpointResolution(ExecutionAttributes)} instead.
      */
+    @Deprecated
     public static boolean endpointIsDiscovered(ExecutionAttributes attrs) {
         return attrs.getOptionalAttribute(SdkInternalExecutionAttribute.IS_DISCOVERED_ENDPOINT).orElse(false);
     }
 
+    /**
+     * True if endpoint resolution should be skipped for the current request. This returns {@code true} if either
+     * {@link SdkInternalExecutionAttribute#SKIP_ENDPOINT_RESOLUTION} or
+     * {@link SdkInternalExecutionAttribute#IS_DISCOVERED_ENDPOINT} is set to {@code true}.
+     */
+    public static boolean skipEndpointResolution(ExecutionAttributes attrs) {
+        return attrs.getOptionalAttribute(SdkInternalExecutionAttribute.SKIP_ENDPOINT_RESOLUTION).orElse(false)
+               || attrs.getOptionalAttribute(SdkInternalExecutionAttribute.IS_DISCOVERED_ENDPOINT).orElse(false);
+    }
+
     /**
      * True if the the {@link SdkInternalExecutionAttribute#DISABLE_HOST_PREFIX_INJECTION} attribute is present and its
      * value is {@code true}, {@code false} otherwise.

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/rules/endpoint-resolve-interceptor-preSra.java

@@ -62,7 +62,7 @@ public QueryResolveEndpointInterceptor() {
     @Override
     public SdkRequest modifyRequest(Context.ModifyRequest context, ExecutionAttributes executionAttributes) {
         SdkRequest result = context.request();
-        if (AwsEndpointProviderUtils.endpointIsDiscovered(executionAttributes)) {
+        if (AwsEndpointProviderUtils.skipEndpointResolution(executionAttributes)) {
             return result;
         }
         QueryEndpointProvider provider = (QueryEndpointProvider) executionAttributes

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/rules/endpoint-resolve-interceptor-with-endpointsbasedauth.java

@@ -50,7 +50,7 @@ public final class QueryResolveEndpointInterceptor implements ExecutionIntercept
     @Override
     public SdkRequest modifyRequest(Context.ModifyRequest context, ExecutionAttributes executionAttributes) {
         SdkRequest result = context.request();
-        if (AwsEndpointProviderUtils.endpointIsDiscovered(executionAttributes)) {
+        if (AwsEndpointProviderUtils.skipEndpointResolution(executionAttributes)) {
             return result;
         }
         QueryEndpointProvider provider = (QueryEndpointProvider) executionAttributes

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/rules/endpoint-resolve-interceptor-with-multiauthsigv4a.java

@@ -39,7 +39,7 @@ public final class DatabaseResolveEndpointInterceptor implements ExecutionInterc
     @Override
     public SdkRequest modifyRequest(Context.ModifyRequest context, ExecutionAttributes executionAttributes) {
         SdkRequest result = context.request();
-        if (AwsEndpointProviderUtils.endpointIsDiscovered(executionAttributes)) {
+        if (AwsEndpointProviderUtils.skipEndpointResolution(executionAttributes)) {
             return result;
         }
         DatabaseEndpointProvider provider = (DatabaseEndpointProvider) executionAttributes

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/rules/endpoint-resolve-interceptor-with-stringarray.java

@@ -41,7 +41,7 @@ public final class SampleSvcResolveEndpointInterceptor implements ExecutionInter
     @Override
     public SdkRequest modifyRequest(Context.ModifyRequest context, ExecutionAttributes executionAttributes) {
         SdkRequest result = context.request();
-        if (AwsEndpointProviderUtils.endpointIsDiscovered(executionAttributes)) {
+        if (AwsEndpointProviderUtils.skipEndpointResolution(executionAttributes)) {
             return result;
         }
         SampleSvcEndpointProvider provider = (SampleSvcEndpointProvider) executionAttributes

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/rules/endpoint-resolve-interceptor.java

@@ -50,7 +50,7 @@ public final class QueryResolveEndpointInterceptor implements ExecutionIntercept
     @Override
     public SdkRequest modifyRequest(Context.ModifyRequest context, ExecutionAttributes executionAttributes) {
         SdkRequest result = context.request();
-        if (AwsEndpointProviderUtils.endpointIsDiscovered(executionAttributes)) {
+        if (AwsEndpointProviderUtils.skipEndpointResolution(executionAttributes)) {
             return result;
         }
         QueryEndpointProvider provider = (QueryEndpointProvider) executionAttributes

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/rules/request-set-endpoint-interceptor.java

@@ -14,7 +14,7 @@
 public final class QueryRequestSetEndpointInterceptor implements ExecutionInterceptor {
     @Override
     public SdkHttpRequest modifyHttpRequest(Context.ModifyHttpRequest context, ExecutionAttributes executionAttributes) {
-        if (AwsEndpointProviderUtils.endpointIsDiscovered(executionAttributes)) {
+        if (AwsEndpointProviderUtils.skipEndpointResolution(executionAttributes)) {
             return context.httpRequest();
         }
         Endpoint endpoint = executionAttributes.getAttribute(SdkInternalExecutionAttribute.RESOLVED_ENDPOINT);

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

@@ -125,10 +125,22 @@ public final class SdkInternalExecutionAttribute extends SdkExecutionAttribute {
 
     /**
      * Whether the endpoint on the request is the result of Endpoint Discovery.
+     *
+     * @deprecated This attribute is specific to the endpoint discovery feature and should not be used to skip endpoint
+     * resolution; use {@link #SKIP_ENDPOINT_RESOLUTION} instead.
      */
+    @Deprecated
     public static final ExecutionAttribute<Boolean> IS_DISCOVERED_ENDPOINT =
         new ExecutionAttribute<>("IsDiscoveredEndpoint");
 
+    /**
+     * Whether endpoint resolution should be skipped for the current request. When set to {@code true}, the SDK will not
+     * invoke the endpoint provider and will use the endpoint already set on the request. This is used for pre-signed URL
+     * operations and other scenarios where the endpoint is already fully resolved.
+     */
+    public static final ExecutionAttribute<Boolean> SKIP_ENDPOINT_RESOLUTION =
+        new ExecutionAttribute<>("SkipEndpointResolution");
+
     /**
      * The nano time that the current API call attempt began.
      */

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

@@ -96,7 +96,7 @@ private static SdkHttpFullRequest modifyEndpointHostIfNeeded(SdkHttpFullRequest
                                                                  ClientExecutionParams executionParams) {
         if (executionParams.discoveredEndpoint() != null) {
             URI discoveredEndpoint = executionParams.discoveredEndpoint();
-            executionParams.putExecutionAttribute(SdkInternalExecutionAttribute.IS_DISCOVERED_ENDPOINT, true);
+            executionParams.putExecutionAttribute(SdkInternalExecutionAttribute.SKIP_ENDPOINT_RESOLUTION, true);
             return originalRequest.toBuilder().host(discoveredEndpoint.getHost()).port(discoveredEndpoint.getPort()).build();
         }
 

services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/presignedurl/DefaultAsyncPresignedUrlExtension.java

@@ -135,8 +135,7 @@ public <ReturnT> CompletableFuture<ReturnT> getObject(
                             .withRequestConfiguration(clientConfiguration)
                             .withInput(internalRequest)
                             .withMetricCollector(apiCallMetricCollector)
-                            // TODO: Deprecate IS_DISCOVERED_ENDPOINT, use new SKIP_ENDPOINT_RESOLUTION for better semantics
-                            .putExecutionAttribute(SdkInternalExecutionAttribute.IS_DISCOVERED_ENDPOINT, true)
+                            .putExecutionAttribute(SdkInternalExecutionAttribute.SKIP_ENDPOINT_RESOLUTION, true)
                             .putExecutionAttribute(SdkInternalExecutionAttribute.HTTP_CHECKSUM,
                                           checksumConfigForUrl(presignedUrlDownloadRequest.presignedUrl()))
                             .withMarshaller(new PresignedUrlDownloadRequestMarshaller(protocolFactory)),

test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/endpointproviders/AwsEndpointProviderUtilsTest.java

@@ -66,6 +66,13 @@ public void endpointIsDiscovered_attrIsTrue_returnsTrue() {
         assertThat(AwsEndpointProviderUtils.endpointIsDiscovered(attrs)).isTrue();
     }
 
+    @Test
+    public void skipEndpointResolution_skipAttrIsTrue_returnsTrue() {
+        ExecutionAttributes attrs = new ExecutionAttributes();
+        attrs.putAttribute(SdkInternalExecutionAttribute.SKIP_ENDPOINT_RESOLUTION, true);
+        assertThat(AwsEndpointProviderUtils.skipEndpointResolution(attrs)).isTrue();
+    }
+
     @Test
     public void disableHostPrefixInjection_attrIsFalse_returnsFalse() {
         ExecutionAttributes attrs = new ExecutionAttributes();