You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polaris.apache.org by co...@apache.org on 2024/11/26 01:36:03 UTC
(polaris) branch mcollado-hk2-di created (now 8b212078)
This is an automated email from the ASF dual-hosted git repository.
collado pushed a change to branch mcollado-hk2-di
in repository https://gitbox.apache.org/repos/asf/polaris.git
at 8b212078 Make PolarisAuthorizer work with PolarisGrantManager
This branch includes the following new commits:
new ade021dd Working impl of HK2 dependency injection
new aeeef193 Add RealmScope and make EntityCache and PolarisMetaStoreManager realm-scoped services
new d3b77f4d Remove dependency on HK2 from core module
new 6fc4c5ec Fix EntityCache to work with RealmScope
new 01c6928f Add CacheDelegatingGrantCache
new 8b212078 Make PolarisAuthorizer work with PolarisGrantManager
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(polaris) 03/06: Remove dependency on HK2 from core module
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
collado pushed a commit to branch mcollado-hk2-di
in repository https://gitbox.apache.org/repos/asf/polaris.git
commit d3b77f4da6db99f24d01740ea29848702cfa91dd
Author: Michael Collado <co...@gmail.com>
AuthorDate: Mon Nov 25 14:55:11 2024 -0800
Remove dependency on HK2 from core module
---
polaris-core/build.gradle.kts | 2 +-
.../core/persistence/MetaStoreManagerFactory.java | 15 +------------
.../apache/polaris/service/PolarisApplication.java | 26 ++++++++++++++++++----
.../service}/context/RealmScopeContext.java | 5 ++++-
.../persistence/cache/EntityCacheFactory.java | 3 ++-
5 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/polaris-core/build.gradle.kts b/polaris-core/build.gradle.kts
index 9bd8888d..1099f7d3 100644
--- a/polaris-core/build.gradle.kts
+++ b/polaris-core/build.gradle.kts
@@ -68,7 +68,7 @@ dependencies {
implementation(libs.swagger.annotations)
implementation(libs.swagger.jaxrs)
implementation(libs.jakarta.validation.api)
- implementation("org.glassfish.hk2:hk2-api:3.0.6")
+ implementation("jakarta.inject:jakarta.inject-api:2.0.1")
implementation("org.apache.iceberg:iceberg-aws")
implementation(platform(libs.awssdk.bom))
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/MetaStoreManagerFactory.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/MetaStoreManagerFactory.java
index 52e60419..5ca642c2 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/MetaStoreManagerFactory.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/MetaStoreManagerFactory.java
@@ -23,18 +23,15 @@ import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
import org.apache.polaris.core.auth.PolarisSecretsManager.PrincipalSecretsResult;
-import org.apache.polaris.core.context.CallContext;
import org.apache.polaris.core.context.RealmContext;
-import org.apache.polaris.core.context.RealmScope;
import org.apache.polaris.core.storage.cache.StorageCredentialCache;
-import org.glassfish.hk2.api.Factory;
/**
* Configuration interface for configuring the {@link PolarisMetaStoreManager} via Dropwizard
* configuration
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
-public interface MetaStoreManagerFactory extends Factory<PolarisMetaStoreManager> {
+public interface MetaStoreManagerFactory {
PolarisMetaStoreManager getOrCreateMetaStoreManager(RealmContext realmContext);
@@ -44,16 +41,6 @@ public interface MetaStoreManagerFactory extends Factory<PolarisMetaStoreManager
Map<String, PrincipalSecretsResult> bootstrapRealms(List<String> realms);
- @RealmScope
- @Override
- default PolarisMetaStoreManager provide() {
- RealmContext realmContext = CallContext.getCurrentContext().getRealmContext();
- return getOrCreateMetaStoreManager(realmContext);
- }
-
- @Override
- default void dispose(PolarisMetaStoreManager instance) {}
-
/** Purge all metadata for the realms provided */
void purgeRealms(List<String> realms);
}
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/PolarisApplication.java b/polaris-service/src/main/java/org/apache/polaris/service/PolarisApplication.java
index d9e04408..41d8ff9c 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/PolarisApplication.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/PolarisApplication.java
@@ -87,12 +87,11 @@ import org.apache.polaris.core.auth.PolarisAuthorizer;
import org.apache.polaris.core.auth.PolarisAuthorizerImpl;
import org.apache.polaris.core.context.CallContext;
import org.apache.polaris.core.context.RealmContext;
-import org.apache.polaris.core.context.RealmScopeContext;
+import org.apache.polaris.core.context.RealmScope;
import org.apache.polaris.core.monitor.PolarisMetricRegistry;
import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
import org.apache.polaris.core.persistence.cache.EntityCache;
-import org.apache.polaris.core.persistence.cache.EntityCacheFactory;
import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider;
import org.apache.polaris.service.admin.PolarisServiceImpl;
import org.apache.polaris.service.admin.api.PolarisCatalogsApi;
@@ -118,11 +117,13 @@ import org.apache.polaris.service.context.CallContextCatalogFactory;
import org.apache.polaris.service.context.CallContextResolver;
import org.apache.polaris.service.context.PolarisCallContextCatalogFactory;
import org.apache.polaris.service.context.RealmContextResolver;
+import org.apache.polaris.service.context.RealmScopeContext;
import org.apache.polaris.service.exception.IcebergExceptionMapper;
import org.apache.polaris.service.exception.IcebergJerseyViolationExceptionMapper;
import org.apache.polaris.service.exception.IcebergJsonProcessingExceptionMapper;
import org.apache.polaris.service.exception.PolarisExceptionMapper;
import org.apache.polaris.service.persistence.InMemoryPolarisMetaStoreManagerFactory;
+import org.apache.polaris.service.persistence.cache.EntityCacheFactory;
import org.apache.polaris.service.ratelimiter.RateLimiter;
import org.apache.polaris.service.ratelimiter.RateLimiterFilter;
import org.apache.polaris.service.storage.PolarisStorageIntegrationProviderImpl;
@@ -134,6 +135,7 @@ import org.apache.polaris.service.task.TaskFileIOSupplier;
import org.apache.polaris.service.throttling.StreamReadConstraintsExceptionMapper;
import org.apache.polaris.service.tracing.TracingFilter;
import org.eclipse.jetty.servlets.CrossOriginFilter;
+import org.glassfish.hk2.api.Factory;
import org.glassfish.hk2.api.ServiceLocator;
import org.glassfish.hk2.utilities.ServiceLocatorUtilities;
import org.glassfish.hk2.utilities.binding.AbstractBinder;
@@ -217,8 +219,10 @@ public class PolarisApplication extends Application<PolarisApplicationConfig> {
protected void configure() {
bind(RealmScopeContext.class).in(Singleton.class);
bind(configuration.getMetaStoreManagerFactory()).to(MetaStoreManagerFactory.class);
- bindFactory(configuration.getMetaStoreManagerFactory())
- .to(PolarisMetaStoreManager.class);
+ bindFactory(PolarisMetaStoreManagerFactory.class)
+ .to(PolarisMetaStoreManager.class)
+ .in(RealmScope.class);
+
bind(configuration.getConfigurationStore()).to(PolarisConfigurationStore.class);
bind(configuration.getFileIOFactory()).to(FileIOFactory.class);
bind(configuration.getPolarisAuthenticator()).to(Authenticator.class);
@@ -488,4 +492,18 @@ public class PolarisApplication extends Application<PolarisApplicationConfig> {
}
}
}
+
+ private static class PolarisMetaStoreManagerFactory implements Factory<PolarisMetaStoreManager> {
+ @Inject MetaStoreManagerFactory metaStoreManagerFactory;
+
+ @RealmScope
+ @Override
+ public PolarisMetaStoreManager provide() {
+ RealmContext realmContext = CallContext.getCurrentContext().getRealmContext();
+ return metaStoreManagerFactory.getOrCreateMetaStoreManager(realmContext);
+ }
+
+ @Override
+ public void dispose(PolarisMetaStoreManager instance) {}
+ }
}
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/context/RealmScopeContext.java b/polaris-service/src/main/java/org/apache/polaris/service/context/RealmScopeContext.java
similarity index 93%
rename from polaris-core/src/main/java/org/apache/polaris/core/context/RealmScopeContext.java
rename to polaris-service/src/main/java/org/apache/polaris/service/context/RealmScopeContext.java
index 6326f958..a60c9575 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/context/RealmScopeContext.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/context/RealmScopeContext.java
@@ -16,13 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.polaris.core.context;
+package org.apache.polaris.service.context;
import jakarta.inject.Singleton;
import java.lang.annotation.Annotation;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import org.apache.polaris.core.context.CallContext;
+import org.apache.polaris.core.context.RealmContext;
+import org.apache.polaris.core.context.RealmScope;
import org.glassfish.hk2.api.ActiveDescriptor;
import org.glassfish.hk2.api.Context;
import org.glassfish.hk2.api.ServiceHandle;
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCacheFactory.java b/polaris-service/src/main/java/org/apache/polaris/service/persistence/cache/EntityCacheFactory.java
similarity index 91%
rename from polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCacheFactory.java
rename to polaris-service/src/main/java/org/apache/polaris/service/persistence/cache/EntityCacheFactory.java
index 4d92d5d2..8dc46674 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCacheFactory.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/persistence/cache/EntityCacheFactory.java
@@ -16,11 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.polaris.core.persistence.cache;
+package org.apache.polaris.service.persistence.cache;
import jakarta.inject.Inject;
import org.apache.polaris.core.context.RealmScope;
import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
+import org.apache.polaris.core.persistence.cache.EntityCache;
import org.glassfish.hk2.api.Factory;
public class EntityCacheFactory implements Factory<EntityCache> {
(polaris) 02/06: Add RealmScope and make EntityCache and PolarisMetaStoreManager realm-scoped services
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
collado pushed a commit to branch mcollado-hk2-di
in repository https://gitbox.apache.org/repos/asf/polaris.git
commit aeeef193367603f1e681fe801f36e7e7d737b330
Author: Michael Collado <co...@gmail.com>
AuthorDate: Thu Nov 7 14:08:57 2024 -0800
Add RealmScope and make EntityCache and PolarisMetaStoreManager realm-scoped services
---
extension/persistence/eclipselink/build.gradle.kts | 1 +
polaris-core/build.gradle.kts | 4 --
.../apache/polaris/core/context/RealmScope.java | 31 +++++++++
.../polaris/core/context/RealmScopeContext.java | 78 ++++++++++++++++++++++
.../core/persistence/MetaStoreManagerFactory.java | 15 ++++-
.../core/persistence/PolarisEntityManager.java | 7 +-
.../core/persistence/cache/EntityCacheFactory.java | 39 +++++++++++
.../apache/polaris/service/PolarisApplication.java | 8 +++
.../service/config/RealmEntityManagerFactory.java | 15 +++--
.../service/admin/PolarisAuthzTestBase.java | 5 +-
.../service/catalog/BasePolarisCatalogTest.java | 5 +-
.../catalog/BasePolarisCatalogViewTest.java | 4 +-
12 files changed, 198 insertions(+), 14 deletions(-)
diff --git a/extension/persistence/eclipselink/build.gradle.kts b/extension/persistence/eclipselink/build.gradle.kts
index 5c833321..2e4474a4 100644
--- a/extension/persistence/eclipselink/build.gradle.kts
+++ b/extension/persistence/eclipselink/build.gradle.kts
@@ -32,6 +32,7 @@ dependencies {
implementation(libs.eclipselink)
implementation(platform(libs.dropwizard.bom))
implementation("io.dropwizard:dropwizard-jackson")
+ implementation("org.glassfish.hk2:hk2-api:3.0.6")
val eclipseLinkDeps: String? = project.findProperty("eclipseLinkDeps") as String?
eclipseLinkDeps?.let {
val dependenciesList = it.split(",")
diff --git a/polaris-core/build.gradle.kts b/polaris-core/build.gradle.kts
index 1603d73f..9bd8888d 100644
--- a/polaris-core/build.gradle.kts
+++ b/polaris-core/build.gradle.kts
@@ -33,10 +33,6 @@ dependencies {
constraints {
implementation("io.airlift:aircompressor:0.27") { because("Vulnerability detected in 0.25") }
}
- // TODO - this is only here for the Discoverable interface
- // We should use a different mechanism to discover the plugin implementations
- implementation(platform(libs.dropwizard.bom))
- implementation("io.dropwizard:dropwizard-jackson")
implementation(platform(libs.jackson.bom))
implementation("com.fasterxml.jackson.core:jackson-annotations")
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/context/RealmScope.java b/polaris-core/src/main/java/org/apache/polaris/core/context/RealmScope.java
new file mode 100644
index 00000000..40fc9599
--- /dev/null
+++ b/polaris-core/src/main/java/org/apache/polaris/core/context/RealmScope.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.polaris.core.context;
+
+import jakarta.inject.Scope;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+import org.glassfish.hk2.api.Proxiable;
+
+@Scope
+@Proxiable
+@Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE, ElementType.METHOD})
+public @interface RealmScope {}
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/context/RealmScopeContext.java b/polaris-core/src/main/java/org/apache/polaris/core/context/RealmScopeContext.java
new file mode 100644
index 00000000..6326f958
--- /dev/null
+++ b/polaris-core/src/main/java/org/apache/polaris/core/context/RealmScopeContext.java
@@ -0,0 +1,78 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.polaris.core.context;
+
+import jakarta.inject.Singleton;
+import java.lang.annotation.Annotation;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import org.glassfish.hk2.api.ActiveDescriptor;
+import org.glassfish.hk2.api.Context;
+import org.glassfish.hk2.api.ServiceHandle;
+
+@Singleton
+public class RealmScopeContext implements Context<RealmScope> {
+ private final Map<String, Map<ActiveDescriptor<?>, Object>> contexts = new ConcurrentHashMap<>();
+
+ @Override
+ public Class<? extends Annotation> getScope() {
+ return RealmScope.class;
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public <U> U findOrCreate(ActiveDescriptor<U> activeDescriptor, ServiceHandle<?> root) {
+ RealmContext realmContext = CallContext.getCurrentContext().getRealmContext();
+ Map<ActiveDescriptor<?>, Object> contextMap =
+ contexts.computeIfAbsent(realmContext.getRealmIdentifier(), k -> new HashMap<>());
+ return (U) contextMap.computeIfAbsent(activeDescriptor, k -> activeDescriptor.create(root));
+ }
+
+ @Override
+ public boolean containsKey(ActiveDescriptor<?> descriptor) {
+ RealmContext realmContext = CallContext.getCurrentContext().getRealmContext();
+ Map<ActiveDescriptor<?>, Object> contextMap =
+ contexts.computeIfAbsent(realmContext.getRealmIdentifier(), k -> new HashMap<>());
+ return contextMap.containsKey(descriptor);
+ }
+
+ @Override
+ public void destroyOne(ActiveDescriptor<?> descriptor) {
+ RealmContext realmContext = CallContext.getCurrentContext().getRealmContext();
+ Map<ActiveDescriptor<?>, Object> contextMap =
+ contexts.computeIfAbsent(realmContext.getRealmIdentifier(), k -> new HashMap<>());
+ contextMap.remove(descriptor);
+ }
+
+ @Override
+ public boolean supportsNullCreation() {
+ return false;
+ }
+
+ @Override
+ public boolean isActive() {
+ return true;
+ }
+
+ @Override
+ public void shutdown() {
+ contexts.clear();
+ }
+}
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/MetaStoreManagerFactory.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/MetaStoreManagerFactory.java
index 5ca642c2..52e60419 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/MetaStoreManagerFactory.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/MetaStoreManagerFactory.java
@@ -23,15 +23,18 @@ import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
import org.apache.polaris.core.auth.PolarisSecretsManager.PrincipalSecretsResult;
+import org.apache.polaris.core.context.CallContext;
import org.apache.polaris.core.context.RealmContext;
+import org.apache.polaris.core.context.RealmScope;
import org.apache.polaris.core.storage.cache.StorageCredentialCache;
+import org.glassfish.hk2.api.Factory;
/**
* Configuration interface for configuring the {@link PolarisMetaStoreManager} via Dropwizard
* configuration
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
-public interface MetaStoreManagerFactory {
+public interface MetaStoreManagerFactory extends Factory<PolarisMetaStoreManager> {
PolarisMetaStoreManager getOrCreateMetaStoreManager(RealmContext realmContext);
@@ -41,6 +44,16 @@ public interface MetaStoreManagerFactory {
Map<String, PrincipalSecretsResult> bootstrapRealms(List<String> realms);
+ @RealmScope
+ @Override
+ default PolarisMetaStoreManager provide() {
+ RealmContext realmContext = CallContext.getCurrentContext().getRealmContext();
+ return getOrCreateMetaStoreManager(realmContext);
+ }
+
+ @Override
+ default void dispose(PolarisMetaStoreManager instance) {}
+
/** Purge all metadata for the realms provided */
void purgeRealms(List<String> realms);
}
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisEntityManager.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisEntityManager.java
index 4709ec89..922e97b0 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisEntityManager.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisEntityManager.java
@@ -51,11 +51,14 @@ public class PolarisEntityManager {
/**
* @param metaStoreManager the metastore manager for the current realm
* @param credentialCache the storage credential cache for the current realm
+ * @param entityCache the entity cache
*/
public PolarisEntityManager(
- PolarisMetaStoreManager metaStoreManager, StorageCredentialCache credentialCache) {
+ PolarisMetaStoreManager metaStoreManager,
+ StorageCredentialCache credentialCache,
+ EntityCache entityCache) {
this.metaStoreManager = metaStoreManager;
- this.entityCache = new EntityCache(metaStoreManager);
+ this.entityCache = entityCache;
this.credentialCache = credentialCache;
}
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCacheFactory.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCacheFactory.java
new file mode 100644
index 00000000..4d92d5d2
--- /dev/null
+++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCacheFactory.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.polaris.core.persistence.cache;
+
+import jakarta.inject.Inject;
+import org.apache.polaris.core.context.RealmScope;
+import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
+import org.glassfish.hk2.api.Factory;
+
+public class EntityCacheFactory implements Factory<EntityCache> {
+ @Inject PolarisMetaStoreManager metaStoreManager;
+
+ @RealmScope
+ @Override
+ public EntityCache provide() {
+ return new EntityCache(metaStoreManager);
+ }
+
+ @Override
+ public void dispose(EntityCache instance) {
+ // no-op
+ }
+}
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/PolarisApplication.java b/polaris-service/src/main/java/org/apache/polaris/service/PolarisApplication.java
index 252fa832..d9e04408 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/PolarisApplication.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/PolarisApplication.java
@@ -87,8 +87,12 @@ import org.apache.polaris.core.auth.PolarisAuthorizer;
import org.apache.polaris.core.auth.PolarisAuthorizerImpl;
import org.apache.polaris.core.context.CallContext;
import org.apache.polaris.core.context.RealmContext;
+import org.apache.polaris.core.context.RealmScopeContext;
import org.apache.polaris.core.monitor.PolarisMetricRegistry;
import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
+import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
+import org.apache.polaris.core.persistence.cache.EntityCache;
+import org.apache.polaris.core.persistence.cache.EntityCacheFactory;
import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider;
import org.apache.polaris.service.admin.PolarisServiceImpl;
import org.apache.polaris.service.admin.api.PolarisCatalogsApi;
@@ -211,7 +215,10 @@ public class PolarisApplication extends Application<PolarisApplicationConfig> {
new AbstractBinder() {
@Override
protected void configure() {
+ bind(RealmScopeContext.class).in(Singleton.class);
bind(configuration.getMetaStoreManagerFactory()).to(MetaStoreManagerFactory.class);
+ bindFactory(configuration.getMetaStoreManagerFactory())
+ .to(PolarisMetaStoreManager.class);
bind(configuration.getConfigurationStore()).to(PolarisConfigurationStore.class);
bind(configuration.getFileIOFactory()).to(FileIOFactory.class);
bind(configuration.getPolarisAuthenticator()).to(Authenticator.class);
@@ -220,6 +227,7 @@ public class PolarisApplication extends Application<PolarisApplicationConfig> {
bind(configuration.getCallContextResolver()).to(CallContextResolver.class);
bind(configuration.getRealmContextResolver()).to(RealmContextResolver.class);
bind(configuration.getRateLimiter()).to(RateLimiter.class);
+ bindFactory(EntityCacheFactory.class).to(EntityCache.class);
bind(new PolarisStorageIntegrationProviderImpl(
() -> {
StsClientBuilder stsClientBuilder = StsClient.builder();
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/config/RealmEntityManagerFactory.java b/polaris-service/src/main/java/org/apache/polaris/service/config/RealmEntityManagerFactory.java
index 358c69cb..f25dd694 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/config/RealmEntityManagerFactory.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/config/RealmEntityManagerFactory.java
@@ -19,11 +19,12 @@
package org.apache.polaris.service.config;
import jakarta.inject.Inject;
+import java.util.HashMap;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import org.apache.polaris.core.context.RealmContext;
import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
import org.apache.polaris.core.persistence.PolarisEntityManager;
+import org.apache.polaris.core.persistence.cache.EntityCache;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,16 +34,20 @@ public class RealmEntityManagerFactory {
private final MetaStoreManagerFactory metaStoreManagerFactory;
// Key: realmIdentifier
- private final Map<String, PolarisEntityManager> cachedEntityManagers = new ConcurrentHashMap<>();
+ private final Map<String, PolarisEntityManager> cachedEntityManagers = new HashMap<>();
+ private final EntityCache entityCache;
// Subclasses for test injection.
protected RealmEntityManagerFactory() {
this.metaStoreManagerFactory = null;
+ this.entityCache = null;
}
@Inject
- public RealmEntityManagerFactory(MetaStoreManagerFactory metaStoreManagerFactory) {
+ public RealmEntityManagerFactory(
+ MetaStoreManagerFactory metaStoreManagerFactory, EntityCache entityCache) {
this.metaStoreManagerFactory = metaStoreManagerFactory;
+ this.entityCache = entityCache;
}
public PolarisEntityManager getOrCreateEntityManager(RealmContext context) {
@@ -56,7 +61,9 @@ public class RealmEntityManagerFactory {
LOGGER.info("Initializing new PolarisEntityManager for realm {}", r);
return new PolarisEntityManager(
metaStoreManagerFactory.getOrCreateMetaStoreManager(context),
- metaStoreManagerFactory.getOrCreateStorageCredentialCache(context));
+ metaStoreManagerFactory.getOrCreateStorageCredentialCache(context),
+ entityCache);
});
+
}
}
diff --git a/polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisAuthzTestBase.java b/polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisAuthzTestBase.java
index 57548cec..5151f0f7 100644
--- a/polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisAuthzTestBase.java
+++ b/polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisAuthzTestBase.java
@@ -62,6 +62,7 @@ import org.apache.polaris.core.entity.PrincipalEntity;
import org.apache.polaris.core.entity.PrincipalRoleEntity;
import org.apache.polaris.core.persistence.PolarisEntityManager;
import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
+import org.apache.polaris.core.persistence.cache.EntityCache;
import org.apache.polaris.core.persistence.resolver.PolarisResolutionManifest;
import org.apache.polaris.core.storage.cache.StorageCredentialCache;
import org.apache.polaris.service.catalog.BasePolarisCatalog;
@@ -173,7 +174,9 @@ public abstract class PolarisAuthzTestBase {
}
},
Clock.systemDefaultZone());
- this.entityManager = new PolarisEntityManager(metaStoreManager, new StorageCredentialCache());
+ this.entityManager =
+ new PolarisEntityManager(
+ metaStoreManager, new StorageCredentialCache(), new EntityCache(metaStoreManager));
this.metaStoreManager = metaStoreManager;
callContext = CallContext.of(realmContext, polarisContext);
diff --git a/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogTest.java b/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogTest.java
index da8a481f..9495365f 100644
--- a/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogTest.java
+++ b/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogTest.java
@@ -79,6 +79,7 @@ import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
import org.apache.polaris.core.persistence.PolarisEntityManager;
import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
import org.apache.polaris.core.persistence.PolarisMetaStoreSession;
+import org.apache.polaris.core.persistence.cache.EntityCache;
import org.apache.polaris.core.storage.PolarisCredentialProperty;
import org.apache.polaris.core.storage.PolarisStorageIntegration;
import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider;
@@ -156,7 +157,9 @@ public class BasePolarisCatalogTest extends CatalogTests<BasePolarisCatalog> {
}
},
Clock.systemDefaultZone());
- entityManager = new PolarisEntityManager(metaStoreManager, new StorageCredentialCache());
+ entityManager =
+ new PolarisEntityManager(
+ metaStoreManager, new StorageCredentialCache(), new EntityCache(metaStoreManager));
CallContext callContext = CallContext.of(realmContext, polarisContext);
CallContext.setCurrentContext(callContext);
diff --git a/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogViewTest.java b/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogViewTest.java
index 252cd16f..7ad1d53d 100644
--- a/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogViewTest.java
+++ b/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogViewTest.java
@@ -48,6 +48,7 @@ import org.apache.polaris.core.entity.PolarisEntityType;
import org.apache.polaris.core.entity.PrincipalEntity;
import org.apache.polaris.core.persistence.PolarisEntityManager;
import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
+import org.apache.polaris.core.persistence.cache.EntityCache;
import org.apache.polaris.core.storage.cache.StorageCredentialCache;
import org.apache.polaris.service.admin.PolarisAdminService;
import org.apache.polaris.service.catalog.io.DefaultFileIOFactory;
@@ -89,7 +90,8 @@ public class BasePolarisCatalogViewTest extends ViewCatalogTests<BasePolarisCata
Clock.systemDefaultZone());
PolarisEntityManager entityManager =
- new PolarisEntityManager(metaStoreManager, new StorageCredentialCache());
+ new PolarisEntityManager(
+ metaStoreManager, new StorageCredentialCache(), new EntityCache(metaStoreManager));
CallContext callContext = CallContext.of(null, polarisContext);
CallContext.setCurrentContext(callContext);
(polaris) 01/06: Working impl of HK2 dependency injection
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
collado pushed a commit to branch mcollado-hk2-di
in repository https://gitbox.apache.org/repos/asf/polaris.git
commit ade021dde177118563f230206b3c8ad314add043
Author: Michael Collado <co...@gmail.com>
AuthorDate: Wed Nov 6 14:25:20 2024 -0800
Working impl of HK2 dependency injection
---
polaris-core/build.gradle.kts | 1 +
.../polaris/core/auth/PolarisAuthorizerImpl.java | 2 +
.../polaris/core/monitor/MetricRegistryAware.java | 24 --
.../LocalPolarisMetaStoreManagerFactory.java | 9 +-
.../core/persistence/MetaStoreManagerFactory.java | 9 +-
polaris-server.yml | 16 +-
.../polaris/service/BootstrapRealmsCommand.java | 10 -
.../apache/polaris/service/PolarisApplication.java | 268 +++++++++++++--------
.../apache/polaris/service/PurgeRealmsCommand.java | 13 -
.../service/TimedApplicationEventListener.java | 2 +
.../polaris/service/admin/PolarisServiceImpl.java | 2 +
.../service/auth/BasePolarisAuthenticator.java | 3 +-
.../service/auth/DefaultOAuth2ApiService.java | 11 +-
.../service/auth/DefaultPolarisAuthenticator.java | 17 +-
.../service/auth/DiscoverableAuthenticator.java | 4 +-
.../polaris/service/auth/JWTRSAKeyPairFactory.java | 10 +-
.../service/auth/JWTSymmetricKeyFactory.java | 6 +-
.../TestInlineBearerTokenPolarisAuthenticator.java | 2 +
.../polaris/service/auth/TestOAuth2ApiService.java | 13 +-
.../polaris/service/auth/TokenBrokerFactory.java | 3 +-
.../service/catalog/IcebergCatalogAdapter.java | 2 +
.../service/config/ConfigurationStoreAware.java | 27 ---
.../polaris/service/config/OAuth2ApiService.java | 6 +-
.../service/config/PolarisApplicationConfig.java | 57 ++++-
.../service/config/RealmEntityManagerFactory.java | 2 +
.../service/context/CallContextResolver.java | 4 +-
.../service/context/DefaultContextResolver.java | 9 +-
.../context/PolarisCallContextCatalogFactory.java | 2 +
.../service/context/RealmContextResolver.java | 4 +-
.../InMemoryPolarisMetaStoreManagerFactory.java | 4 +
.../service/ratelimiter/RateLimiterFilter.java | 2 +
.../service/tracing/OpenTelemetryAware.java | 26 --
.../polaris/service/tracing/TracingFilter.java | 2 +
.../main/resources/META-INF/hk2-locator/default | 53 ++++
.../services/io.dropwizard.jackson.Discoverable | 1 -
.../service/catalog/BasePolarisCatalogTest.java | 8 -
.../service/catalog/io/TestFileIOFactory.java | 4 +-
.../MockRealmTokenBucketRateLimiter.java | 4 +-
.../test/resources/META-INF/hk2-locator/default | 62 +++++
.../resources/polaris-server-integrationtest.yml | 9 +-
server-templates/api.mustache | 3 +
41 files changed, 414 insertions(+), 302 deletions(-)
diff --git a/polaris-core/build.gradle.kts b/polaris-core/build.gradle.kts
index ec5b2bd3..1603d73f 100644
--- a/polaris-core/build.gradle.kts
+++ b/polaris-core/build.gradle.kts
@@ -72,6 +72,7 @@ dependencies {
implementation(libs.swagger.annotations)
implementation(libs.swagger.jaxrs)
implementation(libs.jakarta.validation.api)
+ implementation("org.glassfish.hk2:hk2-api:3.0.6")
implementation("org.apache.iceberg:iceberg-aws")
implementation(platform(libs.awssdk.bom))
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisAuthorizerImpl.java b/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisAuthorizerImpl.java
index 3424f3bd..b6170232 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisAuthorizerImpl.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisAuthorizerImpl.java
@@ -91,6 +91,7 @@ import static org.apache.polaris.core.entity.PolarisPrivilege.VIEW_WRITE_PROPERT
import com.google.common.base.Preconditions;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.SetMultimap;
+import jakarta.inject.Inject;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@@ -460,6 +461,7 @@ public class PolarisAuthorizerImpl implements PolarisAuthorizer {
private final PolarisConfigurationStore featureConfig;
+ @Inject
public PolarisAuthorizerImpl(PolarisConfigurationStore featureConfig) {
this.featureConfig = featureConfig;
}
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/monitor/MetricRegistryAware.java b/polaris-core/src/main/java/org/apache/polaris/core/monitor/MetricRegistryAware.java
deleted file mode 100644
index 2977d60a..00000000
--- a/polaris-core/src/main/java/org/apache/polaris/core/monitor/MetricRegistryAware.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.polaris.core.monitor;
-
-/** Allows setting a configured instance of {@link PolarisMetricRegistry} */
-public interface MetricRegistryAware {
- void setMetricRegistry(PolarisMetricRegistry metricRegistry);
-}
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 b373f507..7b0b8132 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
@@ -18,6 +18,7 @@
*/
package org.apache.polaris.core.persistence;
+import jakarta.inject.Inject;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -33,7 +34,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.monitor.PolarisMetricRegistry;
import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider;
import org.apache.polaris.core.storage.cache.StorageCredentialCache;
import org.jetbrains.annotations.NotNull;
@@ -157,12 +157,7 @@ public abstract class LocalPolarisMetaStoreManagerFactory<StoreType>
return storageCredentialCacheMap.get(realmContext.getRealmIdentifier());
}
- @Override
- public void setMetricRegistry(PolarisMetricRegistry metricRegistry) {
- // no-op
- }
-
- @Override
+ @Inject
public void setStorageIntegrationProvider(PolarisStorageIntegrationProvider storageIntegration) {
this.storageIntegration = storageIntegration;
}
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/MetaStoreManagerFactory.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/MetaStoreManagerFactory.java
index 821d139a..5ca642c2 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/MetaStoreManagerFactory.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/MetaStoreManagerFactory.java
@@ -19,14 +19,11 @@
package org.apache.polaris.core.persistence;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import io.dropwizard.jackson.Discoverable;
import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
import org.apache.polaris.core.auth.PolarisSecretsManager.PrincipalSecretsResult;
import org.apache.polaris.core.context.RealmContext;
-import org.apache.polaris.core.monitor.PolarisMetricRegistry;
-import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider;
import org.apache.polaris.core.storage.cache.StorageCredentialCache;
/**
@@ -34,7 +31,7 @@ import org.apache.polaris.core.storage.cache.StorageCredentialCache;
* configuration
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
-public interface MetaStoreManagerFactory extends Discoverable {
+public interface MetaStoreManagerFactory {
PolarisMetaStoreManager getOrCreateMetaStoreManager(RealmContext realmContext);
@@ -42,10 +39,6 @@ public interface MetaStoreManagerFactory extends Discoverable {
StorageCredentialCache getOrCreateStorageCredentialCache(RealmContext realmContext);
- void setStorageIntegrationProvider(PolarisStorageIntegrationProvider storageIntegrationProvider);
-
- void setMetricRegistry(PolarisMetricRegistry metricRegistry);
-
Map<String, PrincipalSecretsResult> bootstrapRealms(List<String> realms);
/** Purge all metadata for the realms provided */
diff --git a/polaris-server.yml b/polaris-server.yml
index e147d4d4..6a722169 100644
--- a/polaris-server.yml
+++ b/polaris-server.yml
@@ -93,17 +93,19 @@ io:
# TODO - avoid duplicating token broker config
oauth2:
type: test
-# type: default # - uncomment to support Auth0 JWT tokens
-# tokenBroker:
-# type: symmetric-key
-# secret: polaris
authenticator:
class: org.apache.polaris.service.auth.TestInlineBearerTokenPolarisAuthenticator
+
+# - uncomment to support Auth0 JWT tokens
+#oauth2:
+# type: default
+#authenticator:
# class: org.apache.polaris.service.auth.DefaultPolarisAuthenticator # - uncomment to support Auth0 JWT tokens
-# tokenBroker:
-# type: symmetric-key
-# secret: polaris
+#
+#tokenBroker:
+# type: symmetric-key
+# secret: polaris
cors:
allowed-origins:
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/BootstrapRealmsCommand.java b/polaris-service/src/main/java/org/apache/polaris/service/BootstrapRealmsCommand.java
index 3f282b04..24041bbb 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/BootstrapRealmsCommand.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/BootstrapRealmsCommand.java
@@ -25,9 +25,7 @@ import net.sourceforge.argparse4j.inf.Namespace;
import org.apache.polaris.core.PolarisConfigurationStore;
import org.apache.polaris.core.auth.PolarisSecretsManager.PrincipalSecretsResult;
import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
-import org.apache.polaris.service.config.ConfigurationStoreAware;
import org.apache.polaris.service.config.PolarisApplicationConfig;
-import org.apache.polaris.service.context.CallContextResolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,14 +49,6 @@ public class BootstrapRealmsCommand extends ConfiguredCommand<PolarisApplication
MetaStoreManagerFactory metaStoreManagerFactory = configuration.getMetaStoreManagerFactory();
PolarisConfigurationStore configurationStore = configuration.getConfigurationStore();
- if (metaStoreManagerFactory instanceof ConfigurationStoreAware) {
- ((ConfigurationStoreAware) metaStoreManagerFactory).setConfigurationStore(configurationStore);
- }
- CallContextResolver callContextResolver = configuration.getCallContextResolver();
- callContextResolver.setMetaStoreManagerFactory(metaStoreManagerFactory);
- if (callContextResolver instanceof ConfigurationStoreAware csa) {
- csa.setConfigurationStore(configurationStore);
- }
// Execute the bootstrap
Map<String, PrincipalSecretsResult> results =
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/PolarisApplication.java b/polaris-service/src/main/java/org/apache/polaris/service/PolarisApplication.java
index 908496da..252fa832 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/PolarisApplication.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/PolarisApplication.java
@@ -23,13 +23,19 @@ import static java.util.Objects.requireNonNull;
import static org.apache.polaris.service.config.PolarisApplicationConfig.REQUEST_BODY_BYTES_NO_LIMIT;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.annotation.PropertyAccessor;
import com.fasterxml.jackson.core.StreamReadConstraints;
+import com.fasterxml.jackson.databind.DeserializationConfig;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.jsontype.NamedType;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.module.SimpleValueInstantiators;
import io.dropwizard.auth.AuthDynamicFeature;
import io.dropwizard.auth.AuthFilter;
+import io.dropwizard.auth.Authenticator;
import io.dropwizard.auth.oauth.OAuthCredentialAuthFilter;
import io.dropwizard.configuration.EnvironmentVariableSubstitutor;
import io.dropwizard.configuration.SubstitutingSourceProvider;
@@ -50,6 +56,8 @@ import io.opentelemetry.sdk.trace.SdkTracerProvider;
import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
import io.opentelemetry.semconv.ServiceAttributes;
import io.prometheus.metrics.exporter.servlet.jakarta.PrometheusMetricsServlet;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
import jakarta.servlet.DispatcherType;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
@@ -58,6 +66,8 @@ import jakarta.servlet.ServletException;
import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.core.Feature;
+import jakarta.ws.rs.core.FeatureContext;
import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
@@ -77,22 +87,25 @@ import org.apache.polaris.core.auth.PolarisAuthorizer;
import org.apache.polaris.core.auth.PolarisAuthorizerImpl;
import org.apache.polaris.core.context.CallContext;
import org.apache.polaris.core.context.RealmContext;
-import org.apache.polaris.core.monitor.MetricRegistryAware;
import org.apache.polaris.core.monitor.PolarisMetricRegistry;
import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
+import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider;
import org.apache.polaris.service.admin.PolarisServiceImpl;
import org.apache.polaris.service.admin.api.PolarisCatalogsApi;
+import org.apache.polaris.service.admin.api.PolarisCatalogsApiService;
import org.apache.polaris.service.admin.api.PolarisPrincipalRolesApi;
+import org.apache.polaris.service.admin.api.PolarisPrincipalRolesApiService;
import org.apache.polaris.service.admin.api.PolarisPrincipalsApi;
-import org.apache.polaris.service.auth.DiscoverableAuthenticator;
+import org.apache.polaris.service.admin.api.PolarisPrincipalsApiService;
+import org.apache.polaris.service.auth.TokenBrokerFactory;
import org.apache.polaris.service.catalog.IcebergCatalogAdapter;
import org.apache.polaris.service.catalog.api.IcebergRestCatalogApi;
+import org.apache.polaris.service.catalog.api.IcebergRestCatalogApiService;
import org.apache.polaris.service.catalog.api.IcebergRestConfigurationApi;
+import org.apache.polaris.service.catalog.api.IcebergRestConfigurationApiService;
import org.apache.polaris.service.catalog.api.IcebergRestOAuth2Api;
+import org.apache.polaris.service.catalog.api.IcebergRestOAuth2ApiService;
import org.apache.polaris.service.catalog.io.FileIOFactory;
-import org.apache.polaris.service.config.ConfigurationStoreAware;
-import org.apache.polaris.service.config.HasMetaStoreManagerFactory;
-import org.apache.polaris.service.config.OAuth2ApiService;
import org.apache.polaris.service.config.PolarisApplicationConfig;
import org.apache.polaris.service.config.RealmEntityManagerFactory;
import org.apache.polaris.service.config.Serializers;
@@ -106,16 +119,20 @@ import org.apache.polaris.service.exception.IcebergJerseyViolationExceptionMappe
import org.apache.polaris.service.exception.IcebergJsonProcessingExceptionMapper;
import org.apache.polaris.service.exception.PolarisExceptionMapper;
import org.apache.polaris.service.persistence.InMemoryPolarisMetaStoreManagerFactory;
+import org.apache.polaris.service.ratelimiter.RateLimiter;
import org.apache.polaris.service.ratelimiter.RateLimiterFilter;
import org.apache.polaris.service.storage.PolarisStorageIntegrationProviderImpl;
import org.apache.polaris.service.task.ManifestFileCleanupTaskHandler;
import org.apache.polaris.service.task.TableCleanupTaskHandler;
+import org.apache.polaris.service.task.TaskExecutor;
import org.apache.polaris.service.task.TaskExecutorImpl;
import org.apache.polaris.service.task.TaskFileIOSupplier;
import org.apache.polaris.service.throttling.StreamReadConstraintsExceptionMapper;
-import org.apache.polaris.service.tracing.OpenTelemetryAware;
import org.apache.polaris.service.tracing.TracingFilter;
import org.eclipse.jetty.servlets.CrossOriginFilter;
+import org.glassfish.hk2.api.ServiceLocator;
+import org.glassfish.hk2.utilities.ServiceLocatorUtilities;
+import org.glassfish.hk2.utilities.binding.AbstractBinder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
@@ -125,6 +142,7 @@ import software.amazon.awssdk.services.sts.StsClientBuilder;
public class PolarisApplication extends Application<PolarisApplicationConfig> {
private static final Logger LOGGER = LoggerFactory.getLogger(PolarisApplication.class);
+ private ServiceLocator serviceLocator;
public static void main(final String[] args) throws Exception {
new PolarisApplication().run(args);
@@ -151,87 +169,142 @@ public class PolarisApplication extends Application<PolarisApplicationConfig> {
bootstrap.addCommand(new BootstrapRealmsCommand());
bootstrap.addCommand(new PurgeRealmsCommand());
+ SimpleModule module = new SimpleModule();
+ serviceLocator = ServiceLocatorUtilities.createAndPopulateServiceLocator();
+ SimpleValueInstantiators instantiators = new SimpleValueInstantiators();
+ ObjectMapper objectMapper = bootstrap.getObjectMapper();
+ DeserializationConfig deserializationConfig = objectMapper.getDeserializationConfig();
+ serviceLocator
+ .getDescriptors((c) -> true)
+ .forEach(
+ descriptor -> {
+ try {
+ Class<?> klazz =
+ PolarisApplication.class
+ .getClassLoader()
+ .loadClass(descriptor.getImplementation());
+ String name = descriptor.getName();
+ if (name == null) {
+ objectMapper.registerSubtypes(klazz);
+ } else {
+ objectMapper.registerSubtypes(new NamedType(klazz, name));
+ }
+ } catch (ClassNotFoundException e) {
+ LOGGER.error("Error loading class {}", descriptor.getImplementation(), e);
+ throw new RuntimeException("Unable to start Polaris application");
+ }
+ });
+ module.setValueInstantiators(instantiators);
+ module.setMixInAnnotation(Authenticator.class, NamedAuthenticator.class);
+ objectMapper.registerModule(module);
}
+ @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "class")
+ static final class NamedAuthenticator {}
+
@Override
public void run(PolarisApplicationConfig configuration, Environment environment) {
- MetaStoreManagerFactory metaStoreManagerFactory = configuration.getMetaStoreManagerFactory();
+ OpenTelemetry openTelemetry = setupTracing();
+ environment
+ .jersey()
+ .register(
+ new AbstractBinder() {
+ @Override
+ protected void configure() {
+ bind(configuration.getMetaStoreManagerFactory()).to(MetaStoreManagerFactory.class);
+ bind(configuration.getConfigurationStore()).to(PolarisConfigurationStore.class);
+ bind(configuration.getFileIOFactory()).to(FileIOFactory.class);
+ bind(configuration.getPolarisAuthenticator()).to(Authenticator.class);
+ bind(configuration.getTokenBrokerFactory()).to(TokenBrokerFactory.class);
+ bind(configuration.getOauth2Service()).to(IcebergRestOAuth2ApiService.class);
+ bind(configuration.getCallContextResolver()).to(CallContextResolver.class);
+ bind(configuration.getRealmContextResolver()).to(RealmContextResolver.class);
+ bind(configuration.getRateLimiter()).to(RateLimiter.class);
+ bind(new PolarisStorageIntegrationProviderImpl(
+ () -> {
+ StsClientBuilder stsClientBuilder = StsClient.builder();
+ AwsCredentialsProvider awsCredentialsProvider =
+ configuration.credentialsProvider();
+ if (awsCredentialsProvider != null) {
+ stsClientBuilder.credentialsProvider(awsCredentialsProvider);
+ }
+ return stsClientBuilder.build();
+ },
+ configuration.getGcpCredentialsProvider()))
+ .to(PolarisStorageIntegrationProvider.class);
+ bind(new PolarisMetricRegistry(
+ new PrometheusMeterRegistry(PrometheusConfig.DEFAULT)))
+ .to(PolarisMetricRegistry.class);
+ bind(openTelemetry).to(OpenTelemetry.class);
+ bindAsContract(RealmEntityManagerFactory.class).in(Singleton.class);
+ bind(PolarisCallContextCatalogFactory.class)
+ .to(CallContextCatalogFactory.class)
+ .in(Singleton.class);
+ bind(PolarisAuthorizerImpl.class).in(Singleton.class).to(PolarisAuthorizer.class);
+ bind(IcebergCatalogAdapter.class)
+ .in(Singleton.class)
+ .to(IcebergRestCatalogApiService.class)
+ .to(IcebergRestConfigurationApiService.class);
+ bind(PolarisServiceImpl.class)
+ .in(Singleton.class)
+ .to(PolarisCatalogsApiService.class)
+ .to(PolarisPrincipalsApiService.class)
+ .to(PolarisPrincipalRolesApiService.class);
+ FileIOFactory fileIOFactory = configuration.getFileIOFactory();
- metaStoreManagerFactory.setStorageIntegrationProvider(
- new PolarisStorageIntegrationProviderImpl(
- () -> {
- StsClientBuilder stsClientBuilder = StsClient.builder();
- AwsCredentialsProvider awsCredentialsProvider = configuration.credentialsProvider();
- if (awsCredentialsProvider != null) {
- stsClientBuilder.credentialsProvider(awsCredentialsProvider);
- }
- return stsClientBuilder.build();
- },
- configuration.getGcpCredentialsProvider()));
+ TaskHandlerConfiguration taskConfig = configuration.getTaskHandler();
+ TaskExecutorImpl taskExecutor =
+ new TaskExecutorImpl(
+ taskConfig.executorService(), configuration.getMetaStoreManagerFactory());
+ TaskFileIOSupplier fileIOSupplier =
+ new TaskFileIOSupplier(
+ configuration.getMetaStoreManagerFactory(), fileIOFactory);
+ taskExecutor.addTaskHandler(
+ new TableCleanupTaskHandler(
+ taskExecutor, configuration.getMetaStoreManagerFactory(), fileIOSupplier));
+ taskExecutor.addTaskHandler(
+ new ManifestFileCleanupTaskHandler(
+ fileIOSupplier, Executors.newVirtualThreadPerTaskExecutor()));
- PolarisMetricRegistry polarisMetricRegistry =
- new PolarisMetricRegistry(new PrometheusMeterRegistry(PrometheusConfig.DEFAULT));
- metaStoreManagerFactory.setMetricRegistry(polarisMetricRegistry);
+ bind(taskExecutor).to(TaskExecutor.class);
+ }
+ });
+ MetaStoreManagerFactory metaStoreManagerFactory = configuration.getMetaStoreManagerFactory();
+ environment
+ .jersey()
+ .register(
+ new Feature() {
+ @Inject ServiceLocator serviceLocator;
- OpenTelemetry openTelemetry = setupTracing();
- if (metaStoreManagerFactory instanceof OpenTelemetryAware otAware) {
- otAware.setOpenTelemetry(openTelemetry);
- }
- PolarisConfigurationStore configurationStore = configuration.getConfigurationStore();
- if (metaStoreManagerFactory instanceof ConfigurationStoreAware) {
- ((ConfigurationStoreAware) metaStoreManagerFactory).setConfigurationStore(configurationStore);
- }
- RealmEntityManagerFactory entityManagerFactory =
- new RealmEntityManagerFactory(metaStoreManagerFactory);
- CallContextResolver callContextResolver = configuration.getCallContextResolver();
- callContextResolver.setMetaStoreManagerFactory(metaStoreManagerFactory);
- if (callContextResolver instanceof ConfigurationStoreAware csa) {
- csa.setConfigurationStore(configurationStore);
- }
+ @Override
+ public boolean configure(FeatureContext context) {
+ serviceLocator.inject(configuration.getMetaStoreManagerFactory());
+ serviceLocator.inject(configuration.getConfigurationStore());
+ serviceLocator.inject(configuration.getPolarisAuthenticator());
+ serviceLocator.inject(configuration.getTokenBrokerFactory());
+ serviceLocator.inject(configuration.getOauth2Service());
+ serviceLocator.inject(configuration.getFileIOFactory());
+ serviceLocator.inject(configuration.getCallContextResolver());
+ serviceLocator.inject(configuration.getRealmContextResolver());
+ serviceLocator.inject(configuration.getRateLimiter());
+ return true;
+ }
+ });
RealmContextResolver realmContextResolver = configuration.getRealmContextResolver();
- realmContextResolver.setMetaStoreManagerFactory(metaStoreManagerFactory);
+ CallContextResolver callContextResolver = configuration.getCallContextResolver();
environment
.servlets()
.addFilter(
"realmContext", new ContextResolverFilter(realmContextResolver, callContextResolver))
.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), true, "/*");
- FileIOFactory fileIOFactory = configuration.getFileIOFactory();
- if (fileIOFactory instanceof MetricRegistryAware mrAware) {
- mrAware.setMetricRegistry(polarisMetricRegistry);
- }
- if (fileIOFactory instanceof OpenTelemetryAware otAware) {
- otAware.setOpenTelemetry(openTelemetry);
- }
- if (fileIOFactory instanceof ConfigurationStoreAware csAware) {
- csAware.setConfigurationStore(configurationStore);
- }
-
- TaskHandlerConfiguration taskConfig = configuration.getTaskHandler();
- TaskExecutorImpl taskExecutor =
- new TaskExecutorImpl(taskConfig.executorService(), metaStoreManagerFactory);
- TaskFileIOSupplier fileIOSupplier =
- new TaskFileIOSupplier(metaStoreManagerFactory, fileIOFactory);
- taskExecutor.addTaskHandler(
- new TableCleanupTaskHandler(taskExecutor, metaStoreManagerFactory, fileIOSupplier));
- taskExecutor.addTaskHandler(
- new ManifestFileCleanupTaskHandler(
- fileIOSupplier, Executors.newVirtualThreadPerTaskExecutor()));
-
LOGGER.info(
"Initializing PolarisCallContextCatalogFactory for metaStoreManagerType {}",
metaStoreManagerFactory);
- CallContextCatalogFactory catalogFactory =
- new PolarisCallContextCatalogFactory(
- entityManagerFactory, metaStoreManagerFactory, taskExecutor, fileIOFactory);
- PolarisAuthorizer authorizer = new PolarisAuthorizerImpl(configurationStore);
- IcebergCatalogAdapter catalogAdapter =
- new IcebergCatalogAdapter(
- catalogFactory, entityManagerFactory, metaStoreManagerFactory, authorizer);
- environment.jersey().register(new IcebergRestCatalogApi(catalogAdapter));
- environment.jersey().register(new IcebergRestConfigurationApi(catalogAdapter));
+ environment.jersey().register(IcebergRestCatalogApi.class);
+ environment.jersey().register(IcebergRestConfigurationApi.class);
FilterRegistration.Dynamic corsRegistration =
environment.servlets().addFilter("CORS", CrossOriginFilter.class);
@@ -257,6 +330,18 @@ public class PolarisApplication extends Application<PolarisApplicationConfig> {
CrossOriginFilter.ALLOW_CREDENTIALS_PARAM,
configuration.getCorsConfiguration().getAllowCredentials());
corsRegistration.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), true, "/*");
+ // environment
+ // .servlets()
+ // .addFilter("tracing", TracingFilter.class)
+ // .addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), true, "/*");
+ //
+ // if (configuration.getRateLimiter() != null) {
+ // environment
+ // .servlets()
+ // .addFilter("ratelimiter", RateLimiterFilter.class)
+ // .addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), true, "/*");
+ // }
+
environment
.servlets()
.addFilter("tracing", new TracingFilter(openTelemetry))
@@ -265,10 +350,8 @@ public class PolarisApplication extends Application<PolarisApplicationConfig> {
if (configuration.getRateLimiter() != null) {
environment.jersey().register(new RateLimiterFilter(configuration.getRateLimiter()));
}
-
- DiscoverableAuthenticator<String, AuthenticatedPolarisPrincipal> authenticator =
+ Authenticator<String, AuthenticatedPolarisPrincipal> authenticator =
configuration.getPolarisAuthenticator();
- authenticator.setMetaStoreManagerFactory(metaStoreManagerFactory);
AuthFilter<String, AuthenticatedPolarisPrincipal> oauthCredentialAuthFilter =
new OAuthCredentialAuthFilter.Builder<AuthenticatedPolarisPrincipal>()
.setAuthenticator(authenticator)
@@ -276,18 +359,15 @@ public class PolarisApplication extends Application<PolarisApplicationConfig> {
.buildAuthFilter();
environment.jersey().register(new AuthDynamicFeature(oauthCredentialAuthFilter));
environment.healthChecks().register("polaris", new PolarisHealthCheck());
- OAuth2ApiService oauth2Service = configuration.getOauth2Service();
- if (oauth2Service instanceof HasMetaStoreManagerFactory emfAware) {
- emfAware.setMetaStoreManagerFactory(metaStoreManagerFactory);
- }
- environment.jersey().register(new IcebergRestOAuth2Api(oauth2Service));
- environment.jersey().register(new IcebergExceptionMapper());
- environment.jersey().register(new PolarisExceptionMapper());
- PolarisServiceImpl polarisService =
- new PolarisServiceImpl(entityManagerFactory, metaStoreManagerFactory, authorizer);
- environment.jersey().register(new PolarisCatalogsApi(polarisService));
- environment.jersey().register(new PolarisPrincipalsApi(polarisService));
- environment.jersey().register(new PolarisPrincipalRolesApi(polarisService));
+
+ environment.jersey().register(IcebergRestOAuth2Api.class);
+ environment.jersey().register(IcebergExceptionMapper.class);
+ environment.jersey().register(PolarisExceptionMapper.class);
+
+ environment.jersey().register(PolarisCatalogsApi.class);
+ environment.jersey().register(PolarisPrincipalsApi.class);
+ environment.jersey().register(PolarisPrincipalRolesApi.class);
+
ObjectMapper objectMapper = environment.getObjectMapper();
objectMapper.setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY);
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
@@ -302,28 +382,16 @@ public class PolarisApplication extends Application<PolarisApplicationConfig> {
LOGGER.info("Limiting request body size to {} bytes", maxRequestBodyBytes);
}
- environment.jersey().register(new StreamReadConstraintsExceptionMapper());
+ environment.jersey().register(StreamReadConstraintsExceptionMapper.class);
RESTSerializers.registerAll(objectMapper);
Serializers.registerSerializers(objectMapper);
- environment.jersey().register(new IcebergJsonProcessingExceptionMapper());
- environment.jersey().register(new IcebergJerseyViolationExceptionMapper());
- environment.jersey().register(new TimedApplicationEventListener(polarisMetricRegistry));
-
- polarisMetricRegistry.init(
- IcebergRestCatalogApi.class,
- IcebergRestConfigurationApi.class,
- IcebergRestOAuth2Api.class,
- PolarisCatalogsApi.class,
- PolarisPrincipalsApi.class,
- PolarisPrincipalRolesApi.class);
+ environment.jersey().register(IcebergJsonProcessingExceptionMapper.class);
+ environment.jersey().register(IcebergJerseyViolationExceptionMapper.class);
+ environment.jersey().register(TimedApplicationEventListener.class);
environment
.admin()
- .addServlet(
- "metrics",
- new PrometheusMetricsServlet(
- ((PrometheusMeterRegistry) polarisMetricRegistry.getMeterRegistry())
- .getPrometheusRegistry()))
+ .addServlet("metrics", PrometheusMetricsServlet.class)
.addMapping("/metrics");
// For in-memory metastore we need to bootstrap Service and Service principal at startup (for
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/PurgeRealmsCommand.java b/polaris-service/src/main/java/org/apache/polaris/service/PurgeRealmsCommand.java
index 238a82cb..7ceddff9 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/PurgeRealmsCommand.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/PurgeRealmsCommand.java
@@ -21,11 +21,8 @@ package org.apache.polaris.service;
import io.dropwizard.core.cli.ConfiguredCommand;
import io.dropwizard.core.setup.Bootstrap;
import net.sourceforge.argparse4j.inf.Namespace;
-import org.apache.polaris.core.PolarisConfigurationStore;
import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
-import org.apache.polaris.service.config.ConfigurationStoreAware;
import org.apache.polaris.service.config.PolarisApplicationConfig;
-import org.apache.polaris.service.context.CallContextResolver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,16 +42,6 @@ public class PurgeRealmsCommand extends ConfiguredCommand<PolarisApplicationConf
throws Exception {
MetaStoreManagerFactory metaStoreManagerFactory = configuration.getMetaStoreManagerFactory();
- PolarisConfigurationStore configurationStore = configuration.getConfigurationStore();
- if (metaStoreManagerFactory instanceof ConfigurationStoreAware) {
- ((ConfigurationStoreAware) metaStoreManagerFactory).setConfigurationStore(configurationStore);
- }
- CallContextResolver callContextResolver = configuration.getCallContextResolver();
- callContextResolver.setMetaStoreManagerFactory(metaStoreManagerFactory);
- if (callContextResolver instanceof ConfigurationStoreAware csa) {
- csa.setConfigurationStore(configurationStore);
- }
-
metaStoreManagerFactory.purgeRealms(configuration.getDefaultRealms());
LOGGER.info("Purge completed successfully.");
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/TimedApplicationEventListener.java b/polaris-service/src/main/java/org/apache/polaris/service/TimedApplicationEventListener.java
index deaa0bba..0af1360b 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/TimedApplicationEventListener.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/TimedApplicationEventListener.java
@@ -22,6 +22,7 @@ import static org.apache.polaris.core.monitor.PolarisMetricRegistry.TAG_RESP_COD
import com.google.common.base.Stopwatch;
import io.micrometer.core.instrument.Tag;
+import jakarta.inject.Inject;
import java.lang.reflect.Method;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -54,6 +55,7 @@ public class TimedApplicationEventListener implements ApplicationEventListener {
// The PolarisMetricRegistry instance used for recording metrics and error counters.
private final PolarisMetricRegistry polarisMetricRegistry;
+ @Inject
public TimedApplicationEventListener(PolarisMetricRegistry polarisMetricRegistry) {
this.polarisMetricRegistry = polarisMetricRegistry;
}
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/admin/PolarisServiceImpl.java b/polaris-service/src/main/java/org/apache/polaris/service/admin/PolarisServiceImpl.java
index 148d4944..7d6901d4 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/admin/PolarisServiceImpl.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/admin/PolarisServiceImpl.java
@@ -18,6 +18,7 @@
*/
package org.apache.polaris.service.admin;
+import jakarta.inject.Inject;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.SecurityContext;
import java.util.List;
@@ -82,6 +83,7 @@ public class PolarisServiceImpl
private final PolarisAuthorizer polarisAuthorizer;
private final MetaStoreManagerFactory metaStoreManagerFactory;
+ @Inject
public PolarisServiceImpl(
RealmEntityManagerFactory entityManagerFactory,
MetaStoreManagerFactory metaStoreManagerFactory,
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/auth/BasePolarisAuthenticator.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/BasePolarisAuthenticator.java
index c06f17d8..42b238bf 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/auth/BasePolarisAuthenticator.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/BasePolarisAuthenticator.java
@@ -18,6 +18,7 @@
*/
package org.apache.polaris.service.auth;
+import jakarta.inject.Inject;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Optional;
@@ -53,7 +54,7 @@ public abstract class BasePolarisAuthenticator
protected MetaStoreManagerFactory metaStoreManagerFactory;
- @Override
+ @Inject
public void setMetaStoreManagerFactory(MetaStoreManagerFactory metaStoreManagerFactory) {
this.metaStoreManagerFactory = metaStoreManagerFactory;
}
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/auth/DefaultOAuth2ApiService.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/DefaultOAuth2ApiService.java
index 57a9bc74..31610d07 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/auth/DefaultOAuth2ApiService.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/DefaultOAuth2ApiService.java
@@ -20,7 +20,8 @@ package org.apache.polaris.service.auth;
import static java.nio.charset.StandardCharsets.UTF_8;
-import com.fasterxml.jackson.annotation.JsonTypeName;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.SecurityContext;
import org.apache.commons.codec.binary.Base64;
@@ -39,8 +40,8 @@ import org.slf4j.LoggerFactory;
* Default implementation of the {@link OAuth2ApiService} that generates a JWT token for the client
* if the client secret matches.
*/
-@JsonTypeName("default")
-public class DefaultOAuth2ApiService implements OAuth2ApiService, HasMetaStoreManagerFactory {
+@Named("default")
+public class DefaultOAuth2ApiService implements OAuth2ApiService {
private static final Logger LOGGER = LoggerFactory.getLogger(DefaultOAuth2ApiService.class);
private TokenBrokerFactory tokenBrokerFactory;
@@ -121,14 +122,14 @@ public class DefaultOAuth2ApiService implements OAuth2ApiService, HasMetaStoreMa
.build();
}
- @Override
+ @Inject
public void setMetaStoreManagerFactory(MetaStoreManagerFactory metaStoreManagerFactory) {
if (tokenBrokerFactory instanceof HasMetaStoreManagerFactory hemf) {
hemf.setMetaStoreManagerFactory(metaStoreManagerFactory);
}
}
- @Override
+ @Inject
public void setTokenBroker(TokenBrokerFactory tokenBrokerFactory) {
this.tokenBrokerFactory = tokenBrokerFactory;
}
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/auth/DefaultPolarisAuthenticator.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/DefaultPolarisAuthenticator.java
index b57572d3..ebacf430 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/auth/DefaultPolarisAuthenticator.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/DefaultPolarisAuthenticator.java
@@ -18,13 +18,13 @@
*/
package org.apache.polaris.service.auth;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import java.util.Optional;
import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal;
import org.apache.polaris.core.context.CallContext;
-import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
-import org.apache.polaris.service.config.HasMetaStoreManagerFactory;
+@Named("default")
public class DefaultPolarisAuthenticator extends BasePolarisAuthenticator {
private TokenBrokerFactory tokenBrokerFactory;
@@ -36,16 +36,7 @@ public class DefaultPolarisAuthenticator extends BasePolarisAuthenticator {
return getPrincipal(decodedToken);
}
- @Override
- public void setMetaStoreManagerFactory(MetaStoreManagerFactory metaStoreManagerFactory) {
- super.setMetaStoreManagerFactory(metaStoreManagerFactory);
- if (tokenBrokerFactory instanceof HasMetaStoreManagerFactory) {
- ((HasMetaStoreManagerFactory) tokenBrokerFactory)
- .setMetaStoreManagerFactory(metaStoreManagerFactory);
- }
- }
-
- @JsonProperty("tokenBroker")
+ @Inject
public void setTokenBroker(TokenBrokerFactory tokenBrokerFactory) {
this.tokenBrokerFactory = tokenBrokerFactory;
}
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/auth/DiscoverableAuthenticator.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/DiscoverableAuthenticator.java
index a6c2129b..1d78e535 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/auth/DiscoverableAuthenticator.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/DiscoverableAuthenticator.java
@@ -22,7 +22,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo;
import io.dropwizard.auth.Authenticator;
import io.dropwizard.jackson.Discoverable;
import java.security.Principal;
-import org.apache.polaris.service.config.HasMetaStoreManagerFactory;
/**
* Extension of the {@link Authenticator} interface that extends {@link Discoverable} so
@@ -34,5 +33,4 @@ import org.apache.polaris.service.config.HasMetaStoreManagerFactory;
* @param <P>
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, property = "class")
-public interface DiscoverableAuthenticator<C, P extends Principal>
- extends Authenticator<C, P>, Discoverable, HasMetaStoreManagerFactory {}
+public interface DiscoverableAuthenticator<C, P extends Principal> extends Authenticator<C, P> {}
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/auth/JWTRSAKeyPairFactory.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/JWTRSAKeyPairFactory.java
index 5e3441f4..86dafe15 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/auth/JWTRSAKeyPairFactory.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/JWTRSAKeyPairFactory.java
@@ -18,13 +18,13 @@
*/
package org.apache.polaris.service.auth;
-import com.fasterxml.jackson.annotation.JsonTypeName;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import org.apache.polaris.core.context.RealmContext;
import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
-import org.apache.polaris.service.config.HasMetaStoreManagerFactory;
-@JsonTypeName("rsa-key-pair")
-public class JWTRSAKeyPairFactory implements TokenBrokerFactory, HasMetaStoreManagerFactory {
+@Named("rsa-key-pair")
+public class JWTRSAKeyPairFactory implements TokenBrokerFactory {
private int maxTokenGenerationInSeconds = 3600;
private MetaStoreManagerFactory metaStoreManagerFactory;
@@ -39,7 +39,7 @@ public class JWTRSAKeyPairFactory implements TokenBrokerFactory, HasMetaStoreMan
maxTokenGenerationInSeconds);
}
- @Override
+ @Inject
public void setMetaStoreManagerFactory(MetaStoreManagerFactory metaStoreManagerFactory) {
this.metaStoreManagerFactory = metaStoreManagerFactory;
}
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/auth/JWTSymmetricKeyFactory.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/JWTSymmetricKeyFactory.java
index 297103f8..c6ca31b3 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/auth/JWTSymmetricKeyFactory.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/JWTSymmetricKeyFactory.java
@@ -19,16 +19,16 @@
package org.apache.polaris.service.auth;
import com.fasterxml.jackson.annotation.JsonTypeName;
+import jakarta.inject.Inject;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.function.Supplier;
import org.apache.polaris.core.context.RealmContext;
import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
-import org.apache.polaris.service.config.HasMetaStoreManagerFactory;
@JsonTypeName("symmetric-key")
-public class JWTSymmetricKeyFactory implements TokenBrokerFactory, HasMetaStoreManagerFactory {
+public class JWTSymmetricKeyFactory implements TokenBrokerFactory {
private MetaStoreManagerFactory metaStoreManagerFactory;
private int maxTokenGenerationInSeconds = 3600;
private String file;
@@ -68,7 +68,7 @@ public class JWTSymmetricKeyFactory implements TokenBrokerFactory, HasMetaStoreM
this.secret = secret;
}
- @Override
+ @Inject
public void setMetaStoreManagerFactory(MetaStoreManagerFactory metaStoreManagerFactory) {
this.metaStoreManagerFactory = metaStoreManagerFactory;
}
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/auth/TestInlineBearerTokenPolarisAuthenticator.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/TestInlineBearerTokenPolarisAuthenticator.java
index b37a077d..46ce0f36 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/auth/TestInlineBearerTokenPolarisAuthenticator.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/TestInlineBearerTokenPolarisAuthenticator.java
@@ -20,6 +20,7 @@ package org.apache.polaris.service.auth;
import com.google.common.base.Splitter;
import io.dropwizard.auth.AuthenticationException;
+import jakarta.inject.Named;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -45,6 +46,7 @@ import org.slf4j.LoggerFactory;
* This class does not expect a client to be either present or correct. Lookup is delegated to the
* {@link PolarisMetaStoreManager} for the current realm.
*/
+@Named("test")
public class TestInlineBearerTokenPolarisAuthenticator extends BasePolarisAuthenticator {
private static final Logger LOGGER =
LoggerFactory.getLogger(TestInlineBearerTokenPolarisAuthenticator.class);
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/auth/TestOAuth2ApiService.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/TestOAuth2ApiService.java
index a000489f..7c2cb8e9 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/auth/TestOAuth2ApiService.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/TestOAuth2ApiService.java
@@ -18,7 +18,8 @@
*/
package org.apache.polaris.service.auth;
-import com.fasterxml.jackson.annotation.JsonTypeName;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.SecurityContext;
import java.util.HashMap;
@@ -32,14 +33,13 @@ import org.apache.polaris.core.entity.PolarisEntitySubType;
import org.apache.polaris.core.entity.PolarisEntityType;
import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
-import org.apache.polaris.service.config.HasMetaStoreManagerFactory;
import org.apache.polaris.service.config.OAuth2ApiService;
import org.apache.polaris.service.types.TokenType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@JsonTypeName("test")
-public class TestOAuth2ApiService implements OAuth2ApiService, HasMetaStoreManagerFactory {
+@Named("test")
+public class TestOAuth2ApiService implements OAuth2ApiService {
private static final Logger LOGGER = LoggerFactory.getLogger(TestOAuth2ApiService.class);
private MetaStoreManagerFactory metaStoreManagerFactory;
@@ -108,11 +108,8 @@ public class TestOAuth2ApiService implements OAuth2ApiService, HasMetaStoreManag
}
}
- @Override
+ @Inject
public void setMetaStoreManagerFactory(MetaStoreManagerFactory metaStoreManagerFactory) {
this.metaStoreManagerFactory = metaStoreManagerFactory;
}
-
- @Override
- public void setTokenBroker(TokenBrokerFactory tokenBrokerFactory) {}
}
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/auth/TokenBrokerFactory.java b/polaris-service/src/main/java/org/apache/polaris/service/auth/TokenBrokerFactory.java
index abb15c9d..0931b152 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/auth/TokenBrokerFactory.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/auth/TokenBrokerFactory.java
@@ -19,7 +19,6 @@
package org.apache.polaris.service.auth;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import io.dropwizard.jackson.Discoverable;
import java.util.function.Function;
import org.apache.polaris.core.context.RealmContext;
@@ -28,4 +27,4 @@ import org.apache.polaris.core.context.RealmContext;
* created based on the realm context.
*/
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
-public interface TokenBrokerFactory extends Function<RealmContext, TokenBroker>, Discoverable {}
+public interface TokenBrokerFactory extends Function<RealmContext, TokenBroker> {}
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/catalog/IcebergCatalogAdapter.java b/polaris-service/src/main/java/org/apache/polaris/service/catalog/IcebergCatalogAdapter.java
index 94ea6524..467213a7 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/catalog/IcebergCatalogAdapter.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/catalog/IcebergCatalogAdapter.java
@@ -22,6 +22,7 @@ import static org.apache.polaris.service.catalog.AccessDelegationMode.VENDED_CRE
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
+import jakarta.inject.Inject;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.SecurityContext;
import java.net.URLEncoder;
@@ -76,6 +77,7 @@ public class IcebergCatalogAdapter
private final RealmEntityManagerFactory entityManagerFactory;
private final PolarisAuthorizer polarisAuthorizer;
+ @Inject
public IcebergCatalogAdapter(
CallContextCatalogFactory catalogFactory,
RealmEntityManagerFactory entityManagerFactory,
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/config/ConfigurationStoreAware.java b/polaris-service/src/main/java/org/apache/polaris/service/config/ConfigurationStoreAware.java
deleted file mode 100644
index 645f1b00..00000000
--- a/polaris-service/src/main/java/org/apache/polaris/service/config/ConfigurationStoreAware.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.polaris.service.config;
-
-import org.apache.polaris.core.PolarisConfigurationStore;
-
-/** Interface allows injection of a {@link PolarisConfigurationStore} */
-public interface ConfigurationStoreAware {
-
- void setConfigurationStore(PolarisConfigurationStore configurationStore);
-}
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/config/OAuth2ApiService.java b/polaris-service/src/main/java/org/apache/polaris/service/config/OAuth2ApiService.java
index 81c219af..0ab006d8 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/config/OAuth2ApiService.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/config/OAuth2ApiService.java
@@ -19,11 +19,7 @@
package org.apache.polaris.service.config;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import io.dropwizard.jackson.Discoverable;
-import org.apache.polaris.service.auth.TokenBrokerFactory;
import org.apache.polaris.service.catalog.api.IcebergRestOAuth2ApiService;
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
-public interface OAuth2ApiService extends Discoverable, IcebergRestOAuth2ApiService {
- void setTokenBroker(TokenBrokerFactory tokenBrokerFactory);
-}
+public interface OAuth2ApiService extends IcebergRestOAuth2ApiService {}
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/config/PolarisApplicationConfig.java b/polaris-service/src/main/java/org/apache/polaris/service/config/PolarisApplicationConfig.java
index 7d5fd8fd..93b33036 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/config/PolarisApplicationConfig.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/config/PolarisApplicationConfig.java
@@ -22,11 +22,13 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.auth.oauth2.AccessToken;
import com.google.auth.oauth2.GoogleCredentials;
import com.google.common.base.Preconditions;
+import io.dropwizard.auth.Authenticator;
import io.dropwizard.core.Configuration;
import java.io.IOException;
import java.util.Date;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Optional;
import java.util.function.Supplier;
import javax.annotation.Nullable;
@@ -34,11 +36,15 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.polaris.core.PolarisConfigurationStore;
import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal;
import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
-import org.apache.polaris.service.auth.DiscoverableAuthenticator;
+import org.apache.polaris.service.auth.DecodedToken;
+import org.apache.polaris.service.auth.TokenBroker;
+import org.apache.polaris.service.auth.TokenBrokerFactory;
+import org.apache.polaris.service.auth.TokenResponse;
import org.apache.polaris.service.catalog.io.FileIOFactory;
import org.apache.polaris.service.context.CallContextResolver;
import org.apache.polaris.service.context.RealmContextResolver;
import org.apache.polaris.service.ratelimiter.RateLimiter;
+import org.apache.polaris.service.types.TokenType;
import org.slf4j.LoggerFactory;
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
@@ -53,7 +59,7 @@ public class PolarisApplicationConfig extends Configuration {
private String defaultRealm = "default-realm";
private RealmContextResolver realmContextResolver;
private CallContextResolver callContextResolver;
- private DiscoverableAuthenticator<String, AuthenticatedPolarisPrincipal> polarisAuthenticator;
+ private Authenticator<String, AuthenticatedPolarisPrincipal> polarisAuthenticator;
private CorsConfiguration corsConfiguration = new CorsConfiguration();
private TaskHandlerConfiguration taskHandler = new TaskHandlerConfiguration();
private Map<String, Object> globalFeatureConfiguration = Map.of();
@@ -63,6 +69,7 @@ public class PolarisApplicationConfig extends Configuration {
private String awsSecretKey;
private FileIOFactory fileIOFactory;
private RateLimiter rateLimiter;
+ private TokenBrokerFactory tokenBrokerFactory;
private AccessToken gcpAccessToken;
@@ -91,15 +98,55 @@ public class PolarisApplicationConfig extends Configuration {
@JsonProperty("authenticator")
public void setPolarisAuthenticator(
- DiscoverableAuthenticator<String, AuthenticatedPolarisPrincipal> polarisAuthenticator) {
+ Authenticator<String, AuthenticatedPolarisPrincipal> polarisAuthenticator) {
this.polarisAuthenticator = polarisAuthenticator;
}
- public DiscoverableAuthenticator<String, AuthenticatedPolarisPrincipal>
- getPolarisAuthenticator() {
+ public Authenticator<String, AuthenticatedPolarisPrincipal> getPolarisAuthenticator() {
return polarisAuthenticator;
}
+ @JsonProperty("tokenBroker")
+ public void setTokenBrokerFactory(TokenBrokerFactory tokenBrokerFactory) {
+ this.tokenBrokerFactory = tokenBrokerFactory;
+ }
+
+ public TokenBrokerFactory getTokenBrokerFactory() {
+ // return a no-op implementation if none is specified
+ return Objects.requireNonNullElseGet(
+ tokenBrokerFactory,
+ () ->
+ (rc) ->
+ new TokenBroker() {
+ @Override
+ public boolean supportsGrantType(String grantType) {
+ return false;
+ }
+
+ @Override
+ public boolean supportsRequestedTokenType(TokenType tokenType) {
+ return false;
+ }
+
+ @Override
+ public TokenResponse generateFromClientSecrets(
+ String clientId, String clientSecret, String grantType, String scope) {
+ return null;
+ }
+
+ @Override
+ public TokenResponse generateFromToken(
+ TokenType tokenType, String subjectToken, String grantType, String scope) {
+ return null;
+ }
+
+ @Override
+ public DecodedToken verify(String token) {
+ return null;
+ }
+ });
+ }
+
public RealmContextResolver getRealmContextResolver() {
realmContextResolver.setDefaultRealm(this.defaultRealm);
return realmContextResolver;
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/config/RealmEntityManagerFactory.java b/polaris-service/src/main/java/org/apache/polaris/service/config/RealmEntityManagerFactory.java
index b896a13e..358c69cb 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/config/RealmEntityManagerFactory.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/config/RealmEntityManagerFactory.java
@@ -18,6 +18,7 @@
*/
package org.apache.polaris.service.config;
+import jakarta.inject.Inject;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.polaris.core.context.RealmContext;
@@ -39,6 +40,7 @@ public class RealmEntityManagerFactory {
this.metaStoreManagerFactory = null;
}
+ @Inject
public RealmEntityManagerFactory(MetaStoreManagerFactory metaStoreManagerFactory) {
this.metaStoreManagerFactory = metaStoreManagerFactory;
}
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/context/CallContextResolver.java b/polaris-service/src/main/java/org/apache/polaris/service/context/CallContextResolver.java
index 6221e73f..817e5a95 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/context/CallContextResolver.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/context/CallContextResolver.java
@@ -19,15 +19,13 @@
package org.apache.polaris.service.context;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import io.dropwizard.jackson.Discoverable;
import java.util.Map;
import org.apache.polaris.core.context.CallContext;
import org.apache.polaris.core.context.RealmContext;
-import org.apache.polaris.service.config.HasMetaStoreManagerFactory;
/** Uses the resolved RealmContext to further resolve elements of the CallContext. */
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
-public interface CallContextResolver extends HasMetaStoreManagerFactory, Discoverable {
+public interface CallContextResolver {
CallContext resolveCallContext(
RealmContext realmContext,
String method,
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/context/DefaultContextResolver.java b/polaris-service/src/main/java/org/apache/polaris/service/context/DefaultContextResolver.java
index 520d8fdc..944deba7 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/context/DefaultContextResolver.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/context/DefaultContextResolver.java
@@ -20,6 +20,7 @@ package org.apache.polaris.service.context;
import com.fasterxml.jackson.annotation.JsonTypeName;
import com.google.common.base.Splitter;
+import jakarta.inject.Inject;
import java.time.Clock;
import java.time.ZoneId;
import java.util.HashMap;
@@ -32,7 +33,6 @@ import org.apache.polaris.core.context.CallContext;
import org.apache.polaris.core.context.RealmContext;
import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
import org.apache.polaris.core.persistence.PolarisMetaStoreSession;
-import org.apache.polaris.service.config.ConfigurationStoreAware;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,8 +43,7 @@ import org.slf4j.LoggerFactory;
* <p>Example: principal:data-engineer;password:test;realm:acct123
*/
@JsonTypeName("default")
-public class DefaultContextResolver
- implements RealmContextResolver, CallContextResolver, ConfigurationStoreAware {
+public class DefaultContextResolver implements RealmContextResolver, CallContextResolver {
private static final Logger LOGGER = LoggerFactory.getLogger(DefaultContextResolver.class);
public static final String REALM_PROPERTY_KEY = "realm";
@@ -61,7 +60,7 @@ public class DefaultContextResolver
* entityManagerFactory} will be used to resolve elements of the CallContext which require
* additional information from an underlying entity store.
*/
- @Override
+ @Inject
public void setMetaStoreManagerFactory(MetaStoreManagerFactory metaStoreManagerFactory) {
this.metaStoreManagerFactory = metaStoreManagerFactory;
}
@@ -166,7 +165,7 @@ public class DefaultContextResolver
return parsedProperties;
}
- @Override
+ @Inject
public void setConfigurationStore(PolarisConfigurationStore configurationStore) {
this.configurationStore = configurationStore;
}
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/context/PolarisCallContextCatalogFactory.java b/polaris-service/src/main/java/org/apache/polaris/service/context/PolarisCallContextCatalogFactory.java
index 83d659a8..a72f7143 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/context/PolarisCallContextCatalogFactory.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/context/PolarisCallContextCatalogFactory.java
@@ -18,6 +18,7 @@
*/
package org.apache.polaris.service.context;
+import jakarta.inject.Inject;
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.Map;
@@ -50,6 +51,7 @@ public class PolarisCallContextCatalogFactory implements CallContextCatalogFacto
private final FileIOFactory fileIOFactory;
private final MetaStoreManagerFactory metaStoreManagerFactory;
+ @Inject
public PolarisCallContextCatalogFactory(
RealmEntityManagerFactory entityManagerFactory,
MetaStoreManagerFactory metaStoreManagerFactory,
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/context/RealmContextResolver.java b/polaris-service/src/main/java/org/apache/polaris/service/context/RealmContextResolver.java
index 681a10b6..e8e6ec39 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/context/RealmContextResolver.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/context/RealmContextResolver.java
@@ -19,13 +19,11 @@
package org.apache.polaris.service.context;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import io.dropwizard.jackson.Discoverable;
import java.util.Map;
import org.apache.polaris.core.context.RealmContext;
-import org.apache.polaris.service.config.HasMetaStoreManagerFactory;
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type")
-public interface RealmContextResolver extends Discoverable, HasMetaStoreManagerFactory {
+public interface RealmContextResolver {
RealmContext resolveRealmContext(
String requestURL,
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java b/polaris-service/src/main/java/org/apache/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java
index 2fa0d4e9..3cb088fe 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/persistence/InMemoryPolarisMetaStoreManagerFactory.java
@@ -19,6 +19,8 @@
package org.apache.polaris.service.persistence;
import com.fasterxml.jackson.annotation.JsonTypeName;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
@@ -35,6 +37,8 @@ import org.apache.polaris.core.persistence.PolarisTreeMapStore;
import org.jetbrains.annotations.NotNull;
@JsonTypeName("in-memory")
+@Named("in-memory")
+@Singleton
public class InMemoryPolarisMetaStoreManagerFactory
extends LocalPolarisMetaStoreManagerFactory<PolarisTreeMapStore> {
final Set<String> bootstrappedRealms = new HashSet<>();
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/ratelimiter/RateLimiterFilter.java b/polaris-service/src/main/java/org/apache/polaris/service/ratelimiter/RateLimiterFilter.java
index 034717c4..c5ad957b 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/ratelimiter/RateLimiterFilter.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/ratelimiter/RateLimiterFilter.java
@@ -18,6 +18,7 @@
*/
package org.apache.polaris.service.ratelimiter;
+import jakarta.inject.Inject;
import jakarta.ws.rs.container.ContainerRequestContext;
import jakarta.ws.rs.container.ContainerRequestFilter;
import jakarta.ws.rs.core.Response;
@@ -33,6 +34,7 @@ public class RateLimiterFilter implements ContainerRequestFilter {
private final RateLimiter rateLimiter;
+ @Inject
public RateLimiterFilter(RateLimiter rateLimiter) {
this.rateLimiter = rateLimiter;
}
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/tracing/OpenTelemetryAware.java b/polaris-service/src/main/java/org/apache/polaris/service/tracing/OpenTelemetryAware.java
deleted file mode 100644
index 07a24e29..00000000
--- a/polaris-service/src/main/java/org/apache/polaris/service/tracing/OpenTelemetryAware.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.polaris.service.tracing;
-
-import io.opentelemetry.api.OpenTelemetry;
-
-/** Allows setting a configured instance of {@link OpenTelemetry} */
-public interface OpenTelemetryAware {
- void setOpenTelemetry(OpenTelemetry openTelemetry);
-}
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/tracing/TracingFilter.java b/polaris-service/src/main/java/org/apache/polaris/service/tracing/TracingFilter.java
index b3cefe1c..f5d96829 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/tracing/TracingFilter.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/tracing/TracingFilter.java
@@ -28,6 +28,7 @@ import io.opentelemetry.semconv.HttpAttributes;
import io.opentelemetry.semconv.ServerAttributes;
import io.opentelemetry.semconv.UrlAttributes;
import jakarta.annotation.Priority;
+import jakarta.inject.Inject;
import jakarta.servlet.Filter;
import jakarta.servlet.FilterChain;
import jakarta.servlet.ServletException;
@@ -53,6 +54,7 @@ public class TracingFilter implements Filter {
private static final Logger LOGGER = LoggerFactory.getLogger(TracingFilter.class);
private final OpenTelemetry openTelemetry;
+ @Inject
public TracingFilter(OpenTelemetry openTelemetry) {
this.openTelemetry = openTelemetry;
}
diff --git a/polaris-service/src/main/resources/META-INF/hk2-locator/default b/polaris-service/src/main/resources/META-INF/hk2-locator/default
new file mode 100644
index 00000000..321c78db
--- /dev/null
+++ b/polaris-service/src/main/resources/META-INF/hk2-locator/default
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+[org.apache.polaris.service.auth.DefaultPolarisAuthenticator]S
+contract={org.apache.polaris.service.auth.BasePolarisAuthenticator}
+name=default
+qualifier={jakarta.inject.Named}
+
+[org.apache.polaris.service.auth.TestInlineBearerTokenPolarisAuthenticator]S
+contract={io.dropwizard.auth.Authenticator}
+name=test
+qualifier={jakarta.inject.Named}
+
+[org.apache.polaris.service.persistence.InMemoryPolarisMetaStoreManagerFactory]S
+contract={org.apache.polaris.core.persistence.MetaStoreManagerFactory}
+name=in-memory
+qualifier={jakarta.inject.Named}
+
+[org.apache.polaris.service.auth.DefaultOAuth2ApiService]S
+contract={org.apache.polaris.service.catalog.api.IcebergRestOAuth2ApiService}
+name=default
+qualifier={jakarta.inject.Named}
+
+[org.apache.polaris.service.auth.TestOAuth2ApiService]S
+contract={org.apache.polaris.service.catalog.api.IcebergRestOAuth2ApiService}
+name=test
+qualifier={jakarta.inject.Named}
+
+[org.apache.polaris.service.auth.JWTSymmetricKeyFactory]S
+contract={org.apache.polaris.service.auth.TokenBrokerFactory}
+name=symmetric-key
+qualifier={jakarta.inject.Named}
+
+[org.apache.polaris.service.auth.JWTRSAKeyPairFactory]S
+contract={org.apache.polaris.service.auth.TokenBrokerFactory}
+name=rsa-key-pair
+qualifier={jakarta.inject.Named}
+
diff --git a/polaris-service/src/main/resources/META-INF/services/io.dropwizard.jackson.Discoverable b/polaris-service/src/main/resources/META-INF/services/io.dropwizard.jackson.Discoverable
index 95d1f8ec..95de5f61 100644
--- a/polaris-service/src/main/resources/META-INF/services/io.dropwizard.jackson.Discoverable
+++ b/polaris-service/src/main/resources/META-INF/services/io.dropwizard.jackson.Discoverable
@@ -18,7 +18,6 @@
#
org.apache.polaris.service.auth.DiscoverableAuthenticator
-org.apache.polaris.core.persistence.MetaStoreManagerFactory
org.apache.polaris.service.config.OAuth2ApiService
org.apache.polaris.service.context.RealmContextResolver
org.apache.polaris.service.context.CallContextResolver
diff --git a/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogTest.java b/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogTest.java
index 7b0270c4..da8a481f 100644
--- a/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogTest.java
+++ b/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogTest.java
@@ -75,7 +75,6 @@ import org.apache.polaris.core.entity.PolarisEntitySubType;
import org.apache.polaris.core.entity.PolarisEntityType;
import org.apache.polaris.core.entity.PrincipalEntity;
import org.apache.polaris.core.entity.TaskEntity;
-import org.apache.polaris.core.monitor.PolarisMetricRegistry;
import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
import org.apache.polaris.core.persistence.PolarisEntityManager;
import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
@@ -287,9 +286,6 @@ public class BasePolarisCatalogTest extends CatalogTests<BasePolarisCatalog> {
return new StorageCredentialCache();
}
- @Override
- public void setMetricRegistry(PolarisMetricRegistry metricRegistry) {}
-
@Override
public Map<String, PrincipalSecretsResult> bootstrapRealms(List<String> realms) {
throw new NotImplementedException("Bootstrapping realms is not supported");
@@ -299,10 +295,6 @@ public class BasePolarisCatalogTest extends CatalogTests<BasePolarisCatalog> {
public void purgeRealms(List<String> realms) {
throw new NotImplementedException("Purging realms is not supported");
}
-
- @Override
- public void setStorageIntegrationProvider(
- PolarisStorageIntegrationProvider storageIntegrationProvider) {}
};
}
diff --git a/polaris-service/src/test/java/org/apache/polaris/service/catalog/io/TestFileIOFactory.java b/polaris-service/src/test/java/org/apache/polaris/service/catalog/io/TestFileIOFactory.java
index 9afeeb15..75923e08 100644
--- a/polaris-service/src/test/java/org/apache/polaris/service/catalog/io/TestFileIOFactory.java
+++ b/polaris-service/src/test/java/org/apache/polaris/service/catalog/io/TestFileIOFactory.java
@@ -18,7 +18,7 @@
*/
package org.apache.polaris.service.catalog.io;
-import com.fasterxml.jackson.annotation.JsonTypeName;
+import jakarta.inject.Named;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -32,7 +32,7 @@ import org.apache.iceberg.io.FileIO;
* A FileIOFactory that measures the number of bytes read, files written, and files deleted. It can
* inject exceptions at various parts of the IO construction.
*/
-@JsonTypeName("test")
+@Named("test")
public class TestFileIOFactory implements FileIOFactory {
private final List<TestFileIO> ios = new ArrayList<>();
diff --git a/polaris-service/src/test/java/org/apache/polaris/service/ratelimiter/MockRealmTokenBucketRateLimiter.java b/polaris-service/src/test/java/org/apache/polaris/service/ratelimiter/MockRealmTokenBucketRateLimiter.java
index 95570091..3011562b 100644
--- a/polaris-service/src/test/java/org/apache/polaris/service/ratelimiter/MockRealmTokenBucketRateLimiter.java
+++ b/polaris-service/src/test/java/org/apache/polaris/service/ratelimiter/MockRealmTokenBucketRateLimiter.java
@@ -20,14 +20,14 @@ package org.apache.polaris.service.ratelimiter;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeName;
+import jakarta.inject.Named;
import java.time.Clock;
import java.time.Instant;
import java.time.ZoneOffset;
import org.threeten.extra.MutableClock;
/** RealmTokenBucketRateLimiter with a mock clock */
-@JsonTypeName("mock-realm-token-bucket")
+@Named("mock-realm-token-bucket")
public class MockRealmTokenBucketRateLimiter extends RealmTokenBucketRateLimiter {
public static MutableClock CLOCK = MutableClock.of(Instant.now(), ZoneOffset.UTC);
diff --git a/polaris-service/src/test/resources/META-INF/hk2-locator/default b/polaris-service/src/test/resources/META-INF/hk2-locator/default
new file mode 100644
index 00000000..b643b9c3
--- /dev/null
+++ b/polaris-service/src/test/resources/META-INF/hk2-locator/default
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+[org.apache.polaris.service.auth.DefaultPolarisAuthenticator]S
+contract={org.apache.polaris.service.auth.BasePolarisAuthenticator}
+name=default
+qualifier={jakarta.inject.Named}
+
+[org.apache.polaris.service.auth.TestInlineBearerTokenPolarisAuthenticator]S
+contract={io.dropwizard.auth.Authenticator}
+name=test
+qualifier={jakarta.inject.Named}
+
+[org.apache.polaris.service.persistence.InMemoryPolarisMetaStoreManagerFactory]S
+contract={org.apache.polaris.core.persistence.MetaStoreManagerFactory}
+name=in-memory
+qualifier={jakarta.inject.Named}
+
+[org.apache.polaris.service.auth.DefaultOAuth2ApiService]S
+contract={org.apache.polaris.service.catalog.api.IcebergRestOAuth2ApiService}
+name=default
+qualifier={jakarta.inject.Named}
+
+[org.apache.polaris.service.auth.TestOAuth2ApiService]S
+contract={org.apache.polaris.service.catalog.api.IcebergRestOAuth2ApiService}
+name=test
+qualifier={jakarta.inject.Named}
+
+[org.apache.polaris.service.auth.JWTSymmetricKeyFactory]S
+contract={org.apache.polaris.service.auth.TokenBrokerFactory}
+name=symmetric-key
+qualifier={jakarta.inject.Named}
+
+[org.apache.polaris.service.auth.JWTRSAKeyPairFactory]S
+contract={org.apache.polaris.service.auth.TokenBrokerFactory}
+name=rsa-key-pair
+qualifier={jakarta.inject.Named}
+
+[org.apache.polaris.service.catalog.io.TestFileIOFactory]S
+contract={org.apache.polaris.service.catalog.io.FileIOFactory}
+name=test
+qualifier={jakarta.inject.Named}
+
+[org.apache.polaris.service.ratelimiter.MockRealmTokenBucketRateLimiter]S
+contract={org.apache.polaris.service.ratelimiter.RateLimiter}
+name=mock-realm-token-bucket
+qualifier={jakarta.inject.Named}
diff --git a/polaris-service/src/test/resources/polaris-server-integrationtest.yml b/polaris-service/src/test/resources/polaris-server-integrationtest.yml
index b3c8289a..76db1ec1 100644
--- a/polaris-service/src/test/resources/polaris-server-integrationtest.yml
+++ b/polaris-service/src/test/resources/polaris-server-integrationtest.yml
@@ -87,16 +87,13 @@ io:
oauth2:
type: default
- tokenBroker:
- type: symmetric-key
- secret: polaris
authenticator:
class: org.apache.polaris.service.auth.DefaultPolarisAuthenticator
- tokenBroker:
- type: symmetric-key
- secret: polaris
+tokenBroker:
+ type: symmetric-key
+ secret: polaris
callContextResolver:
type: default
diff --git a/server-templates/api.mustache b/server-templates/api.mustache
index 08821fbf..6a1151a6 100644
--- a/server-templates/api.mustache
+++ b/server-templates/api.mustache
@@ -51,6 +51,8 @@ import {{javaxPackage}}.servlet.http.HttpServletResponse;
import {{javaxPackage}}.ws.rs.core.Context;
import {{javaxPackage}}.ws.rs.core.SecurityContext;
+import {{javaxPackage}}.inject.Inject;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -82,6 +84,7 @@ public class {{classname}} {
private final {{classname}}Service service;
+ @Inject
public {{classname}}({{classname}}Service service) {
this.service = service;
}
(polaris) 04/06: Fix EntityCache to work with RealmScope
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
collado pushed a commit to branch mcollado-hk2-di
in repository https://gitbox.apache.org/repos/asf/polaris.git
commit 6fc4c5ece42a18e4421b3a6d0ccb335ff141da14
Author: Michael Collado <co...@gmail.com>
AuthorDate: Mon Nov 25 17:34:54 2024 -0800
Fix EntityCache to work with RealmScope
---
.../apache/polaris/core/context/RealmScope.java | 2 --
.../core/persistence/cache/EntityCache.java | 4 +++
.../apache/polaris/service/PolarisApplication.java | 38 ++++++++++++++++++++--
.../service/config/RealmEntityManagerFactory.java | 2 ++
.../polaris/service/context/RealmScopeContext.java | 5 +--
5 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/context/RealmScope.java b/polaris-core/src/main/java/org/apache/polaris/core/context/RealmScope.java
index 40fc9599..281b9c80 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/context/RealmScope.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/context/RealmScope.java
@@ -22,10 +22,8 @@ import jakarta.inject.Scope;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.glassfish.hk2.api.Proxiable;
@Scope
-@Proxiable
@Retention(java.lang.annotation.RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE, ElementType.METHOD})
public @interface RealmScope {}
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCache.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCache.java
index 3966b1e3..fdf8e1dd 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCache.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/EntityCache.java
@@ -21,11 +21,13 @@ package org.apache.polaris.core.persistence.cache;
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import com.github.benmanes.caffeine.cache.RemovalListener;
+import jakarta.inject.Inject;
import java.util.AbstractMap;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import org.apache.polaris.core.PolarisCallContext;
+import org.apache.polaris.core.context.RealmScope;
import org.apache.polaris.core.entity.PolarisBaseEntity;
import org.apache.polaris.core.entity.PolarisEntityType;
import org.apache.polaris.core.entity.PolarisGrantRecord;
@@ -34,6 +36,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/** The entity cache, can be private or shared */
+@RealmScope
public class EntityCache {
// cache mode
@@ -53,6 +56,7 @@ public class EntityCache {
*
* @param polarisRemoteCache the meta store manager implementation
*/
+ @Inject
public EntityCache(@NotNull PolarisRemoteCache polarisRemoteCache) {
// by name cache
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/PolarisApplication.java b/polaris-service/src/main/java/org/apache/polaris/service/PolarisApplication.java
index 41d8ff9c..bbcb2257 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/PolarisApplication.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/PolarisApplication.java
@@ -57,6 +57,7 @@ import io.opentelemetry.sdk.trace.export.SimpleSpanProcessor;
import io.opentelemetry.semconv.ServiceAttributes;
import io.prometheus.metrics.exporter.servlet.jakarta.PrometheusMetricsServlet;
import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import jakarta.inject.Singleton;
import jakarta.servlet.DispatcherType;
import jakarta.servlet.Filter;
@@ -85,13 +86,16 @@ import org.apache.polaris.core.PolarisConfigurationStore;
import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal;
import org.apache.polaris.core.auth.PolarisAuthorizer;
import org.apache.polaris.core.auth.PolarisAuthorizerImpl;
+import org.apache.polaris.core.auth.PolarisGrantManager;
import org.apache.polaris.core.context.CallContext;
import org.apache.polaris.core.context.RealmContext;
import org.apache.polaris.core.context.RealmScope;
import org.apache.polaris.core.monitor.PolarisMetricRegistry;
import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
+import org.apache.polaris.core.persistence.cache.CacheDelegatingGrantCache;
import org.apache.polaris.core.persistence.cache.EntityCache;
+import org.apache.polaris.core.persistence.cache.PolarisRemoteCache;
import org.apache.polaris.core.storage.PolarisStorageIntegrationProvider;
import org.apache.polaris.service.admin.PolarisServiceImpl;
import org.apache.polaris.service.admin.api.PolarisCatalogsApi;
@@ -135,8 +139,10 @@ import org.apache.polaris.service.task.TaskFileIOSupplier;
import org.apache.polaris.service.throttling.StreamReadConstraintsExceptionMapper;
import org.apache.polaris.service.tracing.TracingFilter;
import org.eclipse.jetty.servlets.CrossOriginFilter;
+import org.glassfish.hk2.api.Context;
import org.glassfish.hk2.api.Factory;
import org.glassfish.hk2.api.ServiceLocator;
+import org.glassfish.hk2.api.TypeLiteral;
import org.glassfish.hk2.utilities.ServiceLocatorUtilities;
import org.glassfish.hk2.utilities.binding.AbstractBinder;
import org.slf4j.Logger;
@@ -217,7 +223,9 @@ public class PolarisApplication extends Application<PolarisApplicationConfig> {
new AbstractBinder() {
@Override
protected void configure() {
- bind(RealmScopeContext.class).in(Singleton.class);
+ bind(RealmScopeContext.class)
+ .in(Singleton.class)
+ .to(new TypeLiteral<Context<RealmScope>>() {});
bind(configuration.getMetaStoreManagerFactory()).to(MetaStoreManagerFactory.class);
bindFactory(PolarisMetaStoreManagerFactory.class)
.to(PolarisMetaStoreManager.class)
@@ -231,7 +239,18 @@ public class PolarisApplication extends Application<PolarisApplicationConfig> {
bind(configuration.getCallContextResolver()).to(CallContextResolver.class);
bind(configuration.getRealmContextResolver()).to(RealmContextResolver.class);
bind(configuration.getRateLimiter()).to(RateLimiter.class);
- bindFactory(EntityCacheFactory.class).to(EntityCache.class);
+ bindFactory(EntityCacheFactory.class).in(RealmScope.class).to(EntityCache.class);
+
+ bindFactory(PolarisRemoteCacheFactory.class)
+ .in(RealmScope.class)
+ .to(PolarisRemoteCache.class);
+
+ // factory to use a cache delegating grant cache
+ // currently depends explicitly on the metaStoreManager as the delegate grant
+ // manager
+ bindFactory(PolarisMetaStoreManagerFactory.class)
+ .in(RealmScope.class)
+ .to(PolarisGrantManager.class);
bind(new PolarisStorageIntegrationProviderImpl(
() -> {
StsClientBuilder stsClientBuilder = StsClient.builder();
@@ -248,7 +267,7 @@ public class PolarisApplication extends Application<PolarisApplicationConfig> {
new PrometheusMeterRegistry(PrometheusConfig.DEFAULT)))
.to(PolarisMetricRegistry.class);
bind(openTelemetry).to(OpenTelemetry.class);
- bindAsContract(RealmEntityManagerFactory.class).in(Singleton.class);
+ bindAsContract(RealmEntityManagerFactory.class).in(RealmScope.class);
bind(PolarisCallContextCatalogFactory.class)
.to(CallContextCatalogFactory.class)
.in(Singleton.class);
@@ -506,4 +525,17 @@ public class PolarisApplication extends Application<PolarisApplicationConfig> {
@Override
public void dispose(PolarisMetaStoreManager instance) {}
}
+
+ private static class PolarisRemoteCacheFactory implements Factory<PolarisRemoteCache> {
+ @Inject PolarisMetaStoreManager metaStoreManager;
+
+ @RealmScope
+ @Override
+ public PolarisRemoteCache provide() {
+ return metaStoreManager;
+ }
+
+ @Override
+ public void dispose(PolarisRemoteCache instance) {}
+ }
}
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/config/RealmEntityManagerFactory.java b/polaris-service/src/main/java/org/apache/polaris/service/config/RealmEntityManagerFactory.java
index f25dd694..90315635 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/config/RealmEntityManagerFactory.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/config/RealmEntityManagerFactory.java
@@ -22,6 +22,7 @@ import jakarta.inject.Inject;
import java.util.HashMap;
import java.util.Map;
import org.apache.polaris.core.context.RealmContext;
+import org.apache.polaris.core.context.RealmScope;
import org.apache.polaris.core.persistence.MetaStoreManagerFactory;
import org.apache.polaris.core.persistence.PolarisEntityManager;
import org.apache.polaris.core.persistence.cache.EntityCache;
@@ -29,6 +30,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/** Gets or creates PolarisEntityManager instances based on config values and RealmContext. */
+@RealmScope
public class RealmEntityManagerFactory {
private static final Logger LOGGER = LoggerFactory.getLogger(RealmEntityManagerFactory.class);
private final MetaStoreManagerFactory metaStoreManagerFactory;
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/context/RealmScopeContext.java b/polaris-service/src/main/java/org/apache/polaris/service/context/RealmScopeContext.java
index a60c9575..7ad82d26 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/context/RealmScopeContext.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/context/RealmScopeContext.java
@@ -44,7 +44,7 @@ public class RealmScopeContext implements Context<RealmScope> {
public <U> U findOrCreate(ActiveDescriptor<U> activeDescriptor, ServiceHandle<?> root) {
RealmContext realmContext = CallContext.getCurrentContext().getRealmContext();
Map<ActiveDescriptor<?>, Object> contextMap =
- contexts.computeIfAbsent(realmContext.getRealmIdentifier(), k -> new HashMap<>());
+ contexts.computeIfAbsent(realmContext.getRealmIdentifier(), k -> new ConcurrentHashMap<>());
return (U) contextMap.computeIfAbsent(activeDescriptor, k -> activeDescriptor.create(root));
}
@@ -71,7 +71,8 @@ public class RealmScopeContext implements Context<RealmScope> {
@Override
public boolean isActive() {
- return true;
+ return CallContext.getCurrentContext() != null
+ && CallContext.getCurrentContext().getRealmContext() != null;
}
@Override
(polaris) 05/06: Add CacheDelegatingGrantCache
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
collado pushed a commit to branch mcollado-hk2-di
in repository https://gitbox.apache.org/repos/asf/polaris.git
commit 01c6928f188624bf0d260a2d79eb5983b480bfe7
Author: Michael Collado <co...@gmail.com>
AuthorDate: Mon Nov 25 17:35:14 2024 -0800
Add CacheDelegatingGrantCache
---
.../cache/CacheDelegatingGrantCache.java | 164 +++++++++++++++++++++
1 file changed, 164 insertions(+)
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/CacheDelegatingGrantCache.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/CacheDelegatingGrantCache.java
new file mode 100644
index 00000000..8bf54845
--- /dev/null
+++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/cache/CacheDelegatingGrantCache.java
@@ -0,0 +1,164 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.polaris.core.persistence.cache;
+
+import jakarta.inject.Inject;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import org.apache.polaris.core.PolarisCallContext;
+import org.apache.polaris.core.auth.PolarisGrantManager;
+import org.apache.polaris.core.context.RealmScope;
+import org.apache.polaris.core.entity.PolarisEntityCore;
+import org.apache.polaris.core.entity.PolarisPrivilege;
+import org.apache.polaris.core.persistence.BaseResult;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@RealmScope
+public class CacheDelegatingGrantCache implements PolarisGrantManager {
+ private static final Logger LOGGER = LoggerFactory.getLogger(CacheDelegatingGrantCache.class);
+ private final EntityCache entityCache;
+ private final PolarisGrantManager delegateGrantManager;
+
+ @Inject
+ public CacheDelegatingGrantCache(
+ EntityCache entityCache, PolarisGrantManager delegateGrantManager) {
+ this.entityCache = entityCache;
+ this.delegateGrantManager = delegateGrantManager;
+ }
+
+ @Override
+ public @NotNull PrivilegeResult grantUsageOnRoleToGrantee(
+ @NotNull PolarisCallContext callCtx,
+ @Nullable PolarisEntityCore catalog,
+ @NotNull PolarisEntityCore role,
+ @NotNull PolarisEntityCore grantee) {
+ return delegateGrantManager.grantUsageOnRoleToGrantee(callCtx, catalog, role, grantee);
+ }
+
+ @Override
+ public @NotNull PrivilegeResult revokeUsageOnRoleFromGrantee(
+ @NotNull PolarisCallContext callCtx,
+ @Nullable PolarisEntityCore catalog,
+ @NotNull PolarisEntityCore role,
+ @NotNull PolarisEntityCore grantee) {
+ return delegateGrantManager.revokeUsageOnRoleFromGrantee(callCtx, catalog, role, grantee);
+ }
+
+ @Override
+ public @NotNull PrivilegeResult grantPrivilegeOnSecurableToRole(
+ @NotNull PolarisCallContext callCtx,
+ @NotNull PolarisEntityCore grantee,
+ @Nullable List<PolarisEntityCore> catalogPath,
+ @NotNull PolarisEntityCore securable,
+ @NotNull PolarisPrivilege privilege) {
+ return delegateGrantManager.grantPrivilegeOnSecurableToRole(
+ callCtx, grantee, catalogPath, securable, privilege);
+ }
+
+ @Override
+ public @NotNull PrivilegeResult revokePrivilegeOnSecurableFromRole(
+ @NotNull PolarisCallContext callCtx,
+ @NotNull PolarisEntityCore grantee,
+ @Nullable List<PolarisEntityCore> catalogPath,
+ @NotNull PolarisEntityCore securable,
+ @NotNull PolarisPrivilege privilege) {
+ return delegateGrantManager.revokePrivilegeOnSecurableFromRole(
+ callCtx, grantee, catalogPath, securable, privilege);
+ }
+
+ @Override
+ public @NotNull LoadGrantsResult loadGrantsOnSecurable(
+ @NotNull PolarisCallContext callCtx, long securableCatalogId, long securableId) {
+ EntityCacheLookupResult lookupResult =
+ entityCache.getOrLoadEntityById(callCtx, securableCatalogId, securableId);
+ if (lookupResult == null) {
+ LOGGER.warn(
+ "No cache hit or entity found for securable with catalogId {} and id {}",
+ securableCatalogId,
+ securableId);
+ return new LoadGrantsResult(BaseResult.ReturnStatus.ENTITY_NOT_FOUND, null);
+ }
+ callCtx
+ .getDiagServices()
+ .checkNotNull(lookupResult.getCacheEntry(), "Lookup result did not contain an entry");
+ LOGGER.debug(
+ "Returning grants from cache for securable with catalogId {} and id {}",
+ securableCatalogId,
+ securableId);
+ EntityCacheEntry cacheEntry = lookupResult.getCacheEntry();
+ callCtx.getDiagServices().checkNotNull(cacheEntry.getEntity(), "Entity not found in cache");
+ return new LoadGrantsResult(
+ cacheEntry.getEntity().getGrantRecordsVersion(),
+ cacheEntry.getGrantRecordsAsSecurable(),
+ cacheEntry.getGrantRecordsAsSecurable().stream()
+ .map(
+ gr ->
+ entityCache.getOrLoadEntityById(
+ callCtx, gr.getGranteeCatalogId(), gr.getGranteeId()))
+ .flatMap(
+ result ->
+ Optional.ofNullable(result)
+ .map(EntityCacheLookupResult::getCacheEntry)
+ .map(EntityCacheEntry::getEntity)
+ .stream())
+ .collect(Collectors.toList()));
+ }
+
+ @Override
+ public @NotNull LoadGrantsResult loadGrantsToGrantee(
+ PolarisCallContext callCtx, long granteeCatalogId, long granteeId) {
+ EntityCacheLookupResult lookupResult =
+ entityCache.getOrLoadEntityById(callCtx, granteeCatalogId, granteeId);
+ if (lookupResult == null) {
+ LOGGER.warn(
+ "No cache hit or entity found for grantee with catalogId {} and id {}",
+ granteeCatalogId,
+ granteeId);
+ return new LoadGrantsResult(BaseResult.ReturnStatus.ENTITY_NOT_FOUND, null);
+ }
+ callCtx
+ .getDiagServices()
+ .checkNotNull(lookupResult.getCacheEntry(), "Lookup result did not contain an entry");
+ LOGGER.debug(
+ "Returning grants from cache for grantee with catalogId {} and id {}",
+ granteeCatalogId,
+ granteeId);
+ EntityCacheEntry cacheEntry = lookupResult.getCacheEntry();
+ callCtx.getDiagServices().checkNotNull(cacheEntry.getEntity(), "Entity not found in cache");
+ return new LoadGrantsResult(
+ cacheEntry.getEntity().getGrantRecordsVersion(),
+ cacheEntry.getGrantRecordsAsGrantee(),
+ cacheEntry.getGrantRecordsAsGrantee().stream()
+ .map(
+ gr ->
+ entityCache.getOrLoadEntityById(
+ callCtx, gr.getSecurableCatalogId(), gr.getSecurableId()))
+ .flatMap(
+ result ->
+ Optional.ofNullable(result)
+ .map(EntityCacheLookupResult::getCacheEntry)
+ .map(EntityCacheEntry::getEntity)
+ .stream())
+ .collect(Collectors.toList()));
+ }
+}
(polaris) 06/06: Make PolarisAuthorizer work with PolarisGrantManager
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
collado pushed a commit to branch mcollado-hk2-di
in repository https://gitbox.apache.org/repos/asf/polaris.git
commit 8b212078f5dda57c695836af70fed10cc17b8199
Author: Michael Collado <co...@gmail.com>
AuthorDate: Wed Nov 6 17:16:09 2024 -0800
Make PolarisAuthorizer work with PolarisGrantManager
---
.../polaris/core/auth/PolarisAuthorizer.java | 3 +
.../polaris/core/auth/PolarisAuthorizerImpl.java | 59 ++++++++++++++----
.../persistence/PolarisResolvedPathWrapper.java | 33 ++--------
.../resolver/PolarisResolutionManifest.java | 33 +++++-----
.../polaris/service/admin/PolarisAdminService.java | 12 +++-
.../service/catalog/BasePolarisCatalog.java | 13 ++--
.../catalog/PolarisCatalogHandlerWrapper.java | 71 ++++++----------------
.../service/admin/PolarisAuthzTestBase.java | 16 ++---
.../service/catalog/BasePolarisCatalogTest.java | 2 +-
.../catalog/BasePolarisCatalogViewTest.java | 2 +-
10 files changed, 122 insertions(+), 122 deletions(-)
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisAuthorizer.java b/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisAuthorizer.java
index 5224739d..0fbfb543 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisAuthorizer.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisAuthorizer.java
@@ -20,6 +20,7 @@ package org.apache.polaris.core.auth;
import java.util.List;
import java.util.Set;
+import org.apache.polaris.core.PolarisCallContext;
import org.apache.polaris.core.entity.PolarisBaseEntity;
import org.apache.polaris.core.persistence.PolarisResolvedPathWrapper;
import org.jetbrains.annotations.NotNull;
@@ -29,6 +30,7 @@ import org.jetbrains.annotations.Nullable;
public interface PolarisAuthorizer {
void authorizeOrThrow(
+ @NotNull PolarisCallContext polarisCallContext,
@NotNull AuthenticatedPolarisPrincipal authenticatedPrincipal,
@NotNull Set<PolarisBaseEntity> activatedEntities,
@NotNull PolarisAuthorizableOperation authzOp,
@@ -36,6 +38,7 @@ public interface PolarisAuthorizer {
@Nullable PolarisResolvedPathWrapper secondary);
void authorizeOrThrow(
+ @NotNull PolarisCallContext polarisCallContext,
@NotNull AuthenticatedPolarisPrincipal authenticatedPrincipal,
@NotNull Set<PolarisBaseEntity> activatedEntities,
@NotNull PolarisAuthorizableOperation authzOp,
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisAuthorizerImpl.java b/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisAuthorizerImpl.java
index b6170232..e5e010d6 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisAuthorizerImpl.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/auth/PolarisAuthorizerImpl.java
@@ -92,20 +92,21 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.SetMultimap;
import jakarta.inject.Inject;
+import jakarta.inject.Provider;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import org.apache.iceberg.exceptions.ForbiddenException;
+import org.apache.polaris.core.PolarisCallContext;
import org.apache.polaris.core.PolarisConfiguration;
import org.apache.polaris.core.PolarisConfigurationStore;
-import org.apache.polaris.core.context.CallContext;
import org.apache.polaris.core.entity.PolarisBaseEntity;
+import org.apache.polaris.core.entity.PolarisEntity;
import org.apache.polaris.core.entity.PolarisEntityConstants;
import org.apache.polaris.core.entity.PolarisEntityCore;
import org.apache.polaris.core.entity.PolarisGrantRecord;
import org.apache.polaris.core.entity.PolarisPrivilege;
import org.apache.polaris.core.persistence.PolarisResolvedPathWrapper;
-import org.apache.polaris.core.persistence.ResolvedPolarisEntity;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
@@ -459,10 +460,13 @@ public class PolarisAuthorizerImpl implements PolarisAuthorizer {
List.of(CATALOG_ROLE_MANAGE_GRANTS_FOR_GRANTEE, CATALOG_MANAGE_ACCESS));
}
+ private final Provider<PolarisGrantManager> grantManager;
private final PolarisConfigurationStore featureConfig;
@Inject
- public PolarisAuthorizerImpl(PolarisConfigurationStore featureConfig) {
+ public PolarisAuthorizerImpl(
+ Provider<PolarisGrantManager> grantManager, PolarisConfigurationStore featureConfig) {
+ this.grantManager = grantManager;
this.featureConfig = featureConfig;
}
@@ -487,12 +491,14 @@ public class PolarisAuthorizerImpl implements PolarisAuthorizer {
@Override
public void authorizeOrThrow(
+ PolarisCallContext polarisCallContext,
@NotNull AuthenticatedPolarisPrincipal authenticatedPrincipal,
@NotNull Set<PolarisBaseEntity> activatedEntities,
@NotNull PolarisAuthorizableOperation authzOp,
@Nullable PolarisResolvedPathWrapper target,
@Nullable PolarisResolvedPathWrapper secondary) {
authorizeOrThrow(
+ polarisCallContext,
authenticatedPrincipal,
activatedEntities,
authzOp,
@@ -502,14 +508,16 @@ public class PolarisAuthorizerImpl implements PolarisAuthorizer {
@Override
public void authorizeOrThrow(
+ @NotNull PolarisCallContext polarisCallContext,
@NotNull AuthenticatedPolarisPrincipal authenticatedPrincipal,
@NotNull Set<PolarisBaseEntity> activatedEntities,
@NotNull PolarisAuthorizableOperation authzOp,
@Nullable List<PolarisResolvedPathWrapper> targets,
@Nullable List<PolarisResolvedPathWrapper> secondaries) {
+
boolean enforceCredentialRotationRequiredState =
featureConfig.getConfiguration(
- CallContext.getCurrentContext().getPolarisCallContext(),
+ polarisCallContext,
PolarisConfiguration.ENFORCE_PRINCIPAL_CREDENTIAL_ROTATION_REQUIRED_CHECKING);
if (enforceCredentialRotationRequiredState
&& authenticatedPrincipal
@@ -521,7 +529,12 @@ public class PolarisAuthorizerImpl implements PolarisAuthorizer {
"Principal '%s' is not authorized for op %s due to PRINCIPAL_CREDENTIAL_ROTATION_REQUIRED_STATE",
authenticatedPrincipal.getName(), authzOp);
} else if (!isAuthorized(
- authenticatedPrincipal, activatedEntities, authzOp, targets, secondaries)) {
+ polarisCallContext,
+ authenticatedPrincipal,
+ activatedEntities,
+ authzOp,
+ targets,
+ secondaries)) {
throw new ForbiddenException(
"Principal '%s' with activated PrincipalRoles '%s' and activated grants via '%s' is not authorized for op %s",
authenticatedPrincipal.getName(),
@@ -537,12 +550,14 @@ public class PolarisAuthorizerImpl implements PolarisAuthorizer {
* the operation.
*/
public boolean isAuthorized(
+ @NotNull PolarisCallContext polarisCallContext,
@NotNull AuthenticatedPolarisPrincipal authenticatedPolarisPrincipal,
@NotNull Set<PolarisBaseEntity> activatedEntities,
@NotNull PolarisAuthorizableOperation authzOp,
@Nullable PolarisResolvedPathWrapper target,
@Nullable PolarisResolvedPathWrapper secondary) {
return isAuthorized(
+ polarisCallContext,
authenticatedPolarisPrincipal,
activatedEntities,
authzOp,
@@ -551,6 +566,7 @@ public class PolarisAuthorizerImpl implements PolarisAuthorizer {
}
public boolean isAuthorized(
+ @NotNull PolarisCallContext polarisCallContext,
@NotNull AuthenticatedPolarisPrincipal authenticatedPolarisPrincipal,
@NotNull Set<PolarisBaseEntity> activatedEntities,
@NotNull PolarisAuthorizableOperation authzOp,
@@ -567,7 +583,11 @@ public class PolarisAuthorizerImpl implements PolarisAuthorizer {
privilegeOnTarget);
for (PolarisResolvedPathWrapper target : targets) {
if (!hasTransitivePrivilege(
- authenticatedPolarisPrincipal, entityIdSet, privilegeOnTarget, target)) {
+ polarisCallContext,
+ authenticatedPolarisPrincipal,
+ entityIdSet,
+ privilegeOnTarget,
+ target)) {
// TODO: Collect missing privileges to report all at the end and/or return to code
// that throws NotAuthorizedException for more useful messages.
return false;
@@ -582,7 +602,11 @@ public class PolarisAuthorizerImpl implements PolarisAuthorizer {
privilegeOnSecondary);
for (PolarisResolvedPathWrapper secondary : secondaries) {
if (!hasTransitivePrivilege(
- authenticatedPolarisPrincipal, entityIdSet, privilegeOnSecondary, secondary)) {
+ polarisCallContext,
+ authenticatedPolarisPrincipal,
+ entityIdSet,
+ privilegeOnSecondary,
+ secondary)) {
return false;
}
}
@@ -600,6 +624,7 @@ public class PolarisAuthorizerImpl implements PolarisAuthorizer {
* errors/exceptions.
*/
public boolean hasTransitivePrivilege(
+ @NotNull PolarisCallContext polarisCallContext,
@NotNull AuthenticatedPolarisPrincipal authenticatedPolarisPrincipal,
Set<Long> activatedGranteeIds,
PolarisPrivilege desiredPrivilege,
@@ -607,12 +632,20 @@ public class PolarisAuthorizerImpl implements PolarisAuthorizer {
// Iterate starting at the parent, since the most common case should be to manage grants as
// high up in the resource hierarchy as possible, so we expect earlier termination.
- for (ResolvedPolarisEntity resolvedSecurableEntity : resolvedPath.getResolvedFullPath()) {
- Preconditions.checkState(
- resolvedSecurableEntity.getGrantRecordsAsSecurable() != null,
- "Got null grantRecordsAsSecurable for resolvedSecurableEntity %s",
- resolvedSecurableEntity);
- for (PolarisGrantRecord grantRecord : resolvedSecurableEntity.getGrantRecordsAsSecurable()) {
+ for (PolarisEntity resolvedSecurableEntity : resolvedPath.getRawFullPath()) {
+ PolarisGrantManager.LoadGrantsResult securableGrants =
+ grantManager
+ .get()
+ .loadGrantsOnSecurable(
+ polarisCallContext,
+ resolvedSecurableEntity.getCatalogId(),
+ resolvedSecurableEntity.getId());
+ Preconditions.checkArgument(
+ securableGrants.isSuccess(),
+ "Unable to load grants on securable %s - %s",
+ resolvedSecurableEntity,
+ securableGrants.getExtraInformation());
+ for (PolarisGrantRecord grantRecord : securableGrants.getGrantRecords()) {
if (matchesOrIsSubsumedBy(
desiredPrivilege, PolarisPrivilege.fromCode(grantRecord.getPrivilegeCode()))) {
// Found a potential candidate for satisfying our authz goal.
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisResolvedPathWrapper.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisResolvedPathWrapper.java
index 6b09598c..2e539f89 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisResolvedPathWrapper.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/PolarisResolvedPathWrapper.java
@@ -19,7 +19,6 @@
package org.apache.polaris.core.persistence;
import java.util.List;
-import java.util.stream.Collectors;
import org.apache.polaris.core.entity.PolarisEntity;
/**
@@ -27,15 +26,15 @@ import org.apache.polaris.core.entity.PolarisEntity;
* and grant records.
*/
public class PolarisResolvedPathWrapper {
- private final List<ResolvedPolarisEntity> resolvedPath;
+ private final List<PolarisEntity> resolvedPath;
// TODO: Distinguish between whether parentPath had a null in the chain or whether only
// the leaf element was null.
- public PolarisResolvedPathWrapper(List<ResolvedPolarisEntity> resolvedPath) {
+ public PolarisResolvedPathWrapper(List<PolarisEntity> resolvedPath) {
this.resolvedPath = resolvedPath;
}
- public ResolvedPolarisEntity getResolvedLeafEntity() {
+ public PolarisEntity getResolvedLeafEntity() {
if (resolvedPath == null || resolvedPath.isEmpty()) {
return null;
}
@@ -43,38 +42,18 @@ public class PolarisResolvedPathWrapper {
}
public PolarisEntity getRawLeafEntity() {
- ResolvedPolarisEntity resolvedEntity = getResolvedLeafEntity();
- if (resolvedEntity != null) {
- return resolvedEntity.getEntity();
- }
- return null;
- }
-
- public List<ResolvedPolarisEntity> getResolvedFullPath() {
- return resolvedPath;
+ return getResolvedLeafEntity();
}
public List<PolarisEntity> getRawFullPath() {
if (resolvedPath == null) {
return null;
}
- return resolvedPath.stream().map(ResolvedPolarisEntity::getEntity).collect(Collectors.toList());
- }
-
- public List<ResolvedPolarisEntity> getResolvedParentPath() {
- if (resolvedPath == null) {
- return null;
- }
- return resolvedPath.subList(0, resolvedPath.size() - 1);
+ return resolvedPath;
}
public List<PolarisEntity> getRawParentPath() {
- if (resolvedPath == null) {
- return null;
- }
- return getResolvedParentPath().stream()
- .map(ResolvedPolarisEntity::getEntity)
- .collect(Collectors.toList());
+ return resolvedPath.subList(0, resolvedPath.size() - 1);
}
@Override
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/PolarisResolutionManifest.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/PolarisResolutionManifest.java
index 629e282e..1fb9c37c 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/PolarisResolutionManifest.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/resolver/PolarisResolutionManifest.java
@@ -31,6 +31,7 @@ import org.apache.polaris.core.PolarisDiagnostics;
import org.apache.polaris.core.auth.AuthenticatedPolarisPrincipal;
import org.apache.polaris.core.context.CallContext;
import org.apache.polaris.core.entity.PolarisBaseEntity;
+import org.apache.polaris.core.entity.PolarisEntity;
import org.apache.polaris.core.entity.PolarisEntityConstants;
import org.apache.polaris.core.entity.PolarisEntitySubType;
import org.apache.polaris.core.entity.PolarisEntityType;
@@ -215,10 +216,11 @@ public class PolarisResolutionManifest implements PolarisResolutionManifestCatal
}
}
- List<ResolvedPolarisEntity> resolvedEntities = new ArrayList<>();
+ List<PolarisEntity> resolvedEntities = new ArrayList<>();
resolvedEntities.add(
- new ResolvedPolarisEntity(passthroughResolver.getResolvedReferenceCatalog()));
- resolvedPath.forEach(cacheEntry -> resolvedEntities.add(new ResolvedPolarisEntity(cacheEntry)));
+ PolarisEntity.of(passthroughResolver.getResolvedReferenceCatalog().getEntity()));
+ resolvedPath.forEach(
+ cacheEntry -> resolvedEntities.add(PolarisEntity.of(cacheEntry.getEntity())));
LOGGER.debug(
"Returning resolvedEntities from getPassthroughResolvedPath: {}", resolvedEntities);
return new PolarisResolvedPathWrapper(resolvedEntities);
@@ -269,7 +271,7 @@ public class PolarisResolutionManifest implements PolarisResolutionManifestCatal
this.simulatedResolvedRootContainerEntity = simulatedResolvedRootContainerEntity;
}
- private ResolvedPolarisEntity getResolvedRootContainerEntity() {
+ private PolarisEntity getResolvedRootContainerEntity() {
if (primaryResolverStatus.getStatus() != ResolverStatus.StatusEnum.SUCCESS) {
return null;
}
@@ -278,9 +280,9 @@ public class PolarisResolutionManifest implements PolarisResolutionManifestCatal
PolarisEntityType.ROOT, PolarisEntityConstants.getRootContainerName());
if (resolvedCacheEntry == null) {
LOGGER.debug("Failed to find rootContainer, so using simulated rootContainer instead.");
- return simulatedResolvedRootContainerEntity;
+ return simulatedResolvedRootContainerEntity.getEntity();
}
- return new ResolvedPolarisEntity(resolvedCacheEntry);
+ return PolarisEntity.of(resolvedCacheEntry.getEntity());
}
public PolarisResolvedPathWrapper getResolvedRootContainerEntityAsPath() {
@@ -304,10 +306,11 @@ public class PolarisResolutionManifest implements PolarisResolutionManifestCatal
// getResolvedReferenceCatalogEntity().
return new PolarisResolvedPathWrapper(
List.of(
- getResolvedRootContainerEntity(), new ResolvedPolarisEntity(resolvedCachedCatalog)));
+ getResolvedRootContainerEntity(),
+ PolarisEntity.of(resolvedCachedCatalog.getEntity())));
} else {
return new PolarisResolvedPathWrapper(
- List.of(new ResolvedPolarisEntity(resolvedCachedCatalog)));
+ List.of(PolarisEntity.of(resolvedCachedCatalog.getEntity())));
}
}
@@ -355,12 +358,14 @@ public class PolarisResolutionManifest implements PolarisResolutionManifestCatal
}
}
- List<ResolvedPolarisEntity> resolvedEntities = new ArrayList<>();
+ List<PolarisEntity> resolvedEntities = new ArrayList<>();
if (prependRootContainer) {
resolvedEntities.add(getResolvedRootContainerEntity());
}
- resolvedEntities.add(new ResolvedPolarisEntity(primaryResolver.getResolvedReferenceCatalog()));
- resolvedPath.forEach(cacheEntry -> resolvedEntities.add(new ResolvedPolarisEntity(cacheEntry)));
+ resolvedEntities.add(
+ PolarisEntity.of(primaryResolver.getResolvedReferenceCatalog().getEntity()));
+ resolvedPath.forEach(
+ cacheEntry -> resolvedEntities.add(PolarisEntity.of(cacheEntry.getEntity())));
return new PolarisResolvedPathWrapper(resolvedEntities);
}
@@ -403,10 +408,10 @@ public class PolarisResolutionManifest implements PolarisResolutionManifestCatal
return null;
}
- ResolvedPolarisEntity resolvedRootContainerEntity = getResolvedRootContainerEntity();
+ PolarisEntity resolvedRootContainerEntity = getResolvedRootContainerEntity();
return resolvedRootContainerEntity == null
- ? new PolarisResolvedPathWrapper(List.of(new ResolvedPolarisEntity(resolvedCacheEntry)))
+ ? new PolarisResolvedPathWrapper(List.of(PolarisEntity.of(resolvedCacheEntry.getEntity())))
: new PolarisResolvedPathWrapper(
- List.of(resolvedRootContainerEntity, new ResolvedPolarisEntity(resolvedCacheEntry)));
+ List.of(resolvedRootContainerEntity, PolarisEntity.of(resolvedCacheEntry.getEntity())));
}
}
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java b/polaris-service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java
index ba5113e9..a0960201 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/admin/PolarisAdminService.java
@@ -157,6 +157,7 @@ public class PolarisAdminService {
PolarisResolvedPathWrapper rootContainerWrapper =
resolutionManifest.getResolvedRootContainerEntityAsPath();
authorizer.authorizeOrThrow(
+ getCurrentPolarisContext(),
authenticatedPrincipal,
resolutionManifest.getAllActivatedPrincipalRoleEntities(),
op,
@@ -191,7 +192,7 @@ public class PolarisAdminService {
// TODO: If we do add more "self" privilege operations for PRINCIPAL targets this should
// be extracted into an EnumSet and/or pushed down into PolarisAuthorizer.
- if (topLevelEntityWrapper.getResolvedLeafEntity().getEntity().getId()
+ if (topLevelEntityWrapper.getResolvedLeafEntity().getId()
== authenticatedPrincipal.getPrincipalEntity().getId()
&& (op.equals(PolarisAuthorizableOperation.ROTATE_CREDENTIALS)
|| op.equals(PolarisAuthorizableOperation.RESET_CREDENTIALS))) {
@@ -202,6 +203,7 @@ public class PolarisAdminService {
return;
}
authorizer.authorizeOrThrow(
+ getCurrentPolarisContext(),
authenticatedPrincipal,
resolutionManifest.getAllActivatedCatalogRoleAndPrincipalRoles(),
op,
@@ -222,6 +224,7 @@ public class PolarisAdminService {
throw new NotFoundException("CatalogRole does not exist: %s", catalogRoleName);
}
authorizer.authorizeOrThrow(
+ getCurrentPolarisContext(),
authenticatedPrincipal,
resolutionManifest.getAllActivatedCatalogRoleAndPrincipalRoles(),
op,
@@ -252,6 +255,7 @@ public class PolarisAdminService {
principalRoleName, PolarisEntityType.PRINCIPAL_ROLE);
authorizer.authorizeOrThrow(
+ getCurrentPolarisContext(),
authenticatedPrincipal,
resolutionManifest.getAllActivatedCatalogRoleAndPrincipalRoles(),
op,
@@ -288,6 +292,7 @@ public class PolarisAdminService {
principalRoleName, PolarisEntityType.PRINCIPAL_ROLE);
authorizer.authorizeOrThrow(
+ getCurrentPolarisContext(),
authenticatedPrincipal,
resolutionManifest.getAllActivatedCatalogRoleAndPrincipalRoles(),
op,
@@ -318,6 +323,7 @@ public class PolarisAdminService {
resolutionManifest.getResolvedTopLevelEntity(principalName, PolarisEntityType.PRINCIPAL);
authorizer.authorizeOrThrow(
+ getCurrentPolarisContext(),
authenticatedPrincipal,
resolutionManifest.getAllActivatedCatalogRoleAndPrincipalRoles(),
op,
@@ -356,6 +362,7 @@ public class PolarisAdminService {
resolutionManifest.getResolvedPath(catalogRoleName, true);
authorizer.authorizeOrThrow(
+ getCurrentPolarisContext(),
authenticatedPrincipal,
resolutionManifest.getAllActivatedCatalogRoleAndPrincipalRoles(),
op,
@@ -385,6 +392,7 @@ public class PolarisAdminService {
PolarisResolvedPathWrapper catalogRoleWrapper =
resolutionManifest.getResolvedPath(catalogRoleName, true);
authorizer.authorizeOrThrow(
+ getCurrentPolarisContext(),
authenticatedPrincipal,
resolutionManifest.getAllActivatedCatalogRoleAndPrincipalRoles(),
op,
@@ -424,6 +432,7 @@ public class PolarisAdminService {
resolutionManifest.getResolvedPath(catalogRoleName, true);
authorizer.authorizeOrThrow(
+ getCurrentPolarisContext(),
authenticatedPrincipal,
resolutionManifest.getAllActivatedCatalogRoleAndPrincipalRoles(),
op,
@@ -468,6 +477,7 @@ public class PolarisAdminService {
resolutionManifest.getResolvedPath(catalogRoleName, true);
authorizer.authorizeOrThrow(
+ getCurrentPolarisContext(),
authenticatedPrincipal,
resolutionManifest.getAllActivatedCatalogRoleAndPrincipalRoles(),
op,
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/catalog/BasePolarisCatalog.java b/polaris-service/src/main/java/org/apache/polaris/service/catalog/BasePolarisCatalog.java
index 4911b5cf..15a66ed8 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/catalog/BasePolarisCatalog.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/catalog/BasePolarisCatalog.java
@@ -658,11 +658,12 @@ public class BasePolarisCatalog extends BaseMetastoreViewCatalog
new PolarisEntity.Builder(entity).setProperties(newProperties).build();
if (!callContext
- .getPolarisCallContext()
- .getConfigurationStore()
- .getConfiguration(
- callContext.getPolarisCallContext(),
- PolarisConfiguration.ALLOW_NAMESPACE_LOCATION_OVERLAP)) {
+ .getPolarisCallContext()
+ .getConfigurationStore()
+ .getConfiguration(
+ callContext.getPolarisCallContext(),
+ PolarisConfiguration.ALLOW_NAMESPACE_LOCATION_OVERLAP)
+ && properties.containsKey(PolarisEntityConstants.ENTITY_BASE_LOCATION)) {
LOGGER.debug("Validating no overlap with sibling tables or namespaces");
validateNoLocationOverlap(
NamespaceEntity.of(updatedEntity).getBaseLocation(),
@@ -1672,7 +1673,7 @@ public class BasePolarisCatalog extends BaseMetastoreViewCatalog
toEntity =
new TableLikeEntity.Builder(TableLikeEntity.of(leafEntity))
.setTableIdentifier(to)
- .setParentId(resolvedNewParentEntities.getResolvedLeafEntity().getEntity().getId())
+ .setParentId(resolvedNewParentEntities.getResolvedLeafEntity().getId())
.build();
} else {
// only the name of the entity is changed
diff --git a/polaris-service/src/main/java/org/apache/polaris/service/catalog/PolarisCatalogHandlerWrapper.java b/polaris-service/src/main/java/org/apache/polaris/service/catalog/PolarisCatalogHandlerWrapper.java
index 3d12f75a..d5794185 100644
--- a/polaris-service/src/main/java/org/apache/polaris/service/catalog/PolarisCatalogHandlerWrapper.java
+++ b/polaris-service/src/main/java/org/apache/polaris/service/catalog/PolarisCatalogHandlerWrapper.java
@@ -215,6 +215,7 @@ public class PolarisCatalogHandlerWrapper {
throw new NoSuchNamespaceException("Namespace does not exist: %s", namespace);
}
authorizer.authorizeOrThrow(
+ callContext.getPolarisCallContext(),
authenticatedPrincipal,
resolutionManifest.getAllActivatedCatalogRoleAndPrincipalRoles(),
op,
@@ -248,6 +249,7 @@ public class PolarisCatalogHandlerWrapper {
throw new NoSuchNamespaceException("Namespace does not exist: %s", parentNamespace);
}
authorizer.authorizeOrThrow(
+ callContext.getPolarisCallContext(),
authenticatedPrincipal,
resolutionManifest.getAllActivatedCatalogRoleAndPrincipalRoles(),
op,
@@ -285,6 +287,7 @@ public class PolarisCatalogHandlerWrapper {
throw new NoSuchNamespaceException("Namespace does not exist: %s", namespace);
}
authorizer.authorizeOrThrow(
+ callContext.getPolarisCallContext(),
authenticatedPrincipal,
resolutionManifest.getAllActivatedCatalogRoleAndPrincipalRoles(),
op,
@@ -317,6 +320,7 @@ public class PolarisCatalogHandlerWrapper {
}
}
authorizer.authorizeOrThrow(
+ callContext.getPolarisCallContext(),
authenticatedPrincipal,
resolutionManifest.getAllActivatedCatalogRoleAndPrincipalRoles(),
op,
@@ -370,6 +374,7 @@ public class PolarisCatalogHandlerWrapper {
"View does not exist: %s", identifier)))
.toList();
authorizer.authorizeOrThrow(
+ callContext.getPolarisCallContext(),
authenticatedPrincipal,
resolutionManifest.getAllActivatedCatalogRoleAndPrincipalRoles(),
op,
@@ -430,6 +435,7 @@ public class PolarisCatalogHandlerWrapper {
PolarisResolvedPathWrapper secondary =
resolutionManifest.getResolvedPath(dst.namespace(), true);
authorizer.authorizeOrThrow(
+ callContext.getPolarisCallContext(),
authenticatedPrincipal,
resolutionManifest.getAllActivatedCatalogRoleAndPrincipalRoles(),
op,
@@ -566,10 +572,7 @@ public class PolarisCatalogHandlerWrapper {
CatalogEntity catalog =
CatalogEntity.of(
- resolutionManifest
- .getResolvedReferenceCatalogEntity()
- .getResolvedLeafEntity()
- .getEntity());
+ resolutionManifest.getResolvedReferenceCatalogEntity().getResolvedLeafEntity());
if (isExternal(catalog)) {
throw new BadRequestException("Cannot create table on external catalogs.");
}
@@ -585,10 +588,7 @@ public class PolarisCatalogHandlerWrapper {
CatalogEntity catalog =
CatalogEntity.of(
- resolutionManifest
- .getResolvedReferenceCatalogEntity()
- .getResolvedLeafEntity()
- .getEntity());
+ resolutionManifest.getResolvedReferenceCatalogEntity().getResolvedLeafEntity());
if (isExternal(catalog)) {
throw new BadRequestException("Cannot create table on external catalogs.");
}
@@ -694,10 +694,7 @@ public class PolarisCatalogHandlerWrapper {
CatalogEntity catalog =
CatalogEntity.of(
- resolutionManifest
- .getResolvedReferenceCatalogEntity()
- .getResolvedLeafEntity()
- .getEntity());
+ resolutionManifest.getResolvedReferenceCatalogEntity().getResolvedLeafEntity());
if (isExternal(catalog)) {
throw new BadRequestException("Cannot create table on external catalogs.");
}
@@ -717,10 +714,7 @@ public class PolarisCatalogHandlerWrapper {
CatalogEntity catalog =
CatalogEntity.of(
- resolutionManifest
- .getResolvedReferenceCatalogEntity()
- .getResolvedLeafEntity()
- .getEntity());
+ resolutionManifest.getResolvedReferenceCatalogEntity().getResolvedLeafEntity());
if (isExternal(catalog)) {
throw new BadRequestException("Cannot create table on external catalogs.");
}
@@ -774,10 +768,7 @@ public class PolarisCatalogHandlerWrapper {
CatalogEntity catalog =
CatalogEntity.of(
- resolutionManifest
- .getResolvedReferenceCatalogEntity()
- .getResolvedLeafEntity()
- .getEntity());
+ resolutionManifest.getResolvedReferenceCatalogEntity().getResolvedLeafEntity());
if (catalog
.getCatalogType()
.equals(org.apache.polaris.core.admin.model.Catalog.TypeEnum.INTERNAL)) {
@@ -904,10 +895,7 @@ public class PolarisCatalogHandlerWrapper {
CatalogEntity catalog =
CatalogEntity.of(
- resolutionManifest
- .getResolvedReferenceCatalogEntity()
- .getResolvedLeafEntity()
- .getEntity());
+ resolutionManifest.getResolvedReferenceCatalogEntity().getResolvedLeafEntity());
if (isExternal(catalog)) {
throw new BadRequestException("Cannot update table on external catalogs.");
}
@@ -923,10 +911,7 @@ public class PolarisCatalogHandlerWrapper {
CatalogEntity catalog =
CatalogEntity.of(
- resolutionManifest
- .getResolvedReferenceCatalogEntity()
- .getResolvedLeafEntity()
- .getEntity());
+ resolutionManifest.getResolvedReferenceCatalogEntity().getResolvedLeafEntity());
if (isExternal(catalog)) {
throw new BadRequestException("Cannot update table on external catalogs.");
}
@@ -948,10 +933,7 @@ public class PolarisCatalogHandlerWrapper {
CatalogEntity catalog =
CatalogEntity.of(
- resolutionManifest
- .getResolvedReferenceCatalogEntity()
- .getResolvedLeafEntity()
- .getEntity());
+ resolutionManifest.getResolvedReferenceCatalogEntity().getResolvedLeafEntity());
if (isExternal(catalog)) {
throw new BadRequestException("Cannot drop table on external catalogs.");
}
@@ -973,10 +955,7 @@ public class PolarisCatalogHandlerWrapper {
CatalogEntity catalog =
CatalogEntity.of(
- resolutionManifest
- .getResolvedReferenceCatalogEntity()
- .getResolvedLeafEntity()
- .getEntity());
+ resolutionManifest.getResolvedReferenceCatalogEntity().getResolvedLeafEntity());
if (isExternal(catalog)) {
throw new BadRequestException("Cannot rename table on external catalogs.");
}
@@ -997,10 +976,7 @@ public class PolarisCatalogHandlerWrapper {
.toList());
CatalogEntity catalog =
CatalogEntity.of(
- resolutionManifest
- .getResolvedReferenceCatalogEntity()
- .getResolvedLeafEntity()
- .getEntity());
+ resolutionManifest.getResolvedReferenceCatalogEntity().getResolvedLeafEntity());
if (isExternal(catalog)) {
throw new BadRequestException("Cannot update table on external catalogs.");
}
@@ -1104,10 +1080,7 @@ public class PolarisCatalogHandlerWrapper {
CatalogEntity catalog =
CatalogEntity.of(
- resolutionManifest
- .getResolvedReferenceCatalogEntity()
- .getResolvedLeafEntity()
- .getEntity());
+ resolutionManifest.getResolvedReferenceCatalogEntity().getResolvedLeafEntity());
if (isExternal(catalog)) {
throw new BadRequestException("Cannot create view on external catalogs.");
}
@@ -1127,10 +1100,7 @@ public class PolarisCatalogHandlerWrapper {
CatalogEntity catalog =
CatalogEntity.of(
- resolutionManifest
- .getResolvedReferenceCatalogEntity()
- .getResolvedLeafEntity()
- .getEntity());
+ resolutionManifest.getResolvedReferenceCatalogEntity().getResolvedLeafEntity());
if (isExternal(catalog)) {
throw new BadRequestException("Cannot replace view on external catalogs.");
}
@@ -1160,10 +1130,7 @@ public class PolarisCatalogHandlerWrapper {
CatalogEntity catalog =
CatalogEntity.of(
- resolutionManifest
- .getResolvedReferenceCatalogEntity()
- .getResolvedLeafEntity()
- .getEntity());
+ resolutionManifest.getResolvedReferenceCatalogEntity().getResolvedLeafEntity());
if (isExternal(catalog)) {
throw new BadRequestException("Cannot rename view on external catalogs.");
}
diff --git a/polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisAuthzTestBase.java b/polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisAuthzTestBase.java
index 5151f0f7..994e80e9 100644
--- a/polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisAuthzTestBase.java
+++ b/polaris-service/src/test/java/org/apache/polaris/service/admin/PolarisAuthzTestBase.java
@@ -131,12 +131,7 @@ public abstract class PolarisAuthzTestBase {
new Schema(
required(3, "id", Types.IntegerType.get(), "unique ID 🤪"),
required(4, "data", Types.StringType.get()));
- protected final PolarisAuthorizer polarisAuthorizer =
- new PolarisAuthorizerImpl(
- new DefaultConfigurationStore(
- Map.of(
- PolarisConfiguration.ENFORCE_PRINCIPAL_CREDENTIAL_ROTATION_REQUIRED_CHECKING.key,
- true)));
+ protected PolarisAuthorizer polarisAuthorizer;
protected BasePolarisCatalog baseCatalog;
protected PolarisAdminService adminService;
@@ -159,7 +154,14 @@ public abstract class PolarisAuthzTestBase {
RealmContext realmContext = () -> "realm";
PolarisMetaStoreManager metaStoreManager =
metaStoreManagerFactory.getOrCreateMetaStoreManager(realmContext);
-
+ polarisAuthorizer =
+ new PolarisAuthorizerImpl(
+ () -> metaStoreManager,
+ new DefaultConfigurationStore(
+ Map.of(
+ PolarisConfiguration.ENFORCE_PRINCIPAL_CREDENTIAL_ROTATION_REQUIRED_CHECKING
+ .key,
+ true)));
Map<String, Object> configMap =
Map.of(
"ALLOW_SPECIFYING_FILE_IO_IMPL", true, "ALLOW_EXTERNAL_METADATA_FILE_LOCATION", true);
diff --git a/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogTest.java b/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogTest.java
index 9495365f..cba7ebaa 100644
--- a/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogTest.java
+++ b/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogTest.java
@@ -184,7 +184,7 @@ public class BasePolarisCatalogTest extends CatalogTests<BasePolarisCatalog> {
entityManager,
metaStoreManager,
authenticatedRoot,
- new PolarisAuthorizerImpl(new PolarisConfigurationStore() {}));
+ new PolarisAuthorizerImpl(() -> metaStoreManager, new PolarisConfigurationStore() {}));
String storageLocation = "s3://my-bucket/path/to/data";
storageConfigModel =
AwsStorageConfigInfo.builder()
diff --git a/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogViewTest.java b/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogViewTest.java
index 7ad1d53d..1f64fb21 100644
--- a/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogViewTest.java
+++ b/polaris-service/src/test/java/org/apache/polaris/service/catalog/BasePolarisCatalogViewTest.java
@@ -116,7 +116,7 @@ public class BasePolarisCatalogViewTest extends ViewCatalogTests<BasePolarisCata
entityManager,
metaStoreManager,
authenticatedRoot,
- new PolarisAuthorizerImpl(new PolarisConfigurationStore() {}));
+ new PolarisAuthorizerImpl(() -> metaStoreManager, new PolarisConfigurationStore() {}));
adminService.createCatalog(
new CatalogEntity.Builder()
.setName(CATALOG_NAME)