Allow overriding createCatalog calls in integrations tests (#2516)

This is mostly to add testing flexibility in downstream projects.

Author: dimas-b

integration-tests/src/main/java/org/apache/polaris/service/it/env/ManagementApi.java

@@ -164,7 +164,10 @@ public GrantResources listGrants(String catalogName, String catalogRoleName) {
 
   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);

integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogIntegrationBase.java

@@ -275,7 +275,8 @@ public void before(TestInfo testInfo) {
             .setStorageConfigInfo(storageConfig)
             .build();
 
-    managementApi.createCatalog(principalRoleName, catalog);
+    createPolarisCatalog(catalog);
+    managementApi.makeAdmin(principalRoleName, catalog);
 
     restCatalogConfig =
         IntegrationTestsHelper.mergeFromAnnotatedElements(
@@ -340,6 +341,11 @@ protected RESTCatalog catalog() {
     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.
    *

integration-tests/src/main/java/org/apache/polaris/service/it/test/PolarisRestCatalogViewIntegrationBase.java

@@ -137,7 +137,9 @@ public void before(TestInfo testInfo) {
             .setProperties(props)
             .setStorageConfigInfo(storageConfig)
             .build();
-    managementApi.createCatalog(principalRoleName, catalog);
+
+    createPolarisCatalog(catalog);
+    managementApi.makeAdmin(principalRoleName, catalog);
 
     restCatalog =
         IcebergHelper.restCatalog(
@@ -152,6 +154,11 @@ public void cleanUp() {
     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.
    */