From 6e9d9aa4f9a9631c281df4b4c8916490d5cd39d9 Mon Sep 17 00:00:00 2001
From: Aaron Steinfeld <45047841+aaron-steinfeld@users.noreply.github.com>
Date: Thu, 2 Nov 2023 16:53:59 -0400
Subject: [PATCH] chore: add gql deps (#13)

* chore: add ht gql deps

* ci: adjust suppressions
---
 gradle/libs.versions.toml       | 12 ++++++++++--
 hypertrace-bom/build.gradle.kts |  5 +++++
 owasp-suppressions.xml          |  5 ++++-
 test-consumer/build.gradle.kts  |  5 +++++
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 291aafa..ae58849 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -7,6 +7,8 @@ hypertrace-kafka = "0.3.9"
 hypertrace-bom = "+"
 hypertrace-attributeservice = "0.14.35"
 hypertrace-gatewayservice = "0.3.9"
+hypertrace-entityservice = "0.8.86"
+hypertrace-configservice = "0.1.56"
 
 junit = "5.10.0"
 mockito = "5.5.0"
@@ -51,13 +53,18 @@ hypertrace-framework-http = { module = "org.hypertrace.core.serviceframework:pla
 hypertrace-framework-spi = { module = "org.hypertrace.core.serviceframework:service-framework-spi", version.ref = "hypertrace-framework" }
 hypertrace-integrationtest-framework = { module = "org.hypertrace.core.serviceframework:integrationtest-service-framework", version.ref = "hypertrace-framework" }
 hypertrace-framework-documentstore-metrics = { module = "org.hypertrace.core.serviceframework:docstore-metrics", version.ref = "hypertrace-framework" }
-hypertrace-documentstore = { module = "org.hypertrace.core.documentstore:document-store", version = "0.7.44" }
+hypertrace-documentstore = { module = "org.hypertrace.core.documentstore:document-store", version = "0.7.49" }
 hypertrace-eventstore = { module = "org.hypertrace.core.eventstore:event-store", version = "0.1.3" }
 hypertrace-kafka-bom = { module = "org.hypertrace.core.kafkastreams.framework:kafka-bom", version.ref = "hypertrace-kafka" }
 hypertrace-kafka-framework = { module = "org.hypertrace.core.kafkastreams.framework:kafka-streams-framework", version.ref = "hypertrace-kafka" }
 hypertrace-attributeservice-api = { module = "org.hypertrace.core.attribute.service:attribute-service-api", version.ref = "hypertrace-attributeservice" }
 hypertrace-attributeservice-cachingclient = { module = "org.hypertrace.core.attribute.service:caching-attribute-service-client", version.ref = "hypertrace-attributeservice" }
 hypertrace-gatewayservice-api = { module = "org.hypertrace.gateway.service:gateway-service-api", version.ref = "hypertrace-gatewayservice" }
+hypertrace-entityservice-types-rxclient = { module = "org.hypertrace.entity.service:entity-type-service-rx-client", version.ref = "hypertrace-entityservice" }
+hypertrace-configservice-spaces-api = { module = "org.hypertrace.config.service:spaces-config-service-api", version.ref = "hypertrace-configservice" }
+hypertrace-configservice-labels-api = { module = "org.hypertrace.config.service:labels-config-service-api", version.ref = "hypertrace-configservice" }
+hypertrace-configservice-labelapplication-api = { module = "org.hypertrace.config.service:label-application-rule-config-service-api", version.ref = "hypertrace-configservice" }
+hypertrace-configservice-spanprocessing-api = { module = "org.hypertrace.config.service:span-processing-config-service-api", version.ref = "hypertrace-configservice" }
 hypertrace-bom = { module = "org.hypertrace.bom:hypertrace-bom", version.ref = "hypertrace-bom" }
 
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" }
@@ -77,4 +84,5 @@ owasp-dependencycheck = { id = "org.owasp.dependencycheck", version = "8.4.0" }
 google-protobuf = { id = "com.google.protobuf", version = "0.9.4" }
 
 [bundles]
-grpc-api = ["grpc-stub", "grpc-protobuf", "javax-annotation", "protobuf-java"]
\ No newline at end of file
+grpc-api = ["grpc-stub", "grpc-protobuf", "javax-annotation", "protobuf-java"]
+
diff --git a/hypertrace-bom/build.gradle.kts b/hypertrace-bom/build.gradle.kts
index e6c6a3f..8ccccb2 100644
--- a/hypertrace-bom/build.gradle.kts
+++ b/hypertrace-bom/build.gradle.kts
@@ -26,6 +26,11 @@ dependencies {
     api(libs.hypertrace.attributeservice.api)
     api(libs.hypertrace.attributeservice.cachingclient)
     api(libs.hypertrace.gatewayservice.api)
+    api(libs.hypertrace.entityservice.types.rxclient)
+    api(libs.hypertrace.configservice.spaces.api)
+    api(libs.hypertrace.configservice.labels.api)
+    api(libs.hypertrace.configservice.labelapplication.api)
+    api(libs.hypertrace.configservice.spanprocessing.api)
 
     api(libs.guava)
     api(libs.google.re2j)
diff --git a/owasp-suppressions.xml b/owasp-suppressions.xml
index 7b93938..d7a9adc 100644
--- a/owasp-suppressions.xml
+++ b/owasp-suppressions.xml
@@ -7,13 +7,16 @@
     <packageUrl regex="true">^pkg:maven/org\.hypertrace\..*@.*$</packageUrl>
     <cpe>cpe:/a:grpc:grpc</cpe>
     <cpe>cpe:/a:utils_project:utils</cpe>
+    <cpe>cpe:/a:service_project:service</cpe>
+    <cpe>cpe:/a:processing:processing</cpe>
   </suppress>
   <suppress until="2023-11-30Z">
     <notes><![CDATA[
    Doesn't appear to be a real vulnerability, jackson maintainers discuss at https://github.com/FasterXML/jackson-databind/issues/3973
    Revisit when suppression expires
    ]]></notes>
-    <packageUrl regex="true">^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$</packageUrl>
+    <packageUrl regex="true">^pkg:maven/com\.fasterxml\.jackson\.core/jackson\-databind@.*$
+    </packageUrl>
     <cve>CVE-2023-35116</cve>
   </suppress>
   <suppress>
diff --git a/test-consumer/build.gradle.kts b/test-consumer/build.gradle.kts
index 7092ceb..a09999d 100644
--- a/test-consumer/build.gradle.kts
+++ b/test-consumer/build.gradle.kts
@@ -18,6 +18,11 @@ dependencies {
   api(libs.hypertrace.eventstore)
   api(libs.hypertrace.attributeservice.api)
   api(libs.hypertrace.attributeservice.cachingclient)
+  api(libs.hypertrace.entityservice.types.rxclient)
+  api(libs.hypertrace.configservice.spaces.api)
+  api(libs.hypertrace.configservice.labels.api)
+  api(libs.hypertrace.configservice.labelapplication.api)
+  api(libs.hypertrace.configservice.spanprocessing.api)
   api(libs.hypertrace.gatewayservice.api)
 
   api(libs.guava)