Skip to content

Commit

Permalink
fix: [storage] An existing resource pattern value `projects/{project}…
Browse files Browse the repository at this point in the history
…/buckets/{bucket}/managedFolders/{managedFolder=**}` to resource definition `storage.googleapis.com/ManagedFolder` is removed (#5311)

* fix: An existing resource pattern value `projects/{project}/buckets/{bucket}/managedFolders/{managedFolder=**}` to resource definition `storage.googleapis.com/ManagedFolder` is removed
feat: A new resource pattern value `projects/{project}/buckets/{bucket}/managedFolders/{managed_folder=**}` added to the resource definition `storage.googleapis.com/ManagedFolder`

PiperOrigin-RevId: 630439820

Source-Link: googleapis/googleapis@d9a3161

Source-Link: googleapis/googleapis-gen@d39d37f
Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLXN0b3JhZ2UtY29udHJvbC8uT3dsQm90LnlhbWwiLCJoIjoiZDM5ZDM3ZjRiYWQ5NzVkYTBmYjBiYjI3N2RkNGUxOGZiZWJhMjRkNSJ9

* 🦉 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>
Co-authored-by: sofisl <[email protected]>
  • Loading branch information
3 people authored May 8, 2024
1 parent 2a5066f commit e8dd1b7
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2023 Google LLC
// Copyright 2024 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -500,7 +500,7 @@ message GetStorageLayoutRequest {
message ManagedFolder {
option (google.api.resource) = {
type: "storage.googleapis.com/ManagedFolder"
pattern: "projects/{project}/buckets/{bucket}/managedFolders/{managedFolder=**}"
pattern: "projects/{project}/buckets/{bucket}/managedFolders/{managed_folder=**}"
plural: "managedFolders"
singular: "managedFolder"
};
Expand Down
2 changes: 1 addition & 1 deletion packages/google-storage-control/protos/protos.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions packages/google-storage-control/src/v2/storage_control_client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ export class StorageControlClient {
'projects/{project}/buckets/{bucket}/folders/{folder=**}'
),
managedFolderPathTemplate: new this._gaxModule.PathTemplate(
'projects/{project}/buckets/{bucket}/managedFolders/{managedFolder=**}'
'projects/{project}/buckets/{bucket}/managedFolders/{managed_folder=**}'
),
projectPathTemplate: new this._gaxModule.PathTemplate(
'projects/{project}'
Expand Down Expand Up @@ -2202,14 +2202,14 @@ export class StorageControlClient {
*
* @param {string} project
* @param {string} bucket
* @param {string} managedFolder
* @param {string} managed_folder
* @returns {string} Resource name string.
*/
managedFolderPath(project: string, bucket: string, managedFolder: string) {
return this.pathTemplates.managedFolderPathTemplate.render({
project: project,
bucket: bucket,
managedFolder: managedFolder,
managed_folder: managedFolder,
});
}

Expand Down Expand Up @@ -2238,15 +2238,15 @@ export class StorageControlClient {
}

/**
* Parse the managedFolder from ManagedFolder resource.
* Parse the managed_folder from ManagedFolder resource.
*
* @param {string} managedFolderName
* A fully-qualified path representing ManagedFolder resource.
* @returns {string} A string representing the managedFolder.
* @returns {string} A string representing the managed_folder.
*/
matchManagedFolderFromManagedFolderName(managedFolderName: string) {
return this.pathTemplates.managedFolderPathTemplate.match(managedFolderName)
.managedFolder;
.managed_folder;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2524,7 +2524,7 @@ describe('v2.StorageControlClient', () => {
const expectedParameters = {
project: 'projectValue',
bucket: 'bucketValue',
managedFolder: 'managedFolderValue',
managed_folder: 'managedFolderValue',
};
const client = new storagecontrolModule.v2.StorageControlClient({
credentials: {client_email: 'bogus', private_key: 'bogus'},
Expand Down

0 comments on commit e8dd1b7

Please sign in to comment.