chore: clean up vulnerabilities (#160)

* clean up vulnerabilities

* docs

* update document store version

Author: SrikarMannepalli

config-service/build.gradle.kts

@@ -63,9 +63,9 @@ dependencies {
 
   // Integration test dependencies
   integrationTestImplementation(projects.configServiceImpl)
+  integrationTestImplementation(projects.configProtoConverter)
   integrationTestImplementation(libs.junit.jupiter)
   integrationTestImplementation(libs.guava)
-  integrationTestImplementation(libs.snakeyaml)
   integrationTestImplementation(libs.hypertrace.framework.integrationtest)
   integrationTestImplementation(libs.hypertrace.grpcutils.client)
   integrationTestImplementation(libs.hypertrace.grpcutils.context)

config-service/src/integrationTest/java/org/hypertrace/config/service/ConfigServiceIntegrationTest.java

@@ -77,9 +77,9 @@ public static void setup() throws IOException {
             .withCallCredentials(
                 RequestContextClientCallCredsProviderFactory.getClientCallCredsProvider().get());
 
-    config1 = getConfigValue("config1.yaml");
-    config2 = getConfigValue("config2.yaml");
-    config3 = getConfigValue("config3.yaml");
+    config1 = getConfigValue("config1.json");
+    config2 = getConfigValue("config2.json");
+    config3 = getConfigValue("config3.json");
   }
 
   @AfterAll

config-service/src/integrationTest/java/org/hypertrace/config/service/IntegrationTestUtils.java

@@ -1,52 +1,29 @@
 package org.hypertrace.config.service;
 
+import static org.hypertrace.config.proto.converter.ConfigProtoConverter.mergeFromJsonString;
+
 import com.google.common.io.Resources;
-import com.google.protobuf.ListValue;
-import com.google.protobuf.Struct;
 import com.google.protobuf.Value;
 import java.io.IOException;
 import java.nio.charset.Charset;
-import java.util.List;
-import java.util.Map;
-import org.yaml.snakeyaml.Yaml;
 
 public class IntegrationTestUtils {
 
   /**
-   * Reads the YAML file and converts it into {@link Value} object
+   * Reads the Json file and converts it into {@link Value} object
    *
-   * @param yamlFileName
+   * @param jsonFileName
    * @return
    * @throws IOException
    */
-  public static Value getConfigValue(String yamlFileName) throws IOException {
-    String yamlConfigString = getConfigString(yamlFileName);
-    Yaml yaml = new Yaml();
-    Object yamlObject = yaml.load(yamlConfigString);
-    return getConfigValue(yamlObject);
+  public static Value getConfigValue(String jsonFileName) throws IOException {
+    String jsonConfigString = getConfigString(jsonFileName);
+    Value.Builder valueBuilder = Value.newBuilder();
+    mergeFromJsonString(jsonConfigString, valueBuilder);
+    return valueBuilder.build();
   }
 
   private static String getConfigString(String resourceName) throws IOException {
     return Resources.toString(Resources.getResource(resourceName), Charset.defaultCharset());
   }
-
-  private static Value getConfigValue(Object yamlObject) {
-    Value.Builder configValueBuilder = Value.newBuilder();
-    if (yamlObject instanceof Map) {
-      Struct.Builder structBuilder = Struct.newBuilder();
-      for (Map.Entry<String, Object> entry : ((Map<String, Object>) yamlObject).entrySet()) {
-        structBuilder.putFields(entry.getKey(), getConfigValue(entry.getValue()));
-      }
-      configValueBuilder.setStructValue(structBuilder.build());
-    } else if (yamlObject instanceof List) {
-      ListValue.Builder listValueBuilder = ListValue.newBuilder();
-      for (Object element : (List) yamlObject) {
-        listValueBuilder.addValues(getConfigValue(element));
-      }
-      configValueBuilder.setListValue(listValueBuilder.build());
-    } else {
-      configValueBuilder.setStringValue(String.valueOf(yamlObject));
-    }
-    return configValueBuilder.build();
-  }
 }

config-service/src/integrationTest/resources/config1.json

@@ -0,0 +1,32 @@
+{
+  "invoice": 34843,
+  "date": "2001-01-11",
+  "bill_to": {
+    "given": "C1",
+    "family": "D1",
+    "address": {
+      "lines": "111 Walkman Dr.Suite #111",
+      "city": "Royal Oak",
+      "postal": 48046
+    }
+  },
+  "ship_to": {
+    "given": "C1",
+    "family": "D1",
+    "address": {
+      "lines": "111 Walkman Dr.Suite #111",
+      "city": "Royal Oak",
+      "postal": 48046
+    }
+  },
+  "product": [
+    {
+      "sku": "BL394D",
+      "quantity": 4,
+      "description": "Basketball",
+      "price": 450.00
+    }
+  ],
+  "tax": 251.42,
+  "comments": "Late afternoon is best.\n  Backup contact is Nancy\n  Billsmer @ 338-4338."
+}

config-service/src/integrationTest/resources/config1.yaml

@@ -0,0 +1,29 @@
+{
+  "invoice": 34843,
+  "date": "2002-02-22",
+  "bill_to": {
+    "given": "C2",
+    "family": "D2",
+    "address": {
+      "lines": "222 Walkman Dr.Suite #292",
+      "city": "Royal Oak",
+      "state": "MI"
+    }
+  },
+  "product": [
+    {
+      "sku": "BL222D",
+      "quantity": 4,
+      "description": "Basketball",
+      "price": 450.00
+    },
+    {
+      "sku": "BL333H",
+      "quantity": 1,
+      "description": "Super Hoop",
+      "price": 2392.00
+    }
+  ],
+  "total": 4443.52,
+  "comments": "Late afternoon is best.\n  Backup contact is Nancy\n  Billsmer @ 338-4338."
+}

config-service/src/integrationTest/resources/config2.json

@@ -0,0 +1,40 @@
+{
+  "invoice": 34843,
+  "date": "2002-02-22",
+  "bill_to": {
+    "given": "C2",
+    "family": "D2",
+    "address": {
+      "lines": "222 Walkman Dr.Suite #292",
+      "city": "Royal Oak",
+      "state": "MI",
+      "postal": 48046
+    }
+  },
+  "ship_to": {
+    "given": "C1",
+    "family": "D1",
+    "address": {
+      "lines": "111 Walkman Dr.Suite #111",
+      "city": "Royal Oak",
+      "postal": 48046
+    }
+  },
+  "product": [
+    {
+      "sku": "BL222D",
+      "quantity": 4,
+      "description": "Basketball",
+      "price": 450.00
+    },
+    {
+      "sku": "BL333H",
+      "quantity": 1,
+      "description": "Super Hoop",
+      "price": 2392.00
+    }
+  ],
+  "tax": 251.42,
+  "total": 4443.52,
+  "comments": "Late afternoon is best.\n  Backup contact is Nancy\n  Billsmer @ 338-4338."
+}

config-service/src/integrationTest/resources/config2.yaml

@@ -1,11 +1,11 @@
 [versions]
-protoc = "3.21.7"
+protoc = "3.21.12"
 grpc = "1.50.0"
 gson = "2.9.0"
 hypertrace-grpcutils = "0.11.2"
-hypertrace-framework = "0.1.47"
+hypertrace-framework = "0.1.48"
 lombok = "1.18.22"
-jackson = "2.13.2.2"
+jackson = "2.14.1"
 kafka = "6.0.1-ccs"
 kotlin = "1.4.32"
 
@@ -24,7 +24,7 @@ hypertrace-grpc-framework = { module = "org.hypertrace.core.serviceframework:pla
 hypertrace-framework-metrics = { module = "org.hypertrace.core.serviceframework:platform-service-framework", version.ref = "hypertrace-framework" }
 hypertrace-framework-integrationtest = { module = "org.hypertrace.core.serviceframework:integrationtest-service-framework", version.ref = "hypertrace-framework" }
 
-hypertrace-documentstore = { module = "org.hypertrace.core.documentstore:document-store", version = "0.7.23" }
+hypertrace-documentstore = { module = "org.hypertrace.core.documentstore:document-store", version = "0.7.25" }
 hypertrace-eventstore = { module = "org.hypertrace.core.eventstore:event-store", version = "0.1.2" }
 
 guava = { module = "com.google.guava:guava", version = "31.1-jre" }
@@ -33,7 +33,6 @@ guice = { module = "com.google.inject:guice", version = "5.0.1" }
 javax-annotation = { module = "javax.annotation:javax.annotation-api", version = "1.3.2" }
 typesafe-config = { module = "com.typesafe:config", version = "1.4.1" }
 lombok = { module = "org.projectlombok:lombok", version.ref = "lombok" }
-snakeyaml = { module = "org.yaml:snakeyaml", version = "1.28" }
 jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" }
 rxjava3 = { module = "io.reactivex.rxjava3:rxjava", version = "3.0.11" }
 google-re2j = { module = "com.google.re2j:re2j", version = "1.6" }