From 1d434a905392b00bb48ebbb812034e062ed27dd2 Mon Sep 17 00:00:00 2001 From: Denis DelGrosso <85250797+ddelgrosso1@users.noreply.github.com> Date: Thu, 18 Apr 2024 16:07:39 -0400 Subject: [PATCH 1/3] fix: expand types of custom metadata within FileMetadata (#2442) --- src/file.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/file.ts b/src/file.ts index 8edb2c602..d7dc41a9f 100644 --- a/src/file.ts +++ b/src/file.ts @@ -470,7 +470,7 @@ export interface FileMetadata extends BaseMetadata { md5Hash?: string; mediaLink?: string; metadata?: { - [key: string]: string; + [key: string]: string | boolean | number | null; }; metageneration?: string | number; name?: string; From 2ebd7aca6c474147e5a1d1fb2a96b7d052a08a21 Mon Sep 17 00:00:00 2001 From: Vishwaraj Anand Date: Mon, 22 Apr 2024 13:14:41 +0000 Subject: [PATCH 2/3] fix: change copyoptions type (#2439) * fix: change copyoptions type * fix: added test * chore: address pr comments --- src/file.ts | 4 +++- test/file.ts | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/file.ts b/src/file.ts index d7dc41a9f..e4438a7d8 100644 --- a/src/file.ts +++ b/src/file.ts @@ -361,7 +361,9 @@ export interface CopyOptions { contentType?: string; contentDisposition?: string; destinationKmsKeyName?: string; - metadata?: FileMetadata; + metadata?: { + [key: string]: string | boolean | number | null; + }; predefinedAcl?: string; token?: string; userProject?: string; diff --git a/test/file.ts b/test/file.ts index d0cc0c2ba..bd95ad26d 100644 --- a/test/file.ts +++ b/test/file.ts @@ -545,12 +545,17 @@ describe('File', () => { it('should accept an options object', done => { const newFile = new File(BUCKET, 'name'); + const METADATA = { + metadataKey: 'metadataValue', + }; const options = { option: true, + metadata: METADATA, }; file.request = (reqOpts: DecorateRequestOptions) => { assert.deepStrictEqual(reqOpts.json, options); + assert.strictEqual(reqOpts.json.metadata, METADATA); done(); }; From 2eacda806e5ba9bdb32f2d42b23468753998bb9a Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 09:24:18 -0400 Subject: [PATCH 3/3] chore(main): release 7.10.1 (#2443) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 8 ++++++++ package.json | 2 +- samples/package.json | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9207ee3a7..920e2a56d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ [1]: https://www.npmjs.com/package/@google-cloud/storage?activeTab=versions +## [7.10.1](https://github.com/googleapis/nodejs-storage/compare/v7.10.0...v7.10.1) (2024-04-22) + + +### Bug Fixes + +* Change copyoptions type ([#2439](https://github.com/googleapis/nodejs-storage/issues/2439)) ([2ebd7ac](https://github.com/googleapis/nodejs-storage/commit/2ebd7aca6c474147e5a1d1fb2a96b7d052a08a21)) +* Expand types of custom metadata within FileMetadata ([#2442](https://github.com/googleapis/nodejs-storage/issues/2442)) ([1d434a9](https://github.com/googleapis/nodejs-storage/commit/1d434a905392b00bb48ebbb812034e062ed27dd2)) + ## [7.10.0](https://github.com/googleapis/nodejs-storage/compare/v7.9.0...v7.10.0) (2024-04-15) diff --git a/package.json b/package.json index d21deaf1a..fd23f6f93 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@google-cloud/storage", "description": "Cloud Storage Client Library for Node.js", - "version": "7.10.0", + "version": "7.10.1", "license": "Apache-2.0", "author": "Google Inc.", "engines": { diff --git a/samples/package.json b/samples/package.json index 018c785b7..edf1724aa 100644 --- a/samples/package.json +++ b/samples/package.json @@ -17,7 +17,7 @@ }, "dependencies": { "@google-cloud/pubsub": "^4.0.0", - "@google-cloud/storage": "^7.10.0", + "@google-cloud/storage": "^7.10.1", "node-fetch": "^2.6.7", "uuid": "^8.0.0", "yargs": "^16.0.0"