Move endpoint resolution from interceptors to pipeline stage#6820
Move endpoint resolution from interceptors to pipeline stage#6820S-Saranya1 wants to merge 2 commits intofeature/master/core-interceptors-migrationfrom
Conversation
87d0960 to
305ba3a
Compare
6000d9f to
7b09efe
Compare
…l/endpoint-resolution-refactoring
| } | ||
|
|
||
| // Apply resolved endpoint URL | ||
| ClientEndpointProvider clientEndpointProvider = |
There was a problem hiding this comment.
I see that in the design doc, there's a backward compatibility issue and is solved by adding a check for customer modified url here. Why is that missed here?
| awsV4aAuthScheme, awsV4aHttpSigner); | ||
| b.addStatement("$T optionBuilder = selectedAuthScheme.authSchemeOption().toBuilder()", | ||
| authSchemeOption.nestedClass("Builder")); | ||
| b.addStatement("$1T rs = $1T.create(endpointParams.region().id())", regionSet); |
There was a problem hiding this comment.
Do we need to add a null check here for the endpointParams.region() here?
There was a problem hiding this comment.
Nvm, seems that this won't be null
| @@ -38,10 +52,6 @@ public static Boolean fipsEnabledBuiltIn(ExecutionAttributes executionAttributes | |||
| return executionAttributes.getAttribute(AwsExecutionAttribute.FIPS_ENDPOINT_ENABLED); | |||
| } | |||
|
|
|||
| /** | |||
There was a problem hiding this comment.
Just curious why do we deleted the comments here and below?
| "TestValue0")))) | ||
| .hasMessageContaining("stop"); | ||
|
|
||
| assertThat(interceptor.context.httpRequest().matchingHeaders("TestHeader")).containsExactly("TestValue", "TestValue0"); |
There was a problem hiding this comment.
This is a subtle behavioral change and we can call it out as a known behavior change in the feature branch merging PR description. if downstream system is doing exact string matching on header value ordering (which is wrong) this could break them.
Motivation and Context
The SDK uses ExecutionInterceptor for core endpoint resolution functionality. But this interface was
designed for customer extensibility, not internal SDK. This is Part 2 of the core interceptors migration, following the auth scheme resolution refactoring in #6755.
Modifications
1. Codegen — generate resolveEndpoint() in client classes
2. Codegen — generate per-service EndpointResolverUtils
3. Added EndpointResolutionStage
New pipeline stage in sdk-core that runs after AuthSchemeResolutionStage. Calls the service-specific callback, stores RESOLVED_ENDPOINT, copies endpoint headers, applies resolved URL, and reports ENDPOINT_RESOLVE_DURATION metric. Registered in both sync and async pipelines.
4. Added EndpointResolver interface and ClientExecutionParams
EndpointResolver functional interface in sdk-core, endpointResolver field on ClientExecutionParams, ENDPOINT_RESOLVER execution attribute, and wiring in AwsExecutionContextBuilder.
5. De-duplicated AwsEndpointProviderUtils
Created single shared class in aws-core replacing identical per-service generated copies. Deleted the AwsEndpointProviderUtils.java.resource template.
6. Updated S3 presigner and S3Utilities
Removed old endpoint interceptors from both. Added direct endpoint resolution methods that call S3EndpointResolverUtils.ruleParams() and apply the resolved URL.
7. Deleted dead code
Removed EndpointResolverInterceptorSpec, RequestEndpointInterceptorSpec, AuthSchemeInterceptorSpec, their tests, AwsEndpointProviderUtils.java.resource template, and dead generateAuthSchemeInterceptor() method.
Testing
Screenshots (if appropriate)
Types of changes
Checklist
mvn installsucceedsscripts/new-changescript and following the instructions. Commit the new file created by the script in.changes/next-releasewith your changes.License