Skip to content

Commit 4dd1a88

Browse files
gcf-owl-bot[bot]BenWhitehead
gcf-owl-bot[bot]
and
BenWhitehead
authored
feat: replace enum with string representation for predefined ACLs and public_access_prevention (#1323)
* feat!: Replace enum with string representation for predefined ACLs and public_access_prevention fix!: Remove CustomPlacementConfig, which is no longer the way custom dual regions will be specified feat: Add Autoclass support to Bucket configuration feat: Add matches_prefix and matches_suffix support to Lifecycle configuration PiperOrigin-RevId: 438078321 Source-Link: googleapis/googleapis@151e02b Source-Link: https://github.com/googleapis/googleapis-gen/commit/8759a1ffa05ee9977c9d37afdf44c581be39528a Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiODc1OWExZmZhMDVlZTk5NzdjOWQzN2FmZGY0NGM1ODFiZTM5NTI4YSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * chore: add clirr rules to allow change from enum to strings Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: BenWhitehead <[email protected]>
1 parent f21f624 commit 4dd1a88

22 files changed

+2708
-2168
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
@@ -436,8 +436,8 @@ public final Bucket createBucket(String parent, Bucket bucket, String bucketId)
436436
* .setParent(ProjectName.of("[PROJECT]").toString())
437437
* .setBucket(Bucket.newBuilder().build())
438438
* .setBucketId("bucketId-1603305307")
439-
* .setPredefinedAcl(PredefinedBucketAcl.forNumber(0))
440-
* .setPredefinedDefaultObjectAcl(PredefinedObjectAcl.forNumber(0))
439+
* .setPredefinedAcl("predefinedAcl1207041188")
440+
* .setPredefinedDefaultObjectAcl("predefinedDefaultObjectAcl2109168048")
441441
* .build();
442442
* Bucket response = storageClient.createBucket(request);
443443
* }
@@ -463,8 +463,8 @@ public final Bucket createBucket(CreateBucketRequest request) {
463463
* .setParent(ProjectName.of("[PROJECT]").toString())
464464
* .setBucket(Bucket.newBuilder().build())
465465
* .setBucketId("bucketId-1603305307")
466-
* .setPredefinedAcl(PredefinedBucketAcl.forNumber(0))
467-
* .setPredefinedDefaultObjectAcl(PredefinedObjectAcl.forNumber(0))
466+
* .setPredefinedAcl("predefinedAcl1207041188")
467+
* .setPredefinedDefaultObjectAcl("predefinedDefaultObjectAcl2109168048")
468468
* .build();
469469
* ApiFuture<Bucket> future = storageClient.createBucketCallable().futureCall(request);
470470
* // Do something.
@@ -1089,8 +1089,8 @@ public final Bucket updateBucket(Bucket bucket, FieldMask updateMask) {
10891089
* .setBucket(Bucket.newBuilder().build())
10901090
* .setIfMetagenerationMatch(1043427781)
10911091
* .setIfMetagenerationNotMatch(1025430873)
1092-
* .setPredefinedAcl(PredefinedBucketAcl.forNumber(0))
1093-
* .setPredefinedDefaultObjectAcl(PredefinedObjectAcl.forNumber(0))
1092+
* .setPredefinedAcl("predefinedAcl1207041188")
1093+
* .setPredefinedDefaultObjectAcl("predefinedDefaultObjectAcl2109168048")
10941094
* .setUpdateMask(FieldMask.newBuilder().build())
10951095
* .setCommonRequestParams(CommonRequestParams.newBuilder().build())
10961096
* .build();
@@ -1118,8 +1118,8 @@ public final Bucket updateBucket(UpdateBucketRequest request) {
11181118
* .setBucket(Bucket.newBuilder().build())
11191119
* .setIfMetagenerationMatch(1043427781)
11201120
* .setIfMetagenerationNotMatch(1025430873)
1121-
* .setPredefinedAcl(PredefinedBucketAcl.forNumber(0))
1122-
* .setPredefinedDefaultObjectAcl(PredefinedObjectAcl.forNumber(0))
1121+
* .setPredefinedAcl("predefinedAcl1207041188")
1122+
* .setPredefinedDefaultObjectAcl("predefinedDefaultObjectAcl2109168048")
11231123
* .setUpdateMask(FieldMask.newBuilder().build())
11241124
* .setCommonRequestParams(CommonRequestParams.newBuilder().build())
11251125
* .build();
@@ -1576,7 +1576,7 @@ public final ListNotificationsPagedResponse listNotifications(ListNotificationsR
15761576
* ComposeObjectRequest.newBuilder()
15771577
* .setDestination(Object.newBuilder().build())
15781578
* .addAllSourceObjects(new ArrayList<ComposeObjectRequest.SourceObject>())
1579-
* .setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
1579+
* .setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
15801580
* .setIfGenerationMatch(-1086241088)
15811581
* .setIfMetagenerationMatch(1043427781)
15821582
* .setKmsKey(
@@ -1608,7 +1608,7 @@ public final Object composeObject(ComposeObjectRequest request) {
16081608
* ComposeObjectRequest.newBuilder()
16091609
* .setDestination(Object.newBuilder().build())
16101610
* .addAllSourceObjects(new ArrayList<ComposeObjectRequest.SourceObject>())
1611-
* .setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
1611+
* .setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
16121612
* .setIfGenerationMatch(-1086241088)
16131613
* .setIfMetagenerationMatch(1043427781)
16141614
* .setKmsKey(
@@ -1949,7 +1949,7 @@ public final Object updateObject(Object object, FieldMask updateMask) {
19491949
* .setIfGenerationNotMatch(1475720404)
19501950
* .setIfMetagenerationMatch(1043427781)
19511951
* .setIfMetagenerationNotMatch(1025430873)
1952-
* .setPredefinedAcl(PredefinedObjectAcl.forNumber(0))
1952+
* .setPredefinedAcl("predefinedAcl1207041188")
19531953
* .setUpdateMask(FieldMask.newBuilder().build())
19541954
* .setCommonObjectRequestParams(CommonObjectRequestParams.newBuilder().build())
19551955
* .setCommonRequestParams(CommonRequestParams.newBuilder().build())
@@ -1980,7 +1980,7 @@ public final Object updateObject(UpdateObjectRequest request) {
19801980
* .setIfGenerationNotMatch(1475720404)
19811981
* .setIfMetagenerationMatch(1043427781)
19821982
* .setIfMetagenerationNotMatch(1025430873)
1983-
* .setPredefinedAcl(PredefinedObjectAcl.forNumber(0))
1983+
* .setPredefinedAcl("predefinedAcl1207041188")
19841984
* .setUpdateMask(FieldMask.newBuilder().build())
19851985
* .setCommonObjectRequestParams(CommonObjectRequestParams.newBuilder().build())
19861986
* .setCommonRequestParams(CommonRequestParams.newBuilder().build())
@@ -2238,7 +2238,7 @@ public final UnaryCallable<ListObjectsRequest, ListObjectsResponse> listObjectsC
22382238
* .setSourceObject("sourceObject1196439354")
22392239
* .setSourceGeneration(1232209852)
22402240
* .setRewriteToken("rewriteToken80654285")
2241-
* .setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
2241+
* .setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
22422242
* .setIfGenerationMatch(-1086241088)
22432243
* .setIfGenerationNotMatch(1475720404)
22442244
* .setIfMetagenerationMatch(1043427781)
@@ -2285,7 +2285,7 @@ public final RewriteResponse rewriteObject(RewriteObjectRequest request) {
22852285
* .setSourceObject("sourceObject1196439354")
22862286
* .setSourceGeneration(1232209852)
22872287
* .setRewriteToken("rewriteToken80654285")
2288-
* .setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
2288+
* .setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
22892289
* .setIfGenerationMatch(-1086241088)
22902290
* .setIfGenerationNotMatch(1475720404)
22912291
* .setIfMetagenerationMatch(1043427781)

‎gapic-google-cloud-storage-v2/src/test/java/com/google/storage/v2/StorageClientTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public void getBucketTest() throws Exception {
197197
.setRetentionPolicy(Bucket.RetentionPolicy.newBuilder().build())
198198
.setIamConfig(Bucket.IamConfig.newBuilder().build())
199199
.setSatisfiesPzs(true)
200-
.setCustomPlacementConfig(Bucket.CustomPlacementConfig.newBuilder().build())
200+
.setAutoclass(Bucket.Autoclass.newBuilder().build())
201201
.build();
202202
mockStorage.addResponse(expectedResponse);
203203

@@ -260,7 +260,7 @@ public void getBucketTest2() throws Exception {
260260
.setRetentionPolicy(Bucket.RetentionPolicy.newBuilder().build())
261261
.setIamConfig(Bucket.IamConfig.newBuilder().build())
262262
.setSatisfiesPzs(true)
263-
.setCustomPlacementConfig(Bucket.CustomPlacementConfig.newBuilder().build())
263+
.setAutoclass(Bucket.Autoclass.newBuilder().build())
264264
.build();
265265
mockStorage.addResponse(expectedResponse);
266266

@@ -323,7 +323,7 @@ public void createBucketTest() throws Exception {
323323
.setRetentionPolicy(Bucket.RetentionPolicy.newBuilder().build())
324324
.setIamConfig(Bucket.IamConfig.newBuilder().build())
325325
.setSatisfiesPzs(true)
326-
.setCustomPlacementConfig(Bucket.CustomPlacementConfig.newBuilder().build())
326+
.setAutoclass(Bucket.Autoclass.newBuilder().build())
327327
.build();
328328
mockStorage.addResponse(expectedResponse);
329329

@@ -392,7 +392,7 @@ public void createBucketTest2() throws Exception {
392392
.setRetentionPolicy(Bucket.RetentionPolicy.newBuilder().build())
393393
.setIamConfig(Bucket.IamConfig.newBuilder().build())
394394
.setSatisfiesPzs(true)
395-
.setCustomPlacementConfig(Bucket.CustomPlacementConfig.newBuilder().build())
395+
.setAutoclass(Bucket.Autoclass.newBuilder().build())
396396
.build();
397397
mockStorage.addResponse(expectedResponse);
398398

@@ -549,7 +549,7 @@ public void lockBucketRetentionPolicyTest() throws Exception {
549549
.setRetentionPolicy(Bucket.RetentionPolicy.newBuilder().build())
550550
.setIamConfig(Bucket.IamConfig.newBuilder().build())
551551
.setSatisfiesPzs(true)
552-
.setCustomPlacementConfig(Bucket.CustomPlacementConfig.newBuilder().build())
552+
.setAutoclass(Bucket.Autoclass.newBuilder().build())
553553
.build();
554554
mockStorage.addResponse(expectedResponse);
555555

@@ -613,7 +613,7 @@ public void lockBucketRetentionPolicyTest2() throws Exception {
613613
.setRetentionPolicy(Bucket.RetentionPolicy.newBuilder().build())
614614
.setIamConfig(Bucket.IamConfig.newBuilder().build())
615615
.setSatisfiesPzs(true)
616-
.setCustomPlacementConfig(Bucket.CustomPlacementConfig.newBuilder().build())
616+
.setAutoclass(Bucket.Autoclass.newBuilder().build())
617617
.build();
618618
mockStorage.addResponse(expectedResponse);
619619

@@ -927,7 +927,7 @@ public void updateBucketTest() throws Exception {
927927
.setRetentionPolicy(Bucket.RetentionPolicy.newBuilder().build())
928928
.setIamConfig(Bucket.IamConfig.newBuilder().build())
929929
.setSatisfiesPzs(true)
930-
.setCustomPlacementConfig(Bucket.CustomPlacementConfig.newBuilder().build())
930+
.setAutoclass(Bucket.Autoclass.newBuilder().build())
931931
.build();
932932
mockStorage.addResponse(expectedResponse);
933933

@@ -1337,7 +1337,7 @@ public void composeObjectTest() throws Exception {
13371337
ComposeObjectRequest.newBuilder()
13381338
.setDestination(Object.newBuilder().build())
13391339
.addAllSourceObjects(new ArrayList<ComposeObjectRequest.SourceObject>())
1340-
.setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
1340+
.setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
13411341
.setIfGenerationMatch(-1086241088)
13421342
.setIfMetagenerationMatch(1043427781)
13431343
.setKmsKey(
@@ -1381,7 +1381,7 @@ public void composeObjectExceptionTest() throws Exception {
13811381
ComposeObjectRequest.newBuilder()
13821382
.setDestination(Object.newBuilder().build())
13831383
.addAllSourceObjects(new ArrayList<ComposeObjectRequest.SourceObject>())
1384-
.setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
1384+
.setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
13851385
.setIfGenerationMatch(-1086241088)
13861386
.setIfMetagenerationMatch(1043427781)
13871387
.setKmsKey(
@@ -1926,7 +1926,7 @@ public void rewriteObjectTest() throws Exception {
19261926
.setSourceObject("sourceObject1196439354")
19271927
.setSourceGeneration(1232209852)
19281928
.setRewriteToken("rewriteToken80654285")
1929-
.setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
1929+
.setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
19301930
.setIfGenerationMatch(-1086241088)
19311931
.setIfGenerationNotMatch(1475720404)
19321932
.setIfMetagenerationMatch(1043427781)
@@ -2012,7 +2012,7 @@ public void rewriteObjectExceptionTest() throws Exception {
20122012
.setSourceObject("sourceObject1196439354")
20132013
.setSourceGeneration(1232209852)
20142014
.setRewriteToken("rewriteToken80654285")
2015-
.setDestinationPredefinedAcl(PredefinedObjectAcl.forNumber(0))
2015+
.setDestinationPredefinedAcl("destinationPredefinedAcl1111125814")
20162016
.setIfGenerationMatch(-1086241088)
20172017
.setIfGenerationNotMatch(1475720404)
20182018
.setIfMetagenerationMatch(1043427781)

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

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,110 @@
5555
</difference>
5656

5757

58+
<!--
59+
replace enum with string representation for predefined ACLs and public_access_prevention
60+
-->
61+
<difference>
62+
<differenceType>6011</differenceType>
63+
<className>com/google/storage/v2/*</className>
64+
<field>CUSTOM_PLACEMENT_CONFIG_FIELD_NUMBER</field>
65+
</difference>
66+
<!-- allow removal of old methods -->
67+
<difference>
68+
<differenceType>7002</differenceType>
69+
<className>com/google/storage/v2/*</className>
70+
<method>* *CustomPlacementConfig*(*)</method>
71+
</difference>
72+
<difference>
73+
<differenceType>7002</differenceType>
74+
<className>com/google/storage/v2/*</className>
75+
<method>* *DestinationPredefinedAclValue*(*)</method>
76+
</difference>
77+
<difference>
78+
<differenceType>7002</differenceType>
79+
<className>com/google/storage/v2/*</className>
80+
<method>* *PredefinedAclValue*(*)</method>
81+
</difference>
82+
<difference>
83+
<differenceType>7002</differenceType>
84+
<className>com/google/storage/v2/*</className>
85+
<method>* *PredefinedDefaultObjectAclValue*(*)</method>
86+
</difference>
87+
<difference>
88+
<differenceType>7002</differenceType>
89+
<className>com/google/storage/v2/*</className>
90+
<method>* *PublicAccessPrevention*(*)</method>
91+
</difference>
92+
<!-- Allow new parameter type -->
93+
<difference>
94+
<differenceType>7005</differenceType>
95+
<className>com/google/storage/v2/Bucket$IamConfig$Builder</className>
96+
<method>com.google.storage.v2.Bucket$IamConfig$Builder setPublicAccessPrevention(com.google.storage.v2.Bucket$IamConfig$PublicAccessPrevention)</method>
97+
<to>com.google.storage.v2.Bucket$IamConfig$Builder setPublicAccessPrevention(java.lang.String)</to>
98+
</difference>
99+
<!-- <difference>
100+
<differenceType>7005</differenceType>
101+
<className>com/google/storage/v2/*$Builder</className>
102+
<method>com.google.storage.v2.*$Builder setDestinationPredefinedAcl(com.google.storage.v2.PredefinedObjectAcl)</method>
103+
<to>com.google.storage.v2.*$Builder setDestinationPredefinedAcl(java.lang.String)</to>
104+
</difference>-->
105+
<!--
106+
<difference>
107+
<differenceType>7005</differenceType>
108+
<className>com/google/storage/v2/*$Builder</className>
109+
<method>com.google.storage.v2.*$Builder setPredefinedDefaultObjectAcl(com.google.storage.v2.PredefinedObjectAcl)</method>
110+
<to>com.google.storage.v2.*$Builder setPredefinedDefaultObjectAcl(com.google.storage.v2.PredefinedObjectAcl)</to>
111+
</difference>
112+
-->
113+
<!-- for some weird reason I don't understand, having more than one 7005 rule here breaks them working together-->
114+
<difference>
115+
<differenceType>7005</differenceType>
116+
<className>com/google/storage/v2/*</className>
117+
<method>* *(*)</method>
118+
<to>* *(*)</to>
119+
</difference>
120+
121+
<!-- Allow new return type -->
122+
<difference>
123+
<differenceType>7006</differenceType>
124+
<className>com/google/storage/v2/*</className>
125+
<method>* *DestinationPredefinedAcl*(*)</method>
126+
<to>*</to>
127+
</difference>
128+
<difference>
129+
<differenceType>7006</differenceType>
130+
<className>com/google/storage/v2/*</className>
131+
<method>* *PredefinedAcl*(*)</method>
132+
<to>*</to>
133+
</difference>
134+
<difference>
135+
<differenceType>7006</differenceType>
136+
<className>com/google/storage/v2/*</className>
137+
<method>* *PredefinedDefaultObjectAcl*(*)</method>
138+
<to>*</to>
139+
</difference>
140+
<difference>
141+
<differenceType>7006</differenceType>
142+
<className>com/google/storage/v2/*</className>
143+
<method>* *PublicAccessPrevention*(*)</method>
144+
<to>*</to>
145+
</difference>
146+
<!-- Allow deletion of old inner class -->
147+
<difference>
148+
<differenceType>8001</differenceType>
149+
<className>com/google/storage/v2/Bucket$CustomPlacementConfig*</className>
150+
</difference>
151+
<difference>
152+
<differenceType>8001</differenceType>
153+
<className>com/google/storage/v2/Bucket$IamConfig$PublicAccessPrevention*</className>
154+
</difference>
155+
<difference>
156+
<differenceType>8001</differenceType>
157+
<className>com/google/storage/v2/PredefinedBucketAcl</className>
158+
</difference>
159+
<difference>
160+
<differenceType>8001</differenceType>
161+
<className>com/google/storage/v2/PredefinedObjectAcl</className>
162+
</difference>
163+
58164
</differences>

0 commit comments

Comments
 (0)