From 12b5958d9300989a7d5a80b105e48ef5a15c80fd Mon Sep 17 00:00:00 2001
From: Renovate Bot <bot@renovateapp.com>
Date: Tue, 29 Mar 2022 01:27:32 +0000
Subject: [PATCH 1/4] test(deps): update dependency
 com.google.cloud:google-cloud-conformance-tests to v0.2.9

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 56c6801e30..5867a9f1e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-conformance-tests</artifactId>
-        <version>0.2.8</version>
+        <version>0.2.9</version>
         <scope>test</scope>
         <exclusions>
           <exclusion>

From 0ed798af4275ced550eff9be7b456527650193a5 Mon Sep 17 00:00:00 2001
From: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Date: Tue, 29 Mar 2022 01:29:58 +0000
Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?=
 =?UTF-8?q?st-processor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 65b0f49823..eb25ef9f49 100644
--- a/README.md
+++ b/README.md
@@ -56,13 +56,13 @@ implementation 'com.google.cloud:google-cloud-storage'
 If you are using Gradle without BOM, add this to your dependencies
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-storage:2.5.0'
+implementation 'com.google.cloud:google-cloud-storage:2.5.1'
 ```
 
 If you are using SBT, add this to your dependencies
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "2.5.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "2.5.1"
 ```
 
 ## Authentication

From a56dd8a580dd6b2aa6c62a89b1012c7e875fdf5b Mon Sep 17 00:00:00 2001
From: BenWhitehead <BenWhitehead@users.noreply.github.com>
Date: Tue, 29 Mar 2022 13:13:29 -0400
Subject: [PATCH 3/4] chore: lower case instruction name to ensure valid bucket
 name generated

---
 .../conformance/retry/TestRetryConformance.java  | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/TestRetryConformance.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/TestRetryConformance.java
index 027da5377d..b9b8456ddf 100644
--- a/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/TestRetryConformance.java
+++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/TestRetryConformance.java
@@ -111,13 +111,21 @@ final class TestRetryConformance {
             .map(s -> s.replace("return-", ""))
             .collect(Collectors.joining("_"));
     this.bucketName =
-        String.format("%s_s%03d-%s-m%03d_bkt1", BASE_ID, scenarioId, instructionsString, mappingId);
+        String.format(
+            "%s_s%03d-%s-m%03d_bkt1",
+            BASE_ID, scenarioId, instructionsString.toLowerCase(), mappingId);
     this.bucketName2 =
-        String.format("%s_s%03d-%s-m%03d_bkt2", BASE_ID, scenarioId, instructionsString, mappingId);
+        String.format(
+            "%s_s%03d-%s-m%03d_bkt2",
+            BASE_ID, scenarioId, instructionsString.toLowerCase(), mappingId);
     this.userProject =
-        String.format("%s_s%03d-%s-m%03d_prj1", BASE_ID, scenarioId, instructionsString, mappingId);
+        String.format(
+            "%s_s%03d-%s-m%03d_prj1",
+            BASE_ID, scenarioId, instructionsString.toLowerCase(), mappingId);
     this.objectName =
-        String.format("%s_s%03d-%s-m%03d_obj1", BASE_ID, scenarioId, instructionsString, mappingId);
+        String.format(
+            "%s_s%03d-%s-m%03d_obj1",
+            BASE_ID, scenarioId, instructionsString.toLowerCase(), mappingId);
   }
 
   public String getProjectId() {

From 76950c7b224d4e25c485d9df19109b8fdf8234a6 Mon Sep 17 00:00:00 2001
From: BenWhitehead <BenWhitehead@users.noreply.github.com>
Date: Tue, 29 Mar 2022 13:14:12 -0400
Subject: [PATCH 4/4] chore: update ITRetryConformanceTest resolution to
 temporarily exclude new resumable media scenarios

---
 .../storage/conformance/retry/ITRetryConformanceTest.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/ITRetryConformanceTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/ITRetryConformanceTest.java
index cacc0d5574..b713a22224 100644
--- a/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/ITRetryConformanceTest.java
+++ b/google-cloud-storage/src/test/java/com/google/cloud/storage/conformance/retry/ITRetryConformanceTest.java
@@ -149,7 +149,13 @@ public static Collection<Object[]> testCases() throws IOException {
             .setMappings(new RpcMethodMappings())
             .setProjectId("conformance-tests")
             .setHost(TEST_BENCH.getBaseUri().replaceAll("https?://", ""))
-            .setTestAllowFilter(RetryTestCaseResolver.includeAll())
+            .setTestAllowFilter(
+                RetryTestCaseResolver.includeAll()
+                    .and(
+                        (m, trc) ->
+                            trc.getScenarioId()
+                                < 7) // Temporarily exclude resumable media scenarios
+                )
             .build();
 
     List<RetryTestCase> retryTestCases = resolver.getRetryTestCases();