From 9c19d7a773f6409aaac207cb755d78b4a80f89c4 Mon Sep 17 00:00:00 2001 From: Philipp Muens Date: Fri, 16 Jun 2017 08:43:25 +0100 Subject: [PATCH] Remove deployment bucket reference from Service class --- lib/classes/Service.js | 21 --------------------- lib/classes/Service.test.js | 16 ---------------- 2 files changed, 37 deletions(-) diff --git a/lib/classes/Service.js b/lib/classes/Service.js index a986eaeb0..8bb225bc8 100644 --- a/lib/classes/Service.js +++ b/lib/classes/Service.js @@ -7,7 +7,6 @@ const BbPromise = require('bluebird'); const semver = require('semver'); class Service { - constructor(serverless, data) { this.serverless = serverless; @@ -111,17 +110,6 @@ class Service { that.service = serverlessFile.service; } - if (_.isObject(that.provider.deploymentBucket)) { - that.provider.deploymentBucketObject = that.provider.deploymentBucket; - if (that.provider.deploymentBucketObject.name) { - that.provider.deploymentBucket = that.provider.deploymentBucketObject.name; - } else { - delete that.provider.deploymentBucket; - } - } else { - that.provider.deploymentBucketObject = { name: that.provider.deploymentBucket }; - } - that.custom = serverlessFile.custom; that.plugins = serverlessFile.plugins; that.resources = serverlessFile.resources; @@ -228,15 +216,6 @@ class Service { getAllEventsInFunction(functionName) { return this.getFunction(functionName).events; } - - setDeploymentBucketName(name) { - const provider = this.provider; - if (provider.deploymentBucketObject) { - provider.deploymentBucketObject.name = name; - } - provider.deploymentBucket = name; - } - } module.exports = Service; diff --git a/lib/classes/Service.test.js b/lib/classes/Service.test.js index 6bbb09711..a03d7dc88 100644 --- a/lib/classes/Service.test.js +++ b/lib/classes/Service.test.js @@ -923,20 +923,4 @@ describe('Service', () => { }]); }); }); - - describe('#setDeploymentBucketName()', () => { - it('should set the name field of the deploymentBucket object', () => { - const serverless = new Serverless(); - const serviceInstance = new Service(serverless); - const newName = 'new-name'; - serviceInstance.provider.deploymentBucketObject = { - name: 'old-name', - }; - - serviceInstance.setDeploymentBucketName(newName); - - expect(serviceInstance.provider.deploymentBucketObject.name).to.be.equal(newName); - expect(serviceInstance.provider.deploymentBucket).to.be.equal(newName); - }); - }); });