From 9c4c4fb380cc450c478725cfa9b91f83b7110178 Mon Sep 17 00:00:00 2001 From: Dmitri Bourlatchkov Date: Tue, 2 Sep 2025 15:08:49 -0400 Subject: [PATCH 1/2] Use local diagnostics in TransactionWorkspaceMetaStoreManager Fix undetected merge conflict after #2197 --- .../persistence/TransactionWorkspaceMetaStoreManager.java | 4 +--- 1 file changed, 1 insertion(+), 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 811445fb5c..7f414ef9dd 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 PrincipalSecretsResult resetPrincipalSecrets( 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; } From 62fd0e97e10a670547479f4d7a0cb6d402ad1b4a Mon Sep 17 00:00:00 2001 From: Dmitri Bourlatchkov Date: Tue, 2 Sep 2025 16:54:08 -0400 Subject: [PATCH 2/2] Add resetCredentials to PolarisPrincipalsEventServiceDelegator --- .../admin/PolarisPrincipalsEventServiceDelegator.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 b281290b14..34bc132c04 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.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 Response createPrincipal( 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) {