fix: pass predefined acl as destinationPredefinedAcl to qs (#872)

AVaksman · Benjamin E. Coe · commit 09b8fa4d3a07 · 2019-10-07T15:50:01.000-07:00
diff --git a/src/file.ts b/src/file.ts
@@ -323,6 +323,7 @@ interface CopyQuery {
   rewriteToken?: string;
   userProject?: string;
   destinationKmsKeyName?: string;
+  destinationPredefinedAcl?: string;
 }
 
 interface FileQuery {
@@ -833,7 +834,10 @@ class File extends ServiceObject<File> {
     });
   }
 
-  copy(destination: string | Bucket | File): Promise<CopyResponse>;
+  copy(
+    destination: string | Bucket | File,
+    options?: CopyOptions
+  ): Promise<CopyResponse>;
   copy(destination: string | Bucket | File, callback: CopyCallback): void;
   copy(
     destination: string | Bucket | File,
@@ -1031,6 +1035,10 @@ class File extends ServiceObject<File> {
       query.userProject = options.userProject;
       delete options.userProject;
     }
+    if (options.predefinedAcl !== undefined) {
+      query.destinationPredefinedAcl = options.predefinedAcl;
+      delete options.predefinedAcl;
+    }
 
     newFile = newFile! || destBucket.file(destName);
 
diff --git a/system-test/storage.ts b/system-test/storage.ts
@@ -2597,6 +2597,16 @@ describe('storage', () => {
       await Promise.all([file.delete, copiedFile.delete()]);
     });
 
+    it('should respect predefined Acl at file#copy', async () => {
+      const opts = {destination: 'CloudLogo'};
+      const [file] = await bucket.upload(FILES.logo.path, opts);
+      const copyOpts = {predefinedAcl: 'publicRead'};
+      const [copiedFile] = await file.copy('CloudLogoCopy', copyOpts);
+      const publicAcl = await isFilePublicAsync(copiedFile);
+      assert.strictEqual(publicAcl, true);
+      await Promise.all([file.delete, copiedFile.delete()]);
+    });
+
     it('should copy a large file', async () => {
       const otherBucket = storage.bucket(generateName());
       const file = bucket.file('Big');
diff --git a/test/file.ts b/test/file.ts
@@ -550,6 +550,23 @@ describe('File', () => {
       file.copy(newFile, {destinationKmsKeyName}, assert.ifError);
     });
 
+    it('should accept predefined Acl', done => {
+      const options = {
+        predefinedAcl: 'authenticatedRead',
+      };
+      const newFile = new File(BUCKET, 'new-file');
+      file.request = (reqOpts: DecorateRequestOptions) => {
+        assert.strictEqual(
+          reqOpts.qs.destinationPredefinedAcl,
+          options.predefinedAcl
+        );
+        assert.strictEqual(reqOpts.json.destinationPredefinedAcl, undefined);
+        done();
+      };
+
+      file.copy(newFile, options, assert.ifError);
+    });
+
     it('should favor the option over the File KMS name', done => {
       const newFile = new File(BUCKET, 'new-file');
       newFile.kmsKeyName = 'incorrect-kms-key-name';
