Skip to content

Commit

Permalink
fix: Temporarily restoring storage_grpc_service_config.json to fix br…
Browse files Browse the repository at this point in the history 
…oken test (#2365)

* fix: Temporarily restoring storage_grpc_service_config.json to fix broken test

PiperOrigin-RevId: 604727220

Source-Link: googleapis/googleapis@0518a59

Source-Link: googleapis/googleapis-gen@69f6d61
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNjlmNmQ2MTRkNzZlOWNhYzJmNjM3YWRmNDQ2YzY0NGRiMmQwNWRiOSJ9

chore: set packed = false on field_behavior extension

PiperOrigin-RevId: 604675854

Source-Link: googleapis/googleapis@42c04fe

Source-Link: googleapis/googleapis-gen@a1ed8a9
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: googleapis/googleapis-gen@cc90073
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: googleapis/googleapis-gen@e9a5c2e
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: googleapis/googleapis-gen@0f24a12
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: googleapis/googleapis-gen@d86ba5b
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>
  • Loading branch information
@gcf-owl-bot
gcf-owl-bot[bot] and gcf-owl-bot[bot] committed Feb 7, 2024
1 parent 59ac502 commit 50b6610
Show file tree
Hide file tree
Showing 151 changed files with 3,400 additions and 1,617 deletions.
642 changes: 605 additions & 37 deletions gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageClient.java
View file

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/GrpcStorageStub.java
View file
Expand Up @@ -475,12 +475,8 @@ public class GrpcStorageStub extends StorageStub {
PathTemplate.create("{bucket=**}");
private static final PathTemplate GET_IAM_POLICY_0_PATH_TEMPLATE =
PathTemplate.create("{bucket=**}");
private static final PathTemplate GET_IAM_POLICY_1_PATH_TEMPLATE =
PathTemplate.create("{bucket=projects/*/buckets/*}/objects/**");
private static final PathTemplate SET_IAM_POLICY_0_PATH_TEMPLATE =
PathTemplate.create("{bucket=**}");
private static final PathTemplate SET_IAM_POLICY_1_PATH_TEMPLATE =
PathTemplate.create("{bucket=projects/*/buckets/*}/objects/**");
private static final PathTemplate TEST_IAM_PERMISSIONS_0_PATH_TEMPLATE =
PathTemplate.create("{bucket=**}");
private static final PathTemplate TEST_IAM_PERMISSIONS_1_PATH_TEMPLATE =
Expand Down Expand Up @@ -631,7 +627,6 @@ protected GrpcStorageStub(
request -> {
RequestParamsBuilder builder = RequestParamsBuilder.create();
builder.add(request.getResource(), "bucket", GET_IAM_POLICY_0_PATH_TEMPLATE);
builder.add(request.getResource(), "bucket", GET_IAM_POLICY_1_PATH_TEMPLATE);
return builder.build();
})
.build();
Expand All @@ -642,7 +637,6 @@ protected GrpcStorageStub(
request -> {
RequestParamsBuilder builder = RequestParamsBuilder.create();
builder.add(request.getResource(), "bucket", SET_IAM_POLICY_0_PATH_TEMPLATE);
builder.add(request.getResource(), "bucket", SET_IAM_POLICY_1_PATH_TEMPLATE);
return builder.build();
})
.build();
Expand Down
19 changes: 18 additions & 1 deletion ...google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/StorageStubSettings.java
View file
Expand Up @@ -626,6 +626,15 @@ public StorageStub createStub() throws IOException {
"Transport not supported: %s", getTransportChannelProvider().getTransportName()));
}

/** Returns the endpoint set by the user or the the service's default endpoint. */
@Override
public String getEndpoint() {
if (super.getEndpoint() != null) {
return super.getEndpoint();
}
return getDefaultEndpoint();
}

/** Returns the default service name. */
@Override
public String getServiceName() {
Expand Down Expand Up @@ -973,7 +982,6 @@ private static Builder createDefault() {
builder.setTransportChannelProvider(defaultTransportChannelProvider());
builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build());
builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build());
builder.setEndpoint(getDefaultEndpoint());
builder.setMtlsEndpoint(getDefaultMtlsEndpoint());
builder.setSwitchToMtlsEndpointAllowed(true);

Expand Down Expand Up @@ -1334,6 +1342,15 @@ public UnaryCallSettings.Builder<GetHmacKeyRequest, HmacKeyMetadata> getHmacKeyS
return updateHmacKeySettings;
}

/** Returns the endpoint set by the user or the the service's default endpoint. */
@Override
public String getEndpoint() {
if (super.getEndpoint() != null) {
return super.getEndpoint();
}
return getDefaultEndpoint();
}

@Override
public StorageStubSettings build() throws IOException {
return new StorageStubSettings(this);
Expand Down
135 changes: 135 additions & 0 deletions ...age-v2/src/main/resources/META-INF/native-image/com.google.storage.v2/reflect-config.json
View file
Expand Up @@ -710,6 +710,15 @@
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.protobuf.DescriptorProtos$Edition",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.protobuf.DescriptorProtos$EnumDescriptorProto",
"queryAllDeclaredConstructors": true,
Expand Down Expand Up @@ -845,6 +854,114 @@
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.protobuf.DescriptorProtos$FeatureSet",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$Builder",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$EnumType",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$FieldPresence",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$JsonFormat",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$MessageEncoding",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$RepeatedFieldEncoding",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.protobuf.DescriptorProtos$FeatureSet$Utf8Validation",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$Builder",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$FeatureSetEditionDefault",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.protobuf.DescriptorProtos$FeatureSetDefaults$FeatureSetEditionDefault$Builder",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.protobuf.DescriptorProtos$FieldDescriptorProto",
"queryAllDeclaredConstructors": true,
Expand Down Expand Up @@ -908,6 +1025,24 @@
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.protobuf.DescriptorProtos$FieldOptions$EditionDefault$Builder",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.protobuf.DescriptorProtos$FieldOptions$JSType",
"queryAllDeclaredConstructors": true,
Expand Down
125 changes: 125 additions & 0 deletions ...oud-storage-control/src/main/java/com/google/storage/control/v2/StorageControlClient.java
View file
Expand Up @@ -61,6 +61,131 @@
* <p>Note: close() needs to be called on the StorageControlClient object to clean up resources such
* as threads. In the example above, try-with-resources is used, which automatically calls close().
*
* <table>
* <caption>Methods</caption>
* <tr>
* <th>Method</th>
* <th>Description</th>
* <th>Method Variants</th>
* </tr>
* <tr>
* <td><p> CreateFolder</td>
* <td><p> Creates a new folder.</td>
* <td>
* <p>Request object method variants only take one parameter, a request object, which must be constructed before the call.</p>
* <ul>
* <li><p> createFolder(CreateFolderRequest request)
* </ul>
* <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>
* <ul>
* <li><p> createFolder(BucketName parent, Folder folder, String folderId)
* <li><p> createFolder(String parent, Folder folder, String folderId)
* </ul>
* <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>
* <ul>
* <li><p> createFolderCallable()
* </ul>
* </td>
* </tr>
* <tr>
* <td><p> DeleteFolder</td>
* <td><p> Permanently deletes an empty folder.</td>
* <td>
* <p>Request object method variants only take one parameter, a request object, which must be constructed before the call.</p>
* <ul>
* <li><p> deleteFolder(DeleteFolderRequest request)
* </ul>
* <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>
* <ul>
* <li><p> deleteFolder(FolderName name)
* <li><p> deleteFolder(String name)
* </ul>
* <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>
* <ul>
* <li><p> deleteFolderCallable()
* </ul>
* </td>
* </tr>
* <tr>
* <td><p> GetFolder</td>
* <td><p> Returns metadata for the specified folder.</td>
* <td>
* <p>Request object method variants only take one parameter, a request object, which must be constructed before the call.</p>
* <ul>
* <li><p> getFolder(GetFolderRequest request)
* </ul>
* <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>
* <ul>
* <li><p> getFolder(FolderName name)
* <li><p> getFolder(String name)
* </ul>
* <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>
* <ul>
* <li><p> getFolderCallable()
* </ul>
* </td>
* </tr>
* <tr>
* <td><p> ListFolders</td>
* <td><p> Retrieves a list of folders for a given bucket.</td>
* <td>
* <p>Request object method variants only take one parameter, a request object, which must be constructed before the call.</p>
* <ul>
* <li><p> listFolders(ListFoldersRequest request)
* </ul>
* <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>
* <ul>
* <li><p> listFolders(BucketName parent)
* <li><p> listFolders(String parent)
* </ul>
* <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>
* <ul>
* <li><p> listFoldersPagedCallable()
* <li><p> listFoldersCallable()
* </ul>
* </td>
* </tr>
* <tr>
* <td><p> RenameFolder</td>
* <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>
* <td>
* <p>Request object method variants only take one parameter, a request object, which must be constructed before the call.</p>
* <ul>
* <li><p> renameFolderAsync(RenameFolderRequest request)
* </ul>
* <p>Methods that return long-running operations have "Async" method variants that return `OperationFuture`, which is used to track polling of the service.</p>
* <ul>
* <li><p> renameFolderAsync(FolderName name, String destinationFolderId)
* <li><p> renameFolderAsync(String name, String destinationFolderId)
* </ul>
* <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>
* <ul>
* <li><p> renameFolderOperationCallable()
* <li><p> renameFolderCallable()
* </ul>
* </td>
* </tr>
* <tr>
* <td><p> GetStorageLayout</td>
* <td><p> Returns the storage layout configuration for a given bucket.</td>
* <td>
* <p>Request object method variants only take one parameter, a request object, which must be constructed before the call.</p>
* <ul>
* <li><p> getStorageLayout(GetStorageLayoutRequest request)
* </ul>
* <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>
* <ul>
* <li><p> getStorageLayout(StorageLayoutName name)
* <li><p> getStorageLayout(String name)
* </ul>
* <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>
* <ul>
* <li><p> getStorageLayoutCallable()
* </ul>
* </td>
* </tr>
* </table>
*
* <p>See the individual methods for example code.
*
* <p>Many parameters require resource names to be formatted in a particular way. To assist with
Expand Down

0 comments on commit 50b6610

Please sign in to comment.