(polaris) branch main updated: Allow overriding createCatalog calls in integrations tests (#2516)

[dimas]

This is an automated email from the ASF dual-hosted git repository.

dimas pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/polaris.git


The following commit(s) were added to refs/heads/main by this push:
     new d11b9e49b Allow overriding createCatalog calls in integrations tests 
(#2516)
d11b9e49b is described below

commit d11b9e49b8e027aa3a23130ce3a4f22098b309f0
Author: Dmitri Bourlatchkov <dmitri.bourlatch...@gmail.com>
AuthorDate: Mon Sep 8 10:07:25 2025 -0400

    Allow overriding createCatalog calls in integrations tests (#2516)
    
    This is mostly to add testing flexibility in downstream projects.
---
 .../java/org/apache/polaris/service/it/env/ManagementApi.java    | 3 +++
 .../service/it/test/PolarisRestCatalogIntegrationBase.java       | 8 +++++++-
 .../service/it/test/PolarisRestCatalogViewIntegrationBase.java   | 9 ++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git 
a/integration-tests/src/main/java/org/apache/polaris/service/it/env/ManagementApi.java
 
b/integration-tests/src/main/java/org/apache/polaris/service/it/env/ManagementApi.java
index 3e76d92d7..f985c3492 100644
--- 
a/integration-tests/src/main/java/org/apache/polaris/service/it/env/ManagementApi.java
+++ 
b/integration-tests/src/main/java/org/apache/polaris/service/it/env/ManagementApi.java
@@ -164,7 +164,10 @@ public class ManagementApi extends PolarisRestApi {
 
   public void createCatalog(String principalRoleName, Catalog catalog) {
     createCatalog(catalog);
+    makeAdmin(principalRoleName, catalog);
+  }
 
+  public void makeAdmin(String principalRoleName, Catalog catalog) {
     // Create a new CatalogRole that has CATALOG_MANAGE_CONTENT and 
CATALOG_MANAGE_ACCESS
     String catalogRoleName = "custom-admin";
     createCatalogRole(catalog.getName(), catalogRoleName);
diff --git 
a/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogIntegrationBase.java
 
b/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogIntegrationBase.java
index ad72ad5eb..f82efc923 100644
--- 
a/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogIntegrationBase.java
+++ 
b/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogIntegrationBase.java
@@ -275,7 +275,8 @@ public abstract class PolarisRestCatalogIntegrationBase 
extends CatalogTests<RES
             .setStorageConfigInfo(storageConfig)
             .build();
 
-    managementApi.createCatalog(principalRoleName, catalog);
+    createPolarisCatalog(catalog);
+    managementApi.makeAdmin(principalRoleName, catalog);
 
     restCatalogConfig =
         IntegrationTestsHelper.mergeFromAnnotatedElements(
@@ -340,6 +341,11 @@ public abstract class PolarisRestCatalogIntegrationBase 
extends CatalogTests<RES
     return restCatalog;
   }
 
+  /** Overridable methods to allow subclasses to execute additional logic on 
catalog creation. */
+  protected void createPolarisCatalog(Catalog catalog) {
+    managementApi.createCatalog(catalog);
+  }
+
   /**
    * Initialize a RESTCatalog for testing.
    *
diff --git 
a/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewIntegrationBase.java
 
b/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewIntegrationBase.java
index ccb9bc18d..778ea30a5 100644
--- 
a/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewIntegrationBase.java
+++ 
b/integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewIntegrationBase.java
@@ -137,7 +137,9 @@ public abstract class PolarisRestCatalogViewIntegrationBase 
extends ViewCatalogT
             .setProperties(props)
             .setStorageConfigInfo(storageConfig)
             .build();
-    managementApi.createCatalog(principalRoleName, catalog);
+
+    createPolarisCatalog(catalog);
+    managementApi.makeAdmin(principalRoleName, catalog);
 
     restCatalog =
         IcebergHelper.restCatalog(
@@ -152,6 +154,11 @@ public abstract class 
PolarisRestCatalogViewIntegrationBase extends ViewCatalogT
     client.cleanUp(adminToken);
   }
 
+  /** Overridable methods to allow subclasses to execute additional logic on 
catalog creation. */
+  protected void createPolarisCatalog(Catalog catalog) {
+    managementApi.createCatalog(catalog);
+  }
+
   /**
    * @return The catalog's storage config.
    */