Skip to content

Refactor Polaris cloudTests and adopt changes from PR #2405 #2871

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 2 commits into from
Nov 3, 2025
Merged

Refactor Polaris cloudTests and adopt changes from PR #2405 #2871

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb296dd
Refactor Polaris cloudTests and adopt changes from PR #2405
tmater Oct 23, 2025
5d61ff6
Revert env var change
tmater Oct 27, 2025
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
6 changes: 3 additions & 3 deletions ...sRestCatalogAzureIntegrationTestBase.java → ...isRestCatalogAdlsIntegrationTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
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");
public static final String TENANT_ID = System.getenv("INTEGRATION_TEST_ADLS_TENANT_ID");
Copy link
Contributor

@dimas-b dimas-b Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@andrew4699 : is that change ok from your POV?

Copy link
Contributor

@andrew4699 andrew4699 Oct 23, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Renaming this will certainly break things that depend on it, but I haven't been involved with the latest guidelines on changes that break internal "interfaces", so I'd defer to what the status quo is.

Copy link
Contributor Author

@tmater tmater Oct 27, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for looking into it @dimas-b & @andrew4699! Makes sense, reverted the env rename part.

public static final String BASE_LOCATION = System.getenv("INTEGRATION_TEST_ADLS_PATH");

@Override
protected StorageConfigInfo getStorageConfigInfo() {
Expand Down
2 changes: 1 addition & 1 deletion ...risRestCatalogGcpIntegrationTestBase.java → ...risRestCatalogGcsIntegrationTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion ...risRestCatalogAwsIntegrationTestBase.java → ...arisRestCatalogS3IntegrationTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
6 changes: 3 additions & 3 deletions ...sRestCatalogViewAzureIntegrationTest.java → ...stCatalogViewAdlsIntegrationTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
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");
public static final String TENANT_ID = System.getenv("INTEGRATION_TEST_ADLS_TENANT_ID");
public static final String BASE_LOCATION = System.getenv("INTEGRATION_TEST_ADLS_PATH");

@Override
protected StorageConfigInfo getStorageConfigInfo() {
Expand Down
2 changes: 1 addition & 1 deletion ...risRestCatalogViewGcpIntegrationTest.java → ...estCatalogViewGcsIntegrationTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion ...risRestCatalogViewAwsIntegrationTest.java → ...RestCatalogViewS3IntegrationTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions runtime/service/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
export INTEGRATION_TEST_ADLS_PATH="abfss://bucket/subpath"
export INTEGRATION_TEST_ADLS_TENANT_ID="your-tenant-id"
./gradlew :polaris-runtime-service:cloudTest
```
```
For GCS:
```shell
export INTEGRATION_TEST_GCS_PATH="gs://bucket/subpath"
Expand Down
6 changes: 3 additions & 3 deletions ...olaris/service/it/RestCatalogAzureIT.java → ...polaris/service/it/RestCatalogAdlsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
@EnabledIfEnvironmentVariable(named = "INTEGRATION_TEST_ADLS_PATH", matches = ".+")
public class RestCatalogAdlsIT extends PolarisRestCatalogAdlsIntegrationTestBase {}
4 changes: 2 additions & 2 deletions .../polaris/service/it/RestCatalogGcpIT.java → .../polaris/service/it/RestCatalogGcsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
4 changes: 2 additions & 2 deletions .../polaris/service/it/RestCatalogAwsIT.java → ...e/polaris/service/it/RestCatalogS3IT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}
6 changes: 3 additions & 3 deletions ...is/service/it/RestCatalogViewAzureIT.java → ...ris/service/it/RestCatalogViewAdlsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
@EnabledIfEnvironmentVariable(named = "INTEGRATION_TEST_ADLS_PATH", matches = ".+")
public class RestCatalogViewAdlsIT extends PolarisRestCatalogViewAdlsIntegrationTestBase {

@BeforeEach
public void setUpTempDir(@TempDir Path tempDir) throws Exception {
Expand Down
4 changes: 2 additions & 2 deletions ...aris/service/it/RestCatalogViewGcpIT.java → ...aris/service/it/RestCatalogViewGcsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions ...aris/service/it/RestCatalogViewAwsIT.java → ...laris/service/it/RestCatalogViewS3IT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down