Make s3control work with preSRA codegen (#4495)

* Add useSraAuth=true for SraIdentityResolutionTest * Make s3control work with preSRA codegen

Author: gosar

codegen/src/main/java/software/amazon/awssdk/codegen/poet/rules/EndpointResolverInterceptorSpec.java

@@ -536,11 +536,6 @@ private MethodSpec authSchemeWithEndpointSignerPropertiesMethod() {
 
  method.beginControlFlow("for ($T endpointAuthScheme : endpointAuthSchemes)", EndpointAuthScheme.class);
 
- // Don't include signer properties for auth options that don't match our selected auth scheme
- method.beginControlFlow("if (!endpointAuthScheme.schemeId().equals(selectedAuthScheme.authSchemeOption().schemeId()))");
- method.addStatement("continue");
- method.endControlFlow();
-
  method.addStatement("$T option = selectedAuthScheme.authSchemeOption().toBuilder()", AuthSchemeOption.Builder.class);
 
  if (dependsOnHttpAuthAws) {

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/rules/endpoint-resolve-interceptor.java

@@ -125,9 +125,6 @@ private static void operationWithStaticContextParamsStaticContextParams(QueryEnd
  private <T extends Identity> SelectedAuthScheme<T> authSchemeWithEndpointSignerProperties(
  List<EndpointAuthScheme> endpointAuthSchemes, SelectedAuthScheme<T> selectedAuthScheme) {
  for (EndpointAuthScheme endpointAuthScheme : endpointAuthSchemes) {
- if (!endpointAuthScheme.schemeId().equals(selectedAuthScheme.authSchemeOption().schemeId())) {
- continue;
- }
  AuthSchemeOption.Builder option = selectedAuthScheme.authSchemeOption().toBuilder();
  if (endpointAuthScheme instanceof SigV4AuthScheme) {
  SigV4AuthScheme v4AuthScheme = (SigV4AuthScheme) endpointAuthScheme;

services/s3control/src/main/resources/codegen-resources/customization.config

@@ -19,6 +19,5 @@
  "interceptors": [
  "software.amazon.awssdk.services.s3control.internal.interceptors.ConfigureSignerInterceptor",
  "software.amazon.awssdk.services.s3control.internal.interceptors.PayloadSigningInterceptor"
- ],
- "useSraAuth": true
+ ]
 }