Skip to content

Commit bd818b3

Browse files
gcf-owl-bot[bot]BenWhitehead
gcf-owl-bot[bot]
and
BenWhitehead
authored
feat: regenerate gapic storage v2 client as of googleapis/googleapis@844d0f7 (#1673)
feat: Add routing annotations feat!: Update CreateBucket spec to state that bucket field is not REQUIRED feat!: Update UpdateBucketRequest to state that bucket and update_mask fields are REQUIRED feat!: Update ReadObjectRequest to state that bucket and object fields are REQUIRED feat!: Update WriteObjectSpec to state that resource field is REQUIRED feat!: Update RewriteObjectRequest to state that destination_name and destination_bucket fields are REQUIRED feat!: Update StartResumableWriteRequest to state that write_object_spec field is REQUIRED feat!: Update UpdateObjectRequest to state that object and update_mask fields are REQUIRED docs: Remove OPTIONAL annotations on fields where the fields aren't required, and to remove proto-optional annotations feat!: Update BucketAccessControl and specs to include new entity_alt field. PiperOrigin-RevId: 477175825 Source-Link: googleapis/googleapis@844d0f7 Source-Link: https://github.com/googleapis/googleapis-gen/commit/603a9c8a2ef36a408b09961300304446ead9aa43 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNjAzYTljOGEyZWYzNmE0MDhiMDk5NjEzMDAzMDQ0NDZlYWQ5YWE0MyJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: update clirr rules for new proto definition Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: BenWhitehead <BenWhitehead@users.noreply.github.com>
1 parent f74d1ee commit bd818b3

31 files changed

+1859
-1085
lines changed

‎gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageClient.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -442,9 +442,9 @@ public final UnaryCallable<GetBucketRequest, Bucket> getBucketCallable() {
442442
* }</pre>
443443
*
444444
* @param parent Required. The project to which this bucket will belong.
445-
* @param bucket Required. Properties of the new bucket being inserted. The project and name of
446-
* the bucket are specified in the parent and bucket_id fields, respectively. Populating those
447-
* fields in `bucket` will result in an error.
445+
* @param bucket Properties of the new bucket being inserted. The project and name of the bucket
446+
* are specified in the parent and bucket_id fields, respectively. Populating those fields in
447+
* `bucket` will result in an error.
448448
* @param bucketId Required. The ID to use for this bucket, which will become the final component
449449
* of the bucket's resource name. For example, the value `foo` might result in a bucket with
450450
* the name `projects/123456/buckets/foo`.
@@ -481,9 +481,9 @@ public final Bucket createBucket(ProjectName parent, Bucket bucket, String bucke
481481
* }</pre>
482482
*
483483
* @param parent Required. The project to which this bucket will belong.
484-
* @param bucket Required. Properties of the new bucket being inserted. The project and name of
485-
* the bucket are specified in the parent and bucket_id fields, respectively. Populating those
486-
* fields in `bucket` will result in an error.
484+
* @param bucket Properties of the new bucket being inserted. The project and name of the bucket
485+
* are specified in the parent and bucket_id fields, respectively. Populating those fields in
486+
* `bucket` will result in an error.
487487
* @param bucketId Required. The ID to use for this bucket, which will become the final component
488488
* of the bucket's resource name. For example, the value `foo` might result in a bucket with
489489
* the name `projects/123456/buckets/foo`.
@@ -1256,9 +1256,9 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
12561256
* }
12571257
* }</pre>
12581258
*
1259-
* @param bucket The bucket to update. The bucket's `name` field will be used to identify the
1260-
* bucket.
1261-
* @param updateMask List of fields to be updated.
1259+
* @param bucket Required. The bucket to update. The bucket's `name` field will be used to
1260+
* identify the bucket.
1261+
* @param updateMask Required. List of fields to be updated.
12621262
* <p>To specify ALL fields, equivalent to the JSON API's "update" function, specify a single
12631263
* field with the value `&#42;`. Note: not recommended. If a new field is introduced at a
12641264
* later time, an older client updating with the `&#42;` may accidentally reset the new
@@ -2338,11 +2338,11 @@ public final ServerStreamingCallable<ReadObjectRequest, ReadObjectResponse> read
23382338
* }
23392339
* }</pre>
23402340
*
2341-
* @param object The object to update. The object's bucket and name fields are used to identify
2342-
* the object to update. If present, the object's generation field selects a specific revision
2343-
* of this object whose metadata should be updated. Otherwise, assumes the live version of the
2344-
* object.
2345-
* @param updateMask List of fields to be updated.
2341+
* @param object Required. The object to update. The object's bucket and name fields are used to
2342+
* identify the object to update. If present, the object's generation field selects a specific
2343+
* revision of this object whose metadata should be updated. Otherwise, assumes the live
2344+
* version of the object.
2345+
* @param updateMask Required. List of fields to be updated.
23462346
* <p>To specify ALL fields, equivalent to the JSON API's "update" function, specify a single
23472347
* field with the value `&#42;`. Note: not recommended. If a new field is introduced at a
23482348
* later time, an older client updating with the `&#42;` may accidentally reset the new

‎gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/GrpcStorageStub.java‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,10 @@ public class GrpcStorageStub extends StorageStub {
432432
private static final PathTemplate DELETE_BUCKET_0_PATH_TEMPLATE =
433433
PathTemplate.create("{bucket=**}");
434434
private static final PathTemplate GET_BUCKET_0_PATH_TEMPLATE = PathTemplate.create("{bucket=**}");
435+
private static final PathTemplate CREATE_BUCKET_0_PATH_TEMPLATE =
436+
PathTemplate.create("{project=**}");
437+
private static final PathTemplate LIST_BUCKETS_0_PATH_TEMPLATE =
438+
PathTemplate.create("{project=**}");
435439
private static final PathTemplate LOCK_BUCKET_RETENTION_POLICY_0_PATH_TEMPLATE =
436440
PathTemplate.create("{bucket=**}");
437441
private static final PathTemplate GET_IAM_POLICY_0_PATH_TEMPLATE =
@@ -481,6 +485,18 @@ public class GrpcStorageStub extends StorageStub {
481485
PathTemplate.create("{bucket=**}");
482486
private static final PathTemplate QUERY_WRITE_STATUS_0_PATH_TEMPLATE =
483487
PathTemplate.create("{bucket=projects/*/buckets/*}/**");
488+
private static final PathTemplate GET_SERVICE_ACCOUNT_0_PATH_TEMPLATE =
489+
PathTemplate.create("{project=**}");
490+
private static final PathTemplate CREATE_HMAC_KEY_0_PATH_TEMPLATE =
491+
PathTemplate.create("{project=**}");
492+
private static final PathTemplate DELETE_HMAC_KEY_0_PATH_TEMPLATE =
493+
PathTemplate.create("{project=**}");
494+
private static final PathTemplate GET_HMAC_KEY_0_PATH_TEMPLATE =
495+
PathTemplate.create("{project=**}");
496+
private static final PathTemplate LIST_HMAC_KEYS_0_PATH_TEMPLATE =
497+
PathTemplate.create("{project=**}");
498+
private static final PathTemplate UPDATE_HMAC_KEY_0_PATH_TEMPLATE =
499+
PathTemplate.create("{project=**}");
484500

485501
public static final GrpcStorageStub create(StorageStubSettings settings) throws IOException {
486502
return new GrpcStorageStub(settings, ClientContext.create(settings));
@@ -540,10 +556,22 @@ protected GrpcStorageStub(
540556
GrpcCallSettings<CreateBucketRequest, Bucket> createBucketTransportSettings =
541557
GrpcCallSettings.<CreateBucketRequest, Bucket>newBuilder()
542558
.setMethodDescriptor(createBucketMethodDescriptor)
559+
.setParamsExtractor(
560+
request -> {
561+
RequestParamsBuilder builder = RequestParamsBuilder.create();
562+
builder.add(request.getParent(), "project", CREATE_BUCKET_0_PATH_TEMPLATE);
563+
return builder.build();
564+
})
543565
.build();
544566
GrpcCallSettings<ListBucketsRequest, ListBucketsResponse> listBucketsTransportSettings =
545567
GrpcCallSettings.<ListBucketsRequest, ListBucketsResponse>newBuilder()
546568
.setMethodDescriptor(listBucketsMethodDescriptor)
569+
.setParamsExtractor(
570+
request -> {
571+
RequestParamsBuilder builder = RequestParamsBuilder.create();
572+
builder.add(request.getParent(), "project", LIST_BUCKETS_0_PATH_TEMPLATE);
573+
return builder.build();
574+
})
547575
.build();
548576
GrpcCallSettings<LockBucketRetentionPolicyRequest, Bucket>
549577
lockBucketRetentionPolicyTransportSettings =
@@ -792,26 +820,67 @@ protected GrpcStorageStub(
792820
GrpcCallSettings<GetServiceAccountRequest, ServiceAccount> getServiceAccountTransportSettings =
793821
GrpcCallSettings.<GetServiceAccountRequest, ServiceAccount>newBuilder()
794822
.setMethodDescriptor(getServiceAccountMethodDescriptor)
823+
.setParamsExtractor(
824+
request -> {
825+
RequestParamsBuilder builder = RequestParamsBuilder.create();
826+
builder.add(request.getProject(), "project", GET_SERVICE_ACCOUNT_0_PATH_TEMPLATE);
827+
return builder.build();
828+
})
795829
.build();
796830
GrpcCallSettings<CreateHmacKeyRequest, CreateHmacKeyResponse> createHmacKeyTransportSettings =
797831
GrpcCallSettings.<CreateHmacKeyRequest, CreateHmacKeyResponse>newBuilder()
798832
.setMethodDescriptor(createHmacKeyMethodDescriptor)
833+
.setParamsExtractor(
834+
request -> {
835+
RequestParamsBuilder builder = RequestParamsBuilder.create();
836+
builder.add(request.getProject(), "project", CREATE_HMAC_KEY_0_PATH_TEMPLATE);
837+
return builder.build();
838+
})
799839
.build();
800840
GrpcCallSettings<DeleteHmacKeyRequest, Empty> deleteHmacKeyTransportSettings =
801841
GrpcCallSettings.<DeleteHmacKeyRequest, Empty>newBuilder()
802842
.setMethodDescriptor(deleteHmacKeyMethodDescriptor)
843+
.setParamsExtractor(
844+
request -> {
845+
RequestParamsBuilder builder = RequestParamsBuilder.create();
846+
builder.add(request.getProject(), "project", DELETE_HMAC_KEY_0_PATH_TEMPLATE);
847+
return builder.build();
848+
})
803849
.build();
804850
GrpcCallSettings<GetHmacKeyRequest, HmacKeyMetadata> getHmacKeyTransportSettings =
805851
GrpcCallSettings.<GetHmacKeyRequest, HmacKeyMetadata>newBuilder()
806852
.setMethodDescriptor(getHmacKeyMethodDescriptor)
853+
.setParamsExtractor(
854+
request -> {
855+
RequestParamsBuilder builder = RequestParamsBuilder.create();
856+
builder.add(request.getProject(), "project", GET_HMAC_KEY_0_PATH_TEMPLATE);
857+
return builder.build();
858+
})
807859
.build();
808860
GrpcCallSettings<ListHmacKeysRequest, ListHmacKeysResponse> listHmacKeysTransportSettings =
809861
GrpcCallSettings.<ListHmacKeysRequest, ListHmacKeysResponse>newBuilder()
810862
.setMethodDescriptor(listHmacKeysMethodDescriptor)
863+
.setParamsExtractor(
864+
request -> {
865+
RequestParamsBuilder builder = RequestParamsBuilder.create();
866+
builder.add(request.getProject(), "project", LIST_HMAC_KEYS_0_PATH_TEMPLATE);
867+
return builder.build();
868+
})
811869
.build();
812870
GrpcCallSettings<UpdateHmacKeyRequest, HmacKeyMetadata> updateHmacKeyTransportSettings =
813871
GrpcCallSettings.<UpdateHmacKeyRequest, HmacKeyMetadata>newBuilder()
814872
.setMethodDescriptor(updateHmacKeyMethodDescriptor)
873+
.setParamsExtractor(
874+
request -> {
875+
RequestParamsBuilder builder = RequestParamsBuilder.create();
876+
if (request.getHmacKey() != null) {
877+
builder.add(
878+
request.getHmacKey().getProject(),
879+
"project",
880+
UPDATE_HMAC_KEY_0_PATH_TEMPLATE);
881+
}
882+
return builder.build();
883+
})
815884
.build();
816885

817886
this.deleteBucketCallable =

‎proto-google-cloud-storage-v2/clirr-ignored-differences.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,23 @@
2020
<method>* *ObjectSize()</method>
2121
</difference>
2222

23+
<!-- Allow adding new entity_alt field to Acls -->
24+
<difference>
25+
<differenceType>7012</differenceType>
26+
<className>com/google/storage/v2/BucketAccessControlOrBuilder</className>
27+
<method>* *EntityAlt*()</method>
28+
</difference>
29+
<difference>
30+
<differenceType>7012</differenceType>
31+
<className>com/google/storage/v2/ObjectAccessControlOrBuilder</className>
32+
<method>* *EntityAlt*()</method>
33+
</difference>
34+
35+
<!-- Allow Bucket.RetentionPolicy.retention_period to be optional -->
36+
<difference>
37+
<differenceType>7012</differenceType>
38+
<className>com/google/storage/v2/Bucket$RetentionPolicyOrBuilder</className>
39+
<method>boolean hasRetentionPeriod()</method>
40+
</difference>
41+
2342
</differences>

0 commit comments

Comments
 (0)