Skip to content

Commit 50b6610

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
fix: Temporarily restoring storage_grpc_service_config.json to fix broken test (#2365)
* fix: Temporarily restoring storage_grpc_service_config.json to fix broken test PiperOrigin-RevId: 604727220 Source-Link: googleapis/googleapis@0518a59 Source-Link: https://github.com/googleapis/googleapis-gen/commit/69f6d614d76e9cac2f637adf446c644db2d05db9 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNjlmNmQ2MTRkNzZlOWNhYzJmNjM3YWRmNDQ2YzY0NGRiMmQwNWRiOSJ9 chore: set packed = false on field_behavior extension PiperOrigin-RevId: 604675854 Source-Link: googleapis/googleapis@42c04fe Source-Link: https://github.com/googleapis/googleapis-gen/commit/a1ed8a97a00d02fe456f6ebd4160c5b2b000ad75 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYTFlZDhhOTdhMDBkMDJmZTQ1NmY2ZWJkNDE2MGM1YjJiMDAwYWQ3NSJ9 fix(deps): Update the Java code generator (gapic-generator-java) to 2.34.0 PiperOrigin-RevId: 603372971 Source-Link: googleapis/googleapis@805cfaa Source-Link: https://github.com/googleapis/googleapis-gen/commit/cc9007333935fd3fd221b97032916ebf737409b7 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiY2M5MDA3MzMzOTM1ZmQzZmQyMjFiOTcwMzI5MTZlYmY3Mzc0MDliNyJ9 build: Update protobuf to 25.2 in WORKSPACE build: Update grpc to 1.60.0 in WORKSPACE build: Remove pin for boringssl in WORKSPACE build: Update bazel to 6.3.0 in .bazeliskrc PiperOrigin-RevId: 603226138 Source-Link: googleapis/googleapis@2aec9e1 Source-Link: https://github.com/googleapis/googleapis-gen/commit/e9a5c2ef37b4d69c93e39141d87aae0b193c00b1 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTlhNWMyZWYzN2I0ZDY5YzkzZTM5MTQxZDg3YWFlMGIxOTNjMDBiMSJ9 docs: Proto field comment updates, edit general gRPC API warning fix: Clear storage_grpc_service_config.json to avoid nested retry strategies PiperOrigin-RevId: 602881263 Source-Link: googleapis/googleapis@f42edbe Source-Link: https://github.com/googleapis/googleapis-gen/commit/0f24a129ced3201a4e2a3f1322fca3c30d61be73 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMGYyNGExMjljZWQzMjAxYTRlMmEzZjEzMjJmY2EzYzMwZDYxYmU3MyJ9 fix(deps): Update the Java code generator (gapic-generator-java) to 2.32.0 PiperOrigin-RevId: 599914188 Source-Link: googleapis/googleapis@17e6661 Source-Link: https://github.com/googleapis/googleapis-gen/commit/d86ba5be537e489435105ca85566cc4103301aba Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZDg2YmE1YmU1MzdlNDg5NDM1MTA1Y2E4NTU2NmNjNDEwMzMwMWFiYSJ9 * 🦉 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 <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 59ac502 commit 50b6610

File tree

151 files changed

+3400
-1617
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

151 files changed

+3400
-1617
lines changed

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

+605-37
Large diffs are not rendered by default.

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

-6
Original file line numberDiff line numberDiff line change
@@ -475,12 +475,8 @@ public class GrpcStorageStub extends StorageStub {
475475
PathTemplate.create("{bucket=**}");
476476
private static final PathTemplate GET_IAM_POLICY_0_PATH_TEMPLATE =
477477
PathTemplate.create("{bucket=**}");
478-
private static final PathTemplate GET_IAM_POLICY_1_PATH_TEMPLATE =
479-
PathTemplate.create("{bucket=projects/*/buckets/*}/objects/**");
480478
private static final PathTemplate SET_IAM_POLICY_0_PATH_TEMPLATE =
481479
PathTemplate.create("{bucket=**}");
482-
private static final PathTemplate SET_IAM_POLICY_1_PATH_TEMPLATE =
483-
PathTemplate.create("{bucket=projects/*/buckets/*}/objects/**");
484480
private static final PathTemplate TEST_IAM_PERMISSIONS_0_PATH_TEMPLATE =
485481
PathTemplate.create("{bucket=**}");
486482
private static final PathTemplate TEST_IAM_PERMISSIONS_1_PATH_TEMPLATE =
@@ -631,7 +627,6 @@ protected GrpcStorageStub(
631627
request -> {
632628
RequestParamsBuilder builder = RequestParamsBuilder.create();
633629
builder.add(request.getResource(), "bucket", GET_IAM_POLICY_0_PATH_TEMPLATE);
634-
builder.add(request.getResource(), "bucket", GET_IAM_POLICY_1_PATH_TEMPLATE);
635630
return builder.build();
636631
})
637632
.build();
@@ -642,7 +637,6 @@ protected GrpcStorageStub(
642637
request -> {
643638
RequestParamsBuilder builder = RequestParamsBuilder.create();
644639
builder.add(request.getResource(), "bucket", SET_IAM_POLICY_0_PATH_TEMPLATE);
645-
builder.add(request.getResource(), "bucket", SET_IAM_POLICY_1_PATH_TEMPLATE);
646640
return builder.build();
647641
})
648642
.build();

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

+18-1
Original file line numberDiff line numberDiff line change
@@ -626,6 +626,15 @@ public StorageStub createStub() throws IOException {
626626
"Transport not supported: %s", getTransportChannelProvider().getTransportName()));
627627
}
628628

629+
/** Returns the endpoint set by the user or the the service's default endpoint. */
630+
@Override
631+
public String getEndpoint() {
632+
if (super.getEndpoint() != null) {
633+
return super.getEndpoint();
634+
}
635+
return getDefaultEndpoint();
636+
}
637+
629638
/** Returns the default service name. */
630639
@Override
631640
public String getServiceName() {
@@ -973,7 +982,6 @@ private static Builder createDefault() {
973982
builder.setTransportChannelProvider(defaultTransportChannelProvider());
974983
builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
975984
builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build());
976-
builder.setEndpoint(getDefaultEndpoint());
977985
builder.setMtlsEndpoint(getDefaultMtlsEndpoint());
978986
builder.setSwitchToMtlsEndpointAllowed(true);
979987

@@ -1334,6 +1342,15 @@ public UnaryCallSettings.Builder<GetHmacKeyRequest, HmacKeyMetadata> getHmacKeyS
13341342
return updateHmacKeySettings;
13351343
}
13361344

1345+
/** Returns the endpoint set by the user or the the service's default endpoint. */
1346+
@Override
1347+
public String getEndpoint() {
1348+
if (super.getEndpoint() != null) {
1349+
return super.getEndpoint();
1350+
}
1351+
return getDefaultEndpoint();
1352+
}
1353+
13371354
@Override
13381355
public StorageStubSettings build() throws IOException {
13391356
return new StorageStubSettings(this);

‎gapic-google-cloud-storage-v2/src/main/resources/META-INF/native-image/com.google.storage.v2/reflect-config.json

+135
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,15 @@
710710
"allDeclaredClasses": true,
711711
"allPublicClasses": true
712712
},
713+
{
714+
"name": "com.google.protobuf.DescriptorProtos$Edition",
715+
"queryAllDeclaredConstructors": true,
716+
"queryAllPublicConstructors": true,
717+
"queryAllDeclaredMethods": true,
718+
"allPublicMethods": true,
719+
"allDeclaredClasses": true,
720+
"allPublicClasses": true
721+
},
713722
{
714723
"name": "com.google.protobuf.DescriptorProtos$EnumDescriptorProto",
715724
"queryAllDeclaredConstructors": true,
@@ -845,6 +854,114 @@
845854
"allDeclaredClasses": true,
846855
"allPublicClasses": true
847856
},
857+
{
858+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet",
859+
"queryAllDeclaredConstructors": true,
860+
"queryAllPublicConstructors": true,
861+
"queryAllDeclaredMethods": true,
862+
"allPublicMethods": true,
863+
"allDeclaredClasses": true,
864+
"allPublicClasses": true
865+
},
866+
{
867+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$Builder",
868+
"queryAllDeclaredConstructors": true,
869+
"queryAllPublicConstructors": true,
870+
"queryAllDeclaredMethods": true,
871+
"allPublicMethods": true,
872+
"allDeclaredClasses": true,
873+
"allPublicClasses": true
874+
},
875+
{
876+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnumType",
877+
"queryAllDeclaredConstructors": true,
878+
"queryAllPublicConstructors": true,
879+
"queryAllDeclaredMethods": true,
880+
"allPublicMethods": true,
881+
"allDeclaredClasses": true,
882+
"allPublicClasses": true
883+
},
884+
{
885+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$FieldPresence",
886+
"queryAllDeclaredConstructors": true,
887+
"queryAllPublicConstructors": true,
888+
"queryAllDeclaredMethods": true,
889+
"allPublicMethods": true,
890+
"allDeclaredClasses": true,
891+
"allPublicClasses": true
892+
},
893+
{
894+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$JsonFormat",
895+
"queryAllDeclaredConstructors": true,
896+
"queryAllPublicConstructors": true,
897+
"queryAllDeclaredMethods": true,
898+
"allPublicMethods": true,
899+
"allDeclaredClasses": true,
900+
"allPublicClasses": true
901+
},
902+
{
903+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$MessageEncoding",
904+
"queryAllDeclaredConstructors": true,
905+
"queryAllPublicConstructors": true,
906+
"queryAllDeclaredMethods": true,
907+
"allPublicMethods": true,
908+
"allDeclaredClasses": true,
909+
"allPublicClasses": true
910+
},
911+
{
912+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$RepeatedFieldEncoding",
913+
"queryAllDeclaredConstructors": true,
914+
"queryAllPublicConstructors": true,
915+
"queryAllDeclaredMethods": true,
916+
"allPublicMethods": true,
917+
"allDeclaredClasses": true,
918+
"allPublicClasses": true
919+
},
920+
{
921+
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$Utf8Validation",
922+
"queryAllDeclaredConstructors": true,
923+
"queryAllPublicConstructors": true,
924+
"queryAllDeclaredMethods": true,
925+
"allPublicMethods": true,
926+
"allDeclaredClasses": true,
927+
"allPublicClasses": true
928+
},
929+
{
930+
"name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults",
931+
"queryAllDeclaredConstructors": true,
932+
"queryAllPublicConstructors": true,
933+
"queryAllDeclaredMethods": true,
934+
"allPublicMethods": true,
935+
"allDeclaredClasses": true,
936+
"allPublicClasses": true
937+
},
938+
{
939+
"name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$Builder",
940+
"queryAllDeclaredConstructors": true,
941+
"queryAllPublicConstructors": true,
942+
"queryAllDeclaredMethods": true,
943+
"allPublicMethods": true,
944+
"allDeclaredClasses": true,
945+
"allPublicClasses": true
946+
},
947+
{
948+
"name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$FeatureSetEditionDefault",
949+
"queryAllDeclaredConstructors": true,
950+
"queryAllPublicConstructors": true,
951+
"queryAllDeclaredMethods": true,
952+
"allPublicMethods": true,
953+
"allDeclaredClasses": true,
954+
"allPublicClasses": true
955+
},
956+
{
957+
"name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$FeatureSetEditionDefault$Builder",
958+
"queryAllDeclaredConstructors": true,
959+
"queryAllPublicConstructors": true,
960+
"queryAllDeclaredMethods": true,
961+
"allPublicMethods": true,
962+
"allDeclaredClasses": true,
963+
"allPublicClasses": true
964+
},
848965
{
849966
"name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto",
850967
"queryAllDeclaredConstructors": true,
@@ -908,6 +1025,24 @@
9081025
"allDeclaredClasses": true,
9091026
"allPublicClasses": true
9101027
},
1028+
{
1029+
"name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault",
1030+
"queryAllDeclaredConstructors": true,
1031+
"queryAllPublicConstructors": true,
1032+
"queryAllDeclaredMethods": true,
1033+
"allPublicMethods": true,
1034+
"allDeclaredClasses": true,
1035+
"allPublicClasses": true
1036+
},
1037+
{
1038+
"name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault$Builder",
1039+
"queryAllDeclaredConstructors": true,
1040+
"queryAllPublicConstructors": true,
1041+
"queryAllDeclaredMethods": true,
1042+
"allPublicMethods": true,
1043+
"allDeclaredClasses": true,
1044+
"allPublicClasses": true
1045+
},
9111046
{
9121047
"name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType",
9131048
"queryAllDeclaredConstructors": true,

‎google-cloud-storage-control/src/main/java/com/google/storage/control/v2/StorageControlClient.java

+125
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,131 @@
6161
* <p>Note: close() needs to be called on the StorageControlClient object to clean up resources such
6262
* as threads. In the example above, try-with-resources is used, which automatically calls close().
6363
*
64+
* <table>
65+
* <caption>Methods</caption>
66+
* <tr>
67+
* <th>Method</th>
68+
* <th>Description</th>
69+
* <th>Method Variants</th>
70+
* </tr>
71+
* <tr>
72+
* <td><p> CreateFolder</td>
73+
* <td><p> Creates a new folder.</td>
74+
* <td>
75+
* <p>Request object method variants only take one parameter, a request object, which must be constructed before the call.</p>
76+
* <ul>
77+
* <li><p> createFolder(CreateFolderRequest request)
78+
* </ul>
79+
* <p>"Flattened" method variants have converted the fields of the request object into function parameters to enable multiple ways to call the same method.</p>
80+
* <ul>
81+
* <li><p> createFolder(BucketName parent, Folder folder, String folderId)
82+
* <li><p> createFolder(String parent, Folder folder, String folderId)
83+
* </ul>
84+
* <p>Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.</p>
85+
* <ul>
86+
* <li><p> createFolderCallable()
87+
* </ul>
88+
* </td>
89+
* </tr>
90+
* <tr>
91+
* <td><p> DeleteFolder</td>
92+
* <td><p> Permanently deletes an empty folder.</td>
93+
* <td>
94+
* <p>Request object method variants only take one parameter, a request object, which must be constructed before the call.</p>
95+
* <ul>
96+
* <li><p> deleteFolder(DeleteFolderRequest request)
97+
* </ul>
98+
* <p>"Flattened" method variants have converted the fields of the request object into function parameters to enable multiple ways to call the same method.</p>
99+
* <ul>
100+
* <li><p> deleteFolder(FolderName name)
101+
* <li><p> deleteFolder(String name)
102+
* </ul>
103+
* <p>Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.</p>
104+
* <ul>
105+
* <li><p> deleteFolderCallable()
106+
* </ul>
107+
* </td>
108+
* </tr>
109+
* <tr>
110+
* <td><p> GetFolder</td>
111+
* <td><p> Returns metadata for the specified folder.</td>
112+
* <td>
113+
* <p>Request object method variants only take one parameter, a request object, which must be constructed before the call.</p>
114+
* <ul>
115+
* <li><p> getFolder(GetFolderRequest request)
116+
* </ul>
117+
* <p>"Flattened" method variants have converted the fields of the request object into function parameters to enable multiple ways to call the same method.</p>
118+
* <ul>
119+
* <li><p> getFolder(FolderName name)
120+
* <li><p> getFolder(String name)
121+
* </ul>
122+
* <p>Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.</p>
123+
* <ul>
124+
* <li><p> getFolderCallable()
125+
* </ul>
126+
* </td>
127+
* </tr>
128+
* <tr>
129+
* <td><p> ListFolders</td>
130+
* <td><p> Retrieves a list of folders for a given bucket.</td>
131+
* <td>
132+
* <p>Request object method variants only take one parameter, a request object, which must be constructed before the call.</p>
133+
* <ul>
134+
* <li><p> listFolders(ListFoldersRequest request)
135+
* </ul>
136+
* <p>"Flattened" method variants have converted the fields of the request object into function parameters to enable multiple ways to call the same method.</p>
137+
* <ul>
138+
* <li><p> listFolders(BucketName parent)
139+
* <li><p> listFolders(String parent)
140+
* </ul>
141+
* <p>Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.</p>
142+
* <ul>
143+
* <li><p> listFoldersPagedCallable()
144+
* <li><p> listFoldersCallable()
145+
* </ul>
146+
* </td>
147+
* </tr>
148+
* <tr>
149+
* <td><p> RenameFolder</td>
150+
* <td><p> Renames a source folder to a destination folder. During a rename, the source and destination folders are locked until the long running operation completes.</td>
151+
* <td>
152+
* <p>Request object method variants only take one parameter, a request object, which must be constructed before the call.</p>
153+
* <ul>
154+
* <li><p> renameFolderAsync(RenameFolderRequest request)
155+
* </ul>
156+
* <p>Methods that return long-running operations have "Async" method variants that return `OperationFuture`, which is used to track polling of the service.</p>
157+
* <ul>
158+
* <li><p> renameFolderAsync(FolderName name, String destinationFolderId)
159+
* <li><p> renameFolderAsync(String name, String destinationFolderId)
160+
* </ul>
161+
* <p>Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.</p>
162+
* <ul>
163+
* <li><p> renameFolderOperationCallable()
164+
* <li><p> renameFolderCallable()
165+
* </ul>
166+
* </td>
167+
* </tr>
168+
* <tr>
169+
* <td><p> GetStorageLayout</td>
170+
* <td><p> Returns the storage layout configuration for a given bucket.</td>
171+
* <td>
172+
* <p>Request object method variants only take one parameter, a request object, which must be constructed before the call.</p>
173+
* <ul>
174+
* <li><p> getStorageLayout(GetStorageLayoutRequest request)
175+
* </ul>
176+
* <p>"Flattened" method variants have converted the fields of the request object into function parameters to enable multiple ways to call the same method.</p>
177+
* <ul>
178+
* <li><p> getStorageLayout(StorageLayoutName name)
179+
* <li><p> getStorageLayout(String name)
180+
* </ul>
181+
* <p>Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.</p>
182+
* <ul>
183+
* <li><p> getStorageLayoutCallable()
184+
* </ul>
185+
* </td>
186+
* </tr>
187+
* </table>
188+
*
64189
* <p>See the individual methods for example code.
65190
*
66191
* <p>Many parameters require resource names to be formatted in a particular way. To assist with

0 commit comments

Comments
 (0)