Skip to content

Adding enabled, description fields in label app rules #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Nov 15, 2021
Merged

Adding enabled, description fields in label app rules #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
30dd6c1
Adding enabled,description fields in label app rules
Nov 5, 2021
76fceb9
Merge branch 'main' into ENG-12057
kamaleshnneerasa Nov 15, 2021
51bd053
Fixing resource name and namespace
Nov 15, 2021
604ec66
Merge branch 'ENG-12057' of https://github.com/hypertrace/config-serv…
Nov 15, 2021
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
2 changes: 2 additions & 0 deletions ...roto/org/hypertrace/label/application/rule/config/service/v1/label_application_rule.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ message LabelApplicationRuleData {
string name = 1;
Condition matching_condition = 2;
Action label_action = 3;
bool enabled = 4;
optional string description = 5;

message Condition {
oneof condition {
Expand Down
6 changes: 3 additions & 3 deletions .../java/org/hypertrace/label/application/rule/config/service/LabelApplicationRuleStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
import org.hypertrace.label.application.rule.config.service.v1.LabelApplicationRule;

public class LabelApplicationRuleStore extends IdentifiedObjectStore<LabelApplicationRule> {
private static final String LABEL_APPLICATION_RULE_CONFIG_RESOURCE_NAME = "label-config";
private static final String LABEL_APPLICATION_RULE_CONFIG_RESOURCE_NAMESPACE =
"label-application-rules";
private static final String LABEL_APPLICATION_RULE_CONFIG_RESOURCE_NAME =
"label-application-rule-config";
private static final String LABEL_APPLICATION_RULE_CONFIG_RESOURCE_NAMESPACE = "labels";

LabelApplicationRuleStore(
ConfigServiceGrpc.ConfigServiceBlockingStub stub,
Expand Down
2 changes: 2 additions & 0 deletions ...g/hypertrace/label/application/rule/config/service/LabelApplicationRuleValidatorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ private void validateLabelApplicationRuleData(LabelApplicationRuleData labelAppl
labelApplicationRuleData, labelApplicationRuleData.NAME_FIELD_NUMBER);
validateCondition(labelApplicationRuleData.getMatchingCondition());
validateAction(labelApplicationRuleData.getLabelAction());
validateNonDefaultPresenceOrThrow(
labelApplicationRuleData, labelApplicationRuleData.ENABLED_FIELD_NUMBER);
}

private void validateCondition(LabelApplicationRuleData.Condition condition) {
Expand Down
2 changes: 2 additions & 0 deletions ...race/label/application/rule/config/service/LabelApplicationRuleConfigServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ private LabelApplicationRuleData buildCompositeRuleData() {
.setName("Composite rule")
.setMatchingCondition(matchingCondition)
.setLabelAction(buildAction())
.setEnabled(true)
.build();
}

Expand All @@ -235,6 +236,7 @@ private LabelApplicationRuleData buildSimpleRuleData(String key, String value) {
.setName("Simple rule")
.setMatchingCondition(matchingCondition)
.setLabelAction(buildAction())
.setEnabled(true)
.build();
}

Expand Down
3 changes: 3 additions & 0 deletions ...g/hypertrace/label/application/rule/config/service/LabelApplicationRuleValidatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,13 +222,15 @@ private CreateLabelApplicationRuleRequest buildCreateCreateLabelApplicationRuleR
.setName(name)
.setMatchingCondition(matchingCondition)
.setLabelAction(buildDynamicLabelAction(labelExpression.get()))
.setEnabled(true)
.build();
} else {
data =
LabelApplicationRuleData.newBuilder()
.setName(name)
.setMatchingCondition(matchingCondition)
.setLabelAction(buildAction())
.setEnabled(true)
.build();
}
return CreateLabelApplicationRuleRequest.newBuilder().setData(data).build();
Expand All @@ -240,6 +242,7 @@ private CreateLabelApplicationRuleRequest buildCreateLabelApplicationRuleRequest
LabelApplicationRuleData.newBuilder()
.setName(name)
.setMatchingCondition(matchingCondition)
.setEnabled(true)
.build();
return CreateLabelApplicationRuleRequest.newBuilder().setData(data).build();
}
Expand Down