Skip to content

Commit

Permalink
chore: add support for system label application rules (#235)
Browse files Browse the repository at this point in the history
  • Loading branch information
saxenakshitiz authored Sep 2, 2024
1 parent 9519fa1 commit 834e663
Show file tree
Hide file tree
Showing 6 changed files with 209 additions and 33 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.hypertrace.core.serviceframework.grpc.GrpcPlatformService;
import org.hypertrace.core.serviceframework.grpc.GrpcPlatformServiceFactory;
import org.hypertrace.core.serviceframework.grpc.GrpcServiceContainerEnvironment;
import org.hypertrace.label.application.rule.config.service.LabelApplicationRuleConfig;
import org.hypertrace.label.application.rule.config.service.LabelApplicationRuleConfigServiceImpl;
import org.hypertrace.label.config.service.LabelsConfigServiceImpl;
import org.hypertrace.notification.config.service.NotificationChannelConfigServiceImpl;
Expand Down Expand Up @@ -78,7 +79,7 @@ public List<GrpcPlatformService> buildServices(
new SpacesConfigServiceImpl(localChannel),
new LabelsConfigServiceImpl(localChannel, config, configChangeEventGenerator),
new LabelApplicationRuleConfigServiceImpl(
localChannel, config, configChangeEventGenerator),
localChannel, new LabelApplicationRuleConfig(config), configChangeEventGenerator),
new EventConditionConfigServiceImpl(localChannel, configChangeEventGenerator),
new NotificationRuleConfigServiceImpl(localChannel, configChangeEventGenerator),
new NotificationChannelConfigServiceImpl(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
package org.hypertrace.label.application.rule.config.service;

import static java.util.function.Function.identity;

import com.google.protobuf.util.JsonFormat;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.typesafe.config.ConfigObject;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import lombok.Getter;
import lombok.SneakyThrows;
import org.hypertrace.label.application.rule.config.service.v1.LabelApplicationRule;

public class LabelApplicationRuleConfig {
private static final String LABEL_APPLICATION_RULE_CONFIG_SERVICE_CONFIG =
"label.application.rule.config.service";
private static final String MAX_DYNAMIC_LABEL_APPLICATION_RULES_PER_TENANT =
"max.dynamic.label.application.rules.per.tenant";
private static final String SYSTEM_LABEL_APPLICATION_RULES = "system.label.application.rules";
private static final int DEFAULT_MAX_DYNAMIC_LABEL_APPLICATION_RULES_PER_TENANT = 100;

@Getter private final int maxDynamicLabelApplicationRulesAllowed;
@Getter private final List<LabelApplicationRule> systemLabelApplicationRules;
@Getter private final Map<String, LabelApplicationRule> systemLabelApplicationRulesMap;

public LabelApplicationRuleConfig(Config config) {
Config labelApplicationRuleConfig =
config.hasPath(LABEL_APPLICATION_RULE_CONFIG_SERVICE_CONFIG)
? config.getConfig(LABEL_APPLICATION_RULE_CONFIG_SERVICE_CONFIG)
: ConfigFactory.empty();
this.maxDynamicLabelApplicationRulesAllowed =
labelApplicationRuleConfig.hasPath(MAX_DYNAMIC_LABEL_APPLICATION_RULES_PER_TENANT)
? labelApplicationRuleConfig.getInt(MAX_DYNAMIC_LABEL_APPLICATION_RULES_PER_TENANT)
: DEFAULT_MAX_DYNAMIC_LABEL_APPLICATION_RULES_PER_TENANT;
if (labelApplicationRuleConfig.hasPath(SYSTEM_LABEL_APPLICATION_RULES)) {
final List<? extends ConfigObject> systemLabelApplicationRulesObjectList =
labelApplicationRuleConfig.getObjectList(SYSTEM_LABEL_APPLICATION_RULES);
this.systemLabelApplicationRules =
buildSystemLabelApplicationRuleList(systemLabelApplicationRulesObjectList);
this.systemLabelApplicationRulesMap =
this.systemLabelApplicationRules.stream()
.collect(Collectors.toUnmodifiableMap(LabelApplicationRule::getId, identity()));
} else {
this.systemLabelApplicationRules = Collections.emptyList();
this.systemLabelApplicationRulesMap = Collections.emptyMap();
}
}

private List<LabelApplicationRule> buildSystemLabelApplicationRuleList(
List<? extends com.typesafe.config.ConfigObject> configObjectList) {
return configObjectList.stream()
.map(LabelApplicationRuleConfig::buildLabelApplicationRuleFromConfig)
.collect(Collectors.toUnmodifiableList());
}

@SneakyThrows
private static LabelApplicationRule buildLabelApplicationRuleFromConfig(
com.typesafe.config.ConfigObject configObject) {
String jsonString = configObject.render();
LabelApplicationRule.Builder builder = LabelApplicationRule.newBuilder();
JsonFormat.parser().merge(jsonString, builder);
return builder.build();
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package org.hypertrace.label.application.rule.config.service;

import com.typesafe.config.Config;
import io.grpc.Channel;
import io.grpc.Status;
import io.grpc.StatusRuntimeException;
import io.grpc.stub.StreamObserver;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
import org.hypertrace.config.objectstore.ConfigObject;
Expand All @@ -27,29 +29,17 @@

public class LabelApplicationRuleConfigServiceImpl
extends LabelApplicationRuleConfigServiceGrpc.LabelApplicationRuleConfigServiceImplBase {
static final String LABEL_APPLICATION_RULE_CONFIG_SERVICE_CONFIG =
"label.application.rule.config.service";
static final String MAX_DYNAMIC_LABEL_APPLICATION_RULES_PER_TENANT =
"max.dynamic.label.application.rules.per.tenant";
static final int DEFAULT_MAX_DYNAMIC_LABEL_APPLICATION_RULES_PER_TENANT = 100;
private final IdentifiedObjectStore<LabelApplicationRule> labelApplicationRuleStore;
private final LabelApplicationRuleValidator requestValidator;
private final int maxDynamicLabelApplicationRulesAllowed;
private final LabelApplicationRuleConfig labelApplicationRuleConfig;

public LabelApplicationRuleConfigServiceImpl(
Channel configChannel, Config config, ConfigChangeEventGenerator configChangeEventGenerator) {
int maxDynamicRules = DEFAULT_MAX_DYNAMIC_LABEL_APPLICATION_RULES_PER_TENANT;
if (config.hasPath(LABEL_APPLICATION_RULE_CONFIG_SERVICE_CONFIG)) {
Config labelApplicationRuleConfig =
config.getConfig(LABEL_APPLICATION_RULE_CONFIG_SERVICE_CONFIG);
if (labelApplicationRuleConfig.hasPath(MAX_DYNAMIC_LABEL_APPLICATION_RULES_PER_TENANT)) {
maxDynamicRules =
labelApplicationRuleConfig.getInt(MAX_DYNAMIC_LABEL_APPLICATION_RULES_PER_TENANT);
}
}
this.maxDynamicLabelApplicationRulesAllowed = maxDynamicRules;
Channel configChannel,
LabelApplicationRuleConfig labelApplicationRuleConfig,
ConfigChangeEventGenerator configChangeEventGenerator) {
this.labelApplicationRuleConfig = labelApplicationRuleConfig;

ConfigServiceBlockingStub configServiceBlockingStub =
final ConfigServiceBlockingStub configServiceBlockingStub =
ConfigServiceGrpc.newBlockingStub(configChannel)
.withCallCredentials(
RequestContextClientCallCredsProviderFactory.getClientCallCredsProvider().get());
Expand Down Expand Up @@ -96,9 +86,18 @@ public void getLabelApplicationRules(
this.labelApplicationRuleStore.getAllObjects(requestContext).stream()
.map(ConfigObject::getData)
.collect(Collectors.toUnmodifiableList());
Set<String> labelApplicationRuleIds =
labelApplicationRules.stream()
.map(LabelApplicationRule::getId)
.collect(Collectors.toUnmodifiableSet());
List<LabelApplicationRule> filteredSystemLabelApplicationRules =
this.labelApplicationRuleConfig.getSystemLabelApplicationRules().stream()
.filter(rule -> !labelApplicationRuleIds.contains(rule.getId()))
.collect(Collectors.toUnmodifiableList());
responseObserver.onNext(
GetLabelApplicationRulesResponse.newBuilder()
.addAllLabelApplicationRules(labelApplicationRules)
.addAllLabelApplicationRules(filteredSystemLabelApplicationRules)
.build());
responseObserver.onCompleted();
} catch (Exception e) {
Expand All @@ -116,6 +115,12 @@ public void updateLabelApplicationRule(
LabelApplicationRule existingRule =
this.labelApplicationRuleStore
.getData(requestContext, request.getId())
.or(
() ->
Optional.ofNullable(
this.labelApplicationRuleConfig
.getSystemLabelApplicationRulesMap()
.get(request.getId())))
.orElseThrow(Status.NOT_FOUND::asRuntimeException);
LabelApplicationRule updateLabelApplicationRule =
existingRule.toBuilder().setData(request.getData()).build();
Expand All @@ -140,6 +145,14 @@ public void deleteLabelApplicationRule(
try {
RequestContext requestContext = RequestContext.CURRENT.get();
this.requestValidator.validateOrThrow(requestContext, request);
String labelApplicationRuleId = request.getId();
if (this.labelApplicationRuleConfig
.getSystemLabelApplicationRulesMap()
.containsKey(labelApplicationRuleId)) {
// Deleting a system label application rule is not allowed
responseObserver.onError(new StatusRuntimeException(Status.INVALID_ARGUMENT));
return;
}
this.labelApplicationRuleStore
.deleteObject(requestContext, request.getId())
.orElseThrow(Status.NOT_FOUND::asRuntimeException);
Expand All @@ -161,7 +174,8 @@ private void checkRequestForDynamicLabelsLimit(
.filter(
action -> action.hasDynamicLabelExpression() || action.hasDynamicLabelKey())
.count();
if (dynamicLabelApplicationRules >= maxDynamicLabelApplicationRulesAllowed) {
if (dynamicLabelApplicationRules
>= this.labelApplicationRuleConfig.getMaxDynamicLabelApplicationRulesAllowed()) {
throw Status.RESOURCE_EXHAUSTED.asRuntimeException();
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
package org.hypertrace.label.application.rule.config.service;

import static org.hypertrace.label.application.rule.config.service.LabelApplicationRuleConfigServiceImpl.LABEL_APPLICATION_RULE_CONFIG_SERVICE_CONFIG;
import static org.hypertrace.label.application.rule.config.service.LabelApplicationRuleConfigServiceImpl.MAX_DYNAMIC_LABEL_APPLICATION_RULES_PER_TENANT;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import com.google.protobuf.InvalidProtocolBufferException;
import io.grpc.Channel;
import io.grpc.Status;
import io.grpc.StatusRuntimeException;
Expand Down Expand Up @@ -46,18 +44,24 @@
public class LabelApplicationRuleConfigServiceImplTest {
MockGenericConfigService mockGenericConfigService;
LabelApplicationRuleConfigServiceBlockingStub labelApplicationRuleConfigServiceBlockingStub;
LabelApplicationRule systemLabelApplicationRule;

@BeforeEach
void setUp() {
void setUp() throws InvalidProtocolBufferException {
mockGenericConfigService =
new MockGenericConfigService().mockUpsert().mockGet().mockGetAll().mockDelete();
Channel channel = mockGenericConfigService.channel();
ConfigChangeEventGenerator configChangeEventGenerator = mock(ConfigChangeEventGenerator.class);
Config config =
ConfigFactory.parseMap(
Map.of(
LABEL_APPLICATION_RULE_CONFIG_SERVICE_CONFIG,
Map.of(MAX_DYNAMIC_LABEL_APPLICATION_RULES_PER_TENANT, 2)));
systemLabelApplicationRule =
LabelApplicationRule.newBuilder()
.setId("system-label-rule-id-1")
.setData(LabelApplicationRuleData.newBuilder().setName("SystemLabelApplicationRule1"))
.build();
LabelApplicationRuleConfig config = mock(LabelApplicationRuleConfig.class);
when(config.getSystemLabelApplicationRules()).thenReturn(List.of(systemLabelApplicationRule));
when(config.getSystemLabelApplicationRulesMap())
.thenReturn(Map.of(systemLabelApplicationRule.getId(), systemLabelApplicationRule));
when(config.getMaxDynamicLabelApplicationRulesAllowed()).thenReturn(2);
mockGenericConfigService
.addService(
new LabelApplicationRuleConfigServiceImpl(channel, config, configChangeEventGenerator))
Expand Down Expand Up @@ -109,7 +113,8 @@ void createLabelApplicationRuleWithDynamicLabelApplicationRulesLimitReached() {
void getLabelApplicationRules() {
LabelApplicationRule simpleRule = createSimpleRule("auth", "valid");
LabelApplicationRule compositeRule = createCompositeRule();
Set<LabelApplicationRule> expectedRules = Set.of(simpleRule, compositeRule);
Set<LabelApplicationRule> expectedRules =
Set.of(simpleRule, compositeRule, systemLabelApplicationRule);
GetLabelApplicationRulesResponse response =
labelApplicationRuleConfigServiceBlockingStub.getLabelApplicationRules(
GetLabelApplicationRulesRequest.getDefaultInstance());
Expand All @@ -133,6 +138,20 @@ void updateLabelApplicationRule() {
assertEquals(expectedData, response.getLabelApplicationRule().getData());
}

@Test
void updateSystemLabelApplicationRule() {
LabelApplicationRuleData expectedData = buildSimpleRuleData("auth", "not-valid");
UpdateLabelApplicationRuleRequest request =
UpdateLabelApplicationRuleRequest.newBuilder()
.setId(systemLabelApplicationRule.getId())
.setData(expectedData)
.build();
UpdateLabelApplicationRuleResponse response =
labelApplicationRuleConfigServiceBlockingStub.updateLabelApplicationRule(request);
assertEquals(systemLabelApplicationRule.getId(), response.getLabelApplicationRule().getId());
assertEquals(expectedData, response.getLabelApplicationRule().getData());
}

@Test
void updateLabelApplicationRuleError() {
LabelApplicationRule simpleRule = createSimpleRule("auth", "valid");
Expand Down Expand Up @@ -179,6 +198,21 @@ void deleteApplicationRuleError() {
assertEquals(Status.NOT_FOUND, Status.fromThrowable(exception));
}

@Test
void deleteSystemApplicationRuleError() {
DeleteLabelApplicationRuleRequest request =
DeleteLabelApplicationRuleRequest.newBuilder()
.setId(systemLabelApplicationRule.getId())
.build();
Throwable exception =
assertThrows(
StatusRuntimeException.class,
() -> {
labelApplicationRuleConfigServiceBlockingStub.deleteLabelApplicationRule(request);
});
assertEquals(Status.INVALID_ARGUMENT, Status.fromThrowable(exception));
}

private LabelApplicationRuleData buildCompositeRuleData() {
// This condition implies foo(key) exists AND foo(key) = bar(value) AND
// req.http.headers.auth(key) = valid(value)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
package org.hypertrace.label.application.rule.config.service;

import static org.junit.jupiter.api.Assertions.assertEquals;

import com.google.protobuf.InvalidProtocolBufferException;
import com.google.protobuf.util.JsonFormat;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.hypertrace.label.application.rule.config.service.v1.LabelApplicationRule;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

public class LabelApplicationRuleConfigTest {
private static final String SYSTEM_LABEL_APPLICATION_RULE_STR =
"{\"id\":\"system-label-application-rule-1\",\"data\":{\"name\":\"SystemLabelApplicationRule1\",\"matching_condition\":{\"leaf_condition\":{\"key_condition\":{\"operator\":\"OPERATOR_EQUALS\",\"value\":\"test.key\"},\"unary_condition\":{\"operator\":\"OPERATOR_EXISTS\"}}},\"label_action\":{\"entity_types\":[\"API\"],\"operation\":\"OPERATION_MERGE\",\"static_labels\":{\"ids\":[\"static-label-id-1\"]}},\"enabled\":false}}";
LabelApplicationRule systemLabelApplicationRule;
Map<String, LabelApplicationRule> stringLabelApplicationRuleMap;
LabelApplicationRuleConfig labelApplicationRuleConfig;

@BeforeEach
void setUp() throws InvalidProtocolBufferException {
String configStr =
"label.application.rule.config.service {\n"
+ "max.dynamic.label.application.rules.per.tenant = 5\n"
+ "system.label.application.rules = [\n"
+ SYSTEM_LABEL_APPLICATION_RULE_STR
+ "\n]\n"
+ "}\n";
Config config = ConfigFactory.parseString(configStr);
LabelApplicationRule.Builder builder = LabelApplicationRule.newBuilder().clear();
JsonFormat.parser().merge(SYSTEM_LABEL_APPLICATION_RULE_STR, builder);
systemLabelApplicationRule = builder.build();
stringLabelApplicationRuleMap = new HashMap<>();
stringLabelApplicationRuleMap.put(
systemLabelApplicationRule.getId(), systemLabelApplicationRule);
labelApplicationRuleConfig = new LabelApplicationRuleConfig(config);
}

@Test
void test_getMaxDynamicLabelApplicationRulesAllowed() {
assertEquals(5, labelApplicationRuleConfig.getMaxDynamicLabelApplicationRulesAllowed());
}

@Test
void test_getSystemLabelApplicationRules() {
assertEquals(
List.of(systemLabelApplicationRule),
labelApplicationRuleConfig.getSystemLabelApplicationRules());
}

@Test
void test_getSystemLabelApplicationRulesMap() {
assertEquals(
stringLabelApplicationRuleMap,
labelApplicationRuleConfig.getSystemLabelApplicationRulesMap());
}
}
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ plugins {
}

configure<DependencyPluginSettingExtension> {
catalogVersion.set("0.3.23")
catalogVersion.set("0.3.28")
}

enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
Expand Down

0 comments on commit 834e663

Please sign in to comment.