You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by fa...@apache.org on 2025/04/24 11:48:11 UTC
(pekko-connectors) branch 1.1.x updated: Fix metadata not working with GCStorage (#1046)
This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch 1.1.x
in repository https://gitbox.apache.org/repos/asf/pekko-connectors.git
The following commit(s) were added to refs/heads/1.1.x by this push:
new 25c1cf5b5 Fix metadata not working with GCStorage (#1046)
25c1cf5b5 is described below
commit 25c1cf5b5e3c0ec2e865dedaef1fda8a42e8af53
Author: Matthew de Detrich <md...@gmail.com>
AuthorDate: Thu Apr 24 13:48:07 2025 +0200
Fix metadata not working with GCStorage (#1046)
(cherry picked from commit 0306dd6739e8e7b26a0d70e5878676ca37ef5eec)
---
.../stream/connectors/googlecloud/storage/impl/GCStorageStream.scala | 3 ++-
.../googlecloud/storage/scaladsl/GCStorageWiremockBase.scala | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/google-cloud-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/storage/impl/GCStorageStream.scala b/google-cloud-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/storage/impl/GCStorageStream.scala
index 150305568..c202f108b 100644
--- a/google-cloud-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/storage/impl/GCStorageStream.scala
+++ b/google-cloud-storage/src/main/scala/org/apache/pekko/stream/connectors/googlecloud/storage/impl/GCStorageStream.scala
@@ -154,7 +154,8 @@ import scala.concurrent.{ ExecutionContext, Future }
.withQuery(("uploadType" -> "resumable") +: ("name" -> objectName) +: Query.Empty)
val headers = List(`X-Upload-Content-Type`(contentType))
val entity =
- metadata.fold(HttpEntity.Empty)(m => HttpEntity(ContentTypes.`application/json`, m.toJson.toString))
+ metadata.fold(HttpEntity.Empty)(m =>
+ HttpEntity(ContentTypes.`application/json`, JsObject(("metadata", m.toJson)).toString))
val request = HttpRequest(POST, uri, headers, entity)
implicit val um: Unmarshaller[HttpResponse, StorageObject] = Unmarshaller.withMaterializer {
diff --git a/google-cloud-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/storage/scaladsl/GCStorageWiremockBase.scala b/google-cloud-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/storage/scaladsl/GCStorageWiremockBase.scala
index 35f18241c..af10b038d 100644
--- a/google-cloud-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/storage/scaladsl/GCStorageWiremockBase.scala
+++ b/google-cloud-storage/src/test/scala/org/apache/pekko/stream/connectors/googlecloud/storage/scaladsl/GCStorageWiremockBase.scala
@@ -25,7 +25,7 @@ import io.specto.hoverfly.junit.core.{ Hoverfly, HoverflyConfig, HoverflyMode, S
import io.specto.hoverfly.junit.dsl.HoverflyDsl.{ response, service }
import io.specto.hoverfly.junit.dsl.matchers.HoverflyMatchers.equalsToJson
import spray.json.DefaultJsonProtocol.{ mapFormat, StringJsonFormat }
-import spray.json.enrichAny
+import spray.json.{ enrichAny, JsObject }
import scala.annotation.nowarn
import scala.util.Random
@@ -639,7 +639,7 @@ abstract class GCStorageWiremockBase(_system: ActorSystem, _wireMockServer: Hove
dsl(
metadata
.fold(noMeta) { m =>
- noMeta.body(equalsToJson(m.toJson.toString))
+ noMeta.body(equalsToJson(JsObject(("metadata", m.toJson)).toString))
}
.willReturn(
response()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org