diff --git a/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogAzureIntegrationTestBase.java b/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogAdlsIntegrationTestBase.java similarity index 96% rename from integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogAzureIntegrationTestBase.java rename to integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogAdlsIntegrationTestBase.java index 923f3592b0..c4553dea04 100644 --- a/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogAzureIntegrationTestBase.java +++ b/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogAdlsIntegrationTestBase.java @@ -23,7 +23,7 @@ import org.apache.polaris.core.admin.model.StorageConfigInfo; /** Runs PolarisRestCatalogIntegrationBase test on Azure. */ -public abstract class PolarisRestCatalogAzureIntegrationTestBase +public abstract class PolarisRestCatalogAdlsIntegrationTestBase extends PolarisRestCatalogIntegrationBase { public static final String TENANT_ID = System.getenv("INTEGRATION_TEST_AZURE_TENANT_ID"); public static final String BASE_LOCATION = System.getenv("INTEGRATION_TEST_AZURE_PATH"); diff --git a/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogGcpIntegrationTestBase.java b/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogGcsIntegrationTestBase.java similarity index 96% rename from integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogGcpIntegrationTestBase.java rename to integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogGcsIntegrationTestBase.java index 381983933f..5990bc7c4e 100644 --- a/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogGcpIntegrationTestBase.java +++ b/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogGcsIntegrationTestBase.java @@ -23,7 +23,7 @@ import org.apache.polaris.core.admin.model.StorageConfigInfo; /** Runs PolarisRestCatalogIntegrationBase test on GCP. */ -public abstract class PolarisRestCatalogGcpIntegrationTestBase +public abstract class PolarisRestCatalogGcsIntegrationTestBase extends PolarisRestCatalogIntegrationBase { public static final String SERVICE_ACCOUNT = System.getenv("INTEGRATION_TEST_GCS_SERVICE_ACCOUNT"); diff --git a/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogAwsIntegrationTestBase.java b/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogS3IntegrationTestBase.java similarity index 96% rename from integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogAwsIntegrationTestBase.java rename to integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogS3IntegrationTestBase.java index 64bf0f221c..b3b34c6091 100644 --- a/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogAwsIntegrationTestBase.java +++ b/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogS3IntegrationTestBase.java @@ -24,7 +24,7 @@ import org.apache.polaris.core.admin.model.StorageConfigInfo; /** Runs PolarisRestCatalogIntegrationBase test on AWS. */ -public abstract class PolarisRestCatalogAwsIntegrationTestBase +public abstract class PolarisRestCatalogS3IntegrationTestBase extends PolarisRestCatalogIntegrationBase { public static final String ROLE_ARN = Optional.ofNullable(System.getenv("INTEGRATION_TEST_ROLE_ARN")) diff --git a/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewAzureIntegrationTest.java b/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewAdlsIntegrationTestBase.java similarity index 96% rename from integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewAzureIntegrationTest.java rename to integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewAdlsIntegrationTestBase.java index 9d2c4d84a2..36cc707ace 100644 --- a/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewAzureIntegrationTest.java +++ b/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewAdlsIntegrationTestBase.java @@ -25,7 +25,7 @@ import org.apache.polaris.core.admin.model.StorageConfigInfo; /** Runs PolarisRestCatalogViewIntegrationTest on Azure. */ -public class PolarisRestCatalogViewAzureIntegrationTest +public abstract class PolarisRestCatalogViewAdlsIntegrationTestBase extends PolarisRestCatalogViewIntegrationBase { public static final String TENANT_ID = System.getenv("INTEGRATION_TEST_AZURE_TENANT_ID"); public static final String BASE_LOCATION = System.getenv("INTEGRATION_TEST_AZURE_PATH"); diff --git a/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewGcpIntegrationTest.java b/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewGcsIntegrationTestBase.java similarity index 96% rename from integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewGcpIntegrationTest.java rename to integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewGcsIntegrationTestBase.java index 3dea04e619..7c32ec0241 100644 --- a/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewGcpIntegrationTest.java +++ b/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewGcsIntegrationTestBase.java @@ -25,7 +25,7 @@ import org.apache.polaris.core.admin.model.StorageConfigInfo; /** Runs PolarisRestCatalogViewIntegrationTest on GCP. */ -public class PolarisRestCatalogViewGcpIntegrationTest +public abstract class PolarisRestCatalogViewGcsIntegrationTestBase extends PolarisRestCatalogViewIntegrationBase { public static final String SERVICE_ACCOUNT = System.getenv("INTEGRATION_TEST_GCS_SERVICE_ACCOUNT"); diff --git a/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewAwsIntegrationTest.java b/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewS3IntegrationTestBase.java similarity index 96% rename from integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewAwsIntegrationTest.java rename to integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewS3IntegrationTestBase.java index 63471c92b4..496e7ebbe7 100644 --- a/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewAwsIntegrationTest.java +++ b/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewS3IntegrationTestBase.java @@ -26,7 +26,7 @@ import org.apache.polaris.core.admin.model.StorageConfigInfo; /** Runs PolarisRestCatalogViewIntegrationTest on AWS. */ -public class PolarisRestCatalogViewAwsIntegrationTest +public abstract class PolarisRestCatalogViewS3IntegrationTestBase extends PolarisRestCatalogViewIntegrationBase { public static final String ROLE_ARN = Optional.ofNullable(System.getenv("INTEGRATION_TEST_ROLE_ARN")) // Backward compatibility diff --git a/runtime/service/README.md b/runtime/service/README.md index 18026ad8e9..fd4893a505 100644 --- a/runtime/service/README.md +++ b/runtime/service/README.md @@ -34,12 +34,12 @@ export INTEGRATION_TEST_S3_PATH="s3://bucket/subpath" export INTEGRATION_TEST_S3_ROLE_ARN="your-role-arn" ./gradlew :polaris-runtime-service:cloudTest ``` -For Azure: +For ADLS: ```shell export INTEGRATION_TEST_AZURE_PATH="abfss://bucket/subpath" export INTEGRATION_TEST_AZURE_TENANT_ID="your-tenant-id" ./gradlew :polaris-runtime-service:cloudTest -``` +``` For GCS: ```shell export INTEGRATION_TEST_GCS_PATH="gs://bucket/subpath" diff --git a/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogAzureIT.java b/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogAdlsIT.java similarity index 86% rename from runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogAzureIT.java rename to runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogAdlsIT.java index d89bbf22d9..6b8fd8dd18 100644 --- a/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogAzureIT.java +++ b/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogAdlsIT.java @@ -19,9 +19,9 @@ package org.apache.polaris.service.it; import io.quarkus.test.junit.QuarkusIntegrationTest; -import org.apache.polaris.service.it.test.PolarisRestCatalogAzureIntegrationTestBase; +import org.apache.polaris.service.it.test.PolarisRestCatalogAdlsIntegrationTestBase; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; @QuarkusIntegrationTest @EnabledIfEnvironmentVariable(named = "INTEGRATION_TEST_AZURE_PATH", matches = ".+") -public class RestCatalogAzureIT extends PolarisRestCatalogAzureIntegrationTestBase {} +public class RestCatalogAdlsIT extends PolarisRestCatalogAdlsIntegrationTestBase {} diff --git a/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogGcpIT.java b/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogGcsIT.java similarity index 89% rename from runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogGcpIT.java rename to runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogGcsIT.java index 80448f0c2a..c098d0ba3b 100644 --- a/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogGcpIT.java +++ b/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogGcsIT.java @@ -19,9 +19,9 @@ package org.apache.polaris.service.it; import io.quarkus.test.junit.QuarkusIntegrationTest; -import org.apache.polaris.service.it.test.PolarisRestCatalogGcpIntegrationTestBase; +import org.apache.polaris.service.it.test.PolarisRestCatalogGcsIntegrationTestBase; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; @QuarkusIntegrationTest @EnabledIfEnvironmentVariable(named = "INTEGRATION_TEST_GCS_PATH", matches = ".+") -public class RestCatalogGcpIT extends PolarisRestCatalogGcpIntegrationTestBase {} +public class RestCatalogGcsIT extends PolarisRestCatalogGcsIntegrationTestBase {} diff --git a/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogAwsIT.java b/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogS3IT.java similarity index 86% rename from runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogAwsIT.java rename to runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogS3IT.java index a229c1c167..6e6f9d9669 100644 --- a/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogAwsIT.java +++ b/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogS3IT.java @@ -19,9 +19,9 @@ package org.apache.polaris.service.it; import io.quarkus.test.junit.QuarkusIntegrationTest; -import org.apache.polaris.service.it.test.PolarisRestCatalogAwsIntegrationTestBase; +import org.apache.polaris.service.it.test.PolarisRestCatalogS3IntegrationTestBase; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; @QuarkusIntegrationTest @EnabledIfEnvironmentVariable(named = "INTEGRATION_TEST_S3_PATH", matches = ".+") -public class RestCatalogAwsIT extends PolarisRestCatalogAwsIntegrationTestBase {} +public class RestCatalogS3IT extends PolarisRestCatalogS3IntegrationTestBase {} diff --git a/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogViewAzureIT.java b/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogViewAdlsIT.java similarity index 93% rename from runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogViewAzureIT.java rename to runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogViewAdlsIT.java index 38a83c83fa..ce57d43f5a 100644 --- a/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogViewAzureIT.java +++ b/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogViewAdlsIT.java @@ -22,14 +22,14 @@ import java.lang.reflect.Field; import java.nio.file.Path; import org.apache.iceberg.view.ViewCatalogTests; -import org.apache.polaris.service.it.test.PolarisRestCatalogViewAzureIntegrationTest; +import org.apache.polaris.service.it.test.PolarisRestCatalogViewAdlsIntegrationTestBase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; import org.junit.jupiter.api.io.TempDir; @QuarkusIntegrationTest @EnabledIfEnvironmentVariable(named = "INTEGRATION_TEST_AZURE_PATH", matches = ".+") -public class RestCatalogViewAzureIT extends PolarisRestCatalogViewAzureIntegrationTest { +public class RestCatalogViewAdlsIT extends PolarisRestCatalogViewAdlsIntegrationTestBase { @BeforeEach public void setUpTempDir(@TempDir Path tempDir) throws Exception { diff --git a/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogViewGcpIT.java b/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogViewGcsIT.java similarity index 93% rename from runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogViewGcpIT.java rename to runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogViewGcsIT.java index 1eca3ecc32..36c48b0896 100644 --- a/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogViewGcpIT.java +++ b/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogViewGcsIT.java @@ -22,14 +22,14 @@ import java.lang.reflect.Field; import java.nio.file.Path; import org.apache.iceberg.view.ViewCatalogTests; -import org.apache.polaris.service.it.test.PolarisRestCatalogViewGcpIntegrationTest; +import org.apache.polaris.service.it.test.PolarisRestCatalogViewGcsIntegrationTestBase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; import org.junit.jupiter.api.io.TempDir; @QuarkusIntegrationTest @EnabledIfEnvironmentVariable(named = "INTEGRATION_TEST_GCS_PATH", matches = ".+") -public class RestCatalogViewGcpIT extends PolarisRestCatalogViewGcpIntegrationTest { +public class RestCatalogViewGcsIT extends PolarisRestCatalogViewGcsIntegrationTestBase { @BeforeEach public void setUpTempDir(@TempDir Path tempDir) throws Exception { diff --git a/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogViewAwsIT.java b/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogViewS3IT.java similarity index 93% rename from runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogViewAwsIT.java rename to runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogViewS3IT.java index de6cfb387e..65bc1e687a 100644 --- a/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogViewAwsIT.java +++ b/runtime/service/src/cloudTest/java/org/apache/polaris/service/it/RestCatalogViewS3IT.java @@ -22,14 +22,14 @@ import java.lang.reflect.Field; import java.nio.file.Path; import org.apache.iceberg.view.ViewCatalogTests; -import org.apache.polaris.service.it.test.PolarisRestCatalogViewAwsIntegrationTest; +import org.apache.polaris.service.it.test.PolarisRestCatalogViewS3IntegrationTestBase; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; import org.junit.jupiter.api.io.TempDir; @QuarkusIntegrationTest @EnabledIfEnvironmentVariable(named = "INTEGRATION_TEST_S3_PATH", matches = ".+") -public class RestCatalogViewAwsIT extends PolarisRestCatalogViewAwsIntegrationTest { +public class RestCatalogViewS3IT extends PolarisRestCatalogViewS3IntegrationTestBase { @BeforeEach public void setUpTempDir(@TempDir Path tempDir) throws Exception {