Skip to content

Migrate STS from Arn to RuleArn, remove S3EndpointAuthSchemeStrategyFactory, and delete old rule engine tests #7270

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

Open
S-Saranya1 wants to merge 1 commit into
base: feature/master/use-codegen-rules-by-default
Choose a base branch
from
Open

Migrate STS from Arn to RuleArn, remove S3EndpointAuthSchemeStrategyFactory, and delete old rule engine tests #7270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 0 additions & 48 deletions ...software/amazon/awssdk/services/s3/endpoints/internal/KnownS3ExpressEndpointProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,7 @@

package software.amazon.awssdk.services.s3.endpoints.internal;

import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import software.amazon.awssdk.annotations.SdkInternalApi;
import software.amazon.awssdk.awscore.endpoints.AwsEndpointAttribute;
import software.amazon.awssdk.awscore.endpoints.authscheme.EndpointAuthScheme;
import software.amazon.awssdk.endpoints.EndpointAttributeKey;

@SdkInternalApi
Expand All @@ -32,49 +27,6 @@ public final class KnownS3ExpressEndpointProperty {
public static final EndpointAttributeKey<String> BACKEND =
new EndpointAttributeKey<>("Backend", String.class);

public static final List<EndpointAttributeProvider<?>> KNOWN_S3_ENDPOINT_PROPERTIES = Collections.unmodifiableList(
Arrays.asList(
new AuthSchemesProperty(),
new BackendProperty()
)
);

private KnownS3ExpressEndpointProperty() {
}

private static class AuthSchemesProperty implements EndpointAttributeProvider<List<EndpointAuthScheme>> {
@Override
public String propertyName() {
return "authSchemes";
}

@Override
public EndpointAttributeKey<List<EndpointAuthScheme>> attributeKey() {
return AwsEndpointAttribute.AUTH_SCHEMES;
}

@Override
public List<EndpointAuthScheme> attributeValue(Value value) {
EndpointAuthSchemeStrategyFactory endpointAuthSchemeStrategyFactory = new S3EndpointAuthSchemeStrategyFactory();
EndpointAuthSchemeStrategy strategy = endpointAuthSchemeStrategyFactory.endpointAuthSchemeStrategy();
return strategy.createAuthSchemes(value);
}
}

private static class BackendProperty implements EndpointAttributeProvider<String> {
@Override
public String propertyName() {
return "backend";
}

@Override
public EndpointAttributeKey<String> attributeKey() {
return BACKEND;
}

@Override
public String attributeValue(Value value) {
return value.expectString();
}
}
}
113 changes: 0 additions & 113 deletions ...are/amazon/awssdk/services/s3/endpoints/internal/S3EndpointAuthSchemeStrategyFactory.java
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion .../software/amazon/awssdk/services/s3/internal/crossregion/S3CrossRegionSyncClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
import org.junit.jupiter.params.provider.ValueSource;
import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatchers;
import org.mockito.Mock;
import org.mockito.Mockito;
import software.amazon.awssdk.core.interceptor.Context;
import software.amazon.awssdk.core.interceptor.ExecutionAttributes;
Expand Down
10 changes: 6 additions & 4 deletions ...va/software/amazon/awssdk/services/sts/auth/StsGetFederationTokenCredentialsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
import software.amazon.awssdk.core.useragent.BusinessMetricFeatureId;
import software.amazon.awssdk.services.sts.StsClient;
import software.amazon.awssdk.services.sts.endpoints.internal.Arn;
import software.amazon.awssdk.services.sts.endpoints.internal.RuleArn;
import software.amazon.awssdk.services.sts.model.FederatedUser;
import software.amazon.awssdk.services.sts.model.GetFederationTokenRequest;
import software.amazon.awssdk.services.sts.model.GetFederationTokenResponse;
Expand Down Expand Up @@ -89,9 +89,11 @@ private String accountIdFromArn(FederatedUser federatedUser) {
if (federatedUser == null) {
return null;
}
return Arn.parse(federatedUser.arn())
.map(Arn::accountId)
.orElse(null);
RuleArn arn = RuleArn.parse(federatedUser.arn());
if (arn == null) {
return null;
}
return arn.accountId();
}

@Override
Expand Down
10 changes: 6 additions & 4 deletions services/sts/src/main/java/software/amazon/awssdk/services/sts/internal/StsAuthUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

import software.amazon.awssdk.annotations.SdkInternalApi;
import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
import software.amazon.awssdk.services.sts.endpoints.internal.Arn;
import software.amazon.awssdk.services.sts.endpoints.internal.RuleArn;
import software.amazon.awssdk.services.sts.model.AssumedRoleUser;
import software.amazon.awssdk.services.sts.model.Credentials;

Expand All @@ -31,9 +31,11 @@ public static String accountIdFromArn(AssumedRoleUser assumedRoleUser) {
if (assumedRoleUser == null) {
return null;
}
return Arn.parse(assumedRoleUser.arn())
.map(Arn::accountId)
.orElse(null);
RuleArn arn = RuleArn.parse(assumedRoleUser.arn());
if (arn == null) {
return null;
}
return arn.accountId();
}

public static AwsSessionCredentials fromStsCredentials(Credentials credentials, String provider) {
Expand Down
1 change: 0 additions & 1 deletion ...rc/test/java/software/amazon/awssdk/services/sts/auth/StsCredentialsProviderTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import org.mockito.junit.jupiter.MockitoExtension;
import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
import software.amazon.awssdk.services.sts.StsClient;
import software.amazon.awssdk.services.sts.endpoints.internal.Arn;
import software.amazon.awssdk.services.sts.model.Credentials;

/**
Expand Down
5 changes: 2 additions & 3 deletions ...s/src/test/java/software/amazon/awssdk/archtests/NamingConventionWithSuppressionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
import com.tngtech.archunit.junit.ArchTest;
import com.tngtech.archunit.lang.ArchRule;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.function.Supplier;
import java.util.regex.Pattern;
import org.junit.jupiter.api.Test;
import software.amazon.awssdk.services.s3.endpoints.internal.S3EndpointAuthSchemeStrategyFactory;

/**
* This test class diffs from {@link NamingConventionTest}; it doesn't use archunit annotations such as {@link ArchTest}
Expand All @@ -45,8 +45,7 @@ public class NamingConventionWithSuppressionTest {
* DO NOT ADD NEW EXCEPTIONS
*/
private static final Set<Pattern> ALLOWED_SUPPLIER_SUPPRESSION = new HashSet<>(
Arrays.asList(Pattern.compile(".*/DefaultEndpointAuthSchemeStrategyFactory.class"),
ArchUtils.classNameToPattern(S3EndpointAuthSchemeStrategyFactory.class)));
Collections.singletonList(Pattern.compile(".*/DefaultEndpointAuthSchemeStrategyFactory.class")));

@Test
void supplierImpl_shouldHaveSupplierSuffix() {
Expand Down
Loading
Loading