Feat(Bucket): Runs prettify

serverless · Mar 16, 2021 · c648360 · c648360
1 parent 45666f7
commit c648360
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 9 deletions.
diff --git a/deploy/lib/cleanupDeploymentBucket.test.js b/deploy/lib/cleanupDeploymentBucket.test.js
@@ -17,7 +17,9 @@ describe('CleanupDeploymentBucket', () => {
     serverless.service = {
       service: 'my-service',
       provider: {
-        deploymentBucketName: 'sls-my-service-dev-12345678',
+        bucket: {
+          name: 'sls-my-service-dev-12345678',
+        },
       },
     };
     serverless.setProvider('google', new GoogleProvider(serverless));

diff --git a/deploy/lib/uploadArtifacts.test.js b/deploy/lib/uploadArtifacts.test.js
@@ -21,7 +21,9 @@ describe('UploadArtifacts', () => {
     serverless.service = {
       service: 'my-service',
       provider: {
-        deploymentBucketName: 'sls-my-service-dev-12345678',
+        bucket: {
+          name: 'sls-my-service-dev-12345678',
+        },
       },
       package: {
         artifactFilePath: '/some-file-path',

diff --git a/package/lib/compileFunctions.test.js b/package/lib/compileFunctions.test.js
@@ -22,7 +22,9 @@ describe('CompileFunctions', () => {
       compiledConfigurationTemplate: {
         resources: [],
       },
-      deploymentBucketName: 'sls-my-service-dev-12345678',
+      bucket: {
+        name: 'sls-my-service-dev-12345678',
+      },
       project: 'myProject',
       region: 'us-central1',
     };

diff --git a/package/lib/prepareDeployment.test.js b/package/lib/prepareDeployment.test.js
@@ -24,7 +24,9 @@ describe('PrepareDeployment', () => {
     serverless.service.service = 'my-service';
     serverless.service.provider = {
       compiledConfigurationTemplate: coreResources,
-      deploymentBucketName: 'sls-my-service-dev-12345678',
+      bucket: {
+        name: 'sls-my-service-dev-12345678',
+      },
     };
     serverless.setProvider('google', new GoogleProvider(serverless));
     const options = {

diff --git a/remove/lib/emptyDeploymentBucket.js b/remove/lib/emptyDeploymentBucket.js
@@ -9,7 +9,8 @@ module.exports = {
 
   getObjectsToRemove() {
     const params = {
-      bucket: this.serverless.service.provider.deploymentBucketName,
+      bucket:
+        this.serverless.service.provider.bucket && this.serverless.service.provider.bucket.name,
     };
 
     return this.provider.request('storage', 'objects', 'list', params).then((response) => {

diff --git a/remove/lib/emptyDeploymentBucket.test.js b/remove/lib/emptyDeploymentBucket.test.js
@@ -17,7 +17,9 @@ describe('EmptyDeploymentBucket', () => {
     serverless.service = {
       service: 'my-service',
       provider: {
-        deploymentBucketName: 'sls-my-service-dev-12345678',
+        bucket: {
+          name: 'sls-my-service-dev-12345678',
+        },
       },
     };
     serverless.setProvider('google', new GoogleProvider(serverless));

diff --git a/shared/setDeploymentBucketName.test.js b/shared/setDeploymentBucketName.test.js
@@ -75,9 +75,7 @@ describe('SetDeploymentBucketName', () => {
       requestStub.returns(BbPromise.resolve(response));
 
       return googleCommand.setDeploymentBucketName().then(() => {
-        expect(serverless.service.provider.bucket.name).toEqual(
-          'sls-my-service-dev-12345678'
-        );
+        expect(serverless.service.provider.bucket.name).toEqual('sls-my-service-dev-12345678');
         expect(
           requestStub.calledWithExactly('deploymentmanager', 'resources', 'list', {
             project: 'my-project',