googleapis · Oct 4, 2021 · Oct 4, 2021 · Oct 4, 2021 · Oct 5, 2021 · Oct 5, 2021
diff --git a/.repo-metadata.json b/.repo-metadata.json
@@ -2,7 +2,7 @@
   "name": "storage",
   "name_pretty": "Cloud Storage",
   "product_documentation": "https://cloud.google.com/storage",
-  "client_documentation": "https://googleapis.dev/java/google-cloud-storage/latest/index.html",
+  "client_documentation": "https://cloud.google.com/java/docs/reference/google-cloud-storage/latest/history",
   "api_description": "is a durable and highly available object storage service. Google Cloud Storage is almost infinitely scalable and guarantees consistency: when a write succeeds, the latest copy of the object will be returned to any GET, globally.",
   "issue_tracker": "https://issuetracker.google.com/savedsearches/559782",
   "release_level": "ga",

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+### [2.1.8](https://www.github.com/googleapis/java-storage/compare/v2.1.7...v2.1.8) (2021-10-18)
+
+
+### Bug Fixes
+
+* regenerate google.cloud.storage.v2 protos ([a7e3b94](https://www.github.com/googleapis/java-storage/commit/a7e3b94e4a3e03599b0dbe51fbe574ed4ea1a0d8))
+
+
+### Dependencies
+
+* update kms.version to v0.93.1 ([#1079](https://www.github.com/googleapis/java-storage/issues/1079)) ([1c52b3d](https://www.github.com/googleapis/java-storage/commit/1c52b3db6699c2ad325853e95231e1a908da069f))
+
 ### [2.1.7](https://www.github.com/googleapis/java-storage/compare/v2.1.6...v2.1.7) (2021-10-04)
 
 

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.1.7-alpha</version><!-- {x-version-update:gapic-google-cloud-storage-v2:current} -->
+  <version>2.1.8-alpha</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.1.7</version><!-- {x-version-update:google-cloud-storage:current} -->
+    <version>2.1.8</version><!-- {x-version-update:google-cloud-storage:current} -->
   </parent>
   <dependencies>
     <dependency>

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/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.1.7</version><!-- {x-version-update:google-cloud-storage:current} -->
+  <version>2.1.8</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.1.7</version><!-- {x-version-update:google-cloud-storage:current} -->
+    <version>2.1.8</version><!-- {x-version-update:google-cloud-storage:current} -->
   </parent>
   <properties>
     <site.installationModule>google-cloud-storage</site.installationModule>
-    <kms.version>0.93.0</kms.version>
+    <kms.version>0.93.1</kms.version>
   </properties>
   <dependencies>
     <dependency>

diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/NewRetryAlgorithmManager.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/NewRetryAlgorithmManager.java
@@ -17,6 +17,7 @@
 package com.google.cloud.storage;
 
 import com.google.api.client.googleapis.json.GoogleJsonResponseException;
+import com.google.api.client.http.HttpResponseException;
 import com.google.api.services.storage.model.Bucket;
 import com.google.api.services.storage.model.BucketAccessControl;
 import com.google.api.services.storage.model.HmacKeyMetadata;
@@ -129,9 +130,8 @@ public ExceptionHandler getForBucketsList(Map<StorageRpc.Option, ?> optionsMap)
   @Override
   public ExceptionHandler getForBucketsLockRetentionPolicy(
       Bucket pb, Map<StorageRpc.Option, ?> optionsMap) {
-    return optionsMap.containsKey(StorageRpc.Option.IF_METAGENERATION_MATCH)
-        ? IDEMPOTENT_HANDLER
-        : NON_IDEMPOTENT_HANDLER;
+    // Always idempotent because IfMetagenerationMatch is required
+    return IDEMPOTENT_HANDLER;
   }
 
   @Override
@@ -143,10 +143,7 @@ public ExceptionHandler getForBucketsGetIamPolicy(
   @Override
   public ExceptionHandler getForBucketsSetIamPolicy(
       String bucket, Policy pb, Map<StorageRpc.Option, ?> optionsMap) {
-    // TODO: Include etag when it is supported by the library
-    return optionsMap.containsKey(StorageRpc.Option.IF_METAGENERATION_MATCH)
-        ? IDEMPOTENT_HANDLER
-        : NON_IDEMPOTENT_HANDLER;
+    return pb.getEtag() != null ? IDEMPOTENT_HANDLER : NON_IDEMPOTENT_HANDLER;
   }
 
   @Override
@@ -274,9 +271,7 @@ public ExceptionHandler getForObjectsList(String bucket, Map<StorageRpc.Option,
 
   @Override
   public ExceptionHandler getForObjectsRewrite(RewriteRequest pb) {
-    return (pb.sourceOptions.containsKey(StorageRpc.Option.IF_SOURCE_GENERATION_MATCH)
-                || pb.sourceOptions.containsKey(StorageRpc.Option.IF_GENERATION_MATCH))
-            && pb.targetOptions.containsKey(StorageRpc.Option.IF_GENERATION_MATCH)
+    return pb.targetOptions.containsKey(StorageRpc.Option.IF_GENERATION_MATCH)
         ? IDEMPOTENT_HANDLER
         : NON_IDEMPOTENT_HANDLER;
   }
@@ -334,6 +329,9 @@ public RetryResult beforeEval(Exception exception) {
         //noinspection StatementWithEmptyBody
         if (cause instanceof GoogleJsonResponseException) {
           // this is handled by the case for BaseServiceException below
+        } else if (cause instanceof HttpResponseException) {
+          int code = ((HttpResponseException) cause).getStatusCode();
+          return shouldRetryCode(code);
         } else if (cause instanceof IOException) {
           IOException ioException = (IOException) cause;
           return BaseServiceException.isRetryable(idempotent, ioException)
@@ -344,13 +342,17 @@ public RetryResult beforeEval(Exception exception) {
 
       if (exception instanceof BaseServiceException) {
         int code = ((BaseServiceException) exception).getCode();
-        if (retryableCodes.contains(code)) {
-          return RetryResult.RETRY;
-        } else {
-          return RetryResult.NO_RETRY;
-        }
+        return shouldRetryCode(code);
       }
       return RetryResult.CONTINUE_EVALUATION;
     }
+
+    private RetryResult shouldRetryCode(int code) {
+      if (retryableCodes.contains(code)) {
+        return RetryResult.RETRY;
+      } else {
+        return RetryResult.NO_RETRY;
+      }
+    }
   }
 }