(polaris) branch main updated: Fix credentials printing twice (#1682)

[yufei]

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

yufei 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 3b9d2b070 Fix credentials printing twice (#1682)
3b9d2b070 is described below

commit 3b9d2b0701677a25fb7d3cdac9e8fc8aa4679ebc
Author: Christopher Lambert <xn...@gmx.de>
AuthorDate: Wed May 28 08:20:44 2025 +0200

    Fix credentials printing twice (#1682)
---
 .../jdbc/JdbcMetaStoreManagerFactory.java          | 11 +++--------
 .../LocalPolarisMetaStoreManagerFactory.java       |  6 +++---
 .../InMemoryPolarisMetaStoreManagerFactory.java    | 23 ----------------------
 3 files changed, 6 insertions(+), 34 deletions(-)

diff --git 
a/extension/persistence/relational-jdbc/src/main/java/org/apache/polaris/extension/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java
 
b/extension/persistence/relational-jdbc/src/main/java/org/apache/polaris/extension/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java
index 2fc1d4c5f..f3d028eb9 100644
--- 
a/extension/persistence/relational-jdbc/src/main/java/org/apache/polaris/extension/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java
+++ 
b/extension/persistence/relational-jdbc/src/main/java/org/apache/polaris/extension/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java
@@ -135,17 +135,12 @@ public class JdbcMetaStoreManagerFactory implements 
MetaStoreManagerFactory {
 
     for (String realm : realms) {
       RealmContext realmContext = () -> realm;
-      if (!metaStoreManagerMap.containsKey(realmContext.getRealmIdentifier())) 
{
+      if (!metaStoreManagerMap.containsKey(realm)) {
         initializeForRealm(realmContext, rootCredentialsSet, true);
         PrincipalSecretsResult secretsResult =
             bootstrapServiceAndCreatePolarisPrincipalForRealm(
-                realmContext, 
metaStoreManagerMap.get(realmContext.getRealmIdentifier()));
-
-        if (rootCredentialsSet.credentials().containsKey(realm)) {
-          LOGGER.info("Bootstrapped realm {} using preset credentials.", 
realm);
-        }
-
-        results.put(realmContext.getRealmIdentifier(), secretsResult);
+                realmContext, metaStoreManagerMap.get(realm));
+        results.put(realm, secretsResult);
       }
     }
 
diff --git 
a/polaris-core/src/main/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java
 
b/polaris-core/src/main/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java
index 2c97ebd63..dc615341a 100644
--- 
a/polaris-core/src/main/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java
+++ 
b/polaris-core/src/main/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java
@@ -113,12 +113,12 @@ public abstract class 
LocalPolarisMetaStoreManagerFactory<StoreType>
 
     for (String realm : realms) {
       RealmContext realmContext = () -> realm;
-      if (!metaStoreManagerMap.containsKey(realmContext.getRealmIdentifier())) 
{
+      if (!metaStoreManagerMap.containsKey(realm)) {
         initializeForRealm(realmContext, rootCredentialsSet);
         PrincipalSecretsResult secretsResult =
             bootstrapServiceAndCreatePolarisPrincipalForRealm(
-                realmContext, 
metaStoreManagerMap.get(realmContext.getRealmIdentifier()));
-        results.put(realmContext.getRealmIdentifier(), secretsResult);
+                realmContext, metaStoreManagerMap.get(realm));
+        results.put(realm, secretsResult);
       }
     }
 
diff --git 
a/service/common/src/main/java/org/apache/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java
 
b/service/common/src/main/java/org/apache/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java
index 59fe20053..895e5b51b 100644
--- 
a/service/common/src/main/java/org/apache/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java
+++ 
b/service/common/src/main/java/org/apache/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java
@@ -32,7 +32,6 @@ import org.apache.polaris.core.PolarisDiagnostics;
 import org.apache.polaris.core.context.RealmContext;
 import org.apache.polaris.core.persistence.LocalPolarisMetaStoreManagerFactory;
 import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
-import org.apache.polaris.core.persistence.bootstrap.RootCredentials;
 import org.apache.polaris.core.persistence.bootstrap.RootCredentialsSet;
 import org.apache.polaris.core.persistence.dao.entity.PrincipalSecretsResult;
 import 
org.apache.polaris.core.persistence.transactional.TransactionalPersistence;
@@ -104,28 +103,6 @@ public class InMemoryPolarisMetaStoreManagerFactory
       Iterable<String> realms, RootCredentialsSet rootCredentialsSet) {
     Map<String, PrincipalSecretsResult> results = 
super.bootstrapRealms(realms, rootCredentialsSet);
     bootstrappedRealms.addAll(results.keySet());
-
-    Map<String, RootCredentials> presetCredentials = 
rootCredentialsSet.credentials();
-    for (String realmId : realms) {
-      if (presetCredentials.containsKey(realmId)) {
-        // Credentials provided in the runtime env... no need to print
-        continue;
-      }
-
-      PrincipalSecretsResult principalSecrets = results.get(realmId);
-      if (principalSecrets == null) {
-        continue; // already bootstrapped (possible benign race)
-      }
-
-      String msg =
-          String.format(
-              "realm: %1s root principal credentials: %2s:%3s",
-              realmId,
-              principalSecrets.getPrincipalSecrets().getPrincipalClientId(),
-              principalSecrets.getPrincipalSecrets().getMainSecret());
-      System.out.println(msg);
-    }
-
     return results;
   }
 }