stable tests

apache · Oct 4, 2024 · 0647980 · 0647980
1 parent fac2d72
commit 0647980
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 10 deletions.
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/storage/FileStorageConfigurationInfo.java b/polaris-core/src/main/java/org/apache/polaris/core/storage/FileStorageConfigurationInfo.java
@@ -20,6 +20,8 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
+import java.util.Locale;
+
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -42,7 +44,7 @@ public String getFileIoImplClassName() {
 
  @Override
  public void validatePrefixForStorageType(String loc) {
- if (!loc.startsWith(getStorageType().getPrefix())
+ if (getStorageType().getPrefixes().stream().noneMatch(p -> loc.toLowerCase(Locale.ROOT).startsWith(p))
  && !loc.startsWith("file:/")
  && !loc.startsWith("/")
  && !loc.equals("*")) {

diff --git a/...s-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageConfigurationInfo.java b/...s-core/src/main/java/org/apache/polaris/core/storage/PolarisStorageConfigurationInfo.java
@@ -247,7 +247,7 @@ public enum StorageType {
  FILE("file://"),
  ;
 
- final List<String> prefixes;
+ private final List<String> prefixes;
 
  StorageType(String prefix) {
  this.prefixes = List.of(prefix);

diff --git a/...est/java/org/apache/polaris/service/storage/aws/AwsCredentialsStorageIntegrationTest.java b/...est/java/org/apache/polaris/service/storage/aws/AwsCredentialsStorageIntegrationTest.java
@@ -496,6 +496,6 @@ public void testGetSubscopedCredsInlinePolicyWithEmptyReadAndWrite() {
 
  private static @NotNull String s3Path(
  String bucket, String keyPrefix, PolarisStorageConfigurationInfo.StorageType storageType) {
- return storageType.getPrefix() + bucket + "/" + keyPrefix;
+ return storageType.getPrefixes().get(0) + bucket + "/" + keyPrefix;
  }
 }
diff --git a/polaris-core/src/test/java/org/apache/polaris/service/storage/azure/AzureLocationTest.java b/polaris-core/src/test/java/org/apache/polaris/service/storage/azure/AzureLocationTest.java
@@ -34,12 +34,18 @@ public void testLocation() {
  Assertions.assertThat(azureLocation.getFilePath()).isEqualTo("myfile");
  }
 
+ @Test
+ public void testWasbLocation() {
+ String uri = "wasb://container@storageaccount.blob.core.windows.net/myfile";
+ AzureLocation azureLocation = new AzureLocation(uri);
+ Assertions.assertThat(azureLocation.getContainer()).isEqualTo("container");
+ Assertions.assertThat(azureLocation.getStorageAccount()).isEqualTo("storageaccount");
+ Assertions.assertThat(azureLocation.getEndpoint()).isEqualTo("blob.core.windows.net");
+ Assertions.assertThat(azureLocation.getFilePath()).isEqualTo("myfile");
+ }
+
  @Test
  public void testLocation_negative_cases() {
- Assertions.assertThatThrownBy(
- () ->
- new AzureLocation("wasbs://container@storageaccount.blob.core.windows.net/myfile"))
- .isInstanceOf(IllegalArgumentException.class);
  Assertions.assertThatThrownBy(
  () -> new AzureLocation("abfss://storageaccount.blob.core.windows.net/myfile"))
  .isInstanceOf(IllegalArgumentException.class);

diff --git a/polaris-service/src/test/java/org/apache/polaris/service/entity/CatalogEntityTest.java b/polaris-service/src/test/java/org/apache/polaris/service/entity/CatalogEntityTest.java
@@ -56,7 +56,7 @@ public void testInvalidAllowedLocationPrefix() {
  Assertions.assertThatThrownBy(() -> CatalogEntity.fromCatalog(awsCatalog))
  .isInstanceOf(IllegalArgumentException.class)
  .hasMessageContaining(
- "Location prefix not allowed: 'unsupportPrefix://mybucket/path', expected prefix: 's3://'");
+ "Location prefix not allowed: 'unsupportPrefix://mybucket/path', expected prefixes");
 
  // Invalid azure prefix
  AzureStorageConfigInfo azureStorageConfigModel =
@@ -76,7 +76,7 @@ public void testInvalidAllowedLocationPrefix() {
  .build();
  Assertions.assertThatThrownBy(() -> CatalogEntity.fromCatalog(azureCatalog))
  .isInstanceOf(IllegalArgumentException.class)
- .hasMessageContaining("Invalid azure adls location uri unsupportPrefix://mybucket/path");
+ .hasMessageContaining("Invalid azure location uri unsupportPrefix://mybucket/path");
 
  // invalid gcp prefix
  GcpStorageConfigInfo gcpStorageConfigModel =
@@ -94,7 +94,7 @@ public void testInvalidAllowedLocationPrefix() {
  Assertions.assertThatThrownBy(() -> CatalogEntity.fromCatalog(gcpCatalog))
  .isInstanceOf(IllegalArgumentException.class)
  .hasMessageContaining(
- "Location prefix not allowed: 'unsupportPrefix://mybucket/path', expected prefix: 'gs://'");
+ "Location prefix not allowed: 'unsupportPrefix://mybucket/path', expected prefixes");
  }
 
  @Test