(polaris) branch main updated: Fix CI (#2489)

[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 f41d5bf1b Fix CI (#2489)
f41d5bf1b is described below

commit f41d5bf1ba895b8db51086a542654d3db3bfb121
Author: Dmitri Bourlatchkov <dmitri.bourlatch...@gmail.com>
AuthorDate: Tue Sep 2 17:13:37 2025 -0400

    Fix CI (#2489)
    
    Fix undetected merge conflict after #2197 + #2415 + #2434
    
    * Use local diagnostics in TransactionWorkspaceMetaStoreManager
    
    * Add resetCredentials to PolarisPrincipalsEventServiceDelegator
---
 .../persistence/TransactionWorkspaceMetaStoreManager.java     |  4 +---
 .../service/admin/PolarisPrincipalsEventServiceDelegator.java | 11 +++++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git 
a/polaris-core/src/main/java/org/apache/polaris/core/persistence/TransactionWorkspaceMetaStoreManager.java
 
b/polaris-core/src/main/java/org/apache/polaris/core/persistence/TransactionWorkspaceMetaStoreManager.java
index 811445fb5..7f414ef9d 100644
--- 
a/polaris-core/src/main/java/org/apache/polaris/core/persistence/TransactionWorkspaceMetaStoreManager.java
+++ 
b/polaris-core/src/main/java/org/apache/polaris/core/persistence/TransactionWorkspaceMetaStoreManager.java
@@ -184,9 +184,7 @@ public class TransactionWorkspaceMetaStoreManager 
implements PolarisMetaStoreMan
       long principalId,
       @Nonnull String resolvedClientId,
       String customClientSecret) {
-    callCtx
-        .getDiagServices()
-        .fail("illegal_method_in_transaction_workspace", 
"resetPrincipalSecrets");
+    diagnostics.fail("illegal_method_in_transaction_workspace", 
"resetPrincipalSecrets");
     return null;
   }
 
diff --git 
a/runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisPrincipalsEventServiceDelegator.java
 
b/runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisPrincipalsEventServiceDelegator.java
index b281290b1..34bc132c0 100644
--- 
a/runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisPrincipalsEventServiceDelegator.java
+++ 
b/runtime/service/src/main/java/org/apache/polaris/service/admin/PolarisPrincipalsEventServiceDelegator.java
@@ -27,6 +27,7 @@ import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.SecurityContext;
 import org.apache.polaris.core.admin.model.CreatePrincipalRequest;
 import org.apache.polaris.core.admin.model.GrantPrincipalRoleRequest;
+import org.apache.polaris.core.admin.model.ResetPrincipalRequest;
 import org.apache.polaris.core.admin.model.UpdatePrincipalRequest;
 import org.apache.polaris.core.context.RealmContext;
 import org.apache.polaris.service.admin.api.PolarisPrincipalsApiService;
@@ -43,6 +44,16 @@ public class PolarisPrincipalsEventServiceDelegator 
implements PolarisPrincipals
     return delegate.createPrincipal(request, realmContext, securityContext);
   }
 
+  @Override
+  public Response resetCredentials(
+      String principalName,
+      ResetPrincipalRequest resetPrincipalRequest,
+      RealmContext realmContext,
+      SecurityContext securityContext) {
+    return delegate.resetCredentials(
+        principalName, resetPrincipalRequest, realmContext, securityContext);
+  }
+
   @Override
   public Response deletePrincipal(
       String principalName, RealmContext realmContext, SecurityContext 
securityContext) {