fix: regenerate google.cloud.storage.v2 protos

* fix!: rename committed_size to persisted_size * fix!: replace string key_sha256 with bytes key_sha256_bytes * fix: deprecate zone_affinity field * fix: add INHERITED to PublicAccessPrevention enum PiperOrigin-RevId: 402986756 Source-Author: Google APIs <noreply@google.com> Source-Date: Wed Oct 13 20:18:42 2021 -0700 Source-Repo: googleapis/googleapis Source-Sha: 877d3d9d02591ad612a2c8654b42c37ba09ff9ec Source-Link: googleapis/googleapis@877d3d9 * chore: add clirr rules to allow field renaming in alpha protos Co-authored-by: BenWhitehead <BenWhitehead@users.noreply.github.com>
googleapis · Oct 18, 2021 · a7e3b94 · a7e3b94
1 parent ada8d94
commit a7e3b94
Show file tree

Hide file tree

Showing 15 changed files with 422 additions and 380 deletions.
diff --git a/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageClient.java b/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageClient.java
@@ -190,7 +190,7 @@ public final ServerStreamingCallable<ReadObjectRequest, ReadObjectResponse> read
    * that method an `WriteObjectSpec.` They should then attach the returned `upload_id` to the first
    * message of each following call to `Create`. If there is an error or the connection is broken
    * during the resumable `Create()`, the client should check the status of the `Create()` by
-   * calling `QueryWriteStatus()` and continue writing from the returned `committed_size`. This may
+   * calling `QueryWriteStatus()` and continue writing from the returned `persisted_size`. This may
    * be less than the amount of data the client previously sent.
    *
    * <p>The service will not view the object as complete until the client has sent a
@@ -294,7 +294,7 @@ public final StartResumableWriteResponse startResumableWrite(StartResumableWrite
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
-   * Determines the `committed_size` for an object that is being written, which can then be used as
+   * Determines the `persisted_size` for an object that is being written, which can then be used as
    * the `write_offset` for the next `Write()` call.
    *
    * <p>If the object does not exist (i.e., the object has been deleted, or the first `Write()` has
@@ -303,7 +303,7 @@ public final StartResumableWriteResponse startResumableWrite(StartResumableWrite
    * <p>The client &#42;&#42;may&#42;&#42; call `QueryWriteStatus()` at any time to determine how
    * much data has been processed for this object. This is useful if the client is buffering data
    * and needs to know which data can be safely evicted. For any sequence of `QueryWriteStatus()`
-   * calls for a given object name, the sequence of returned `committed_size` values will be
+   * calls for a given object name, the sequence of returned `persisted_size` values will be
    * non-decreasing.
    *
    * <p>Sample code:
@@ -327,7 +327,7 @@ public final QueryWriteStatusResponse queryWriteStatus(String uploadId) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
-   * Determines the `committed_size` for an object that is being written, which can then be used as
+   * Determines the `persisted_size` for an object that is being written, which can then be used as
    * the `write_offset` for the next `Write()` call.
    *
    * <p>If the object does not exist (i.e., the object has been deleted, or the first `Write()` has
@@ -336,7 +336,7 @@ public final QueryWriteStatusResponse queryWriteStatus(String uploadId) {
    * <p>The client &#42;&#42;may&#42;&#42; call `QueryWriteStatus()` at any time to determine how
    * much data has been processed for this object. This is useful if the client is buffering data
    * and needs to know which data can be safely evicted. For any sequence of `QueryWriteStatus()`
-   * calls for a given object name, the sequence of returned `committed_size` values will be
+   * calls for a given object name, the sequence of returned `persisted_size` values will be
    * non-decreasing.
    *
    * <p>Sample code:
@@ -362,7 +362,7 @@ public final QueryWriteStatusResponse queryWriteStatus(QueryWriteStatusRequest r
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
-   * Determines the `committed_size` for an object that is being written, which can then be used as
+   * Determines the `persisted_size` for an object that is being written, which can then be used as
    * the `write_offset` for the next `Write()` call.
    *
    * <p>If the object does not exist (i.e., the object has been deleted, or the first `Write()` has
@@ -371,7 +371,7 @@ public final QueryWriteStatusResponse queryWriteStatus(QueryWriteStatusRequest r
    * <p>The client &#42;&#42;may&#42;&#42; call `QueryWriteStatus()` at any time to determine how
    * much data has been processed for this object. This is useful if the client is buffering data
    * and needs to know which data can be safely evicted. For any sequence of `QueryWriteStatus()`
-   * calls for a given object name, the sequence of returned `committed_size` values will be
+   * calls for a given object name, the sequence of returned `persisted_size` values will be
    * non-decreasing.
    *
    * <p>Sample code:

diff --git a/grpc-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageGrpc.java b/grpc-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageGrpc.java
@@ -287,7 +287,7 @@ public void readObject(
      * each following call to `Create`. If there is an error or the connection is
      * broken during the resumable `Create()`, the client should check the status
      * of the `Create()` by calling `QueryWriteStatus()` and continue writing from
-     * the returned `committed_size`. This may be less than the amount of data the
+     * the returned `persisted_size`. This may be less than the amount of data the
      * client previously sent.
      * The service will not view the object as complete until the client has
      * sent a `WriteObjectRequest` with `finish_write` set to `true`. Sending any
@@ -324,7 +324,7 @@ public void startResumableWrite(
      *
      *
      * <pre>
-     * Determines the `committed_size` for an object that is being written, which
+     * Determines the `persisted_size` for an object that is being written, which
      * can then be used as the `write_offset` for the next `Write()` call.
      * If the object does not exist (i.e., the object has been deleted, or the
      * first `Write()` has not yet reached the service), this method returns the
@@ -333,7 +333,7 @@ public void startResumableWrite(
      * much data has been processed for this object. This is useful if the
      * client is buffering data and needs to know which data can be safely
      * evicted. For any sequence of `QueryWriteStatus()` calls for a given
-     * object name, the sequence of returned `committed_size` values will be
+     * object name, the sequence of returned `persisted_size` values will be
      * non-decreasing.
      * </pre>
      */
@@ -426,7 +426,7 @@ public void readObject(
      * each following call to `Create`. If there is an error or the connection is
      * broken during the resumable `Create()`, the client should check the status
      * of the `Create()` by calling `QueryWriteStatus()` and continue writing from
-     * the returned `committed_size`. This may be less than the amount of data the
+     * the returned `persisted_size`. This may be less than the amount of data the
      * client previously sent.
      * The service will not view the object as complete until the client has
      * sent a `WriteObjectRequest` with `finish_write` set to `true`. Sending any
@@ -465,7 +465,7 @@ public void startResumableWrite(
      *
      *
      * <pre>
-     * Determines the `committed_size` for an object that is being written, which
+     * Determines the `persisted_size` for an object that is being written, which
      * can then be used as the `write_offset` for the next `Write()` call.
      * If the object does not exist (i.e., the object has been deleted, or the
      * first `Write()` has not yet reached the service), this method returns the
@@ -474,7 +474,7 @@ public void startResumableWrite(
      * much data has been processed for this object. This is useful if the
      * client is buffering data and needs to know which data can be safely
      * evicted. For any sequence of `QueryWriteStatus()` calls for a given
-     * object name, the sequence of returned `committed_size` values will be
+     * object name, the sequence of returned `persisted_size` values will be
      * non-decreasing.
      * </pre>
      */
@@ -539,7 +539,7 @@ public com.google.storage.v2.StartResumableWriteResponse startResumableWrite(
      *
      *
      * <pre>
-     * Determines the `committed_size` for an object that is being written, which
+     * Determines the `persisted_size` for an object that is being written, which
      * can then be used as the `write_offset` for the next `Write()` call.
      * If the object does not exist (i.e., the object has been deleted, or the
      * first `Write()` has not yet reached the service), this method returns the
@@ -548,7 +548,7 @@ public com.google.storage.v2.StartResumableWriteResponse startResumableWrite(
      * much data has been processed for this object. This is useful if the
      * client is buffering data and needs to know which data can be safely
      * evicted. For any sequence of `QueryWriteStatus()` calls for a given
-     * object name, the sequence of returned `committed_size` values will be
+     * object name, the sequence of returned `persisted_size` values will be
      * non-decreasing.
      * </pre>
      */
@@ -597,7 +597,7 @@ protected StorageFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions c
      *
      *
      * <pre>
-     * Determines the `committed_size` for an object that is being written, which
+     * Determines the `persisted_size` for an object that is being written, which
      * can then be used as the `write_offset` for the next `Write()` call.
      * If the object does not exist (i.e., the object has been deleted, or the
      * first `Write()` has not yet reached the service), this method returns the
@@ -606,7 +606,7 @@ protected StorageFutureStub build(io.grpc.Channel channel, io.grpc.CallOptions c
      * much data has been processed for this object. This is useful if the
      * client is buffering data and needs to know which data can be safely
      * evicted. For any sequence of `QueryWriteStatus()` calls for a given
-     * object name, the sequence of returned `committed_size` values will be
+     * object name, the sequence of returned `persisted_size` values will be
      * non-decreasing.
      * </pre>
      */

diff --git a/proto-google-cloud-storage-v2/clirr-ignored-differences.xml b/proto-google-cloud-storage-v2/clirr-ignored-differences.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- see https://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
+<differences>
+    <!--
+      - Rename committed_size -> persisted_size
+      - * QueryWriteStatusResponse
+      - * WriteObjectResponse
+      -->
+
+    <!-- remove committed_size -->
+    <difference>
+        <differenceType>6001</differenceType>
+        <className>com/google/storage/v2/*</className>
+        <field>COMMITTED_SIZE</field>
+    </difference>
+    <difference>
+        <differenceType>6011</differenceType>
+        <className>com/google/storage/v2/*</className>
+        <field>COMMITTED_SIZE_FIELD_NUMBER</field>
+    </difference>
+    <difference>
+        <differenceType>7002</differenceType>
+        <className>com/google/storage/v2/*</className>
+        <method>* *CommittedSize(*)</method>
+    </difference>
+    <!-- add PersistedSize -->
+    <difference>
+        <differenceType>7012</differenceType>
+        <className>com/google/storage/v2/*</className>
+        <method>* *PersistedSize(*)</method>
+    </difference>
+
+    <!--
+      - Change type String key_sha256 -> bytes key_sha256_bytes
+      - * Object.CustomerEncryption
+      -->
+    <!---->
+
+    <!-- remove key_sha256 -->
+    <difference>
+        <differenceType>6011</differenceType>
+        <className>com/google/storage/v2/Object$CustomerEncryption*</className>
+        <field>KEY_SHA256_FIELD_NUMBER</field>
+    </difference>
+    <difference>
+        <differenceType>7002</differenceType>
+        <className>com/google/storage/v2/Object$CustomerEncryption*</className>
+        <method>* *KeySha256(*)</method>
+    </difference>
+    <!-- add PersistedSize -->
+    <difference>
+        <differenceType>7012</differenceType>
+        <className>com/google/storage/v2/Object$CustomerEncryption*</className>
+        <method>* *KeySha256Bytes(*)</method>
+    </difference>
+</differences>