From e8dd1b7aa0e455acf2179787b498e6b6a934672b Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 12:05:31 -0700 Subject: [PATCH] fix: [storage] An existing resource pattern value `projects/{project}/buckets/{bucket}/managedFolders/{managedFolder=**}` to resource definition `storage.googleapis.com/ManagedFolder` is removed (#5311) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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: https://github.com/googleapis/googleapis/commit/d9a31617c583f87ae0868907b0698a33a4ed9b93 Source-Link: https://github.com/googleapis/googleapis-gen/commit/d39d37f4bad975da0fb0bb277dd4e18fbeba24d5 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 Co-authored-by: sofisl <55454395+sofisl@users.noreply.github.com> --- .../google/storage/control/v2/storage_control.proto | 4 ++-- packages/google-storage-control/protos/protos.json | 2 +- .../src/v2/storage_control_client.ts | 12 ++++++------ .../test/gapic_storage_control_v2.ts | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/google-storage-control/protos/google/storage/control/v2/storage_control.proto b/packages/google-storage-control/protos/google/storage/control/v2/storage_control.proto index 61663a64672..373e2cfd016 100644 --- a/packages/google-storage-control/protos/google/storage/control/v2/storage_control.proto +++ b/packages/google-storage-control/protos/google/storage/control/v2/storage_control.proto @@ -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. @@ -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" }; diff --git a/packages/google-storage-control/protos/protos.json b/packages/google-storage-control/protos/protos.json index 58a7355fdc5..8f47e4c386d 100644 --- a/packages/google-storage-control/protos/protos.json +++ b/packages/google-storage-control/protos/protos.json @@ -723,7 +723,7 @@ "ManagedFolder": { "options": { "(google.api.resource).type": "storage.googleapis.com/ManagedFolder", - "(google.api.resource).pattern": "projects/{project}/buckets/{bucket}/managedFolders/{managedFolder=**}", + "(google.api.resource).pattern": "projects/{project}/buckets/{bucket}/managedFolders/{managed_folder=**}", "(google.api.resource).plural": "managedFolders", "(google.api.resource).singular": "managedFolder" }, diff --git a/packages/google-storage-control/src/v2/storage_control_client.ts b/packages/google-storage-control/src/v2/storage_control_client.ts index 52d644f8672..5541c4a3372 100644 --- a/packages/google-storage-control/src/v2/storage_control_client.ts +++ b/packages/google-storage-control/src/v2/storage_control_client.ts @@ -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}' @@ -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, }); } @@ -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; } /** diff --git a/packages/google-storage-control/test/gapic_storage_control_v2.ts b/packages/google-storage-control/test/gapic_storage_control_v2.ts index 68774cdcd8c..541094bda77 100644 --- a/packages/google-storage-control/test/gapic_storage_control_v2.ts +++ b/packages/google-storage-control/test/gapic_storage_control_v2.ts @@ -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'},