Merge branch 'main' into fix-sample

googleapis · Nov 25, 2024 · 835ae07 · 835ae07
2 parents a5fdf27 + 273774e
commit 835ae07
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -99,7 +99,7 @@
     "@types/mime": "^3.0.0",
     "@types/mocha": "^9.1.1",
     "@types/mockery": "^1.4.29",
-    "@types/node": "^20.4.4",
+    "@types/node": "^22.0.0",
     "@types/node-fetch": "^2.1.3",
     "@types/proxyquire": "^1.3.28",
     "@types/request": "^2.48.4",

diff --git a/src/file.ts b/src/file.ts
@@ -3820,7 +3820,7 @@ class File extends ServiceObject<File, FileMetadata> {
         encryptionKey: optionsOrCallback,
       };
     } else if (typeof optionsOrCallback === 'object') {
-      options = optionsOrCallback;
+      options = optionsOrCallback as EncryptionKeyOptions;
     }
 
     const newFile = this.bucket.file(this.id!, options);