Skip to content

Switch endpointdiscovery/endpointproviders back to useSraAuth=false #4532

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

Merged
gosar merged 2 commits into from
Oct 4, 2023
Merged

Switch endpointdiscovery/endpointproviders back to useSraAuth=false #4532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffaf8ec
Switch endpointdiscovery back to useSraAuth=false
gosar Oct 3, 2023
fcf8f0b
Switch ndpointproviders back to useSraAuth=false
gosar Oct 3, 2023
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
3 changes: 1 addition & 2 deletions ...-classes-test/src/main/resources/codegen-resources/endpointdiscovery/customization.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"skipEndpointTestGeneration": true,
"useSraAuth": true
"skipEndpointTestGeneration": true
}
3 changes: 1 addition & 2 deletions ...-classes-test/src/main/resources/codegen-resources/endpointproviders/customization.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"skipEndpointTestGeneration": true,
"useSraAuth": true
"skipEndpointTestGeneration": true
}
19 changes: 3 additions & 16 deletions ...test/java/software/amazon/awssdk/services/endpointproviders/EndpointInterceptorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,20 @@

package software.amazon.awssdk.services.endpointproviders;

import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import org.junit.Test;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
import software.amazon.awssdk.auth.signer.AwsSignerExecutionAttribute;
import software.amazon.awssdk.awscore.endpoints.AwsEndpointAttribute;
import software.amazon.awssdk.awscore.endpoints.authscheme.EndpointAuthScheme;
import software.amazon.awssdk.awscore.endpoints.authscheme.SigV4AuthScheme;
import software.amazon.awssdk.awscore.endpoints.authscheme.SigV4aAuthScheme;
import software.amazon.awssdk.core.client.config.SdkAdvancedClientOption;
import software.amazon.awssdk.core.interceptor.Context;
import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
import software.amazon.awssdk.core.interceptor.ExecutionInterceptor;
import software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute;
import software.amazon.awssdk.endpoints.Endpoint;
import software.amazon.awssdk.http.auth.aws.signer.AwsV4HttpSigner;
import software.amazon.awssdk.http.auth.aws.signer.AwsV4aHttpSigner;
import software.amazon.awssdk.http.auth.aws.signer.RegionSet;
import software.amazon.awssdk.http.auth.spi.scheme.AuthScheme;
import software.amazon.awssdk.http.auth.spi.scheme.AuthSchemeOption;
import software.amazon.awssdk.http.auth.spi.signer.AsyncSignRequest;
import software.amazon.awssdk.http.auth.spi.signer.AsyncSignedRequest;
import software.amazon.awssdk.http.auth.spi.signer.BaseSignRequest;
Expand All @@ -52,7 +39,6 @@
import software.amazon.awssdk.identity.spi.IdentityProvider;
import software.amazon.awssdk.identity.spi.IdentityProviders;
import software.amazon.awssdk.regions.Region;
import software.amazon.awssdk.regions.RegionScope;
import software.amazon.awssdk.services.restjsonendpointproviders.RestJsonEndpointProvidersAsyncClient;
import software.amazon.awssdk.services.restjsonendpointproviders.RestJsonEndpointProvidersAsyncClientBuilder;
import software.amazon.awssdk.services.restjsonendpointproviders.RestJsonEndpointProvidersClient;
Expand Down Expand Up @@ -201,6 +187,8 @@ public void async_endpointProviderReturnsHeaders_appendedToExistingRequest() {
assertThat(interceptor.context.httpRequest().matchingHeaders("TestHeader")).containsExactly("TestValue", "TestValue0");
}

// TODO(sra-identity-auth): Enable for useSraAuth=true
/*
@Test
public void sync_endpointProviderReturnsSignerProperties_overridesV4AuthSchemeResolverProperties() {
RestJsonEndpointProvidersEndpointProvider defaultEndpointProvider =
Expand Down Expand Up @@ -464,6 +452,7 @@ public void sync_endpointProviderReturnsV4aSignerProperties_executionAttributesF
assertThat(interceptor.executionAttributes.getAttribute(AwsSignerExecutionAttribute.SERVICE_SIGNING_NAME)).isEqualTo("name-from-ep");
assertThat(interceptor.executionAttributes.getAttribute(AwsSignerExecutionAttribute.SIGNER_DOUBLE_URL_ENCODE)).isEqualTo(true);
}
*/

private static AuthScheme<?> authScheme(String schemeId, HttpSigner<AwsCredentialsIdentity> signer) {
return new AuthScheme<AwsCredentialsIdentity>() {
Expand Down Expand Up @@ -524,8 +513,6 @@ public static class CaptureCompletedException extends RuntimeException {
}

private RestJsonEndpointProvidersClientBuilder syncClientBuilder() {
// TODO(sra-identity-auth): The service is currently using useSraAuth=true.
// Need to have tests for useSraAuth=false that work too - needs codegen changes I think.
return RestJsonEndpointProvidersClient.builder()
.region(Region.US_WEST_2)
.credentialsProvider(
Expand Down