Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: replace enum with string representation for predefined ACLs and public_access_prevention #1323

Merged
merged 3 commits into from
Mar 30, 2022
Merged

feat: replace enum with string representation for predefined ACLs and public_access_prevention #1323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1214f09
feat!: Replace enum with string representation for predefined ACLs an…
gcf-owl-bot[bot] Mar 29, 2022
33228af
🦉 Updates from OwlBot post-processor
gcf-owl-bot[bot] Mar 29, 2022
33a19ff
chore: add clirr rules to allow change from enum to strings
BenWhitehead Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 14 additions & 14 deletions gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,8 +436,8 @@ public final Bucket createBucket(String parent, Bucket bucket, String bucketId)
* .setParent(ProjectName.of("[PROJECT]").toString())
* .setBucket(Bucket.newBuilder().build())
* .setBucketId("bucketId-1603305307")
* .setPredefinedAcl(PredefinedBucketAcl.forNumber(0))
* .setPredefinedDefaultObjectAcl(PredefinedObjectAcl.forNumber(0))
* .setPredefinedAcl("predefinedAcl1207041188")
* .setPredefinedDefaultObjectAcl("predefinedDefaultObjectAcl2109168048")
* .build();
* Bucket response = storageClient.createBucket(request);
* }
Expand All @@ -463,8 +463,8 @@ public final Bucket createBucket(CreateBucketRequest request) {
* .setParent(ProjectName.of("[PROJECT]").toString())
* .setBucket(Bucket.newBuilder().build())
* .setBucketId("bucketId-1603305307")
* .setPredefinedAcl(PredefinedBucketAcl.forNumber(0))
* .setPredefinedDefaultObjectAcl(PredefinedObjectAcl.forNumber(0))
* .setPredefinedAcl("predefinedAcl1207041188")
* .setPredefinedDefaultObjectAcl("predefinedDefaultObjectAcl2109168048")
* .build();
* ApiFuture<Bucket> future = storageClient.createBucketCallable().futureCall(request);
* // Do something.
Expand Down Expand Up @@ -1089,8 +1089,8 @@ public final Bucket updateBucket(Bucket bucket, FieldMask updateMask) {
* .setBucket(Bucket.newBuilder().build())
* .setIfMetagenerationMatch(1043427781)
* .setIfMetagenerationNotMatch(1025430873)
* .setPredefinedAcl(PredefinedBucketAcl.forNumber(0))
* .setPredefinedDefaultObjectAcl(PredefinedObjectAcl.forNumber(0))
* .setPredefinedAcl("predefinedAcl1207041188")
* .setPredefinedDefaultObjectAcl("predefinedDefaultObjectAcl2109168048")
* .setUpdateMask(FieldMask.newBuilder().build())
* .setCommonRequestParams(CommonRequestParams.newBuilder().build())
* .build();
Expand Down Expand Up @@ -1118,8 +1118,8 @@ public final Bucket updateBucket(UpdateBucketRequest request) {
* .setBucket(Bucket.newBuilder().build())
* .setIfMetagenerationMatch(1043427781)
* .setIfMetagenerationNotMatch(1025430873)
* .setPredefinedAcl(PredefinedBucketAcl.forNumber(0))
* .setPredefinedDefaultObjectAcl(PredefinedObjectAcl.forNumber(0))
* .setPredefinedAcl("predefinedAcl1207041188")
* .setPredefinedDefaultObjectAcl("predefinedDefaultObjectAcl2109168048")
* .setUpdateMask(FieldMask.newBuilder().build())
* .setCommonRequestParams(CommonRequestParams.newBuilder().build())
* .build();
Expand Down Expand Up @@ -1576,7 +1576,7 @@ public final ListNotificationsPagedResponse listNotifications(ListNotificationsR
* ComposeObjectRequest.newBuilder()
* .setDestination(Object.newBuilder().build())
* .addAllSourceObjects(new ArrayList<ComposeObjectRequest.SourceObject>())
* .setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
* .setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
* .setIfGenerationMatch(-1086241088)
* .setIfMetagenerationMatch(1043427781)
* .setKmsKey(
Expand Down Expand Up @@ -1608,7 +1608,7 @@ public final Object composeObject(ComposeObjectRequest request) {
* ComposeObjectRequest.newBuilder()
* .setDestination(Object.newBuilder().build())
* .addAllSourceObjects(new ArrayList<ComposeObjectRequest.SourceObject>())
* .setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
* .setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
* .setIfGenerationMatch(-1086241088)
* .setIfMetagenerationMatch(1043427781)
* .setKmsKey(
Expand Down Expand Up @@ -1949,7 +1949,7 @@ public final Object updateObject(Object object, FieldMask updateMask) {
* .setIfGenerationNotMatch(1475720404)
* .setIfMetagenerationMatch(1043427781)
* .setIfMetagenerationNotMatch(1025430873)
* .setPredefinedAcl(PredefinedObjectAcl.forNumber(0))
* .setPredefinedAcl("predefinedAcl1207041188")
* .setUpdateMask(FieldMask.newBuilder().build())
* .setCommonObjectRequestParams(CommonObjectRequestParams.newBuilder().build())
* .setCommonRequestParams(CommonRequestParams.newBuilder().build())
Expand Down Expand Up @@ -1980,7 +1980,7 @@ public final Object updateObject(UpdateObjectRequest request) {
* .setIfGenerationNotMatch(1475720404)
* .setIfMetagenerationMatch(1043427781)
* .setIfMetagenerationNotMatch(1025430873)
* .setPredefinedAcl(PredefinedObjectAcl.forNumber(0))
* .setPredefinedAcl("predefinedAcl1207041188")
* .setUpdateMask(FieldMask.newBuilder().build())
* .setCommonObjectRequestParams(CommonObjectRequestParams.newBuilder().build())
* .setCommonRequestParams(CommonRequestParams.newBuilder().build())
Expand Down Expand Up @@ -2238,7 +2238,7 @@ public final UnaryCallable<ListObjectsRequest, ListObjectsResponse> listObjectsC
* .setSourceObject("sourceObject1196439354")
* .setSourceGeneration(1232209852)
* .setRewriteToken("rewriteToken80654285")
* .setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
* .setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
* .setIfGenerationMatch(-1086241088)
* .setIfGenerationNotMatch(1475720404)
* .setIfMetagenerationMatch(1043427781)
Expand Down Expand Up @@ -2285,7 +2285,7 @@ public final RewriteResponse rewriteObject(RewriteObjectRequest request) {
* .setSourceObject("sourceObject1196439354")
* .setSourceGeneration(1232209852)
* .setRewriteToken("rewriteToken80654285")
* .setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
* .setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
* .setIfGenerationMatch(-1086241088)
* .setIfGenerationNotMatch(1475720404)
* .setIfMetagenerationMatch(1043427781)
Expand Down
22 changes: 11 additions & 11 deletions gapic-google-cloud-storage-v2/src/test/java/com/google/storage/v2/StorageClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ public void getBucketTest() throws Exception {
.setRetentionPolicy(Bucket.RetentionPolicy.newBuilder().build())
.setIamConfig(Bucket.IamConfig.newBuilder().build())
.setSatisfiesPzs(true)
.setCustomPlacementConfig(Bucket.CustomPlacementConfig.newBuilder().build())
.setAutoclass(Bucket.Autoclass.newBuilder().build())
.build();
mockStorage.addResponse(expectedResponse);

Expand Down Expand Up @@ -260,7 +260,7 @@ public void getBucketTest2() throws Exception {
.setRetentionPolicy(Bucket.RetentionPolicy.newBuilder().build())
.setIamConfig(Bucket.IamConfig.newBuilder().build())
.setSatisfiesPzs(true)
.setCustomPlacementConfig(Bucket.CustomPlacementConfig.newBuilder().build())
.setAutoclass(Bucket.Autoclass.newBuilder().build())
.build();
mockStorage.addResponse(expectedResponse);

Expand Down Expand Up @@ -323,7 +323,7 @@ public void createBucketTest() throws Exception {
.setRetentionPolicy(Bucket.RetentionPolicy.newBuilder().build())
.setIamConfig(Bucket.IamConfig.newBuilder().build())
.setSatisfiesPzs(true)
.setCustomPlacementConfig(Bucket.CustomPlacementConfig.newBuilder().build())
.setAutoclass(Bucket.Autoclass.newBuilder().build())
.build();
mockStorage.addResponse(expectedResponse);

Expand Down Expand Up @@ -392,7 +392,7 @@ public void createBucketTest2() throws Exception {
.setRetentionPolicy(Bucket.RetentionPolicy.newBuilder().build())
.setIamConfig(Bucket.IamConfig.newBuilder().build())
.setSatisfiesPzs(true)
.setCustomPlacementConfig(Bucket.CustomPlacementConfig.newBuilder().build())
.setAutoclass(Bucket.Autoclass.newBuilder().build())
.build();
mockStorage.addResponse(expectedResponse);

Expand Down Expand Up @@ -549,7 +549,7 @@ public void lockBucketRetentionPolicyTest() throws Exception {
.setRetentionPolicy(Bucket.RetentionPolicy.newBuilder().build())
.setIamConfig(Bucket.IamConfig.newBuilder().build())
.setSatisfiesPzs(true)
.setCustomPlacementConfig(Bucket.CustomPlacementConfig.newBuilder().build())
.setAutoclass(Bucket.Autoclass.newBuilder().build())
.build();
mockStorage.addResponse(expectedResponse);

Expand Down Expand Up @@ -613,7 +613,7 @@ public void lockBucketRetentionPolicyTest2() throws Exception {
.setRetentionPolicy(Bucket.RetentionPolicy.newBuilder().build())
.setIamConfig(Bucket.IamConfig.newBuilder().build())
.setSatisfiesPzs(true)
.setCustomPlacementConfig(Bucket.CustomPlacementConfig.newBuilder().build())
.setAutoclass(Bucket.Autoclass.newBuilder().build())
.build();
mockStorage.addResponse(expectedResponse);

Expand Down Expand Up @@ -927,7 +927,7 @@ public void updateBucketTest() throws Exception {
.setRetentionPolicy(Bucket.RetentionPolicy.newBuilder().build())
.setIamConfig(Bucket.IamConfig.newBuilder().build())
.setSatisfiesPzs(true)
.setCustomPlacementConfig(Bucket.CustomPlacementConfig.newBuilder().build())
.setAutoclass(Bucket.Autoclass.newBuilder().build())
.build();
mockStorage.addResponse(expectedResponse);

Expand Down Expand Up @@ -1337,7 +1337,7 @@ public void composeObjectTest() throws Exception {
ComposeObjectRequest.newBuilder()
.setDestination(Object.newBuilder().build())
.addAllSourceObjects(new ArrayList<ComposeObjectRequest.SourceObject>())
.setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
.setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
.setIfGenerationMatch(-1086241088)
.setIfMetagenerationMatch(1043427781)
.setKmsKey(
Expand Down Expand Up @@ -1381,7 +1381,7 @@ public void composeObjectExceptionTest() throws Exception {
ComposeObjectRequest.newBuilder()
.setDestination(Object.newBuilder().build())
.addAllSourceObjects(new ArrayList<ComposeObjectRequest.SourceObject>())
.setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
.setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
.setIfGenerationMatch(-1086241088)
.setIfMetagenerationMatch(1043427781)
.setKmsKey(
Expand Down Expand Up @@ -1926,7 +1926,7 @@ public void rewriteObjectTest() throws Exception {
.setSourceObject("sourceObject1196439354")
.setSourceGeneration(1232209852)
.setRewriteToken("rewriteToken80654285")
.setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
.setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
.setIfGenerationMatch(-1086241088)
.setIfGenerationNotMatch(1475720404)
.setIfMetagenerationMatch(1043427781)
Expand Down Expand Up @@ -2012,7 +2012,7 @@ public void rewriteObjectExceptionTest() throws Exception {
.setSourceObject("sourceObject1196439354")
.setSourceGeneration(1232209852)
.setRewriteToken("rewriteToken80654285")
.setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
.setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
.setIfGenerationMatch(-1086241088)
.setIfGenerationNotMatch(1475720404)
.setIfMetagenerationMatch(1043427781)
Expand Down
106 changes: 106 additions & 0 deletions proto-google-cloud-storage-v2/clirr-ignored-differences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,110 @@
</difference>


<!--
replace enum with string representation for predefined ACLs and public_access_prevention
-->
<difference>
<differenceType>6011</differenceType>
<className>com/google/storage/v2/*</className>
<field>CUSTOM_PLACEMENT_CONFIG_FIELD_NUMBER</field>
</difference>
<!-- allow removal of old methods -->
<difference>
<differenceType>7002</differenceType>
<className>com/google/storage/v2/*</className>
<method>* *CustomPlacementConfig*(*)</method>
</difference>
<difference>
<differenceType>7002</differenceType>
<className>com/google/storage/v2/*</className>
<method>* *DestinationPredefinedAclValue*(*)</method>
</difference>
<difference>
<differenceType>7002</differenceType>
<className>com/google/storage/v2/*</className>
<method>* *PredefinedAclValue*(*)</method>
</difference>
<difference>
<differenceType>7002</differenceType>
<className>com/google/storage/v2/*</className>
<method>* *PredefinedDefaultObjectAclValue*(*)</method>
</difference>
<difference>
<differenceType>7002</differenceType>
<className>com/google/storage/v2/*</className>
<method>* *PublicAccessPrevention*(*)</method>
</difference>
<!-- Allow new parameter type -->
<difference>
<differenceType>7005</differenceType>
<className>com/google/storage/v2/Bucket$IamConfig$Builder</className>
<method>com.google.storage.v2.Bucket$IamConfig$Builder setPublicAccessPrevention(com.google.storage.v2.Bucket$IamConfig$PublicAccessPrevention)</method>
<to>com.google.storage.v2.Bucket$IamConfig$Builder setPublicAccessPrevention(java.lang.String)</to>
</difference>
<!-- <difference>
<differenceType>7005</differenceType>
<className>com/google/storage/v2/*$Builder</className>
<method>com.google.storage.v2.*$Builder setDestinationPredefinedAcl(com.google.storage.v2.PredefinedObjectAcl)</method>
<to>com.google.storage.v2.*$Builder setDestinationPredefinedAcl(java.lang.String)</to>
</difference>-->
<!--
<difference>
<differenceType>7005</differenceType>
<className>com/google/storage/v2/*$Builder</className>
<method>com.google.storage.v2.*$Builder setPredefinedDefaultObjectAcl(com.google.storage.v2.PredefinedObjectAcl)</method>
<to>com.google.storage.v2.*$Builder setPredefinedDefaultObjectAcl(com.google.storage.v2.PredefinedObjectAcl)</to>
</difference>
-->
<!-- for some weird reason I don't understand, having more than one 7005 rule here breaks them working together-->
<difference>
<differenceType>7005</differenceType>
<className>com/google/storage/v2/*</className>
<method>* *(*)</method>
<to>* *(*)</to>
</difference>

<!-- Allow new return type -->
<difference>
<differenceType>7006</differenceType>
<className>com/google/storage/v2/*</className>
<method>* *DestinationPredefinedAcl*(*)</method>
<to>*</to>
</difference>
<difference>
<differenceType>7006</differenceType>
<className>com/google/storage/v2/*</className>
<method>* *PredefinedAcl*(*)</method>
<to>*</to>
</difference>
<difference>
<differenceType>7006</differenceType>
<className>com/google/storage/v2/*</className>
<method>* *PredefinedDefaultObjectAcl*(*)</method>
<to>*</to>
</difference>
<difference>
<differenceType>7006</differenceType>
<className>com/google/storage/v2/*</className>
<method>* *PublicAccessPrevention*(*)</method>
<to>*</to>
</difference>
<!-- Allow deletion of old inner class -->
<difference>
<differenceType>8001</differenceType>
<className>com/google/storage/v2/Bucket$CustomPlacementConfig*</className>
</difference>
<difference>
<differenceType>8001</differenceType>
<className>com/google/storage/v2/Bucket$IamConfig$PublicAccessPrevention*</className>
</difference>
<difference>
<differenceType>8001</differenceType>
<className>com/google/storage/v2/PredefinedBucketAcl</className>
</difference>
<difference>
<differenceType>8001</differenceType>
<className>com/google/storage/v2/PredefinedObjectAcl</className>
</difference>

</differences>