Skip to content
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

Implementing graphql apis for label application rules #108

Merged
merged 16 commits into from
Nov 5, 2021
Merged

Implementing graphql apis for label application rules #108

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7c3a1f7
Implementing graphql apis for label application rules
Oct 27, 2021
61e5417
Implementing graphql apis for label application rules
Oct 27, 2021
d357ce3
Implementing graphql apis for label application rules
Oct 27, 2021
ec9bcc9
Implementing graphql apis for label application rules
Oct 28, 2021
f1c2541
Implementing graphql apis for label application rules
Oct 29, 2021
6ed7e63
Implementing graphql apis for label application rules
Oct 29, 2021
3d132cd
Implementing graphql apis for label application rules
Oct 29, 2021
51d5e06
Implementing graphql apis for label application rules
Oct 29, 2021
932f27c
Fixing small bug
Oct 29, 2021
6a56adb
Simplifying schema
Oct 29, 2021
459a664
Addessing PR comments
Nov 3, 2021
250e698
Addessing PR comments
Nov 3, 2021
7e606d8
Addressing PR comments
Nov 3, 2021
d227623
Addressing PR comments
Nov 3, 2021
6e1b4d3
Addressing PR comments
Nov 3, 2021
47be40c
Upgrade hypertrace-core-graphql from origin/main
Nov 3, 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: 1 addition & 1 deletion .../hypertrace/graphql/label/application/rules/dao/LabelApplicationRuleRequestConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ private Action convertLabelAction(
Action.Operation operation = getOperationFromAction(action);
Action.Builder actionBuilder =
Action.newBuilder().setOperation(operation).addAllEntityTypes(action.entityTypes());
switch (action.valueType()) {
switch (action.labelApplicationActionType()) {
case STATIC_LABELS:
return actionBuilder
.setStaticLabels(
Expand Down
10 changes: 7 additions & 3 deletions ...hypertrace/graphql/label/application/rules/dao/LabelApplicationRuleResponseConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,11 @@ private Optional<Action> convertAction(
return operation.map(
op ->
new ConvertedAction(
entityTypes, op, staticLabels, null, Action.ValueType.STATIC_LABELS));
entityTypes,
op,
staticLabels,
null,
Action.LabelApplicationActionType.STATIC_LABELS));
case DYNAMIC_LABEL_KEY:
return operation.map(
op ->
Expand All @@ -109,7 +113,7 @@ private Optional<Action> convertAction(
op,
null,
action.getDynamicLabelKey(),
Action.ValueType.STATIC_LABELS));
Action.LabelApplicationActionType.STATIC_LABELS));
default:
log.error("Unrecognized Value type in Action {}", action.getValueCase().name());
return Optional.empty();
Expand Down Expand Up @@ -268,7 +272,7 @@ private static class ConvertedAction implements Action {
Operation operation;
StaticLabels staticLabels;
String dynamicLabelKey;
ValueType valueType;
LabelApplicationActionType labelApplicationActionType;
}

@Value
Expand Down
4 changes: 2 additions & 2 deletions ...abel/application/rules/deserialization/LabelApplicationRuleDataDeserializationConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ private static class ActionArgument implements Action {
@JsonProperty(DYNAMIC_LABEL_KEY_KEY)
String dynamicLabelKey;

@JsonProperty(VALUE_TYPE_KEY)
ValueType valueType;
@JsonProperty(LABEL_APPLICATION_ACTION_TYPE)
LabelApplicationActionType labelApplicationActionType;
}

@Value
Expand Down
4 changes: 2 additions & 2 deletions ...ql/label/application/rules/deserialization/LabelApplicationRuleDeserializationConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ private static class ActionArgument implements Action {
@JsonProperty(DYNAMIC_LABEL_KEY_KEY)
String dynamicLabelKey;

@JsonProperty(VALUE_TYPE_KEY)
ValueType valueType;
@JsonProperty(LABEL_APPLICATION_ACTION_TYPE)
LabelApplicationActionType labelApplicationActionType;
}

@Value
Expand Down
10 changes: 5 additions & 5 deletions ...ma/src/main/java/org/hypertrace/graphql/label/application/rules/schema/shared/Action.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ public interface Action {
String OPERATION_KEY = "operation";
String STATIC_LABELS = "staticLabels";
String DYNAMIC_LABEL_KEY_KEY = "dynamicLabelKey";
String VALUE_TYPE_KEY = "actionType";
String LABEL_APPLICATION_ACTION_TYPE = "actionType";

@GraphQLName(Operation.TYPE_NAME)
enum Operation {
OPERATION_MERGE;
private static final String TYPE_NAME = "LabelApplicationActionOperator";
}

@GraphQLName(ValueType.TYPE_NAME)
enum ValueType {
@GraphQLName(LabelApplicationActionType.TYPE_NAME)
enum LabelApplicationActionType {
STATIC_LABELS,
DYNAMIC_LABEL_KEY;
private static final String TYPE_NAME = "LabelApplicationValueType";
Expand Down Expand Up @@ -51,6 +51,6 @@ enum ValueType {

@GraphQLField
@GraphQLNonNull
@GraphQLName(VALUE_TYPE_KEY)
ValueType valueType();
@GraphQLName(LABEL_APPLICATION_ACTION_TYPE)
LabelApplicationActionType labelApplicationActionType();
}