[Ignore] Testing branch with useSraAuth=true

.changes/next-release/feature-AWSSDKforJavav2-6fbd668.json

@@ -0,0 +1,6 @@
+{
+    "type": "feature",
+    "category": "AWS SDK for Java v2",
+    "contributor": "",
+    "description": "SdkPlugins can now see and modify all configuration set on the client, including default values"
+}

.changes/next-release/feature-AWSSDKforJavav2-f70427b.json

@@ -0,0 +1,6 @@
+{
+    "type": "feature",
+    "category": "AWS SDK for Java v2",
+    "contributor": "",
+    "description": "The `serviceClientConfiguration` from SDK clients now includes the defaults set by the SDK."
+}

build-tools/src/main/resources/software/amazon/awssdk/checkstyle-suppressions.xml

@@ -49,4 +49,8 @@
 
     <!-- Allow non-java.base usage in tests -->
     <suppress checks="software.amazon.awssdk.buildtools.checkstyle.NonJavaBaseModuleCheck" files=".*testutils.*"/>
+
+    <!-- Allow private field declaration before public, to have correct initialization order -->
+    <suppress checks="DeclarationOrder"
+              files=".*SdkAdvancedClientOption\.java$"/>
 </suppressions>

codegen/src/main/java/software/amazon/awssdk/codegen/emitters/tasks/CommonGeneratorTasks.java

@@ -16,15 +16,13 @@
 package software.amazon.awssdk.codegen.emitters.tasks;
 
 import software.amazon.awssdk.codegen.emitters.GeneratorTaskParams;
-import software.amazon.awssdk.codegen.poet.model.SdkClientConfigurationUtilGeneratorTask;
 
 /**
  * Common generator tasks.
  */
 class CommonGeneratorTasks extends CompositeGeneratorTask {
     CommonGeneratorTasks(GeneratorTaskParams params) {
         super(new CommonClientGeneratorTasks(params),
-              new SdkClientConfigurationUtilGeneratorTask(params),
               new SyncClientGeneratorTasks(params),
               new MarshallerGeneratorTasks(params),
               new ModelClassGeneratorTasks(params),

codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java

@@ -267,7 +267,7 @@ public class CustomizationConfig {
     /**
      * Whether SRA based auth logic should be used.
      */
-    private boolean useSraAuth = false;
+    private boolean useSraAuth = true;
 
     /**
      * Whether to generate auth scheme params based on endpoint params.

codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/AsyncClientBuilderClass.java

@@ -27,7 +27,6 @@
 import software.amazon.awssdk.codegen.model.config.customization.MultipartCustomization;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
 import software.amazon.awssdk.codegen.poet.ClassSpec;
-import software.amazon.awssdk.codegen.poet.PoetExtension;
 import software.amazon.awssdk.codegen.poet.PoetUtils;
 import software.amazon.awssdk.codegen.poet.rules.EndpointRulesSpecUtils;
 import software.amazon.awssdk.codegen.utils.AuthUtils;
@@ -43,7 +42,6 @@ public class AsyncClientBuilderClass implements ClassSpec {
     private final ClassName builderInterfaceName;
     private final ClassName builderClassName;
     private final ClassName builderBaseClassName;
-    private final ClassName serviceConfigClassName;
     private final EndpointRulesSpecUtils endpointRulesSpecUtils;
 
     public AsyncClientBuilderClass(IntermediateModel model) {
@@ -55,7 +53,6 @@ public AsyncClientBuilderClass(IntermediateModel model) {
         this.builderClassName = ClassName.get(basePackage, model.getMetadata().getAsyncBuilder());
         this.builderBaseClassName = ClassName.get(basePackage, model.getMetadata().getBaseBuilder());
         this.endpointRulesSpecUtils = new EndpointRulesSpecUtils(model);
-        this.serviceConfigClassName = new PoetExtension(model).getServiceConfigClass();
     }
 
     @Override
@@ -89,7 +86,6 @@ public TypeSpec poetSpec() {
         }
 
         builder.addMethod(buildClientMethod());
-        builder.addMethod(SyncClientBuilderClass.initializeServiceClientConfigMethod(serviceConfigClassName));
 
         return builder.build();
     }
@@ -137,12 +133,9 @@ private MethodSpec buildClientMethod() {
                                                .returns(clientInterfaceName)
                                                .addStatement("$T clientConfiguration = super.asyncClientConfiguration()",
                                                              SdkClientConfiguration.class)
-                                               .addStatement("this.validateClientOptions(clientConfiguration)")
-                                               .addStatement("$T serviceClientConfiguration = initializeServiceClientConfig"
-                                                             + "(clientConfiguration)",
-                                                             serviceConfigClassName);
+                                               .addStatement("this.validateClientOptions(clientConfiguration)");
 
-        builder.addStatement("$1T client = new $2T(serviceClientConfiguration, clientConfiguration)",
+        builder.addStatement("$1T client = new $2T(clientConfiguration)",
                              clientInterfaceName, clientClassName);
         if (model.asyncClientDecoratorClassName().isPresent()) {
             builder.addStatement("return  new $T().decorate(client, clientConfiguration, clientContextParams.copy().build())",

codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java

@@ -37,6 +37,7 @@
 import java.util.Set;
 import javax.lang.model.element.Modifier;
 import software.amazon.awssdk.annotations.SdkInternalApi;
+import software.amazon.awssdk.auth.credentials.TokenUtils;
 import software.amazon.awssdk.auth.signer.Aws4Signer;
 import software.amazon.awssdk.auth.token.credentials.aws.DefaultAwsTokenProvider;
 import software.amazon.awssdk.auth.token.signer.aws.BearerTokenSigner;
@@ -54,7 +55,6 @@
 import software.amazon.awssdk.codegen.poet.rules.EndpointRulesSpecUtils;
 import software.amazon.awssdk.codegen.utils.AuthUtils;
 import software.amazon.awssdk.core.SdkPlugin;
-import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
 import software.amazon.awssdk.core.client.config.SdkAdvancedClientOption;
 import software.amazon.awssdk.core.client.config.SdkClientConfiguration;
 import software.amazon.awssdk.core.client.config.SdkClientOption;
@@ -82,7 +82,6 @@ public class BaseClientBuilderClass implements ClassSpec {
     private final IntermediateModel model;
     private final ClassName builderInterfaceName;
     private final ClassName builderClassName;
-    private final ClassName sdkClientConfigurationUtilClassName;
     private final String basePackage;
     private final EndpointRulesSpecUtils endpointRulesSpecUtils;
     private final AuthSchemeSpecUtils authSchemeSpecUtils;
@@ -93,8 +92,6 @@ public BaseClientBuilderClass(IntermediateModel model) {
         this.basePackage = model.getMetadata().getFullClientPackageName();
         this.builderInterfaceName = ClassName.get(basePackage, model.getMetadata().getBaseBuilderInterface());
         this.builderClassName = ClassName.get(basePackage, model.getMetadata().getBaseBuilder());
-        this.sdkClientConfigurationUtilClassName = ClassName.get(model.getMetadata().getFullClientInternalPackageName(),
-                                                                 "SdkClientConfigurationUtil");
         this.endpointRulesSpecUtils = new EndpointRulesSpecUtils(model);
         this.authSchemeSpecUtils = new AuthSchemeSpecUtils(model);
         this.configurationUtils = new ServiceClientConfigurationUtils(model);
@@ -175,7 +172,6 @@ public TypeSpec poetSpec() {
                 builder.addMethod(defaultTokenAuthSignerMethod());
             }
         }
-        builder.addMethod(setOverridesMethod());
         addServiceHttpConfigIfNeeded(builder, model);
         builder.addMethod(invokePluginsMethod());
         builder.addMethod(validateClientOptionsMethod());
@@ -256,6 +252,8 @@ private MethodSpec mergeServiceDefaultsMethod() {
         }
 
         if (AuthUtils.usesBearerAuth(model)) {
+            builder.addCode(".lazyOption($1T.TOKEN_PROVIDER, p -> $2T.toSdkTokenProvider(p.get($1T.TOKEN_IDENTITY_PROVIDER)))",
+                            AwsClientOption.class, TokenUtils.class);
             builder.addCode(".option($T.TOKEN_IDENTITY_PROVIDER, defaultTokenProvider())\n", AwsClientOption.class);
             if (!authSchemeSpecUtils.useSraAuth()) {
                 builder.addCode(".option($T.TOKEN_SIGNER, defaultTokenSigner())", SdkAdvancedClientOption.class);
@@ -362,18 +360,24 @@ private MethodSpec finalizeServiceConfigurationMethod() {
 
         // Update configuration
         builder.addStatement("$T builder = config.toBuilder()", SdkClientConfiguration.Builder.class);
+        builder.addCode("builder.lazyOption($T.IDENTITY_PROVIDERS, c -> {", SdkClientOption.class)
+               .addStatement("$1T.Builder result = $1T.builder()", IdentityProviders.class);
         if (AuthUtils.usesBearerAuth(model)) {
-            builder.addStatement("$T<? extends $T> identityProvider = config.option($T.TOKEN_IDENTITY_PROVIDER)",
-                                 IdentityProvider.class, TokenIdentity.class, AwsClientOption.class);
-            builder.beginControlFlow("if (identityProvider != null)");
-            builder.addStatement("$T identityProviders = config.option($T.IDENTITY_PROVIDERS)",
-                                 IdentityProviders.class, SdkClientOption.class);
-
-            builder.addStatement("builder.option($T.IDENTITY_PROVIDERS, identityProviders.toBuilder()"
-                                 + ".putIdentityProvider(identityProvider).build())", SdkClientOption.class);
-
+            builder.addStatement("$T<?> tokenIdentityProvider = c.get($T.TOKEN_IDENTITY_PROVIDER)",
+                                 IdentityProvider.class, AwsClientOption.class);
+            builder.beginControlFlow("if (tokenIdentityProvider != null)");
+            builder.addStatement("result.putIdentityProvider(tokenIdentityProvider)");
+            builder.endControlFlow();
+        }
+        if (AuthUtils.usesAwsAuth(model)) {
+            builder.addStatement("$T<?> credentialsIdentityProvider = c.get($T.CREDENTIALS_IDENTITY_PROVIDER)",
+                                 IdentityProvider.class, AwsClientOption.class);
+            builder.beginControlFlow("if (credentialsIdentityProvider != null)", AwsClientOption.class);
+            builder.addStatement("result.putIdentityProvider(credentialsIdentityProvider)");
             builder.endControlFlow();
         }
+        builder.addStatement("return result.build()")
+               .addCode("});");
 
         builder.addCode("builder.option($1T.EXECUTION_INTERCEPTORS, interceptors)", SdkClientOption.class);
 
@@ -715,7 +719,7 @@ private MethodSpec authSchemesMethod() {
             builder.addStatement("schemes.put($1N.schemeId(), $1N)", instanceVariable);
         }
         builder.addStatement("schemes.putAll(this.additionalAuthSchemes)");
-        builder.addStatement("return $T.unmodifiableMap(schemes)", Collections.class);
+        builder.addStatement("return schemes", Collections.class);
         return builder.build();
     }
 
@@ -730,34 +734,18 @@ private MethodSpec invokePluginsMethod() {
                .beginControlFlow("if (plugins.isEmpty())")
                .addStatement("return config")
                .endControlFlow();
-        builder.addStatement("$1T.BuilderInternal serviceConfigBuilder = $1T.builder(config.toBuilder())",
-                             configurationUtils.serviceClientConfigurationBuilderClassName());
-        builder.addStatement("serviceConfigBuilder.overrideConfiguration(overrideConfiguration())");
-        builder.beginControlFlow("for ($T plugin : plugins)", SdkPlugin.class)
+
+
+        builder.addStatement("$T configuration = config.toBuilder()", SdkClientConfiguration.Builder.class)
+               .addStatement("$1T serviceConfigBuilder = new $1T(configuration)",
+                             configurationUtils.serviceClientConfigurationBuilderClassName())
+               .beginControlFlow("for ($T plugin : plugins)", SdkPlugin.class)
                .addStatement("plugin.configureClient(serviceConfigBuilder)")
-               .endControlFlow();
-        builder.addStatement("overrideConfiguration(serviceConfigBuilder.overrideConfiguration())");
-        builder.addStatement("return serviceConfigBuilder.buildSdkClientConfiguration()");
+               .endControlFlow()
+               .addStatement("return configuration.build()");
         return builder.build();
     }
 
-    private MethodSpec setOverridesMethod() {
-        return MethodSpec.methodBuilder("setOverrides")
-                         .addModifiers(PROTECTED)
-                         .addAnnotation(Override.class)
-                         .addParameter(SdkClientConfiguration.class, "configuration")
-                         .returns(SdkClientConfiguration.class)
-                         .addStatement("$T overrideConfiguration = overrideConfiguration()",
-                                       ClientOverrideConfiguration.class)
-                         .beginControlFlow("if (overrideConfiguration == null)")
-                         .addStatement("return configuration")
-                         .endControlFlow()
-                         .addStatement("return $T.copyOverridesToConfiguration(overrideConfiguration, configuration.toBuilder())"
-                                       + ".build()",
-                                       sdkClientConfigurationUtilClassName)
-                         .build();
-    }
-
     @Override
     public ClassName className() {
         return builderClassName;

codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/SyncClientBuilderClass.java

@@ -20,13 +20,11 @@
 import com.squareup.javapoet.ParameterizedTypeName;
 import com.squareup.javapoet.TypeSpec;
 import com.squareup.javapoet.WildcardTypeName;
-import java.net.URI;
 import javax.lang.model.element.Modifier;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.awscore.client.config.AwsClientOption;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
 import software.amazon.awssdk.codegen.poet.ClassSpec;
-import software.amazon.awssdk.codegen.poet.PoetExtension;
 import software.amazon.awssdk.codegen.poet.PoetUtils;
 import software.amazon.awssdk.codegen.poet.rules.EndpointRulesSpecUtils;
 import software.amazon.awssdk.codegen.utils.AuthUtils;
@@ -42,7 +40,6 @@ public class SyncClientBuilderClass implements ClassSpec {
     private final ClassName builderInterfaceName;
     private final ClassName builderClassName;
     private final ClassName builderBaseClassName;
-    private final ClassName serviceConfigClassName;
     private final EndpointRulesSpecUtils endpointRulesSpecUtils;
 
     public SyncClientBuilderClass(IntermediateModel model) {
@@ -54,7 +51,6 @@ public SyncClientBuilderClass(IntermediateModel model) {
         this.builderClassName = ClassName.get(basePackage, model.getMetadata().getSyncBuilder());
         this.builderBaseClassName = ClassName.get(basePackage, model.getMetadata().getBaseBuilder());
         this.endpointRulesSpecUtils = new EndpointRulesSpecUtils(model);
-        this.serviceConfigClassName = new PoetExtension(model).getServiceConfigClass();
     }
 
     @Override
@@ -82,7 +78,6 @@ public TypeSpec poetSpec() {
         }
 
         builder.addMethod(buildClientMethod());
-        builder.addMethod(initializeServiceClientConfigMethod(serviceConfigClassName));
 
         return builder.build();
     }
@@ -130,12 +125,9 @@ private MethodSpec buildClientMethod() {
                                                .returns(clientInterfaceName)
                                                .addStatement("$T clientConfiguration = super.syncClientConfiguration()",
                                                              SdkClientConfiguration.class)
-                                               .addStatement("this.validateClientOptions(clientConfiguration)")
-                                               .addStatement("$T serviceClientConfiguration = initializeServiceClientConfig"
-                                                             + "(clientConfiguration)",
-                                                             serviceConfigClassName);
+                                               .addStatement("this.validateClientOptions(clientConfiguration)");
 
-        builder.addStatement("$1T client = new $2T(serviceClientConfiguration, clientConfiguration)",
+        builder.addStatement("$1T client = new $2T(clientConfiguration)",
                              clientInterfaceName, clientClassName);
         if (model.syncClientDecoratorClassName().isPresent()) {
             builder.addStatement("return new $T().decorate(client, clientConfiguration, clientContextParams.copy().build())",
@@ -159,26 +151,6 @@ private MethodSpec tokenProviderMethodImpl() {
                          .build();
     }
 
-    // TODO(sra-plugins) Move this method to a commons class or move it to the base class
-    public static MethodSpec initializeServiceClientConfigMethod(ClassName serviceConfigClassName) {
-        return MethodSpec.methodBuilder("initializeServiceClientConfig").addModifiers(Modifier.PRIVATE)
-                         .addParameter(SdkClientConfiguration.class, "clientConfig")
-                         .returns(serviceConfigClassName)
-                         .addStatement("$T endpointOverride = null", URI.class)
-                         .beginControlFlow("if ($T.TRUE.equals(clientConfig.option($T.ENDPOINT_OVERRIDDEN)))", Boolean.class,
-                                           SdkClientOption.class)
-                         .addStatement("endpointOverride = clientConfig.option($T.ENDPOINT)", SdkClientOption.class)
-                         .endControlFlow()
-                         .addStatement("return $T.builder()"
-                                       + ".overrideConfiguration(overrideConfiguration())"
-                                       + ".region(clientConfig.option($T.AWS_REGION))"
-                                       + ".endpointOverride(endpointOverride)"
-                                       + ".endpointProvider(clientConfig.option($T.ENDPOINT_PROVIDER))"
-                                       + ".build()",
-                                       serviceConfigClassName, AwsClientOption.class, SdkClientOption.class)
-                         .build();
-    }
-
     @Override
     public ClassName className() {
         return builderClassName;