From 7354e198521384cd2b8583f073217a5a6cb74fe0 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Tue, 11 Apr 2023 16:43:07 -0400 Subject: [PATCH] docs: Update spec for WriteObjectRequest.object_size to clarify that it applies to both one-shot and resumable writes (#1976) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: Update spec for WriteObjectRequest.object_size to clarify that it applies to both one-shot and resumable writes docs: update routing annotations for CancelResumableWriteRequest and QueryWriteStatusRequest docs: add pointer to public documentation URL PiperOrigin-RevId: 523412992 Source-Link: https://github.com/googleapis/googleapis/commit/11ddd42bcee5961c34e8529638d51e9866b65065 Source-Link: https://github.com/googleapis/googleapis-gen/commit/dfb931e19bca32bcb1aa235745599b0fa5a5a222 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZGZiOTMxZTE5YmNhMzJiY2IxYWEyMzU3NDU1OTliMGZhNWE1YTIyMiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot --- .../java/com/google/storage/v2/stub/GrpcStorageStub.java | 4 ++-- .../src/main/java/com/google/storage/v2/StorageProto.java | 4 ++-- .../main/java/com/google/storage/v2/WriteObjectSpec.java | 6 ------ .../com/google/storage/v2/WriteObjectSpecOrBuilder.java | 2 -- .../src/main/proto/google/storage/v2/storage.proto | 6 ++---- 5 files changed, 6 insertions(+), 16 deletions(-) diff --git a/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/GrpcStorageStub.java b/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/GrpcStorageStub.java index bf3d10640..d9519f9f9 100644 --- a/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/GrpcStorageStub.java +++ b/gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/GrpcStorageStub.java @@ -472,7 +472,7 @@ public class GrpcStorageStub extends StorageStub { private static final PathTemplate DELETE_OBJECT_0_PATH_TEMPLATE = PathTemplate.create("{bucket=**}"); private static final PathTemplate CANCEL_RESUMABLE_WRITE_0_PATH_TEMPLATE = - PathTemplate.create("{bucket=projects/*/buckets/*}/**"); + PathTemplate.create("{bucket=projects/*/buckets/*}:**"); private static final PathTemplate GET_OBJECT_0_PATH_TEMPLATE = PathTemplate.create("{bucket=**}"); private static final PathTemplate READ_OBJECT_0_PATH_TEMPLATE = PathTemplate.create("{bucket=**}"); @@ -487,7 +487,7 @@ public class GrpcStorageStub extends StorageStub { private static final PathTemplate START_RESUMABLE_WRITE_0_PATH_TEMPLATE = PathTemplate.create("{bucket=**}"); private static final PathTemplate QUERY_WRITE_STATUS_0_PATH_TEMPLATE = - PathTemplate.create("{bucket=projects/*/buckets/*}/**"); + PathTemplate.create("{bucket=projects/*/buckets/*}:**"); private static final PathTemplate GET_SERVICE_ACCOUNT_0_PATH_TEMPLATE = PathTemplate.create("{project=**}"); private static final PathTemplate CREATE_HMAC_KEY_0_PATH_TEMPLATE = diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageProto.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageProto.java index d627232b0..d4fb8f7df 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageProto.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageProto.java @@ -811,7 +811,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "ncelResumableWriteRequest\032/.google.stora" + "ge.v2.CancelResumableWriteResponse\"A\212\323\344\223" + "\002/\022-\n\tupload_id\022 {bucket=projects/*/buck" - + "ets/*}/**\332A\tupload_id\022\225\001\n\tGetObject\022#.go" + + "ets/*}:**\332A\tupload_id\022\225\001\n\tGetObject\022#.go" + "ogle.storage.v2.GetObjectRequest\032\031.googl" + "e.storage.v2.Object\"H\212\323\344\223\002\027\022\025\n\006bucket\022\013{" + "bucket=**}\332A\rbucket,object\332A\030bucket,obje" @@ -841,7 +841,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "storage.v2.QueryWriteStatusRequest\032+.goo" + "gle.storage.v2.QueryWriteStatusResponse\"" + "A\212\323\344\223\002/\022-\n\tupload_id\022 {bucket=projects/*" - + "/buckets/*}/**\332A\tupload_id\022\200\001\n\021GetServic" + + "/buckets/*}:**\332A\tupload_id\022\200\001\n\021GetServic" + "eAccount\022+.google.storage.v2.GetServiceA" + "ccountRequest\032!.google.storage.v2.Servic" + "eAccount\"\033\212\323\344\223\002\013\022\t\n\007project\332A\007project\022\225\001" diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/WriteObjectSpec.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/WriteObjectSpec.java index 2532f47a8..4eb3c2c7e 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/WriteObjectSpec.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/WriteObjectSpec.java @@ -327,7 +327,6 @@ public long getIfMetagenerationNotMatch() { * This situation is considered a client error, and if such an error occurs * you must start the upload over from scratch, this time sending the correct * number of bytes. - * The `object_size` value is ignored for one-shot (non-resumable) writes. * * * optional int64 object_size = 8; @@ -348,7 +347,6 @@ public boolean hasObjectSize() { * This situation is considered a client error, and if such an error occurs * you must start the upload over from scratch, this time sending the correct * number of bytes. - * The `object_size` value is ignored for one-shot (non-resumable) writes. * * * optional int64 object_size = 8; @@ -1487,7 +1485,6 @@ public Builder clearIfMetagenerationNotMatch() { * This situation is considered a client error, and if such an error occurs * you must start the upload over from scratch, this time sending the correct * number of bytes. - * The `object_size` value is ignored for one-shot (non-resumable) writes. * * * optional int64 object_size = 8; @@ -1508,7 +1505,6 @@ public boolean hasObjectSize() { * This situation is considered a client error, and if such an error occurs * you must start the upload over from scratch, this time sending the correct * number of bytes. - * The `object_size` value is ignored for one-shot (non-resumable) writes. * * * optional int64 object_size = 8; @@ -1529,7 +1525,6 @@ public long getObjectSize() { * This situation is considered a client error, and if such an error occurs * you must start the upload over from scratch, this time sending the correct * number of bytes. - * The `object_size` value is ignored for one-shot (non-resumable) writes. * * * optional int64 object_size = 8; @@ -1554,7 +1549,6 @@ public Builder setObjectSize(long value) { * This situation is considered a client error, and if such an error occurs * you must start the upload over from scratch, this time sending the correct * number of bytes. - * The `object_size` value is ignored for one-shot (non-resumable) writes. * * * optional int64 object_size = 8; diff --git a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/WriteObjectSpecOrBuilder.java b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/WriteObjectSpecOrBuilder.java index 63ddc9749..587cb6b79 100644 --- a/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/WriteObjectSpecOrBuilder.java +++ b/proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/WriteObjectSpecOrBuilder.java @@ -211,7 +211,6 @@ public interface WriteObjectSpecOrBuilder * This situation is considered a client error, and if such an error occurs * you must start the upload over from scratch, this time sending the correct * number of bytes. - * The `object_size` value is ignored for one-shot (non-resumable) writes. * * * optional int64 object_size = 8; @@ -229,7 +228,6 @@ public interface WriteObjectSpecOrBuilder * This situation is considered a client error, and if such an error occurs * you must start the upload over from scratch, this time sending the correct * number of bytes. - * The `object_size` value is ignored for one-shot (non-resumable) writes. * * * optional int64 object_size = 8; diff --git a/proto-google-cloud-storage-v2/src/main/proto/google/storage/v2/storage.proto b/proto-google-cloud-storage-v2/src/main/proto/google/storage/v2/storage.proto index 39df4ee90..9ad3df6d2 100644 --- a/proto-google-cloud-storage-v2/src/main/proto/google/storage/v2/storage.proto +++ b/proto-google-cloud-storage-v2/src/main/proto/google/storage/v2/storage.proto @@ -252,7 +252,7 @@ service Storage { option (google.api.routing) = { routing_parameters { field: "upload_id" - path_template: "{bucket=projects/*/buckets/*}/**" + path_template: "{bucket=projects/*/buckets/*}:**" } }; option (google.api.method_signature) = "upload_id"; @@ -391,7 +391,7 @@ service Storage { option (google.api.routing) = { routing_parameters { field: "upload_id" - path_template: "{bucket=projects/*/buckets/*}/**" + path_template: "{bucket=projects/*/buckets/*}:**" } }; option (google.api.method_signature) = "upload_id"; @@ -963,8 +963,6 @@ message WriteObjectSpec { // This situation is considered a client error, and if such an error occurs // you must start the upload over from scratch, this time sending the correct // number of bytes. - // - // The `object_size` value is ignored for one-shot (non-resumable) writes. optional int64 object_size = 8; }