deps: update gcr.io/cloud-devrel-public-resources/storage-testbench d…

…ocker tag to v0.36.0 (#2080) * chore: update HttpStorageRpc to avoid content-encoding: gzip on an empty request body Co-authored-by: BenWhitehead <[email protected]>
googleapis · Jun 22, 2023 · ba5c11a · ba5c11a
1 parent 5f916fb
commit ba5c11a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/spi/v1/HttpStorageRpc.java
@@ -1103,6 +1103,7 @@ private RewriteResponse rewrite(RewriteRequest req, String token) {
 
       Long maxBytesRewrittenPerCall =
           req.megabytesRewrittenPerCall != null ? req.megabytesRewrittenPerCall * MEGABYTE : null;
+      StorageObject content = req.overrideInfo ? req.target : null;
       Storage.Objects.Rewrite rewrite =
           storage
               .objects()
@@ -1111,7 +1112,7 @@ private RewriteResponse rewrite(RewriteRequest req, String token) {
                   req.source.getName(),
                   req.target.getBucket(),
                   req.target.getName(),
-                  req.overrideInfo ? req.target : null)
+                  content)
               .setSourceGeneration(req.source.getGeneration())
               .setRewriteToken(token)
               .setMaxBytesRewrittenPerCall(maxBytesRewrittenPerCall)
@@ -1132,6 +1133,7 @@ private RewriteResponse rewrite(RewriteRequest req, String token) {
               .setDestinationPredefinedAcl(Option.PREDEFINED_ACL.getString(req.targetOptions))
               .setUserProject(userProject)
               .setDestinationKmsKeyName(Option.KMS_KEY_NAME.getString(req.targetOptions));
+      rewrite.setDisableGZipContent(content == null);
       HttpHeaders requestHeaders = rewrite.getRequestHeaders();
       setEncryptionHeaders(requestHeaders, SOURCE_ENCRYPTION_KEY_PREFIX, req.sourceOptions);
       setEncryptionHeaders(requestHeaders, ENCRYPTION_KEY_PREFIX, req.targetOptions);
@@ -1460,6 +1462,7 @@ public HmacKey createHmacKey(String serviceAccountEmail, Map<Option, ?> options)
           .hmacKeys()
           .create(projectId, serviceAccountEmail)
           .setUserProject(Option.USER_PROJECT.getString(options))
+          .setDisableGZipContent(true)
           .execute();
     } catch (IOException ex) {
       span.setStatus(Status.UNKNOWN.withDescription(ex.getMessage()));
@@ -1714,6 +1717,7 @@ public Bucket lockRetentionPolicy(Bucket bucket, Map<Option, ?> options) {
           .buckets()
           .lockRetentionPolicy(bucket.getName(), Option.IF_METAGENERATION_MATCH.getLong(options))
           .setUserProject(Option.USER_PROJECT.getString(options))
+          .setDisableGZipContent(true)
           .execute();
     } catch (IOException ex) {
       span.setStatus(Status.UNKNOWN.withDescription(ex.getMessage()));

diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITGrpcTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/it/ITGrpcTest.java
@@ -58,7 +58,7 @@
 @RunWith(StorageITRunner.class)
 @CrossRun(
     backends = {Backend.TEST_BENCH},
-    transports = {Transport.HTTP, Transport.GRPC})
+    transports = {Transport.GRPC})
 public final class ITGrpcTest {
 
   @Inject public Storage storage;

diff --git a/...e-cloud-storage/src/test/resources/com/google/cloud/storage/it/runner/registry/Dockerfile b/...e-cloud-storage/src/test/resources/com/google/cloud/storage/it/runner/registry/Dockerfile
@@ -1 +1 @@
-FROM gcr.io/cloud-devrel-public-resources/storage-testbench:v0.35.0
+FROM gcr.io/cloud-devrel-public-resources/storage-testbench:v0.36.0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		FROM gcr.io/cloud-devrel-public-resources/storage-testbench:v0.35.0
		FROM gcr.io/cloud-devrel-public-resources/storage-testbench:v0.36.0