Merge branch 'feature/master/core-interceptors-migration' into somepal/endpoint-resolution-refactoring

S-Saranya1 · web-flow · commit 77abd70833dd · 2026-03-27T10:32:53.000-07:00
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/auth/scheme/query-endpoint-auth-params-auth-scheme-params-with-allowlist.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/auth/scheme/query-endpoint-auth-params-auth-scheme-params-with-allowlist.java
@@ -20,6 +20,7 @@
 import software.amazon.awssdk.http.auth.aws.signer.RegionSet;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.query.auth.scheme.internal.DefaultQueryAuthSchemeParams;
+import software.amazon.awssdk.services.query.endpoints.QueryEndpointParams;
 import software.amazon.awssdk.utils.builder.CopyableBuilder;
 import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
 
@@ -36,6 +37,25 @@ static Builder builder() {
         return DefaultQueryAuthSchemeParams.builder();
     }
 
+    /**
+     * Create a builder pre-populated with endpoint parameters.
+     *
+     * @param endpointParams
+     *        the endpoint parameters to copy
+     * @return a builder with values from the endpoint parameters
+     */
+    static Builder fromEndpointParams(QueryEndpointParams endpointParams) {
+        Builder builder = builder();
+        builder.region(endpointParams.region());
+        builder.defaultTrueParam(endpointParams.defaultTrueParam());
+        builder.defaultStringParam(endpointParams.defaultStringParam());
+        builder.deprecatedParam(endpointParams.deprecatedParam());
+        builder.booleanContextParam(endpointParams.booleanContextParam());
+        builder.stringContextParam(endpointParams.stringContextParam());
+        builder.operationContextParam(endpointParams.operationContextParam());
+        return builder;
+    }
+
     /**
      * Returns the operation for which to resolve the auth scheme.
      */
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/auth/scheme/query-endpoint-auth-params-auth-scheme-params-without-allowlist.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/auth/scheme/query-endpoint-auth-params-auth-scheme-params-without-allowlist.java
@@ -6,6 +6,7 @@
 import software.amazon.awssdk.http.auth.aws.signer.RegionSet;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.query.auth.scheme.internal.DefaultQueryAuthSchemeParams;
+import software.amazon.awssdk.services.query.endpoints.QueryEndpointParams;
 import software.amazon.awssdk.utils.builder.CopyableBuilder;
 import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
 
@@ -22,6 +23,32 @@ static Builder builder() {
         return DefaultQueryAuthSchemeParams.builder();
     }
 
+    /**
+     * Create a builder pre-populated with endpoint parameters.
+     *
+     * @param endpointParams
+     *        the endpoint parameters to copy
+     * @return a builder with values from the endpoint parameters
+     */
+    static Builder fromEndpointParams(QueryEndpointParams endpointParams) {
+        Builder builder = builder();
+        builder.region(endpointParams.region());
+        builder.useDualStackEndpoint(endpointParams.useDualStackEndpoint());
+        builder.useFipsEndpoint(endpointParams.useFipsEndpoint());
+        builder.accountId(endpointParams.accountId());
+        builder.accountIdEndpointMode(endpointParams.accountIdEndpointMode());
+        builder.listOfStrings(endpointParams.listOfStrings());
+        builder.defaultListOfStrings(endpointParams.defaultListOfStrings());
+        builder.endpointId(endpointParams.endpointId());
+        builder.defaultTrueParam(endpointParams.defaultTrueParam());
+        builder.defaultStringParam(endpointParams.defaultStringParam());
+        builder.deprecatedParam(endpointParams.deprecatedParam());
+        builder.booleanContextParam(endpointParams.booleanContextParam());
+        builder.stringContextParam(endpointParams.stringContextParam());
+        builder.operationContextParam(endpointParams.operationContextParam());
+        return builder;
+    }
+
     /**
      * Returns the operation for which to resolve the auth scheme.
      */
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-h2-usePriorKnowledgeForH2-service-client-builder-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-h2-usePriorKnowledgeForH2-service-client-builder-class.java
@@ -31,7 +31,6 @@
 import software.amazon.awssdk.regions.ServiceMetadataAdvancedOption;
 import software.amazon.awssdk.retries.api.RetryStrategy;
 import software.amazon.awssdk.services.h2.auth.scheme.H2AuthSchemeProvider;
-import software.amazon.awssdk.services.h2.auth.scheme.internal.H2AuthSchemeInterceptor;
 import software.amazon.awssdk.services.h2.endpoints.H2EndpointProvider;
 import software.amazon.awssdk.services.h2.endpoints.internal.H2RequestSetEndpointInterceptor;
 import software.amazon.awssdk.services.h2.endpoints.internal.H2ResolveEndpointInterceptor;
@@ -70,7 +69,6 @@ protected final SdkClientConfiguration mergeServiceDefaults(SdkClientConfigurati
     @Override
     protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientConfiguration config) {
         List<ExecutionInterceptor> endpointInterceptors = new ArrayList<>();
-        endpointInterceptors.add(new H2AuthSchemeInterceptor());
         endpointInterceptors.add(new H2ResolveEndpointInterceptor());
         endpointInterceptors.add(new H2RequestSetEndpointInterceptor());
         ClasspathInterceptorChainFactory interceptorFactory = new ClasspathInterceptorChainFactory();
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-custom-context-params-async-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-custom-context-params-async-client-class.java
@@ -13,6 +13,7 @@
 import org.slf4j.LoggerFactory;
 import software.amazon.awssdk.annotations.Generated;
 import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.awscore.client.config.AwsClientOption;
 import software.amazon.awssdk.awscore.client.handler.AwsAsyncClientHandler;
 import software.amazon.awssdk.awscore.exception.AwsServiceException;
 import software.amazon.awssdk.awscore.internal.AwsProtocolMetadata;
@@ -29,6 +30,7 @@
 import software.amazon.awssdk.core.http.HttpResponseHandler;
 import software.amazon.awssdk.core.metrics.CoreMetric;
 import software.amazon.awssdk.core.retry.RetryMode;
+import software.amazon.awssdk.http.auth.spi.scheme.AuthSchemeOption;
 import software.amazon.awssdk.metrics.MetricCollector;
 import software.amazon.awssdk.metrics.MetricPublisher;
 import software.amazon.awssdk.metrics.NoOpMetricCollector;
@@ -38,6 +40,8 @@
 import software.amazon.awssdk.protocols.json.BaseAwsJsonProtocolFactory;
 import software.amazon.awssdk.protocols.json.JsonOperationMetadata;
 import software.amazon.awssdk.retries.api.RetryStrategy;
+import software.amazon.awssdk.services.foobar.auth.scheme.FooBarAuthSchemeParams;
+import software.amazon.awssdk.services.foobar.auth.scheme.FooBarAuthSchemeProvider;
 import software.amazon.awssdk.services.foobar.endpoints.FooBarClientContextParams;
 import software.amazon.awssdk.services.foobar.internal.FooBarServiceClientConfigurationBuilder;
 import software.amazon.awssdk.services.foobar.internal.ServiceVersionInfo;
@@ -60,7 +64,7 @@ final class DefaultFooBarAsyncClient implements FooBarAsyncClient {
     private static final Logger log = LoggerFactory.getLogger(DefaultFooBarAsyncClient.class);
 
     private static final AwsProtocolMetadata protocolMetadata = AwsProtocolMetadata.builder()
-            .serviceProtocol(AwsServiceProtocol.REST_JSON).build();
+                                                                                   .serviceProtocol(AwsServiceProtocol.REST_JSON).build();
 
     private final AsyncClientHandler clientHandler;
 
@@ -71,7 +75,7 @@ final class DefaultFooBarAsyncClient implements FooBarAsyncClient {
     protected DefaultFooBarAsyncClient(SdkClientConfiguration clientConfiguration) {
         this.clientHandler = new AwsAsyncClientHandler(clientConfiguration);
         this.clientConfiguration = clientConfiguration.toBuilder().option(SdkClientOption.SDK_CLIENT, this)
-                .option(SdkClientOption.API_METADATA, "Foo_Bar" + "#" + ServiceVersionInfo.VERSION).build();
+                                                      .option(SdkClientOption.API_METADATA, "Foo_Bar" + "#" + ServiceVersionInfo.VERSION).build();
         this.protocolFactory = init(AwsJsonProtocolFactory.builder()).build();
     }
 
@@ -100,38 +104,43 @@ protected DefaultFooBarAsyncClient(SdkClientConfiguration clientConfiguration) {
     @Override
     public CompletableFuture<GetDatabaseVersionResponse> getDatabaseVersion(GetDatabaseVersionRequest getDatabaseVersionRequest) {
         SdkClientConfiguration clientConfiguration = updateSdkClientConfiguration(getDatabaseVersionRequest,
-                this.clientConfiguration);
+                                                                                  this.clientConfiguration);
         List<MetricPublisher> metricPublishers = resolveMetricPublishers(clientConfiguration, getDatabaseVersionRequest
-                .overrideConfiguration().orElse(null));
+            .overrideConfiguration().orElse(null));
         MetricCollector apiCallMetricCollector = metricPublishers.isEmpty() ? NoOpMetricCollector.create() : MetricCollector
-                .create("ApiCall");
+            .create("ApiCall");
         try {
             apiCallMetricCollector.reportMetric(CoreMetric.SERVICE_ID, "Foo Bar");
             apiCallMetricCollector.reportMetric(CoreMetric.OPERATION_NAME, "GetDatabaseVersion");
             JsonOperationMetadata operationMetadata = JsonOperationMetadata.builder().hasStreamingSuccessResponse(false)
-                    .isPayloadJson(true).build();
+                                                                           .isPayloadJson(true).build();
 
             HttpResponseHandler<GetDatabaseVersionResponse> responseHandler = protocolFactory.createResponseHandler(
-                    operationMetadata, GetDatabaseVersionResponse::builder);
+                operationMetadata, GetDatabaseVersionResponse::builder);
             Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper = errorCode -> {
                 if (errorCode == null) {
                     return Optional.empty();
                 }
                 switch (errorCode) {
-                default:
-                    return Optional.empty();
+                    default:
+                        return Optional.empty();
                 }
             };
             HttpResponseHandler<AwsServiceException> errorResponseHandler = createErrorResponseHandler(protocolFactory,
-                    operationMetadata, exceptionMetadataMapper);
+                                                                                                       operationMetadata, exceptionMetadataMapper);
 
             CompletableFuture<GetDatabaseVersionResponse> executeFuture = clientHandler
-                    .execute(new ClientExecutionParams<GetDatabaseVersionRequest, GetDatabaseVersionResponse>()
-                            .withOperationName("GetDatabaseVersion").withProtocolMetadata(protocolMetadata)
-                            .withMarshaller(new GetDatabaseVersionRequestMarshaller(protocolFactory))
-                            .withResponseHandler(responseHandler).withErrorResponseHandler(errorResponseHandler)
-                            .withRequestConfiguration(clientConfiguration).withMetricCollector(apiCallMetricCollector)
-                            .withInput(getDatabaseVersionRequest));
+                .execute(new ClientExecutionParams<GetDatabaseVersionRequest, GetDatabaseVersionResponse>()
+                             .withOperationName("GetDatabaseVersion")
+                             .withProtocolMetadata(protocolMetadata)
+                             .withMarshaller(new GetDatabaseVersionRequestMarshaller(protocolFactory))
+                             .withResponseHandler(responseHandler)
+                             .withErrorResponseHandler(errorResponseHandler)
+                             .withRequestConfiguration(clientConfiguration)
+                             .withMetricCollector(apiCallMetricCollector)
+                             .withAuthSchemeOptionsResolver(
+                                 r -> resolveAuthSchemeOptions(r, "GetDatabaseVersion", clientConfiguration))
+                             .withInput(getDatabaseVersionRequest));
             CompletableFuture<GetDatabaseVersionResponse> whenCompleted = executeFuture.whenComplete((r, e) -> {
                 metricPublishers.forEach(p -> p.publish(apiCallMetricCollector.collect()));
             });
@@ -155,11 +164,11 @@ public final String serviceName() {
 
     private <T extends BaseAwsJsonProtocolFactory.Builder<T>> T init(T builder) {
         return builder.clientConfiguration(clientConfiguration).defaultServiceExceptionSupplier(FooBarException::builder)
-                .protocol(AwsJsonProtocol.REST_JSON).protocolVersion("1.1");
+                      .protocol(AwsJsonProtocol.REST_JSON).protocolVersion("1.1");
     }
 
     private static List<MetricPublisher> resolveMetricPublishers(SdkClientConfiguration clientConfiguration,
-            RequestOverrideConfiguration requestOverrideConfiguration) {
+                                                                 RequestOverrideConfiguration requestOverrideConfiguration) {
         List<MetricPublisher> publishers = null;
         if (requestOverrideConfiguration != null) {
             publishers = requestOverrideConfiguration.metricPublishers();
@@ -173,6 +182,17 @@ private static List<MetricPublisher> resolveMetricPublishers(SdkClientConfigurat
         return publishers;
     }
 
+    private List<AuthSchemeOption> resolveAuthSchemeOptions(SdkRequest request, String operationName,
+                                                            SdkClientConfiguration clientConfiguration) {
+        FooBarAuthSchemeProvider authSchemeProvider = Validate.isInstanceOf(FooBarAuthSchemeProvider.class,
+                                                                            clientConfiguration.option(SdkClientOption.AUTH_SCHEME_PROVIDER),
+                                                                            "Expected an instance of FooBarAuthSchemeProvider");
+        FooBarAuthSchemeParams.Builder paramsBuilder = FooBarAuthSchemeParams.builder().operation(operationName);
+        paramsBuilder.region(clientConfiguration.option(AwsClientOption.AWS_REGION));
+        List<AuthSchemeOption> options = authSchemeProvider.resolveAuthScheme(paramsBuilder.build());
+        return options;
+    }
+
     private void updateRetryStrategyClientConfiguration(SdkClientConfiguration.Builder configuration) {
         ClientOverrideConfiguration.Builder builder = configuration.asOverrideConfigurationBuilder();
         RetryMode retryMode = builder.retryMode();
@@ -211,15 +231,15 @@ private SdkClientConfiguration updateSdkClientConfiguration(SdkRequest request,
         newContextParams = (newContextParams != null) ? newContextParams : AttributeMap.empty();
         originalContextParams = originalContextParams != null ? originalContextParams : AttributeMap.empty();
         Validate.validState(
-                Objects.equals(originalContextParams.get(FooBarClientContextParams.CROSS_REGION_ACCESS_ENABLED),
-                        newContextParams.get(FooBarClientContextParams.CROSS_REGION_ACCESS_ENABLED)),
-                "CROSS_REGION_ACCESS_ENABLED cannot be modified by request level plugins");
+            Objects.equals(originalContextParams.get(FooBarClientContextParams.CROSS_REGION_ACCESS_ENABLED),
+                           newContextParams.get(FooBarClientContextParams.CROSS_REGION_ACCESS_ENABLED)),
+            "CROSS_REGION_ACCESS_ENABLED cannot be modified by request level plugins");
         updateRetryStrategyClientConfiguration(configuration);
         return configuration.build();
     }
 
     private HttpResponseHandler<AwsServiceException> createErrorResponseHandler(BaseAwsJsonProtocolFactory protocolFactory,
-            JsonOperationMetadata operationMetadata, Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper) {
+                                                                                JsonOperationMetadata operationMetadata, Function<String, Optional<ExceptionMetadata>> exceptionMetadataMapper) {
         return protocolFactory.createErrorResponseHandler(operationMetadata, exceptionMetadataMapper);
     }
 
diff --git a/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-client-class.java b/codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/test-query-client-class.java
