Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,16 @@
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.SecurityContext;
import org.apache.polaris.core.context.RealmContext;
import org.apache.polaris.service.catalog.CatalogPrefixParser;
import org.apache.polaris.service.catalog.api.PolarisCatalogPolicyApiService;
import org.apache.polaris.service.catalog.common.CatalogAdapter;
import org.apache.polaris.service.events.CatalogPolicyServiceEvents;
import org.apache.polaris.service.events.listeners.PolarisEventListener;
import org.apache.polaris.service.types.AttachPolicyRequest;
import org.apache.polaris.service.types.CreatePolicyRequest;
import org.apache.polaris.service.types.DetachPolicyRequest;
import org.apache.polaris.service.types.GetApplicablePoliciesResponse;
import org.apache.polaris.service.types.LoadPolicyResponse;
import org.apache.polaris.service.types.UpdatePolicyRequest;

@Decorator
Expand All @@ -39,6 +44,8 @@ public class CatalogPolicyEventServiceDelegator
implements PolarisCatalogPolicyApiService, CatalogAdapter {

@Inject @Delegate PolicyCatalogAdapter delegate;
@Inject PolarisEventListener polarisEventListener;
@Inject CatalogPrefixParser prefixParser;

@Override
public Response createPolicy(
Expand All @@ -47,8 +54,17 @@ public Response createPolicy(
CreatePolicyRequest createPolicyRequest,
RealmContext realmContext,
SecurityContext securityContext) {
return delegate.createPolicy(
prefix, namespace, createPolicyRequest, realmContext, securityContext);
String catalogName = prefixParser.prefixToCatalogName(realmContext, prefix);
polarisEventListener.onBeforeCreatePolicy(
new CatalogPolicyServiceEvents.BeforeCreatePolicyEvent(
catalogName, namespace, createPolicyRequest));
Response resp =
delegate.createPolicy(
prefix, namespace, createPolicyRequest, realmContext, securityContext);
polarisEventListener.onAfterCreatePolicy(
new CatalogPolicyServiceEvents.AfterCreatePolicyEvent(
catalogName, namespace, (LoadPolicyResponse) resp.getEntity()));
return resp;
}

@Override
Expand All @@ -60,8 +76,15 @@ public Response listPolicies(
String policyType,
RealmContext realmContext,
SecurityContext securityContext) {
return delegate.listPolicies(
prefix, namespace, pageToken, pageSize, policyType, realmContext, securityContext);
String catalogName = prefixParser.prefixToCatalogName(realmContext, prefix);
polarisEventListener.onBeforeListPolicies(
new CatalogPolicyServiceEvents.BeforeListPoliciesEvent(catalogName, namespace, policyType));
Response resp =
delegate.listPolicies(
prefix, namespace, pageToken, pageSize, policyType, realmContext, securityContext);
polarisEventListener.onAfterListPolicies(
new CatalogPolicyServiceEvents.AfterListPoliciesEvent(catalogName, namespace, policyType));
return resp;
}

@Override
Expand All @@ -71,7 +94,15 @@ public Response loadPolicy(
String policyName,
RealmContext realmContext,
SecurityContext securityContext) {
return delegate.loadPolicy(prefix, namespace, policyName, realmContext, securityContext);
String catalogName = prefixParser.prefixToCatalogName(realmContext, prefix);
polarisEventListener.onBeforeLoadPolicy(
new CatalogPolicyServiceEvents.BeforeLoadPolicyEvent(catalogName, namespace, policyName));
Response resp =
delegate.loadPolicy(prefix, namespace, policyName, realmContext, securityContext);
polarisEventListener.onAfterLoadPolicy(
new CatalogPolicyServiceEvents.AfterLoadPolicyEvent(
catalogName, namespace, (LoadPolicyResponse) resp.getEntity()));
return resp;
}

@Override
Expand All @@ -82,8 +113,17 @@ public Response updatePolicy(
UpdatePolicyRequest updatePolicyRequest,
RealmContext realmContext,
SecurityContext securityContext) {
return delegate.updatePolicy(
prefix, namespace, policyName, updatePolicyRequest, realmContext, securityContext);
String catalogName = prefixParser.prefixToCatalogName(realmContext, prefix);
polarisEventListener.onBeforeUpdatePolicy(
new CatalogPolicyServiceEvents.BeforeUpdatePolicyEvent(
catalogName, namespace, policyName, updatePolicyRequest));
Response resp =
delegate.updatePolicy(
prefix, namespace, policyName, updatePolicyRequest, realmContext, securityContext);
polarisEventListener.onAfterUpdatePolicy(
new CatalogPolicyServiceEvents.AfterUpdatePolicyEvent(
catalogName, namespace, (LoadPolicyResponse) resp.getEntity()));
return resp;
}

@Override
Expand All @@ -94,8 +134,17 @@ public Response dropPolicy(
Boolean detachAll,
RealmContext realmContext,
SecurityContext securityContext) {
return delegate.dropPolicy(
prefix, namespace, policyName, detachAll, realmContext, securityContext);
String catalogName = prefixParser.prefixToCatalogName(realmContext, prefix);
polarisEventListener.onBeforeDropPolicy(
new CatalogPolicyServiceEvents.BeforeDropPolicyEvent(
catalogName, namespace, policyName, detachAll));
Response resp =
delegate.dropPolicy(
prefix, namespace, policyName, detachAll, realmContext, securityContext);
polarisEventListener.onAfterDropPolicy(
new CatalogPolicyServiceEvents.AfterDropPolicyEvent(
catalogName, namespace, policyName, detachAll));
return resp;
}

@Override
Expand All @@ -106,8 +155,17 @@ public Response attachPolicy(
AttachPolicyRequest attachPolicyRequest,
RealmContext realmContext,
SecurityContext securityContext) {
return delegate.attachPolicy(
prefix, namespace, policyName, attachPolicyRequest, realmContext, securityContext);
String catalogName = prefixParser.prefixToCatalogName(realmContext, prefix);
polarisEventListener.onBeforeAttachPolicy(
new CatalogPolicyServiceEvents.BeforeAttachPolicyEvent(
catalogName, namespace, policyName, attachPolicyRequest));
Response resp =
delegate.attachPolicy(
prefix, namespace, policyName, attachPolicyRequest, realmContext, securityContext);
polarisEventListener.onAfterAttachPolicy(
new CatalogPolicyServiceEvents.AfterAttachPolicyEvent(
catalogName, namespace, policyName, attachPolicyRequest));
return resp;
}

@Override
Expand All @@ -118,8 +176,17 @@ public Response detachPolicy(
DetachPolicyRequest detachPolicyRequest,
RealmContext realmContext,
SecurityContext securityContext) {
return delegate.detachPolicy(
prefix, namespace, policyName, detachPolicyRequest, realmContext, securityContext);
String catalogName = prefixParser.prefixToCatalogName(realmContext, prefix);
polarisEventListener.onBeforeDetachPolicy(
new CatalogPolicyServiceEvents.BeforeDetachPolicyEvent(
catalogName, namespace, policyName, detachPolicyRequest));
Response resp =
delegate.detachPolicy(
prefix, namespace, policyName, detachPolicyRequest, realmContext, securityContext);
polarisEventListener.onAfterDetachPolicy(
new CatalogPolicyServiceEvents.AfterDetachPolicyEvent(
catalogName, namespace, policyName, detachPolicyRequest));
return resp;
}

@Override
Expand All @@ -132,14 +199,27 @@ public Response getApplicablePolicies(
String policyType,
RealmContext realmContext,
SecurityContext securityContext) {
return delegate.getApplicablePolicies(
prefix,
pageToken,
pageSize,
namespace,
targetName,
policyType,
realmContext,
securityContext);
String catalogName = prefixParser.prefixToCatalogName(realmContext, prefix);
polarisEventListener.onBeforeGetApplicablePolicies(
new CatalogPolicyServiceEvents.BeforeGetApplicablePoliciesEvent(
catalogName, namespace, targetName, policyType));
Response resp =
delegate.getApplicablePolicies(
prefix,
pageToken,
pageSize,
namespace,
targetName,
policyType,
realmContext,
securityContext);
polarisEventListener.onAfterGetApplicablePolicies(
new CatalogPolicyServiceEvents.AfterGetApplicablePoliciesEvent(
catalogName,
namespace,
targetName,
policyType,
(GetApplicablePoliciesResponse) resp.getEntity()));
return resp;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
/*
* 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.events;

import org.apache.polaris.service.types.AttachPolicyRequest;
import org.apache.polaris.service.types.CreatePolicyRequest;
import org.apache.polaris.service.types.DetachPolicyRequest;
import org.apache.polaris.service.types.GetApplicablePoliciesResponse;
import org.apache.polaris.service.types.LoadPolicyResponse;
import org.apache.polaris.service.types.UpdatePolicyRequest;

/**
* Event records for Catalog Policy operations. Each operation has corresponding "Before" and
* "After" event records.
*/
public class CatalogPolicyServiceEvents {

// Policy CRUD Events
public record BeforeCreatePolicyEvent(
Copy link
Contributor

@adutra adutra Sep 3, 2025

Choose a reason for hiding this comment

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

Sorry to insist on naming, but it's still inconsistent.

In #2482 we have (Before|After)(Object)(Verb)Event. E.g. BeforeCatalogListEvent.

Here we have (Before|After)(Verb)(Object)Event. E.g. BeforeCreatePolicyEvent.

(I find verb-object more natural than object-verb btw, but I'll defer the decision to native English speakers.)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thinking about it again, I think verb-object is better too. Let me keep these events as-is in that case and change the rest of the PRs.

String catalogName, String namespace, CreatePolicyRequest createPolicyRequest) {}

public record AfterCreatePolicyEvent(
String catalogName, String namespace, LoadPolicyResponse loadPolicyResponse) {}

public record BeforeListPoliciesEvent(String catalogName, String namespace, String policyType) {}

public record AfterListPoliciesEvent(String catalogName, String namespace, String policyType) {}

public record BeforeLoadPolicyEvent(String catalogName, String namespace, String policyName) {}

public record AfterLoadPolicyEvent(
String catalogName, String namespace, LoadPolicyResponse loadPolicyResponse) {}

public record BeforeUpdatePolicyEvent(
String catalogName,
String namespace,
String policyName,
UpdatePolicyRequest updatePolicyRequest) {}

public record AfterUpdatePolicyEvent(
String catalogName, String namespace, LoadPolicyResponse loadPolicyResponse) {}

public record BeforeDropPolicyEvent(
String catalogName, String namespace, String policyName, Boolean detachAll) {}

public record AfterDropPolicyEvent(
String catalogName, String namespace, String policyName, Boolean detachAll) {}

// Policy Attachment Events
public record BeforeAttachPolicyEvent(
String catalogName,
String namespace,
String policyName,
AttachPolicyRequest attachPolicyRequest) {}

public record AfterAttachPolicyEvent(
String catalogName,
String namespace,
String policyName,
AttachPolicyRequest attachPolicyRequest) {}

public record BeforeDetachPolicyEvent(
String catalogName,
String namespace,
String policyName,
DetachPolicyRequest detachPolicyRequest) {}

public record AfterDetachPolicyEvent(
String catalogName,
String namespace,
String policyName,
DetachPolicyRequest detachPolicyRequest) {}

// Policy Query Events
public record BeforeGetApplicablePoliciesEvent(
String catalogName, String namespace, String targetName, String policyType) {}

public record AfterGetApplicablePoliciesEvent(
String catalogName,
String namespace,
String targetName,
String policyType,
GetApplicablePoliciesResponse getApplicablePoliciesResponse) {}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import org.apache.polaris.service.events.BeforeViewCommitedEvent;
import org.apache.polaris.service.events.BeforeViewRefreshedEvent;
import org.apache.polaris.service.events.CatalogGenericTableServiceEvents;
import org.apache.polaris.service.events.CatalogPolicyServiceEvents;

/**
* Represents an event listener that can respond to notable moments during Polaris's execution.
Expand Down Expand Up @@ -78,6 +79,57 @@ public void onAfterTableCreated(AfterTableCreatedEvent event) {}
/** {@link AfterCatalogCreatedEvent} */
public void onAfterCatalogCreated(AfterCatalogCreatedEvent event) {}

// Catalog Policy Service Events
/** {@link CatalogPolicyServiceEvents.BeforeCreatePolicyEvent} */
public void onBeforeCreatePolicy(CatalogPolicyServiceEvents.BeforeCreatePolicyEvent event) {}

/** {@link CatalogPolicyServiceEvents.AfterCreatePolicyEvent} */
public void onAfterCreatePolicy(CatalogPolicyServiceEvents.AfterCreatePolicyEvent event) {}

/** {@link CatalogPolicyServiceEvents.BeforeListPoliciesEvent} */
public void onBeforeListPolicies(CatalogPolicyServiceEvents.BeforeListPoliciesEvent event) {}

/** {@link CatalogPolicyServiceEvents.AfterListPoliciesEvent} */
public void onAfterListPolicies(CatalogPolicyServiceEvents.AfterListPoliciesEvent event) {}

/** {@link CatalogPolicyServiceEvents.BeforeLoadPolicyEvent} */
public void onBeforeLoadPolicy(CatalogPolicyServiceEvents.BeforeLoadPolicyEvent event) {}

/** {@link CatalogPolicyServiceEvents.AfterLoadPolicyEvent} */
public void onAfterLoadPolicy(CatalogPolicyServiceEvents.AfterLoadPolicyEvent event) {}

/** {@link CatalogPolicyServiceEvents.BeforeUpdatePolicyEvent} */
public void onBeforeUpdatePolicy(CatalogPolicyServiceEvents.BeforeUpdatePolicyEvent event) {}

/** {@link CatalogPolicyServiceEvents.AfterUpdatePolicyEvent} */
public void onAfterUpdatePolicy(CatalogPolicyServiceEvents.AfterUpdatePolicyEvent event) {}

/** {@link CatalogPolicyServiceEvents.BeforeDropPolicyEvent} */
public void onBeforeDropPolicy(CatalogPolicyServiceEvents.BeforeDropPolicyEvent event) {}

/** {@link CatalogPolicyServiceEvents.AfterDropPolicyEvent} */
public void onAfterDropPolicy(CatalogPolicyServiceEvents.AfterDropPolicyEvent event) {}

/** {@link CatalogPolicyServiceEvents.BeforeAttachPolicyEvent} */
public void onBeforeAttachPolicy(CatalogPolicyServiceEvents.BeforeAttachPolicyEvent event) {}

/** {@link CatalogPolicyServiceEvents.AfterAttachPolicyEvent} */
public void onAfterAttachPolicy(CatalogPolicyServiceEvents.AfterAttachPolicyEvent event) {}

/** {@link CatalogPolicyServiceEvents.BeforeDetachPolicyEvent} */
public void onBeforeDetachPolicy(CatalogPolicyServiceEvents.BeforeDetachPolicyEvent event) {}

/** {@link CatalogPolicyServiceEvents.AfterDetachPolicyEvent} */
public void onAfterDetachPolicy(CatalogPolicyServiceEvents.AfterDetachPolicyEvent event) {}

/** {@link CatalogPolicyServiceEvents.BeforeGetApplicablePoliciesEvent} */
public void onBeforeGetApplicablePolicies(
CatalogPolicyServiceEvents.BeforeGetApplicablePoliciesEvent event) {}

/** {@link CatalogPolicyServiceEvents.AfterGetApplicablePoliciesEvent} */
public void onAfterGetApplicablePolicies(
CatalogPolicyServiceEvents.AfterGetApplicablePoliciesEvent event) {}

/** {@link CatalogGenericTableServiceEvents.BeforeCreateGenericTableEvent} */
public void onBeforeCreateGenericTable(
CatalogGenericTableServiceEvents.BeforeCreateGenericTableEvent event) {}
Expand Down