This is an automated email from the ASF dual-hosted git repository.
mdedetrich pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-connectors.git
The following commit(s) were added to refs/heads/main by this push:
new 0306dd673 Fix metadata not working with GCStorage
0306dd673 is described below
commit 0306dd6739e8e7b26a0d70e5878676ca37ef5eec
Author: Matthew de Detrich <[email protected]>
AuthorDate: Wed Apr 23 18:37:03 2025 +0200
Fix metadata not working with GCStorage
---
.../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: [email protected]
For additional commands, e-mail: [email protected]
