Skip to content

Fix SdkPlugins being able to set a region, but the SdkClient's crashing without region anyways. #7177

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
Techno3d wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix SdkPlugins being able to set a region, but the SdkClient's crashing without region anyways. #7177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
33d70c5
fix region being resolved before plugins are run
Jul 20, 2026
7439a9a
Add the changelog
Jul 21, 2026
7208c08
Merge branch 'aws:master' into master
Techno3d Jul 21, 2026
950eb92
Add test case to SdkPluginTest to check if an SdkPlugin can set a reg…
Jul 21, 2026
89878dd
new tests
Jul 21, 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: 6 additions & 0 deletions .changes/next-release/bugfix-AWSSDKforJavav2-238f31f.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"type": "bugfix",
"category": "AWS SDK for Java v2",
"contributor": "Techno3d",
"description": "Fix a bug where an SDK Client that has a plugin which supplies a region would throw an SdkClientException stating that no region was set."
}
12 changes: 6 additions & 6 deletions ...ore/src/main/java/software/amazon/awssdk/core/client/builder/SdkDefaultClientBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,14 +202,14 @@ protected final SdkClientConfiguration syncClientConfiguration() {
configuration = mergeChildDefaults(configuration);
configuration = mergeGlobalDefaults(configuration);

// Invoke the plugins
configuration = invokePlugins(configuration);

@afarber afarber Sep 12, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This makes clientPluginSeesDefaultValue fail for the scheduled-executor case:

the plugin now reads SCHEDULED_EXECUTOR_SERVICE before finalizeConfiguration provides it.

Is that lifecycle change intended?


// Create additional configuration from the default-applied configuration
configuration = finalizeChildConfiguration(configuration);
configuration = finalizeSyncConfiguration(configuration);
configuration = finalizeConfiguration(configuration);

// Invoke the plugins
configuration = invokePlugins(configuration);

return configuration;
}

Expand All @@ -233,14 +233,14 @@ protected final SdkClientConfiguration asyncClientConfiguration() {
configuration = mergeChildDefaults(configuration);
configuration = mergeGlobalDefaults(configuration);

// Invoke the plugins
configuration = invokePlugins(configuration);

// Create additional configuration from the default-applied configuration
configuration = finalizeChildConfiguration(configuration);
configuration = finalizeAsyncConfiguration(configuration);
configuration = finalizeConfiguration(configuration);

// Invoke the plugins
configuration = invokePlugins(configuration);

return configuration;
}

Expand Down
10 changes: 10 additions & 0 deletions ...n-generated-classes-test/src/test/java/software/amazon/awssdk/services/SdkPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import java.util.stream.Stream;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
Expand Down Expand Up @@ -595,6 +596,15 @@ public void beforeTransmission(Context.BeforeTransmission context, ExecutionAttr
assertThat(timesInterceptorCalled).hasValueGreaterThanOrEqualTo(1);
}

@Test
public void pluginSetRegionIsUsed() {
ProtocolRestJsonClient client = ProtocolRestJsonClient.builder()

@afarber afarber Sep 12, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this disable default region detection and add an async equivalent?

As written, it does not prove that no default provider can resolve a region, so the old ordering can still succeed in an environment with AWS_REGION or a profile region.

.addPlugin(config -> ((ProtocolRestJsonServiceClientConfiguration.Builder) config).region(Region.US_EAST_1))
.credentialsProvider(DEFAULT_CREDENTIALS)
.build();
assertThat(client.serviceClientConfiguration().region()).isEqualTo(Region.US_EAST_1);
}

private static ProtocolRestJsonClientBuilder defaultClientBuilder() {
return ProtocolRestJsonClient.builder().region(Region.US_WEST_2).credentialsProvider(DEFAULT_CREDENTIALS);
}
Expand Down