Skip to content

Commit 21879c8

Browse files
millemsmillems
authored
Fixed an issue where request-level overrides (e.g. credentials) were not applied to endpoint discovery calls. (#2657)
1 parent 5fb4475 commit 21879c8

File tree

12 files changed

+378
-122
lines changed

12 files changed

+378
-122
lines changed

‎.changes/next-release/bugfix-AWSSDKforJavav2-dccde5b.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"category": "AWS SDK for Java v2",
3+
"contributor": "",
4+
"type": "bugfix",
5+
"description": "Fixed an issue where request-level overrides (e.g. credentials) were not applied to endpoint discovery calls."
6+
}

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/AsyncClientClass.java‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import org.slf4j.LoggerFactory;
4646
import software.amazon.awssdk.annotations.SdkInternalApi;
4747
import software.amazon.awssdk.auth.signer.AsyncAws4Signer;
48+
import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
4849
import software.amazon.awssdk.awscore.client.config.AwsClientOption;
4950
import software.amazon.awssdk.awscore.client.handler.AwsAsyncClientHandler;
5051
import software.amazon.awssdk.awscore.client.handler.AwsClientHandlerUtils;
@@ -286,15 +287,20 @@ protected MethodSpec.Builder operationBody(MethodSpec.Builder builder, Operation
286287

287288
builder.addStatement("$T cachedEndpoint = null", URI.class);
288289
builder.beginControlFlow("if (endpointDiscoveryEnabled)");
289-
builder.addStatement("\n\nString key = clientConfiguration.option($T.CREDENTIALS_PROVIDER).resolveCredentials()" +
290-
".accessKeyId()", AwsClientOption.class);
291-
builder.addStatement("EndpointDiscoveryRequest endpointDiscoveryRequest = $T.builder().required($L)" +
292-
".defaultEndpoint(clientConfiguration.option($T.ENDPOINT)).build()",
293-
EndpointDiscoveryRequest.class,
294-
opModel.getInputShape().getEndpointDiscovery().isRequired(),
295-
SdkClientOption.class);
296-
builder.addStatement("cachedEndpoint = $L.get(key, endpointDiscoveryRequest)",
297-
"endpointDiscoveryCache");
290+
291+
builder.addCode("$T key = $N.overrideConfiguration()", String.class, opModel.getInput().getVariableName())
292+
.addCode(" .flatMap($T::credentialsProvider)", AwsRequestOverrideConfiguration.class)
293+
.addCode(" .orElseGet(() -> clientConfiguration.option($T.CREDENTIALS_PROVIDER))", AwsClientOption.class)
294+
.addCode(" .resolveCredentials().accessKeyId();");
295+
296+
builder.addCode("$1T endpointDiscoveryRequest = $1T.builder()", EndpointDiscoveryRequest.class)
297+
.addCode(" .required($L)", opModel.getInputShape().getEndpointDiscovery().isRequired())
298+
.addCode(" .defaultEndpoint(clientConfiguration.option($T.ENDPOINT))", SdkClientOption.class)
299+
.addCode(" .overrideConfiguration($N.overrideConfiguration().orElse(null))",
300+
opModel.getInput().getVariableName())
301+
.addCode(" .build();");
302+
303+
builder.addStatement("cachedEndpoint = endpointDiscoveryCache.get(key, endpointDiscoveryRequest)");
298304
builder.endControlFlow();
299305
}
300306

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/SyncClientClass.java‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
import java.util.stream.Collectors;
3636
import javax.lang.model.element.Modifier;
3737
import software.amazon.awssdk.annotations.SdkInternalApi;
38+
import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
3839
import software.amazon.awssdk.awscore.client.config.AwsClientOption;
3940
import software.amazon.awssdk.codegen.docs.SimpleMethodOverload;
4041
import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
@@ -235,15 +236,20 @@ private List<MethodSpec> operationMethodSpecs(OperationModel opModel) {
235236

236237
method.addStatement("$T cachedEndpoint = null", URI.class);
237238
method.beginControlFlow("if (endpointDiscoveryEnabled)");
238-
method.addStatement("\n\nString key = clientConfiguration.option($T.CREDENTIALS_PROVIDER)." +
239-
"resolveCredentials().accessKeyId()", AwsClientOption.class);
240-
method.addStatement("EndpointDiscoveryRequest endpointDiscoveryRequest = $T.builder().required($L)" +
241-
".defaultEndpoint(clientConfiguration.option($T.ENDPOINT)).build()",
242-
EndpointDiscoveryRequest.class,
243-
opModel.getInputShape().getEndpointDiscovery().isRequired(),
244-
SdkClientOption.class);
245-
method.addStatement("cachedEndpoint = $L.get(key, endpointDiscoveryRequest)",
246-
"endpointDiscoveryCache");
239+
240+
method.addCode("$T key = $N.overrideConfiguration()", String.class, opModel.getInput().getVariableName())
241+
.addCode(" .flatMap($T::credentialsProvider)", AwsRequestOverrideConfiguration.class)
242+
.addCode(" .orElseGet(() -> clientConfiguration.option($T.CREDENTIALS_PROVIDER))", AwsClientOption.class)
243+
.addCode(" .resolveCredentials().accessKeyId();");
244+
245+
method.addCode("$1T endpointDiscoveryRequest = $1T.builder()", EndpointDiscoveryRequest.class)
246+
.addCode(" .required($L)", opModel.getInputShape().getEndpointDiscovery().isRequired())
247+
.addCode(" .defaultEndpoint(clientConfiguration.option($T.ENDPOINT))", SdkClientOption.class)
248+
.addCode(" .overrideConfiguration($N.overrideConfiguration().orElse(null))",
249+
opModel.getInput().getVariableName())
250+
.addCode(" .build();");
251+
252+
method.addStatement("cachedEndpoint = endpointDiscoveryCache.get(key, endpointDiscoveryRequest)");
247253
method.endControlFlow();
248254
}
249255

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryAsyncCacheLoaderGenerator.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.util.List;
3131
import java.util.concurrent.CompletableFuture;
3232
import software.amazon.awssdk.annotations.SdkInternalApi;
33+
import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
3334
import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
3435
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
3536
import software.amazon.awssdk.codegen.model.intermediate.OperationModel;
@@ -103,7 +104,9 @@ private MethodSpec discoverEndpoint(OperationModel opModel) {
103104

104105
if (!opModel.getInputShape().isHasHeaderMember()) {
105106
ClassName endpointClass = poetExtensions.getModelClass("Endpoint");
106-
methodBuilder.addCode("return $L.$L($L.builder().build()).thenApply(r -> {",
107+
methodBuilder.addStatement("$1T requestConfig = $1T.from(endpointDiscoveryRequest.overrideConfiguration()"
108+
+ ".orElse(null))", AwsRequestOverrideConfiguration.class)
109+
.addCode("return $L.$L($L.builder().overrideConfiguration(requestConfig).build()).thenApply(r -> {",
107110
CLIENT_FIELD,
108111
opModel.getMethodName(),
109112
poetExtensions.getModelClass(opModel.getInputShape().getC2jName()))

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/endpointdiscovery/EndpointDiscoveryCacheLoaderGenerator.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import java.util.List;
3131
import java.util.concurrent.CompletableFuture;
3232
import software.amazon.awssdk.annotations.SdkInternalApi;
33+
import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
3334
import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
3435
import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
3536
import software.amazon.awssdk.codegen.model.intermediate.OperationModel;
@@ -105,7 +106,9 @@ private MethodSpec discoverEndpoint(OperationModel opModel) {
105106
if (!opModel.getInputShape().isHasHeaderMember()) {
106107
ClassName endpointClass = poetExtensions.getModelClass("Endpoint");
107108
methodBuilder.addCode("return $T.supplyAsync(() -> {", CompletableFuture.class)
108-
.addStatement("$T response = $L.$L($L.builder().build())",
109+
.addStatement("$1T requestConfig = $1T.from(endpointDiscoveryRequest.overrideConfiguration()"
110+
+ ".orElse(null))", AwsRequestOverrideConfiguration.class)
111+
.addStatement("$T response = $L.$L($L.builder().overrideConfiguration(requestConfig).build())",
109112
poetExtensions.getModelClass(opModel.getOutputShape().getC2jName()),
110113
CLIENT_FIELD,
111114
opModel.getMethodName(),

0 commit comments

Comments
 (0)