Skip to content

Move auth scheme/endpoint resolution from interceptor to pipeline stages #7017

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
S-Saranya1 wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Move auth scheme/endpoint resolution from interceptor to pipeline stages #7017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bfc51a7
Move auth scheme resolution to pipeline stage from interceptors (#6755)
S-Saranya1 Mar 5, 2026
b417a87
Move endpoint resolution from interceptors to pipeline stage (#6820)
S-Saranya1 Apr 16, 2026
21e089f
Preserve AWS_CREDENTIALS during auth scheme resolution (#6926)
S-Saranya1 Apr 30, 2026
413b425
Update presign interceptors to resolve auth scheme directly instead o…
S-Saranya1 May 8, 2026
611db6d
Update S3 and S3Control tests for auth scheme and endpoint resolution…
S-Saranya1 May 13, 2026
a95bb32
Fix S3Express utils and tests for auth scheme resolution pipeline mig…
S-Saranya1 May 13, 2026
8af4695
Fix HttpChecksumStage ordering and SIGNING_METHOD resolution for pipe…
S-Saranya1 May 15, 2026
7545bd2
Update codegen fixture files (#6922)
S-Saranya1 May 18, 2026
8a093ce
Merge master into feature/master/core-interceptors-migration
S-Saranya1 May 18, 2026
080d00c
Removed unused import
S-Saranya1 May 18, 2026
4155a7b
Preserve interceptor-set signer properties across auth scheme and end…
S-Saranya1 May 19, 2026
36a0ad3
Update codegen fixture files and fix tests (#6981)
S-Saranya1 May 26, 2026
437f380
Skip auth scheme and endpoint resolution if already resolved by old i…
S-Saranya1 Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions ...src/main/java/software/amazon/awssdk/codegen/emitters/tasks/AuthSchemeGeneratorTasks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import software.amazon.awssdk.codegen.emitters.GeneratorTask;
import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
import software.amazon.awssdk.codegen.emitters.PoetGeneratorTask;
import software.amazon.awssdk.codegen.poet.auth.scheme.AuthSchemeInterceptorSpec;
import software.amazon.awssdk.codegen.poet.auth.scheme.AuthSchemeParamsSpec;
import software.amazon.awssdk.codegen.poet.auth.scheme.AuthSchemeProviderSpec;
import software.amazon.awssdk.codegen.poet.auth.scheme.AuthSchemeSpecUtils;
Expand All @@ -47,7 +46,6 @@ protected List<GeneratorTask> createTasks() {
tasks.add(generateDefaultParamsImpl());
tasks.add(generateModelBasedProvider());
tasks.add(generatePreferenceProvider());
tasks.add(generateAuthSchemeInterceptor());
if (authSchemeSpecUtils.useEndpointBasedAuthProvider()) {
tasks.add(generateEndpointBasedProvider());
tasks.add(generateEndpointAwareAuthSchemeParams());
Expand Down Expand Up @@ -86,10 +84,6 @@ private GeneratorTask generateEndpointAwareAuthSchemeParams() {

}

private GeneratorTask generateAuthSchemeInterceptor() {
return new PoetGeneratorTask(authSchemeInternalDir(), model.getFileHeader(), new AuthSchemeInterceptorSpec(model));
}

private String authSchemeDir() {
return generatorTaskParams.getPathProvider().getAuthSchemeDirectory();
}
Expand Down
6 changes: 2 additions & 4 deletions ...en/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/EndpointProviderTasks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,8 @@
import software.amazon.awssdk.codegen.poet.rules.EndpointProviderInterfaceSpec;
import software.amazon.awssdk.codegen.poet.rules.EndpointProviderSpec;
import software.amazon.awssdk.codegen.poet.rules.EndpointProviderTestSpec;
import software.amazon.awssdk.codegen.poet.rules.EndpointResolverInterceptorSpec;
import software.amazon.awssdk.codegen.poet.rules.EndpointResolverUtilsSpec;
import software.amazon.awssdk.codegen.poet.rules.EndpointRulesClientTestSpec;
import software.amazon.awssdk.codegen.poet.rules.RequestEndpointInterceptorSpec;
import software.amazon.awssdk.codegen.poet.rules2.EndpointProviderSpec2;

public final class EndpointProviderTasks extends BaseGeneratorTasks {
Expand Down Expand Up @@ -103,8 +102,7 @@ private boolean shouldGenerateCompiledEndpointRules() {

private Collection<GeneratorTask> generateInterceptors() {
return Arrays.asList(
new PoetGeneratorTask(endpointRulesInternalDir(), model.getFileHeader(), new EndpointResolverInterceptorSpec(model)),
new PoetGeneratorTask(endpointRulesInternalDir(), model.getFileHeader(), new RequestEndpointInterceptorSpec(model)));
new PoetGeneratorTask(endpointRulesInternalDir(), model.getFileHeader(), new EndpointResolverUtilsSpec(model)));
}

private GeneratorTask generateClientTests() {
Expand Down
524 changes: 0 additions & 524 deletions .../main/java/software/amazon/awssdk/codegen/poet/auth/scheme/AuthSchemeInterceptorSpec.java
View file
Open in desktop

This file was deleted.

32 changes: 30 additions & 2 deletions ...n/src/main/java/software/amazon/awssdk/codegen/poet/auth/scheme/AuthSchemeParamsSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,42 @@ public TypeSpec poetSpec() {
.addModifiers(Modifier.PUBLIC)
.addAnnotation(SdkPublicApi.class)
.addJavadoc(interfaceJavadoc())
.addMethod(builderMethod())
.addType(builderInterfaceSpec());
.addMethod(builderMethod());

if (authSchemeSpecUtils.generateEndpointBasedParams()) {
b.addMethod(fromEndpointParamsMethod());
}

b.addType(builderInterfaceSpec());

addAccessorMethods(b);
addToBuilder(b);
return b.build();
}

private MethodSpec fromEndpointParamsMethod() {
ClassName endpointParamsClass = endpointRulesSpecUtils.parametersClassName();
MethodSpec.Builder builder = MethodSpec.methodBuilder("fromEndpointParams")
.addModifiers(Modifier.PUBLIC, Modifier.STATIC)
.addParameter(endpointParamsClass, "endpointParams")
.returns(authSchemeSpecUtils.parametersInterfaceBuilderInterfaceName())
.addJavadoc("Create a builder pre-populated with endpoint parameters.\n"
+ "@param endpointParams the endpoint parameters to copy\n"
+ "@return a builder with values from the endpoint parameters");

builder.addStatement("$T builder = builder()", authSchemeSpecUtils.parametersInterfaceBuilderInterfaceName());

parameters().forEach((name, model) -> {
if (authSchemeSpecUtils.includeParamForProvider(name)) {
String methodName = endpointRulesSpecUtils.paramMethodName(name);
builder.addStatement("builder.$1N(endpointParams.$1N())", methodName);
}
});

builder.addStatement("return builder");
return builder.build();
}

private CodeBlock interfaceJavadoc() {
CodeBlock.Builder b = CodeBlock.builder();

Expand Down
4 changes: 0 additions & 4 deletions ...gen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,10 +375,6 @@ private MethodSpec finalizeServiceConfigurationMethod() {

List<ClassName> builtInInterceptors = new ArrayList<>();

builtInInterceptors.add(authSchemeSpecUtils.authSchemeInterceptor());
builtInInterceptors.add(endpointRulesSpecUtils.resolverInterceptorName());
builtInInterceptors.add(endpointRulesSpecUtils.requestModifierInterceptorName());

for (String interceptor : model.getCustomizationConfig().getInterceptors()) {
builtInInterceptors.add(ClassName.bestGuess(interceptor));
}
Expand Down
10 changes: 9 additions & 1 deletion codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,12 @@
import software.amazon.awssdk.codegen.poet.PoetExtension;
import software.amazon.awssdk.codegen.poet.PoetUtils;
import software.amazon.awssdk.codegen.poet.StaticImport;
import software.amazon.awssdk.codegen.poet.auth.scheme.AuthSchemeSpecUtils;
import software.amazon.awssdk.codegen.poet.client.specs.ProtocolSpec;
import software.amazon.awssdk.codegen.poet.eventstream.EventStreamUtils;
import software.amazon.awssdk.codegen.poet.model.EventStreamSpecHelper;
import software.amazon.awssdk.codegen.poet.model.ServiceClientConfigurationUtils;
import software.amazon.awssdk.codegen.poet.rules.EndpointRulesSpecUtils;
import software.amazon.awssdk.core.RequestOverrideConfiguration;
import software.amazon.awssdk.core.async.AsyncResponseTransformer;
import software.amazon.awssdk.core.async.AsyncResponseTransformerUtils;
Expand Down Expand Up @@ -100,6 +102,8 @@ public final class AsyncClientClass extends AsyncClientInterface {
private final ProtocolSpec protocolSpec;
private final ClassName serviceClientConfigurationClassName;
private final ServiceClientConfigurationUtils configurationUtils;
private final AuthSchemeSpecUtils authSchemeSpecUtils;
private final EndpointRulesSpecUtils endpointRulesSpecUtils;
private boolean hasScheduledExecutor;

public AsyncClientClass(GeneratorTaskParams dependencies) {
Expand All @@ -110,6 +114,8 @@ public AsyncClientClass(GeneratorTaskParams dependencies) {
this.protocolSpec = getProtocolSpecs(poetExtensions, model);
this.serviceClientConfigurationClassName = new PoetExtension(model).getServiceConfigClass();
this.configurationUtils = new ServiceClientConfigurationUtils(model);
this.authSchemeSpecUtils = new AuthSchemeSpecUtils(model);
this.endpointRulesSpecUtils = new EndpointRulesSpecUtils(model);
}

@Override
Expand Down Expand Up @@ -165,7 +171,9 @@ protected void addAdditionalMethods(TypeSpec.Builder type) {
.addMethod(nameMethod())
.addMethods(protocolSpec.additionalMethods())
.addMethod(protocolSpec.initProtocolFactory(model))
.addMethod(resolveMetricPublishersMethod());
.addMethod(resolveMetricPublishersMethod())
.addMethod(ClientClassUtils.resolveAuthSchemeOptionsMethod(authSchemeSpecUtils, endpointRulesSpecUtils))
.addMethod(ClientClassUtils.resolveEndpointMethod(authSchemeSpecUtils, endpointRulesSpecUtils));

type.addMethod(ClientClassUtils.updateRetryStrategyClientConfigurationMethod());
type.addMethod(updateSdkClientConfigurationMethod(configurationUtils.serviceClientConfigurationBuilderClassName(),
Expand Down
Loading
Loading