update to latest version of storage client

world-federation-of-advertisers · Jan 3, 2025 · 650fd45 · 650fd45
1 parent 98dfdaa
commit 650fd45
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -40,11 +40,11 @@ bazel_dep(
     version = "0.99.1",
     repo_name = "wfa_common_jvm",
 )
-# DO_NOT_SUBMIT (world-federation-of-advertisers/common-jvm#XXX)
+# DO_NOT_SUBMIT (world-federation-of-advertisers/common-jvm#295)
 archive_override(
     module_name = "common-jvm",
-    strip_prefix = "common-jvm-63474cc50dbff81388b99e95572728f1325ae9db",
-    urls = "https://github.com/world-federation-of-advertisers/common-jvm/archive/63474cc50dbff81388b99e95572728f1325ae9db.tar.gz",
+    strip_prefix = "common-jvm-d23dbac4990e80a80260910e13692054c22b8669",
+    urls = "https://github.com/world-federation-of-advertisers/common-jvm/archive/d23dbac4990e80a80260910e13692054c22b8669.tar.gz",
 )
 bazel_dep(
     name = "common-cpp",

diff --git a/src/main/kotlin/org/wfanet/measurement/securecomputation/datawatcher/DataWatcher.kt b/src/main/kotlin/org/wfanet/measurement/securecomputation/datawatcher/DataWatcher.kt
@@ -42,10 +42,9 @@ class DataWatcher(
     val data = builder.build()
     val bucket = data.getBucket()
     val blobKey = data.getName()
-    val path = "gs://" + bucket + "/" + blobKey
     dataWatcherConfigs.forEach { config ->
       val regex = config.sourcePathRegex.toRegex()
-      if (regex.containsMatchIn(path)) {
+      if (regex.containsMatchIn(blobKey)) {
         @Suppress("WHEN_ENUM_CAN_BE_NULL_IN_JAVA")
         when (config.sinkConfigCase) {
           DataWatcherConfig.SinkConfigCase.CONTROL_PLANE_CONFIG -> {

diff --git a/src/test/kotlin/org/wfanet/measurement/securecomputation/datawatcher/DataWatcherTest.kt b/src/test/kotlin/org/wfanet/measurement/securecomputation/datawatcher/DataWatcherTest.kt
@@ -48,7 +48,7 @@ class DataWatcherTest() {
       val subscribingStorageClient = GcsSubscribingStorageClient(inMemoryStorageClient)
 
       val dataWatcherConfig = dataWatcherConfig {
-        sourcePathRegex = "^gs://fake-bucket/path-to-watch"
+        sourcePathRegex = "^path-to-watch"
         this.controlPlaneConfig = controlPlaneConfig {
           queueName = topicId
           appConfig = Any.pack(Int32Value.newBuilder().setValue(5).build())
@@ -59,7 +59,7 @@ class DataWatcherTest() {
       subscribingStorageClient.subscribe(dataWatcher)
 
       subscribingStorageClient.writeBlob(
-        "gs://fake-bucket/path-to-watch/some-data",
+        "path-to-watch/some-data",
         flowOf("some-data".toByteStringUtf8())
       )
       val createWorkItemRequestCaptor = argumentCaptor<CreateWorkItemRequest>()
@@ -77,7 +77,7 @@ class DataWatcherTest() {
       val subscribingStorageClient = GcsSubscribingStorageClient(inMemoryStorageClient)
 
       val dataWatcherConfig = dataWatcherConfig {
-        sourcePathRegex = "^gs://fake-bucket/path-to-watch"
+        sourcePathRegex = "^path-to-watch"
         this.controlPlaneConfig = controlPlaneConfig {
           queueName = topicId
           appConfig = Any.pack(Int32Value.newBuilder().setValue(5).build())
@@ -88,7 +88,7 @@ class DataWatcherTest() {
       subscribingStorageClient.subscribe(dataWatcher)
 
       subscribingStorageClient.writeBlob(
-        "gs://fake-bucket/some-other-path/some-data",
+        "some-other-path/some-data",
         flowOf("some-data".toByteStringUtf8())
       )
       val createWorkItemRequestCaptor = argumentCaptor<CreateWorkItemRequest>()