From 5a4044a8ba13f248fc4f791248f797eb0f1f3c16 Mon Sep 17 00:00:00 2001 From: Alex <7764119+AVaksman@users.noreply.github.com> Date: Wed, 13 May 2020 16:24:27 -0400 Subject: [PATCH] chore!: drop keepAcl parameter in file copy (#1166) Co-authored-by: Frank Natividad --- src/file.ts | 20 ------------------ test/file.ts | 59 ---------------------------------------------------- 2 files changed, 79 deletions(-) diff --git a/src/file.ts b/src/file.ts index c89b5d532..940485b25 100644 --- a/src/file.ts +++ b/src/file.ts @@ -304,7 +304,6 @@ export interface FileOptions { export interface CopyOptions { destinationKmsKeyName?: string; - keepAcl?: string; predefinedAcl?: string; token?: string; userProject?: string; @@ -843,8 +842,6 @@ class File extends ServiceObject { * `projects/my-project/locations/location/keyRings/my-kr/cryptoKeys/my-key`, * that will be used to encrypt the object. Overwrites the object * metadata's `kms_key_name` value, if any. - * @property {string} [keepAcl] This parameter is not supported and will be - * removed in the next major. * @property {string} [predefinedAcl] Set the ACL for the new file. * @property {string} [token] A previously-returned `rewriteToken` from an * unfinished rewrite request. @@ -971,12 +968,6 @@ class File extends ServiceObject { options = optionsOrCallback; } - // eslint-disable-next-line no-prototype-builtins - if (options.hasOwnProperty('keepAcl')) { - // TODO: remove keepAcl from interface in next major. - emitWarning(); - } - options = extend(true, {}, options); callback = callback || util.noop; @@ -3638,17 +3629,6 @@ promisifyAll(File, { exclude: ['request', 'setEncryptionKey'], }); -let warned = false; -export function emitWarning() { - if (!warned) { - warned = true; - process.emitWarning( - 'keepAcl parameter is not supported and will be removed in the next major', - 'DeprecationWarning' - ); - } -} - /** * Reference to the {@link File} class. * @name module:@google-cloud/storage.File diff --git a/test/file.ts b/test/file.ts index dec1a2968..22debadde 100644 --- a/test/file.ts +++ b/test/file.ts @@ -350,65 +350,6 @@ describe('File', () => { }); describe('copy', () => { - describe('depricate `keepAcl`', () => { - // eslint-disable-next-line - let STORAGE2: any; - // eslint-disable-next-line - let BUCKET2: any; - // eslint-disable-next-line @typescript-eslint/no-explicit-any - let file2: any; - beforeEach(() => { - STORAGE2 = { - createBucket: util.noop, - request: util.noop, - // eslint-disable-next-line @typescript-eslint/no-explicit-any - makeAuthenticatedRequest(req: {}, callback: any) { - if (callback) { - (callback.onAuthenticated || callback)(null, req); - } - }, - bucket(name: string) { - return new Bucket(this, name); - }, - }; - BUCKET2 = new Bucket(STORAGE, 'bucket-name'); - file2 = new File(BUCKET, FILE_NAME); - }); - - it('should warn if `keepAcl` parameter is passed', done => { - file.request = util.noop; - - // since --throw-deprication is enabled using try=>catch block - try { - file.copy('newFile', {keepAcl: 'private'}, assert.ifError); - } catch (err) { - assert.strictEqual( - err.message, - 'keepAcl parameter is not supported and will be removed in the next major' - ); - assert.strictEqual(err.name, 'DeprecationWarning'); - done(); - } - }); - - it('should warn only once `keepAcl` parameter is passed', done => { - file.request = util.noop; - - // since --throw-deprication is enabled using try=>catch block - try { - file.copy('newFile', {keepAcl: 'private'}, assert.ifError); - } catch (err) { - assert.strictEqual( - err.message, - 'keepAcl parameter is not supported and will be removed in the next major' - ); - assert.strictEqual(err.name, 'DeprecationWarning'); - } - file2.copy('newFile2', {keepAcl: 'private'}, assert.ifError); - done(); - }); - }); - it('should throw if no destination is provided', () => { assert.throws(() => { file.copy();