Added new operator to check IP within range (#185)

* Added new operator to check ip within range

* Updated enums

* Updated ht config-service version

* Updated converters for StringCondition value changes

* Reverted breaking changes | addressed review comment

* Removed redundant deserializer

Author: sanket-mundra

hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/schema/rule/StringCondition.java

@@ -3,28 +3,51 @@
 import graphql.annotations.annotationTypes.GraphQLField;
 import graphql.annotations.annotationTypes.GraphQLName;
 import graphql.annotations.annotationTypes.GraphQLNonNull;
+import java.util.List;
+import javax.annotation.Nullable;
 
 @GraphQLName(StringCondition.TYPE_NAME)
 public interface StringCondition {
   String TYPE_NAME = "LabelApplicationStringCondition";
 
   String OPERATOR_KEY = "operator";
   String VALUE_KEY = "value";
+  String VALUES_KEY = "values";
+  String STRING_CONDITION_VALUE_TYPE_KEY = "stringConditionValueType";
 
   @GraphQLName(Operator.TYPE_NAME)
   enum Operator {
     OPERATOR_EQUALS,
-    OPERATOR_MATCHES_REGEX;
+    OPERATOR_MATCHES_REGEX,
+    OPERATOR_MATCHES_IPS,
+    OPERATOR_NOT_MATCHES_IPS;
     private static final String TYPE_NAME = "StringConditionOperator";
   }
 
+  @GraphQLName(StringConditionValueType.TYPE_NAME)
+  enum StringConditionValueType {
+    VALUE,
+    VALUES;
+    private static final String TYPE_NAME = "StringConditionValueType";
+  }
+
   @GraphQLField
   @GraphQLNonNull
   @GraphQLName(OPERATOR_KEY)
   Operator operator();
 
   @GraphQLField
-  @GraphQLNonNull
+  @Nullable
   @GraphQLName(VALUE_KEY)
   String value();
+
+  @GraphQLField
+  @Nullable
+  @GraphQLName(VALUES_KEY)
+  List<String> values();
+
+  @GraphQLField
+  @Nullable
+  @GraphQLName(STRING_CONDITION_VALUE_TYPE_KEY)
+  StringConditionValueType stringConditionValueType();
 }

hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/dao/LabelApplicationRuleRequestConverter.java

@@ -130,10 +130,19 @@ LeafCondition convertLeafCondition(
 
   StringCondition convertStringCondition(
       org.hypertrace.graphql.label.schema.rule.StringCondition stringCondition) {
-    return StringCondition.newBuilder()
-        .setOperator(convertStringConditionOperator(stringCondition.operator()))
-        .setValue(stringCondition.value())
-        .build();
+    StringCondition.Builder stringConditionBuilder =
+        StringCondition.newBuilder()
+            .setOperator(convertStringConditionOperator(stringCondition.operator()));
+    switch (stringCondition.stringConditionValueType()) {
+      case VALUES:
+        return stringConditionBuilder
+            .setValues(
+                StringCondition.StringList.newBuilder().addAllValues(stringCondition.values()))
+            .build();
+      case VALUE:
+      default:
+        return stringConditionBuilder.setValue(stringCondition.value()).build();
+    }
   }
 
   UnaryCondition convertUnaryCondition(
@@ -150,6 +159,10 @@ StringCondition.Operator convertStringConditionOperator(
         return StringCondition.Operator.OPERATOR_EQUALS;
       case OPERATOR_MATCHES_REGEX:
         return StringCondition.Operator.OPERATOR_MATCHES_REGEX;
+      case OPERATOR_MATCHES_IPS:
+        return StringCondition.Operator.OPERATOR_MATCHES_IPS;
+      case OPERATOR_NOT_MATCHES_IPS:
+        return StringCondition.Operator.OPERATOR_NOT_MATCHES_IPS;
       default:
         throw new IllegalArgumentException("Unsupported String Condition Operator");
     }

hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/dao/LabelApplicationRuleResponseConverter.java

@@ -216,7 +216,28 @@ private Optional<StringCondition> convertStringCondition(
               .StringCondition
           stringCondition) {
     Optional<StringCondition.Operator> operator = convertOperatorInStringCondition(stringCondition);
-    return operator.map(op -> new ConvertedStringCondition(op, stringCondition.getValue()));
+    switch (stringCondition.getKindCase()) {
+      case VALUE:
+        return operator.map(
+            op ->
+                new ConvertedStringCondition(
+                    op,
+                    stringCondition.getValue(),
+                    null,
+                    StringCondition.StringConditionValueType.VALUE));
+      case VALUES:
+        return operator.map(
+            op ->
+                new ConvertedStringCondition(
+                    op,
+                    null,
+                    stringCondition.getValues().getValuesList(),
+                    StringCondition.StringConditionValueType.VALUES));
+      default:
+        log.error(
+            "Unrecognized String Condition Value Type {}", stringCondition.getKindCase().name());
+        return Optional.empty();
+    }
   }
 
   private Optional<StringCondition.Operator> convertOperatorInStringCondition(
@@ -228,6 +249,10 @@ private Optional<StringCondition.Operator> convertOperatorInStringCondition(
         return Optional.of(StringCondition.Operator.OPERATOR_EQUALS);
       case OPERATOR_MATCHES_REGEX:
         return Optional.of(StringCondition.Operator.OPERATOR_MATCHES_REGEX);
+      case OPERATOR_MATCHES_IPS:
+        return Optional.of(StringCondition.Operator.OPERATOR_MATCHES_IPS);
+      case OPERATOR_NOT_MATCHES_IPS:
+        return Optional.of(StringCondition.Operator.OPERATOR_NOT_MATCHES_IPS);
       default:
         log.error(
             "Unrecognized Operator Type in String Condition {}",
@@ -316,6 +341,8 @@ private static class ConvertedUnaryCondition implements UnaryCondition {
   private static class ConvertedStringCondition implements StringCondition {
     Operator operator;
     String value;
+    List<String> values;
+    StringConditionValueType stringConditionValueType;
   }
 
   @Value

hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/deserialization/LabelApplicationRuleDataDeserializationConfig.java

@@ -146,6 +146,12 @@ private static class StringConditionArgument implements StringCondition {
 
     @JsonProperty(VALUE_KEY)
     String value;
+
+    @JsonProperty(VALUES_KEY)
+    List<String> values;
+
+    @JsonProperty(STRING_CONDITION_VALUE_TYPE_KEY)
+    StringConditionValueType stringConditionValueType;
   }
 
   @Value

hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/deserialization/LabelApplicationRuleDeserializationConfig.java

@@ -10,9 +10,6 @@ protected void configure() {
     Multibinder<ArgumentDeserializationConfig> deserializationConfigBinder =
         Multibinder.newSetBinder(binder(), ArgumentDeserializationConfig.class);
 
-    deserializationConfigBinder
-        .addBinding()
-        .to(LabelApplicationRuleDataDeserializationConfig.class);
     deserializationConfigBinder.addBinding().to(LabelApplicationRuleDeserializationConfig.class);
 
     deserializationConfigBinder

hypertrace-graphql-labels-schema-impl/src/main/java/org/hypertrace/graphql/label/deserialization/LabelApplicationRuleDeserializationModule.java

@@ -12,7 +12,7 @@ dependencies {
     api("org.hypertrace.entity.service:entity-type-service-rx-client:0.5.6")
     api("org.hypertrace.config.service:spaces-config-service-api:0.1.1")
     api("org.hypertrace.config.service:labels-config-service-api:0.1.15")
-    api("org.hypertrace.config.service:label-application-rule-config-service-api:0.1.16")
+    api("org.hypertrace.config.service:label-application-rule-config-service-api:0.1.52")
     api("org.hypertrace.config.service:span-processing-config-service-api:0.1.41")
   }
 }