fix: do not automatically set overrideUnlockedRetention (#2421)

googleapis · Mar 7, 2024 · c781bdc · c781bdc
1 parent 11ebe2b
commit c781bdc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/src/file.ts b/src/file.ts
@@ -3857,10 +3857,6 @@ class File extends ServiceObject<File, FileMetadata> {
       options
     );
 
-    if (metadata.retention !== undefined) {
-      options.overrideUnlockedRetention = true;
-    }
-
     super
       .setMetadata(metadata, options)
       .then(resp => cb!(null, ...resp))

diff --git a/system-test/storage.ts b/system-test/storage.ts
@@ -1648,7 +1648,10 @@ describe('storage', function () {
 
     it('should disable object retention on the file', async () => {
       const file = new File(objectRetentionBucket, fileName);
-      const [metadata] = await file.setMetadata({retention: null});
+      const [metadata] = await file.setMetadata(
+        {retention: null},
+        {overrideUnlockedRetention: true}
+      );
       assert.strictEqual(metadata.retention, undefined);
     });
   });

diff --git a/test/file.ts b/test/file.ts
@@ -4589,16 +4589,19 @@ describe('File', () => {
   });
 
   describe('setMetadata', () => {
-    it('should set query parameter overrideUnlockedRetention', done => {
+    it('should accept overrideUnlockedRetention option and set query parameter', done => {
       const newFile = new File(BUCKET, 'new-file');
 
       newFile.parent.request = (reqOpts: DecorateRequestOptions) => {
-        console.log(reqOpts.qs);
         assert.strictEqual(reqOpts.qs.overrideUnlockedRetention, true);
         done();
       };
 
-      newFile.setMetadata({retention: null}, assert.ifError);
+      newFile.setMetadata(
+        {retention: null},
+        {overrideUnlockedRetention: true},
+        assert.ifError
+      );
     });
   });