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 7350b6b536..b005d411f5 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 @@ -32,7 +32,6 @@ import org.apache.polaris.core.entity.PolarisEntityConstants; import org.apache.polaris.core.entity.PolarisEntitySubType; import org.apache.polaris.core.entity.PolarisEntityType; -import org.apache.polaris.core.entity.PolarisPrincipalSecrets; import org.apache.polaris.core.persistence.bootstrap.RootCredentialsSet; import org.apache.polaris.core.persistence.cache.EntityCache; import org.apache.polaris.core.persistence.dao.entity.BaseResult; @@ -237,22 +236,11 @@ private PrincipalSecretsResult bootstrapServiceAndCreatePolarisPrincipalForRealm PolarisEntityType.PRINCIPAL, PolarisEntitySubType.NULL_SUBTYPE, PolarisEntityConstants.getRootPrincipalName()); - PolarisPrincipalSecrets secrets = - metaStoreManager - .loadPrincipalSecrets( - polarisContext, - PolarisEntity.of(rootPrincipalLookup.getEntity()) - .getInternalPropertiesAsMap() - .get(PolarisEntityConstants.getClientIdPropertyName())) - .getPrincipalSecrets(); - PrincipalSecretsResult rotatedSecrets = - metaStoreManager.rotatePrincipalSecrets( - polarisContext, - secrets.getPrincipalClientId(), - secrets.getPrincipalId(), - false, - secrets.getMainSecretHash()); - return rotatedSecrets; + return metaStoreManager.loadPrincipalSecrets( + polarisContext, + PolarisEntity.of(rootPrincipalLookup.getEntity()) + .getInternalPropertiesAsMap() + .get(PolarisEntityConstants.getClientIdPropertyName())); } /** 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 4122285b0b..59fe200539 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 @@ -79,7 +79,7 @@ public synchronized PolarisMetaStoreManager getOrCreateMetaStoreManager( RealmContext realmContext) { String realmId = realmContext.getRealmIdentifier(); if (!bootstrappedRealms.contains(realmId)) { - bootstrapRealmsAndPrintCredentials(List.of(realmId)); + bootstrapRealmsFromEnvironment(List.of(realmId)); } return super.getOrCreateMetaStoreManager(realmContext); } @@ -89,12 +89,12 @@ public synchronized Supplier getOrCreateSessionSupplie RealmContext realmContext) { String realmId = realmContext.getRealmIdentifier(); if (!bootstrappedRealms.contains(realmId)) { - bootstrapRealmsAndPrintCredentials(List.of(realmId)); + bootstrapRealmsFromEnvironment(List.of(realmId)); } return super.getOrCreateSessionSupplier(realmContext); } - private void bootstrapRealmsAndPrintCredentials(List realms) { + private void bootstrapRealmsFromEnvironment(List realms) { RootCredentialsSet rootCredentialsSet = RootCredentialsSet.fromEnvironment(); this.bootstrapRealms(realms, rootCredentialsSet); }