Skip to content

Move and rename IdentityProviderConfiguration #4423

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
merged 6 commits into from
Sep 13, 2023
Merged

Move and rename IdentityProviderConfiguration #4423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e5b35c7
Move IdentityProviderConfiguration to identity-spi
gosar Sep 12, 2023
2bfa05b
Rename IdentityProviderConfiguration to IdentityProviders
gosar Sep 12, 2023
09f5875
Rename identityResolvers to identityProviders
gosar Sep 12, 2023
5140b14
Rename IDENTITY_PROVIDER_CONFIGURATION to IDENTITY_PROVIDERS
gosar Sep 12, 2023
dcee779
Re-organize imports to fix ordering
gosar Sep 12, 2023
d3d4e4a
Fix one place that still used configuration
gosar Sep 12, 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
10 changes: 5 additions & 5 deletions .../main/java/software/amazon/awssdk/codegen/poet/auth/scheme/AuthSchemeInterceptorSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@
import software.amazon.awssdk.core.metrics.CoreMetric;
import software.amazon.awssdk.http.auth.spi.AuthScheme;
import software.amazon.awssdk.http.auth.spi.AuthSchemeOption;
import software.amazon.awssdk.http.auth.spi.IdentityProviderConfiguration;
import software.amazon.awssdk.identity.spi.AwsCredentialsIdentity;
import software.amazon.awssdk.identity.spi.Identity;
import software.amazon.awssdk.identity.spi.IdentityProvider;
import software.amazon.awssdk.identity.spi.IdentityProviders;
import software.amazon.awssdk.identity.spi.ResolveIdentityRequest;
import software.amazon.awssdk.identity.spi.TokenIdentity;
import software.amazon.awssdk.metrics.MetricCollector;
Expand Down Expand Up @@ -199,15 +199,15 @@ private MethodSpec generateSelectAuthScheme() {
.addStatement("$T authSchemes = executionAttributes.getAttribute($T.AUTH_SCHEMES)",
mapOf(String.class, wildcardAuthScheme()),
SdkInternalExecutionAttribute.class)
.addStatement("$T identityResolvers = executionAttributes.getAttribute($T.IDENTITY_PROVIDER_CONFIGURATION)",
IdentityProviderConfiguration.class, SdkInternalExecutionAttribute.class)
.addStatement("$T identityProviders = executionAttributes.getAttribute($T.IDENTITY_PROVIDERS)",
IdentityProviders.class, SdkInternalExecutionAttribute.class)
.addStatement("$T discardedReasons = new $T<>()",
listOfStringSuppliers(), ArrayList.class);

builder.beginControlFlow("for ($T authOption : authOptions)", AuthSchemeOption.class);
{
builder.addStatement("$T authScheme = authSchemes.get(authOption.schemeId())", wildcardAuthScheme())
.addStatement("$T selectedAuthScheme = trySelectAuthScheme(authOption, authScheme, identityResolvers, "
.addStatement("$T selectedAuthScheme = trySelectAuthScheme(authOption, authScheme, identityProviders, "
+ "discardedReasons, metricCollector)",
wildcardSelectedAuthScheme());
builder.beginControlFlow("if (selectedAuthScheme != null)");
Expand Down Expand Up @@ -235,7 +235,7 @@ private MethodSpec generateTrySelectAuthScheme() {
.returns(namedSelectedAuthScheme())
.addParameter(AuthSchemeOption.class, "authOption")
.addParameter(namedAuthScheme(), "authScheme")
.addParameter(IdentityProviderConfiguration.class, "identityProviders")
.addParameter(IdentityProviders.class, "identityProviders")
.addParameter(listOfStringSuppliers(), "discardedReasons")
.addParameter(MetricCollector.class, "metricCollector")
.addTypeVariable(TypeVariableName.get("T", Identity.class));
Expand Down
9 changes: 4 additions & 5 deletions ...gen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@
import software.amazon.awssdk.http.Protocol;
import software.amazon.awssdk.http.SdkHttpConfigurationOption;
import software.amazon.awssdk.http.auth.spi.AuthScheme;
import software.amazon.awssdk.http.auth.spi.IdentityProviderConfiguration;
import software.amazon.awssdk.identity.spi.IdentityProvider;
import software.amazon.awssdk.identity.spi.IdentityProviders;
import software.amazon.awssdk.identity.spi.TokenIdentity;
import software.amazon.awssdk.protocols.query.interceptor.QueryParametersToBodyInterceptor;
import software.amazon.awssdk.utils.AttributeMap;
Expand Down Expand Up @@ -335,11 +335,10 @@ private MethodSpec finalizeServiceConfigurationMethod() {
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 identityProviderConfig = config.option($T.IDENTITY_PROVIDER_CONFIGURATION)",
IdentityProviderConfiguration.class, SdkClientOption.class);
builder.addStatement("$T identityProviders = config.option($T.IDENTITY_PROVIDERS)",
IdentityProviders.class, SdkClientOption.class);

builder.addStatement("builder.option($T.IDENTITY_PROVIDER_CONFIGURATION, "
+ "identityProviderConfig.toBuilder()"
builder.addStatement("builder.option($T.IDENTITY_PROVIDERS, identityProviders.toBuilder()"
+ ".putIdentityProvider(identityProvider).build())", SdkClientOption.class);

builder.endControlFlow();
Expand Down
10 changes: 5 additions & 5 deletions ...ources/software/amazon/awssdk/codegen/poet/auth/scheme/query-auth-scheme-interceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
import software.amazon.awssdk.core.metrics.CoreMetric;
import software.amazon.awssdk.http.auth.spi.AuthScheme;
import software.amazon.awssdk.http.auth.spi.AuthSchemeOption;
import software.amazon.awssdk.http.auth.spi.IdentityProviderConfiguration;
import software.amazon.awssdk.identity.spi.AwsCredentialsIdentity;
import software.amazon.awssdk.identity.spi.Identity;
import software.amazon.awssdk.identity.spi.IdentityProvider;
import software.amazon.awssdk.identity.spi.IdentityProviders;
import software.amazon.awssdk.identity.spi.ResolveIdentityRequest;
import software.amazon.awssdk.identity.spi.TokenIdentity;
import software.amazon.awssdk.metrics.MetricCollector;
Expand Down Expand Up @@ -61,13 +61,13 @@ private SelectedAuthScheme<? extends Identity> selectAuthScheme(List<AuthSchemeO
ExecutionAttributes executionAttributes) {
MetricCollector metricCollector = executionAttributes.getAttribute(SdkExecutionAttribute.API_CALL_METRIC_COLLECTOR);
Map<String, AuthScheme<?>> authSchemes = executionAttributes.getAttribute(SdkInternalExecutionAttribute.AUTH_SCHEMES);
IdentityProviderConfiguration identityResolvers = executionAttributes
.getAttribute(SdkInternalExecutionAttribute.IDENTITY_PROVIDER_CONFIGURATION);
IdentityProviders identityProviders = executionAttributes
.getAttribute(SdkInternalExecutionAttribute.IDENTITY_PROVIDERS);
List<Supplier<String>> discardedReasons = new ArrayList<>();
for (AuthSchemeOption authOption : authOptions) {
AuthScheme<?> authScheme = authSchemes.get(authOption.schemeId());
SelectedAuthScheme<? extends Identity> selectedAuthScheme = trySelectAuthScheme(authOption, authScheme,
identityResolvers, discardedReasons, metricCollector);
identityProviders, discardedReasons, metricCollector);
if (selectedAuthScheme != null) {
if (!discardedReasons.isEmpty()) {
LOG.debug(() -> String.format("%s auth will be used, discarded: '%s'", authOption.schemeId(),
Expand All @@ -90,7 +90,7 @@ private QueryAuthSchemeParams authSchemeParams(SdkRequest request, ExecutionAttr
}

private <T extends Identity> SelectedAuthScheme<T> trySelectAuthScheme(AuthSchemeOption authOption, AuthScheme<T> authScheme,
IdentityProviderConfiguration identityProviders, List<Supplier<String>> discardedReasons,
IdentityProviders identityProviders, List<Supplier<String>> discardedReasons,
MetricCollector metricCollector) {
if (authScheme == null) {
discardedReasons.add(() -> String.format("'%s' is not enabled for this request.", authOption.schemeId()));
Expand Down
10 changes: 5 additions & 5 deletions ...n/poet/auth/scheme/query-endpoint-auth-params-with-allowlist-auth-scheme-interceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
import software.amazon.awssdk.core.metrics.CoreMetric;
import software.amazon.awssdk.http.auth.spi.AuthScheme;
import software.amazon.awssdk.http.auth.spi.AuthSchemeOption;
import software.amazon.awssdk.http.auth.spi.IdentityProviderConfiguration;
import software.amazon.awssdk.identity.spi.AwsCredentialsIdentity;
import software.amazon.awssdk.identity.spi.Identity;
import software.amazon.awssdk.identity.spi.IdentityProvider;
import software.amazon.awssdk.identity.spi.IdentityProviders;
import software.amazon.awssdk.identity.spi.ResolveIdentityRequest;
import software.amazon.awssdk.identity.spi.TokenIdentity;
import software.amazon.awssdk.metrics.MetricCollector;
Expand Down Expand Up @@ -61,13 +61,13 @@ private SelectedAuthScheme<? extends Identity> selectAuthScheme(List<AuthSchemeO
ExecutionAttributes executionAttributes) {
MetricCollector metricCollector = executionAttributes.getAttribute(SdkExecutionAttribute.API_CALL_METRIC_COLLECTOR);
Map<String, AuthScheme<?>> authSchemes = executionAttributes.getAttribute(SdkInternalExecutionAttribute.AUTH_SCHEMES);
IdentityProviderConfiguration identityResolvers = executionAttributes
.getAttribute(SdkInternalExecutionAttribute.IDENTITY_PROVIDER_CONFIGURATION);
IdentityProviders identityProviders = executionAttributes
.getAttribute(SdkInternalExecutionAttribute.IDENTITY_PROVIDERS);
List<Supplier<String>> discardedReasons = new ArrayList<>();
for (AuthSchemeOption authOption : authOptions) {
AuthScheme<?> authScheme = authSchemes.get(authOption.schemeId());
SelectedAuthScheme<? extends Identity> selectedAuthScheme = trySelectAuthScheme(authOption, authScheme,
identityResolvers, discardedReasons, metricCollector);
identityProviders, discardedReasons, metricCollector);
if (selectedAuthScheme != null) {
if (!discardedReasons.isEmpty()) {
LOG.debug(() -> String.format("%s auth will be used, discarded: '%s'", authOption.schemeId(),
Expand Down Expand Up @@ -99,7 +99,7 @@ private QueryAuthSchemeParams authSchemeParams(SdkRequest request, ExecutionAttr
}

private <T extends Identity> SelectedAuthScheme<T> trySelectAuthScheme(AuthSchemeOption authOption, AuthScheme<T> authScheme,
IdentityProviderConfiguration identityProviders, List<Supplier<String>> discardedReasons,
IdentityProviders identityProviders, List<Supplier<String>> discardedReasons,
MetricCollector metricCollector) {
if (authScheme == null) {
discardedReasons.add(() -> String.format("'%s' is not enabled for this request.", authOption.schemeId()));
Expand Down
10 changes: 5 additions & 5 deletions ...oet/auth/scheme/query-endpoint-auth-params-without-allowlist-auth-scheme-interceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
import software.amazon.awssdk.core.metrics.CoreMetric;
import software.amazon.awssdk.http.auth.spi.AuthScheme;
import software.amazon.awssdk.http.auth.spi.AuthSchemeOption;
import software.amazon.awssdk.http.auth.spi.IdentityProviderConfiguration;
import software.amazon.awssdk.identity.spi.AwsCredentialsIdentity;
import software.amazon.awssdk.identity.spi.Identity;
import software.amazon.awssdk.identity.spi.IdentityProvider;
import software.amazon.awssdk.identity.spi.IdentityProviders;
import software.amazon.awssdk.identity.spi.ResolveIdentityRequest;
import software.amazon.awssdk.identity.spi.TokenIdentity;
import software.amazon.awssdk.metrics.MetricCollector;
Expand Down Expand Up @@ -61,13 +61,13 @@ private SelectedAuthScheme<? extends Identity> selectAuthScheme(List<AuthSchemeO
ExecutionAttributes executionAttributes) {
MetricCollector metricCollector = executionAttributes.getAttribute(SdkExecutionAttribute.API_CALL_METRIC_COLLECTOR);
Map<String, AuthScheme<?>> authSchemes = executionAttributes.getAttribute(SdkInternalExecutionAttribute.AUTH_SCHEMES);
IdentityProviderConfiguration identityResolvers = executionAttributes
.getAttribute(SdkInternalExecutionAttribute.IDENTITY_PROVIDER_CONFIGURATION);
IdentityProviders identityProviders = executionAttributes
.getAttribute(SdkInternalExecutionAttribute.IDENTITY_PROVIDERS);
List<Supplier<String>> discardedReasons = new ArrayList<>();
for (AuthSchemeOption authOption : authOptions) {
AuthScheme<?> authScheme = authSchemes.get(authOption.schemeId());
SelectedAuthScheme<? extends Identity> selectedAuthScheme = trySelectAuthScheme(authOption, authScheme,
identityResolvers, discardedReasons, metricCollector);
identityProviders, discardedReasons, metricCollector);
if (selectedAuthScheme != null) {
if (!discardedReasons.isEmpty()) {
LOG.debug(() -> String.format("%s auth will be used, discarded: '%s'", authOption.schemeId(),
Expand Down Expand Up @@ -102,7 +102,7 @@ private QueryAuthSchemeParams authSchemeParams(SdkRequest request, ExecutionAttr
}

private <T extends Identity> SelectedAuthScheme<T> trySelectAuthScheme(AuthSchemeOption authOption, AuthScheme<T> authScheme,
IdentityProviderConfiguration identityProviders, List<Supplier<String>> discardedReasons,
IdentityProviders identityProviders, List<Supplier<String>> discardedReasons,
MetricCollector metricCollector) {
if (authScheme == null) {
discardedReasons.add(() -> String.format("'%s' is not enabled for this request.", authOption.schemeId()));
Expand Down
8 changes: 4 additions & 4 deletions ...es/software/amazon/awssdk/codegen/poet/builder/test-bearer-auth-client-builder-class.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
import software.amazon.awssdk.http.auth.BearerAuthScheme;
import software.amazon.awssdk.http.auth.NoAuthAuthScheme;
import software.amazon.awssdk.http.auth.spi.AuthScheme;
import software.amazon.awssdk.http.auth.spi.IdentityProviderConfiguration;
import software.amazon.awssdk.identity.spi.IdentityProvider;
import software.amazon.awssdk.identity.spi.IdentityProviders;
import software.amazon.awssdk.identity.spi.TokenIdentity;
import software.amazon.awssdk.services.json.auth.scheme.JsonAuthSchemeProvider;
import software.amazon.awssdk.services.json.auth.scheme.internal.JsonAuthSchemeInterceptor;
Expand Down Expand Up @@ -71,9 +71,9 @@ protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientCon
SdkClientConfiguration.Builder builder = config.toBuilder();
IdentityProvider<? extends TokenIdentity> identityProvider = config.option(AwsClientOption.TOKEN_IDENTITY_PROVIDER);
if (identityProvider != null) {
IdentityProviderConfiguration identityProviderConfig = config.option(SdkClientOption.IDENTITY_PROVIDER_CONFIGURATION);
builder.option(SdkClientOption.IDENTITY_PROVIDER_CONFIGURATION, identityProviderConfig.toBuilder()
.putIdentityProvider(identityProvider).build());
IdentityProviders identityProviders = config.option(SdkClientOption.IDENTITY_PROVIDERS);
builder.option(SdkClientOption.IDENTITY_PROVIDERS, identityProviders.toBuilder()
.putIdentityProvider(identityProvider).build());
}
builder.option(SdkClientOption.EXECUTION_INTERCEPTORS, interceptors);
return builder.build();
Expand Down
8 changes: 4 additions & 4 deletions ...test/resources/software/amazon/awssdk/codegen/poet/builder/test-client-builder-class.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
import software.amazon.awssdk.http.auth.NoAuthAuthScheme;
import software.amazon.awssdk.http.auth.aws.AwsV4AuthScheme;
import software.amazon.awssdk.http.auth.spi.AuthScheme;
import software.amazon.awssdk.http.auth.spi.IdentityProviderConfiguration;
import software.amazon.awssdk.identity.spi.IdentityProvider;
import software.amazon.awssdk.identity.spi.IdentityProviders;
import software.amazon.awssdk.identity.spi.TokenIdentity;
import software.amazon.awssdk.services.json.auth.scheme.JsonAuthSchemeProvider;
import software.amazon.awssdk.services.json.auth.scheme.internal.JsonAuthSchemeInterceptor;
Expand Down Expand Up @@ -132,9 +132,9 @@ protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientCon
SdkClientConfiguration.Builder builder = config.toBuilder();
IdentityProvider<? extends TokenIdentity> identityProvider = config.option(AwsClientOption.TOKEN_IDENTITY_PROVIDER);
if (identityProvider != null) {
IdentityProviderConfiguration identityProviderConfig = config.option(SdkClientOption.IDENTITY_PROVIDER_CONFIGURATION);
builder.option(SdkClientOption.IDENTITY_PROVIDER_CONFIGURATION, identityProviderConfig.toBuilder()
.putIdentityProvider(identityProvider).build());
IdentityProviders identityProviders = config.option(SdkClientOption.IDENTITY_PROVIDERS);
builder.option(SdkClientOption.IDENTITY_PROVIDERS, identityProviders.toBuilder()
.putIdentityProvider(identityProvider).build());
}
builder.option(SdkClientOption.EXECUTION_INTERCEPTORS, interceptors)
.option(AwsClientOption.DUALSTACK_ENDPOINT_ENABLED, finalServiceConfig.dualstackEnabled())
Expand Down
8 changes: 4 additions & 4 deletions ...oftware/amazon/awssdk/codegen/poet/builder/test-client-builder-endpoints-auth-params.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
import software.amazon.awssdk.http.auth.aws.AwsV4AuthScheme;
import software.amazon.awssdk.http.auth.aws.AwsV4aAuthScheme;
import software.amazon.awssdk.http.auth.spi.AuthScheme;
import software.amazon.awssdk.http.auth.spi.IdentityProviderConfiguration;
import software.amazon.awssdk.identity.spi.IdentityProvider;
import software.amazon.awssdk.identity.spi.IdentityProviders;
import software.amazon.awssdk.identity.spi.TokenIdentity;
import software.amazon.awssdk.protocols.query.interceptor.QueryParametersToBodyInterceptor;
import software.amazon.awssdk.services.query.auth.scheme.QueryAuthSchemeProvider;
Expand Down Expand Up @@ -77,9 +77,9 @@ protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientCon
SdkClientConfiguration.Builder builder = config.toBuilder();
IdentityProvider<? extends TokenIdentity> identityProvider = config.option(AwsClientOption.TOKEN_IDENTITY_PROVIDER);
if (identityProvider != null) {
IdentityProviderConfiguration identityProviderConfig = config.option(SdkClientOption.IDENTITY_PROVIDER_CONFIGURATION);
builder.option(SdkClientOption.IDENTITY_PROVIDER_CONFIGURATION, identityProviderConfig.toBuilder()
.putIdentityProvider(identityProvider).build());
IdentityProviders identityProviders = config.option(SdkClientOption.IDENTITY_PROVIDERS);
builder.option(SdkClientOption.IDENTITY_PROVIDERS, identityProviders.toBuilder()
.putIdentityProvider(identityProvider).build());
}
builder.option(SdkClientOption.EXECUTION_INTERCEPTORS, interceptors).option(SdkClientOption.CLIENT_CONTEXT_PARAMS,
clientContextParams.build());
Expand Down
Loading