mirror of
https://github.com/open-metadata/OpenMetadata.git
synced 2025-11-02 11:39:12 +00:00
[Fixes] Patch Minor Fixes (#14919)
* Patch Minor Fixes * Patch Minor Fixes * java checkstyke * Fix Failing Test * fix filtering
This commit is contained in:
Mohit Yadav
GitHub
parent
9dca086053
commit
6d015980b7
@ -29,6 +29,7 @@ import java.util.stream.Collectors;
|
||||
import javax.ws.rs.BadRequestException;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.openmetadata.common.utils.CommonUtil;
|
||||
import org.openmetadata.schema.api.events.AlertFilteringInput;
|
||||
import org.openmetadata.schema.api.events.CreateEventSubscription;
|
||||
import org.openmetadata.schema.entity.events.Argument;
|
||||
import org.openmetadata.schema.entity.events.ArgumentsInput;
|
||||
@ -98,7 +99,7 @@ public final class AlertUtil {
|
||||
|
||||
public static boolean shouldTriggerAlert(String entityType, FilteringRules config) {
|
||||
if (config == null) {
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
// OpenMetadataWide Setting apply to all ChangeEvents
|
||||
if (config.getResources().size() == 1 && config.getResources().get(0).equals("all")) {
|
||||
@ -186,92 +187,71 @@ public final class AlertUtil {
|
||||
}
|
||||
|
||||
public static FilteringRules validateAndBuildFilteringConditions(
|
||||
CreateEventSubscription createEventSubscription) {
|
||||
// Resource Validation
|
||||
List<EventFilterRule> finalRules = new ArrayList<>();
|
||||
List<EventFilterRule> actions = new ArrayList<>();
|
||||
List<String> resource = createEventSubscription.getResources();
|
||||
List<String> resource,
|
||||
CreateEventSubscription.AlertType alertType,
|
||||
AlertFilteringInput input) {
|
||||
if (resource.size() > 1) {
|
||||
throw new BadRequestException(
|
||||
"Only one resource can be specified. Multiple resources are not supported.");
|
||||
}
|
||||
|
||||
if (createEventSubscription
|
||||
.getAlertType()
|
||||
.equals(CreateEventSubscription.AlertType.NOTIFICATION)) {
|
||||
if (alertType.equals(CreateEventSubscription.AlertType.NOTIFICATION)) {
|
||||
Map<String, EventFilterRule> supportedFilters =
|
||||
EventsSubscriptionRegistry.getEntityNotificationDescriptor(resource.get(0))
|
||||
.getSupportedFilters()
|
||||
.stream()
|
||||
.collect(
|
||||
Collectors.toMap(
|
||||
EventFilterRule::getName,
|
||||
eventFilterRule ->
|
||||
JsonUtils.deepCopy(eventFilterRule, EventFilterRule.class)));
|
||||
buildFilteringRulesMap(
|
||||
EventsSubscriptionRegistry.getEntityNotificationDescriptor(resource.get(0))
|
||||
.getSupportedFilters());
|
||||
// Input validation
|
||||
if (createEventSubscription.getInput() != null) {
|
||||
listOrEmpty(createEventSubscription.getInput().getFilters())
|
||||
.forEach(
|
||||
argumentsInput ->
|
||||
finalRules.add(
|
||||
getFilterRule(
|
||||
supportedFilters,
|
||||
argumentsInput,
|
||||
buildInputArgumentsMap(argumentsInput))));
|
||||
if (input != null) {
|
||||
return new FilteringRules()
|
||||
.withResources(resource)
|
||||
.withRules(buildRulesList(supportedFilters, input.getFilters()))
|
||||
.withActions(Collections.emptyList());
|
||||
}
|
||||
return new FilteringRules()
|
||||
.withResources(resource)
|
||||
.withRules(finalRules)
|
||||
.withActions(Collections.emptyList());
|
||||
} else if (createEventSubscription
|
||||
.getAlertType()
|
||||
.equals(CreateEventSubscription.AlertType.OBSERVABILITY)) {
|
||||
} else if (alertType.equals(CreateEventSubscription.AlertType.OBSERVABILITY)) {
|
||||
// Build a Map of Entity Filter Name
|
||||
Map<String, EventFilterRule> supportedFilters =
|
||||
EventsSubscriptionRegistry.getObservabilityDescriptor(resource.get(0))
|
||||
.getSupportedFilters()
|
||||
.stream()
|
||||
.collect(
|
||||
Collectors.toMap(
|
||||
EventFilterRule::getName,
|
||||
eventFilterRule ->
|
||||
JsonUtils.deepCopy(eventFilterRule, EventFilterRule.class)));
|
||||
buildFilteringRulesMap(
|
||||
EventsSubscriptionRegistry.getObservabilityDescriptor(resource.get(0))
|
||||
.getSupportedFilters());
|
||||
|
||||
// Build a Map of Actions
|
||||
Map<String, EventFilterRule> supportedActions =
|
||||
EventsSubscriptionRegistry.getObservabilityDescriptor(resource.get(0))
|
||||
.getSupportedActions()
|
||||
.stream()
|
||||
.collect(
|
||||
Collectors.toMap(
|
||||
EventFilterRule::getName,
|
||||
eventFilterRule ->
|
||||
JsonUtils.deepCopy(eventFilterRule, EventFilterRule.class)));
|
||||
buildFilteringRulesMap(
|
||||
EventsSubscriptionRegistry.getObservabilityDescriptor(resource.get(0))
|
||||
.getSupportedActions());
|
||||
|
||||
// Input validation
|
||||
if (createEventSubscription.getInput() != null) {
|
||||
listOrEmpty(createEventSubscription.getInput().getFilters())
|
||||
.forEach(
|
||||
argumentsInput ->
|
||||
finalRules.add(
|
||||
getFilterRule(
|
||||
supportedFilters,
|
||||
argumentsInput,
|
||||
buildInputArgumentsMap(argumentsInput))));
|
||||
listOrEmpty(createEventSubscription.getInput().getActions())
|
||||
.forEach(
|
||||
argumentsInput ->
|
||||
actions.add(
|
||||
getFilterRule(
|
||||
supportedActions,
|
||||
argumentsInput,
|
||||
buildInputArgumentsMap(argumentsInput))));
|
||||
if (input != null) {
|
||||
return new FilteringRules()
|
||||
.withResources(resource)
|
||||
.withRules(buildRulesList(supportedFilters, input.getFilters()))
|
||||
.withActions(buildRulesList(supportedActions, input.getActions()));
|
||||
}
|
||||
return new FilteringRules()
|
||||
.withResources(resource)
|
||||
.withRules(finalRules)
|
||||
.withActions(actions);
|
||||
}
|
||||
return null;
|
||||
return new FilteringRules()
|
||||
.withResources(resource)
|
||||
.withRules(Collections.emptyList())
|
||||
.withActions(Collections.emptyList());
|
||||
}
|
||||
|
||||
private static Map<String, EventFilterRule> buildFilteringRulesMap(
|
||||
List<EventFilterRule> filteringRules) {
|
||||
return filteringRules.stream()
|
||||
.collect(
|
||||
Collectors.toMap(
|
||||
EventFilterRule::getName,
|
||||
eventFilterRule -> JsonUtils.deepCopy(eventFilterRule, EventFilterRule.class)));
|
||||
}
|
||||
|
||||
private static List<EventFilterRule> buildRulesList(
|
||||
Map<String, EventFilterRule> lookUp, List<ArgumentsInput> input) {
|
||||
List<EventFilterRule> rules = new ArrayList<>();
|
||||
listOrEmpty(input)
|
||||
.forEach(
|
||||
argumentsInput ->
|
||||
rules.add(
|
||||
getFilterRule(lookUp, argumentsInput, buildInputArgumentsMap(argumentsInput))));
|
||||
return rules;
|
||||
}
|
||||
|
||||
private static Map<String, List<String>> buildInputArgumentsMap(ArgumentsInput filter) {
|
||||
|
||||
@ -13,11 +13,17 @@
|
||||
|
||||
package org.openmetadata.service.jdbi3;
|
||||
|
||||
import static org.openmetadata.common.utils.CommonUtil.listOrEmpty;
|
||||
import static org.openmetadata.common.utils.CommonUtil.nullOrEmpty;
|
||||
import static org.openmetadata.service.events.subscription.AlertUtil.validateAndBuildFilteringConditions;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.openmetadata.schema.api.events.CreateEventSubscription;
|
||||
import org.openmetadata.schema.entity.events.Argument;
|
||||
import org.openmetadata.schema.entity.events.ArgumentsInput;
|
||||
import org.openmetadata.schema.entity.events.EventFilterRule;
|
||||
import org.openmetadata.schema.entity.events.EventSubscription;
|
||||
import org.openmetadata.schema.entity.events.SubscriptionDestination;
|
||||
@ -66,6 +72,30 @@ public class EventSubscriptionRepository extends EntityRepository<EventSubscript
|
||||
|
||||
@Override
|
||||
public void prepare(EventSubscription entity, boolean update) {
|
||||
// Sort Filters and Actions
|
||||
if (entity.getInput() != null) {
|
||||
listOrEmpty(entity.getInput().getFilters())
|
||||
.sort(Comparator.comparing(ArgumentsInput::getName));
|
||||
listOrEmpty(entity.getInput().getActions())
|
||||
.sort(Comparator.comparing(ArgumentsInput::getName));
|
||||
|
||||
// Sort Input Args
|
||||
listOrEmpty(entity.getInput().getFilters())
|
||||
.forEach(
|
||||
filter ->
|
||||
listOrEmpty(filter.getArguments()).sort(Comparator.comparing(Argument::getName)));
|
||||
listOrEmpty(entity.getInput().getActions())
|
||||
.forEach(
|
||||
filter ->
|
||||
listOrEmpty(filter.getArguments()).sort(Comparator.comparing(Argument::getName)));
|
||||
}
|
||||
|
||||
if (update && !nullOrEmpty(entity.getFilteringRules())) {
|
||||
entity.setFilteringRules(
|
||||
validateAndBuildFilteringConditions(
|
||||
entity.getFilteringRules().getResources(), entity.getAlertType(), entity.getInput()));
|
||||
}
|
||||
|
||||
validateFilterRules(entity);
|
||||
}
|
||||
|
||||
|
||||
@ -120,10 +120,10 @@ public class EventSubscriptionResource
|
||||
@Override
|
||||
public void initialize(OpenMetadataApplicationConfig config) {
|
||||
try {
|
||||
repository.initSeedDataFromResources();
|
||||
EventsSubscriptionRegistry.initialize(
|
||||
listOrEmpty(EventSubscriptionResource.getNotificationsFilterDescriptors()),
|
||||
listOrEmpty(EventSubscriptionResource.getObservabilityFilterDescriptors()));
|
||||
repository.initSeedDataFromResources();
|
||||
initializeEventSubscriptions();
|
||||
} catch (Exception ex) {
|
||||
// Starting application should not fail
|
||||
@ -599,7 +599,9 @@ public class EventSubscriptionResource
|
||||
.withTrigger(create.getTrigger())
|
||||
.withEnabled(create.getEnabled())
|
||||
.withBatchSize(create.getBatchSize())
|
||||
.withFilteringRules(validateAndBuildFilteringConditions(create))
|
||||
.withFilteringRules(
|
||||
validateAndBuildFilteringConditions(
|
||||
create.getResources(), create.getAlertType(), create.getInput()))
|
||||
.withDestinations(getSubscriptions(create.getDestinations()))
|
||||
.withProvider(create.getProvider())
|
||||
.withRetries(create.getRetries())
|
||||
|
||||
@ -281,7 +281,10 @@ public class EventSubscriptionResourceTest
|
||||
change,
|
||||
"filteringRules",
|
||||
createdAlert.getFilteringRules(),
|
||||
AlertUtil.validateAndBuildFilteringConditions(genericWebhookActionRequest));
|
||||
AlertUtil.validateAndBuildFilteringConditions(
|
||||
genericWebhookActionRequest.getResources(),
|
||||
genericWebhookActionRequest.getAlertType(),
|
||||
genericWebhookActionRequest.getInput()));
|
||||
|
||||
createdAlert =
|
||||
updateAndCheckEntity(
|
||||
@ -299,7 +302,10 @@ public class EventSubscriptionResourceTest
|
||||
change,
|
||||
"filteringRules",
|
||||
createdAlert.getFilteringRules(),
|
||||
AlertUtil.validateAndBuildFilteringConditions(genericWebhookActionRequest));
|
||||
AlertUtil.validateAndBuildFilteringConditions(
|
||||
genericWebhookActionRequest.getResources(),
|
||||
genericWebhookActionRequest.getAlertType(),
|
||||
genericWebhookActionRequest.getInput()));
|
||||
|
||||
createdAlert =
|
||||
updateAndCheckEntity(
|
||||
@ -317,7 +323,10 @@ public class EventSubscriptionResourceTest
|
||||
change,
|
||||
"filteringRules",
|
||||
createdAlert.getFilteringRules(),
|
||||
AlertUtil.validateAndBuildFilteringConditions(genericWebhookActionRequest));
|
||||
AlertUtil.validateAndBuildFilteringConditions(
|
||||
genericWebhookActionRequest.getResources(),
|
||||
genericWebhookActionRequest.getAlertType(),
|
||||
genericWebhookActionRequest.getInput()));
|
||||
|
||||
createdAlert =
|
||||
updateAndCheckEntity(
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user