Skip to content

fix credentials getting printed twice #1682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 28, 2025
Merged

fix credentials getting printed twice #1682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions ...org/apache/polaris/extension/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,17 +135,12 @@ public synchronized Map<String, PrincipalSecretsResult> bootstrapRealms(

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);
}
}

Expand Down
6 changes: 3 additions & 3 deletions ...rc/main/java/org/apache/polaris/core/persistence/LocalPolarisMetaStoreManagerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,12 @@ public synchronized Map<String, PrincipalSecretsResult> bootstrapRealms(

for (String realm : realms) {
RealmContext realmContext = () -> realm;
if (!metaStoreManagerMap.containsKey(realmContext.getRealmIdentifier())) {
if (!metaStoreManagerMap.containsKey(realm)) {
Copy link
Contributor Author

@XN137 XN137 May 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

decided to refactor this for clarity as the realmContext is built from realm right above

initializeForRealm(realmContext, rootCredentialsSet);
PrincipalSecretsResult secretsResult =
bootstrapServiceAndCreatePolarisPrincipalForRealm(
realmContext, metaStoreManagerMap.get(realmContext.getRealmIdentifier()));
results.put(realmContext.getRealmIdentifier(), secretsResult);
realmContext, metaStoreManagerMap.get(realm));
results.put(realm, secretsResult);
}
}

Expand Down
23 changes: 0 additions & 23 deletions ...n/java/org/apache/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
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;
Expand Down Expand Up @@ -104,28 +103,6 @@ public Map<String, PrincipalSecretsResult> bootstrapRealms(
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;
}
}
Loading