Skip to content

Relax ARN validation logic #3071

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Relax ARN validation logic #3071

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
4 changes: 0 additions & 4 deletions ...s-core/src/main/java/org/apache/polaris/core/storage/aws/AwsStorageConfigurationInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,6 @@ public static void validateArn(String arn) {
if (arn.isEmpty()) {
throw new IllegalArgumentException("ARN must not be empty");
}
// specifically throw errors for China
if (arn.contains("aws-cn")) {
throw new IllegalArgumentException("AWS China is temporarily not supported");
}
checkArgument(Pattern.matches(ROLE_ARN_PATTERN, arn), "Invalid role ARN format: %s", arn);
}
}
38 changes: 1 addition & 37 deletions ...est/java/org/apache/polaris/service/storage/aws/AwsCredentialsStorageIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,24 +234,6 @@ public void testGetSubscopedCredsInlinePolicy(String awsPartition) {
});
switch (awsPartition) {
case "aws-cn":
Assertions.assertThatThrownBy(
() ->
new AwsCredentialsStorageIntegration(
AwsStorageConfigurationInfo.builder()
.addAllowedLocation(s3Path(bucket, warehouseKeyPrefix))
.roleARN(roleARN)
.externalId(externalId)
.region(region)
.build(),
stsClient)
.getSubscopedCreds(
EMPTY_REALM_CONFIG,
true,
Set.of(s3Path(bucket, firstPath), s3Path(bucket, secondPath)),
Set.of(s3Path(bucket, firstPath)),
null))
.isInstanceOf(IllegalArgumentException.class);
break;
case AWS_PARTITION:
case "aws-us-gov":
StorageAccessConfig storageAccessConfig =
Expand Down Expand Up @@ -558,24 +540,6 @@ public void testClientRegion(String awsPartition) {
});
switch (awsPartition) {
case "aws-cn":
Assertions.assertThatThrownBy(
() ->
new AwsCredentialsStorageIntegration(
AwsStorageConfigurationInfo.builder()
.addAllowedLocation(s3Path(bucket, warehouseKeyPrefix))
.roleARN(roleARN)
.externalId(externalId)
.region(clientRegion)
.build(),
stsClient)
.getSubscopedCreds(
EMPTY_REALM_CONFIG,
true, /* allowList = true */
Set.of(),
Set.of(),
Optional.empty()))
.isInstanceOf(IllegalArgumentException.class);
break;
case AWS_PARTITION:
case "aws-us-gov":
StorageAccessConfig storageAccessConfig =
Expand Down Expand Up @@ -619,6 +583,7 @@ public void testNoClientRegion(String awsPartition) {
});
switch (awsPartition) {
case AWS_PARTITION:
case "aws-cn":
StorageAccessConfig storageAccessConfig =
new AwsCredentialsStorageIntegration(
AwsStorageConfigurationInfo.builder()
Expand All @@ -637,7 +602,6 @@ public void testNoClientRegion(String awsPartition) {
.isNotEmpty()
.doesNotContainKey(StorageAccessProperty.CLIENT_REGION.getPropertyName());
break;
case "aws-cn":
case "aws-us-gov":
Assertions.assertThatThrownBy(
() ->
Expand Down
8 changes: 2 additions & 6 deletions runtime/service/src/test/java/org/apache/polaris/service/entity/CatalogEntityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ public void testValidAllowedLocationPrefix() {
}

@ParameterizedTest
@ValueSource(strings = {"", "arn:aws:iam:0123456:role/jdoe", "aws-cn"})
@ValueSource(strings = {"", "arn:aws:iam:0123456:role/jdoe", "arn:aws-cn:iam:0123456:role/jdoe"})
public void testInvalidArn(String roleArn) {
String basedLocation = "s3://externally-owned-bucket";
AwsStorageConfigInfo awsStorageConfigModel =
Expand All @@ -275,11 +275,7 @@ public void testInvalidArn(String roleArn) {
.setStorageConfigInfo(awsStorageConfigModel)
.build();
String expectedMessage =
switch (roleArn) {
case "" -> "ARN must not be empty";
case "aws-cn" -> "AWS China is temporarily not supported";
default -> "Invalid role ARN format: arn:aws:iam:0123456:role/jdoe";
};
roleArn.isEmpty() ? "ARN must not be empty" : "Invalid role ARN format: " + roleArn;
Assertions.assertThatThrownBy(() -> CatalogEntity.fromCatalog(realmConfig, awsCatalog))
.isInstanceOf(IllegalArgumentException.class)
.hasMessage(expectedMessage);
Expand Down