Merge branch 'main' into feat/grpc-storage

googleapis · Oct 21, 2022 · d5e937f · d5e937f
2 parents 098056b + c8540e7
commit d5e937f
Show file tree

Hide file tree

Showing 18 changed files with 86 additions and 46 deletions.
diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml
@@ -13,4 +13,4 @@
 # limitations under the License.
 docker:
   image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
-  digest: sha256:6566dc8226f20993af18e5a4e7a2b1ba85a292b02dedb6a1634cf10e1b418fa5
+  digest: sha256:264c6d5da60ff1684fbdd2b268d6a3ffca2038246e0948a06f15ca0c3cf28ce8
diff --git a/.kokoro/requirements.in b/.kokoro/requirements.in
@@ -16,10 +16,12 @@ pycparser==2.21
 pyperclip==1.8.2
 python-dateutil==2.8.2
 requests==2.27.1
+certifi==2022.9.24
 importlib-metadata==4.8.3
 zipp==3.6.0
 google_api_core==2.8.2
 google-cloud-storage==2.0.0
+google-resumable-media==2.3.3
 google-cloud-core==2.3.1
 typing-extensions==4.1.1
 urllib3==1.26.12

diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt
@@ -16,10 +16,12 @@ cachetools==4.2.4 \
     # via
     #   -r requirements.in
     #   google-auth
-certifi==2022.9.14 \
-    --hash=sha256:36973885b9542e6bd01dea287b2b4b3b21236307c56324fcc3f1160f2d655ed5 \
-    --hash=sha256:e232343de1ab72c2aa521b625c80f699e356830fd0e2c620b465b304b17b0516
-    # via requests
+certifi==2022.9.24 \
+    --hash=sha256:0d9c601124e5a6ba9712dbc60d9c53c21e34f5f641fe83002317394311bdce14 \
+    --hash=sha256:90c1a32f1d68f940488354e36370f6cca89f0f106db09518524c88d6ed83f382
+    # via
+    #   -r requirements.in
+    #   requests
 cffi==1.15.1 \
     --hash=sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5 \
     --hash=sha256:03425bdae262c76aad70202debd780501fabeaca237cdfddc008987c0e0f59ef \
@@ -218,7 +220,9 @@ google-crc32c==1.3.0 \
 google-resumable-media==2.3.3 \
     --hash=sha256:27c52620bd364d1c8116eaac4ea2afcbfb81ae9139fb3199652fcac1724bfb6c \
     --hash=sha256:5b52774ea7a829a8cdaa8bd2d4c3d4bc660c91b30857ab2668d0eb830f4ea8c5
-    # via google-cloud-storage
+    # via
+    #   -r requirements.in
+    #   google-cloud-storage
 googleapis-common-protos==1.56.3 \
     --hash=sha256:6f1369b58ed6cf3a4b7054a44ebe8d03b29c309257583a2bbdc064cd1e4a1442 \
     --hash=sha256:87955d7b3a73e6e803f2572a33179de23989ebba725e05ea42f24838b792e461

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [2.13.1](https://github.com/googleapis/java-storage/compare/v2.13.0...v2.13.1) (2022-10-20)
+
+
+### Bug Fixes
+
+* Avoid unexpected initialization of `JacksonParser` in Graal 22.2 ([#1709](https://github.com/googleapis/java-storage/issues/1709)) ([eca1a03](https://github.com/googleapis/java-storage/commit/eca1a03c5d7656179a04058a2af94300f1dc0930))
+* Update BucketInfo.LifecycleRule#fromPb to wire through MatchesPrefix & MatchesSuffix ([#1717](https://github.com/googleapis/java-storage/issues/1717)) ([eae3cf2](https://github.com/googleapis/java-storage/commit/eae3cf2735cd4adab598d311fd64b8906972ffc3))
+
+
+### Dependencies
+
+* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.15 ([#1711](https://github.com/googleapis/java-storage/issues/1711)) ([f188a07](https://github.com/googleapis/java-storage/commit/f188a07b09e0787f958f714333337fc92657a824))
+* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.9.16 ([#1721](https://github.com/googleapis/java-storage/issues/1721)) ([631b98d](https://github.com/googleapis/java-storage/commit/631b98df1a7d44358fbeacb95f2e2a3d590198d1))
+
 ## [2.13.0](https://github.com/googleapis/java-storage/compare/v2.12.0...v2.13.0) (2022-10-03)
 
 

diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ If you are using Maven without BOM, add this to your dependencies:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-storage</artifactId>
-  <version>2.13.0</version>
+  <version>2.13.1</version>
 </dependency>
 
 ```
@@ -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.13.0'
+implementation 'com.google.cloud:google-cloud-storage:2.13.1'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "2.13.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-storage" % "2.13.1"
 ```
 
 ## Authentication

diff --git a/gapic-google-cloud-storage-v2/pom.xml b/gapic-google-cloud-storage-v2/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>gapic-google-cloud-storage-v2</artifactId>
-  <version>2.13.1-alpha-SNAPSHOT</version><!-- {x-version-update:gapic-google-cloud-storage-v2:current} -->
+  <version>2.13.2-alpha-SNAPSHOT</version><!-- {x-version-update:gapic-google-cloud-storage-v2:current} -->
   <name>gapic-google-cloud-storage-v2</name>
   <description>GRPC library for gapic-google-cloud-storage-v2</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-storage-parent</artifactId>
-    <version>2.13.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
+    <version>2.13.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
   </parent>
   <dependencies>
     <dependency>

diff --git a/google-cloud-storage/pom.xml b/google-cloud-storage/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>google-cloud-storage</artifactId>
-  <version>2.13.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
+  <version>2.13.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
   <packaging>jar</packaging>
   <name>Google Cloud Storage</name>
   <url>https://github.com/googleapis/java-storage</url>
@@ -12,11 +12,11 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-storage-parent</artifactId>
-    <version>2.13.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
+    <version>2.13.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
   </parent>
   <properties>
     <site.installationModule>google-cloud-storage</site.installationModule>
-    <kms.version>0.97.8</kms.version>
+    <kms.version>0.98.0</kms.version>
     <junit-platform.version>5.9.1</junit-platform.version>
   </properties>
   <dependencies>

diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java b/google-cloud-storage/src/test/java/com/google/cloud/storage/BucketInfoTest.java
@@ -301,14 +301,31 @@ public void testLifecycleRules() {
             .encode(
                 new LifecycleRule(
                     LifecycleAction.newDeleteAction(),
-                    LifecycleCondition.newBuilder().setAge(10).build()));
+                    LifecycleCondition.newBuilder()
+                        .setAge(10)
+                        .setMatchesPrefix(Arrays.asList("abc", "ijk"))
+                        .setMatchesSuffix(Arrays.asList("xyz"))
+                        .build()));
 
     assertEquals(
         LifecycleRule.DeleteLifecycleAction.TYPE, deleteLifecycleRule.getAction().getType());
     assertEquals(10, deleteLifecycleRule.getCondition().getAge().intValue());
-    assertTrue(
-        Conversions.apiary().lifecycleRule().decode(deleteLifecycleRule).getAction()
-            instanceof DeleteLifecycleAction);
+    assertEquals(2, deleteLifecycleRule.getCondition().getMatchesPrefix().size());
+    assertEquals("abc", (String) deleteLifecycleRule.getCondition().getMatchesPrefix().get(0));
+    assertEquals("ijk", (String) deleteLifecycleRule.getCondition().getMatchesPrefix().get(1));
+    assertEquals(1, deleteLifecycleRule.getCondition().getMatchesSuffix().size());
+    assertEquals("xyz", deleteLifecycleRule.getCondition().getMatchesSuffix().get(0));
+
+    LifecycleRule lcr = Conversions.apiary().lifecycleRule().decode(deleteLifecycleRule);
+    assertEquals(LifecycleRule.DeleteLifecycleAction.TYPE, lcr.getAction().getActionType());
+    assertEquals(10, lcr.getCondition().getAge().intValue());
+    assertEquals(2, lcr.getCondition().getMatchesPrefix().size());
+    assertEquals("abc", (String) lcr.getCondition().getMatchesPrefix().get(0));
+    assertEquals("ijk", (String) lcr.getCondition().getMatchesPrefix().get(1));
+    assertEquals(1, lcr.getCondition().getMatchesSuffix().size());
+    assertEquals("xyz", lcr.getCondition().getMatchesSuffix().get(0));
+
+    assertTrue(lcr.getAction() instanceof DeleteLifecycleAction);
 
     Rule setStorageClassLifecycleRule =
         Conversions.apiary()

diff --git a/...src/test/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties b/...src/test/resources/META-INF/native-image/com/google/cloud/storage/native-image.properties
@@ -5,7 +5,7 @@
 # build time. Initializing these classes explicitly at build time results in a
 # successful build.
 Args = \
- --initialize-at-build-time=com.google.cloud.conformance.storage.v1,\
+  --initialize-at-build-time=com.google.cloud.conformance.storage.v1,\
   com.google.protobuf,\
   com.google.auth.oauth2,\
   com.google.cloud.storage.conformance.retry,\
@@ -14,7 +14,8 @@ Args = \
   com.google.api.client.util,\
   com.google.api.client.http.javanet.NetHttpTransport,\
   com.google.api.client.http.HttpTransport,\
-  com.google.api.client.json,\
+  com.google.api.client.json.JsonParser$1,\
+  com.google.api.client.json.gson.GsonParser$1,\
   com.google.common.io.BaseEncoding,\
   com.google.common.math.IntMath$1,\
   com.google.common.collect.Platform,\

diff --git a/grpc-google-cloud-storage-v2/pom.xml b/grpc-google-cloud-storage-v2/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>grpc-google-cloud-storage-v2</artifactId>
-  <version>2.13.1-alpha-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-storage-v2:current} -->
+  <version>2.13.2-alpha-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-storage-v2:current} -->
   <name>grpc-google-cloud-storage-v2</name>
   <description>GRPC library for grpc-google-cloud-storage-v2</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-storage-parent</artifactId>
-    <version>2.13.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
+    <version>2.13.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
   </parent>
   <dependencies>
     <dependency>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-storage-parent</artifactId>
   <packaging>pom</packaging>
-  <version>2.13.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
+  <version>2.13.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
   <name>Storage Parent</name>
   <url>https://github.com/googleapis/java-storage</url>
   <description>
@@ -14,7 +14,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.5.3</version>
+    <version>1.5.4</version>
   </parent>
 
   <developers>
@@ -54,7 +54,7 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <github.global.server>github</github.global.server>
     <site.installationModule>google-cloud-storage-parent</site.installationModule>
-    <google.cloud.shared-dependencies.version>3.0.4</google.cloud.shared-dependencies.version>
+    <google.cloud.shared-dependencies.version>3.0.5</google.cloud.shared-dependencies.version>
   </properties>
 
   <dependencyManagement>
@@ -70,7 +70,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-storage</artifactId>
-        <version>2.13.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
+        <version>2.13.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.apis</groupId>
@@ -80,7 +80,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-pubsub</artifactId>
-        <version>1.120.20</version>
+        <version>1.120.22</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -92,7 +92,7 @@
       <dependency>
         <groupId>org.mockito</groupId>
         <artifactId>mockito-core</artifactId>
-        <version>4.8.0</version>
+        <version>4.8.1</version>
         <scope>test</scope>
         <exclusions>
           <exclusion>
@@ -111,17 +111,17 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-storage-v2</artifactId>
-        <version>2.13.1-alpha-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-storage-v2:current} -->
+        <version>2.13.2-alpha-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-storage-v2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>grpc-google-cloud-storage-v2</artifactId>
-        <version>2.13.1-alpha-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-storage-v2:current} -->
+        <version>2.13.2-alpha-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-storage-v2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>gapic-google-cloud-storage-v2</artifactId>
-        <version>2.13.1-alpha-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-storage-v2:current} -->
+        <version>2.13.2-alpha-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-storage-v2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>

diff --git a/proto-google-cloud-storage-v2/pom.xml b/proto-google-cloud-storage-v2/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.api.grpc</groupId>
   <artifactId>proto-google-cloud-storage-v2</artifactId>
-  <version>2.13.1-alpha-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-storage-v2:current} -->
+  <version>2.13.2-alpha-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-storage-v2:current} -->
   <name>proto-google-cloud-storage-v2</name>
   <description>PROTO library for proto-google-cloud-storage-v2</description>
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-storage-parent</artifactId>
-    <version>2.13.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
+    <version>2.13.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
   </parent>
   <dependencies>
     <dependency>

diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-storage</artifactId>
-      <version>2.13.0</version>
+      <version>2.13.1</version>
     </dependency>
     <!-- [END storage_install_without_bom] -->
 
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-pubsub</artifactId>
-      <version>1.120.20</version>
+      <version>1.120.22</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/samples/native-image-sample/pom.xml b/samples/native-image-sample/pom.xml
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-pubsub</artifactId>
-      <version>1.120.20</version>
+      <version>1.120.22</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -134,7 +134,7 @@
           <plugin>
             <groupId>org.graalvm.buildtools</groupId>
             <artifactId>native-maven-plugin</artifactId>
-            <version>0.9.14</version>
+            <version>0.9.16</version>
             <extensions>true</extensions>
             <configuration>
               <mainClass>com.example.storage.NativeImageStorageSample</mainClass>

diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-storage</artifactId>
-      <version>2.13.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
+      <version>2.13.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
     </dependency>
 
     <dependency>
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-pubsub</artifactId>
-      <version>1.120.20</version>
+      <version>1.120.22</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-pubsub</artifactId>
-      <version>1.120.20</version>
+      <version>1.120.22</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/samples/snippets/src/main/java/com/example/storage/bucket/CreateBucketDualRegion.java b/samples/snippets/src/main/java/com/example/storage/bucket/CreateBucketDualRegion.java
@@ -71,8 +71,10 @@ public static void createBucketDualRegion(
             + bucket.getName()
             + " in location "
             + bucket.getLocation()
-            + " with regions "
-            + bucket.getCustomPlacementConfig().getDataLocations().toString());
+            + " with location type "
+            + bucket.getLocationType()
+            + " with Custom Placement Config "
+            + bucket.getCustomPlacementConfig().toString());
   }
 }
 // [END storage_create_bucket_dual_region]
diff --git a/versions.txt b/versions.txt
@@ -1,7 +1,7 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-storage:2.13.0:2.13.1-SNAPSHOT
-gapic-google-cloud-storage-v2:2.13.0-alpha:2.13.1-alpha-SNAPSHOT
-grpc-google-cloud-storage-v2:2.13.0-alpha:2.13.1-alpha-SNAPSHOT
-proto-google-cloud-storage-v2:2.13.0-alpha:2.13.1-alpha-SNAPSHOT
+google-cloud-storage:2.13.1:2.13.2-SNAPSHOT
+gapic-google-cloud-storage-v2:2.13.1-alpha:2.13.2-alpha-SNAPSHOT
+grpc-google-cloud-storage-v2:2.13.1-alpha:2.13.2-alpha-SNAPSHOT
+proto-google-cloud-storage-v2:2.13.1-alpha:2.13.2-alpha-SNAPSHOT