Merge pull request #41 from serverless/add-service-resource-merging

Add service resource merging

Author: pmuens

deploy/googleDeploy.js

@@ -8,6 +8,7 @@ const prepareDeployment = require('./lib/prepareDeployment');
 const createDeployment = require('./lib/createDeployment');
 const monitorDeployment = require('../shared/monitorDeployment');
 const generateArtifactDirectoryName = require('./lib/generateArtifactDirectoryName');
+const mergeServiceResources = require('./lib/mergeServiceResources');
 const uploadArtifacts = require('./lib/uploadArtifacts');
 const compileFunctions = require('./lib/compileFunctions');
 const updateDeployment = require('./lib/updateDeployment');
@@ -27,6 +28,7 @@ class GoogleDeploy {
       createDeployment,
       monitorDeployment,
       generateArtifactDirectoryName,
+      mergeServiceResources,
       uploadArtifacts,
       compileFunctions,
       updateDeployment,
@@ -48,6 +50,7 @@ class GoogleDeploy {
         .then(this.compileFunctions),
 
       'deploy:deploy': () => BbPromise.bind(this)
+        .then(this.mergeServiceResources)
         .then(this.uploadArtifacts)
         .then(this.updateDeployment)
         .then(this.cleanupDeploymentBucket),

deploy/googleDeploy.test.js

@@ -41,6 +41,7 @@ describe('GoogleDeploy', () => {
       let prepareDeploymentStub;
       let createDeploymentStub;
       let generateArtifactDirectoryNameStub;
+      let mergeServiceResourcesStub;
       let compileFunctionsStub;
       let uploadArtifactsStub;
       let updateDeploymentStub;
@@ -58,6 +59,8 @@ describe('GoogleDeploy', () => {
         generateArtifactDirectoryNameStub = sinon
           .stub(googleDeploy, 'generateArtifactDirectoryName')
           .returns(BbPromise.resolve());
+        mergeServiceResourcesStub = sinon.stub(googleDeploy, 'mergeServiceResources')
+          .returns(BbPromise.resolve());
         compileFunctionsStub = sinon.stub(googleDeploy, 'compileFunctions')
           .returns(BbPromise.resolve());
         uploadArtifactsStub = sinon.stub(googleDeploy, 'uploadArtifacts')
@@ -74,6 +77,7 @@ describe('GoogleDeploy', () => {
         googleDeploy.prepareDeployment.restore();
         googleDeploy.createDeployment.restore();
         googleDeploy.generateArtifactDirectoryName.restore();
+        googleDeploy.mergeServiceResources.restore();
         googleDeploy.compileFunctions.restore();
         googleDeploy.uploadArtifacts.restore();
         googleDeploy.updateDeployment.restore();
@@ -105,7 +109,8 @@ describe('GoogleDeploy', () => {
 
       it('should run "deploy:deploy" promise chain', () => googleDeploy
         .hooks['deploy:deploy']().then(() => {
-          expect(uploadArtifactsStub.calledOnce).toEqual(true);
+          expect(mergeServiceResourcesStub.calledOnce).toEqual(true);
+          expect(uploadArtifactsStub.calledAfter(mergeServiceResourcesStub)).toEqual(true);
           expect(updateDeploymentStub.calledAfter(uploadArtifactsStub)).toEqual(true);
           expect(cleanupDeploymentBucketStub.calledAfter(updateDeploymentStub)).toEqual(true);
         }));

deploy/lib/mergeServiceResources.js

@@ -0,0 +1,26 @@
+'use strict';
+
+/* eslint no-use-before-define: 0 */
+
+const _ = require('lodash');
+const BbPromise = require('bluebird');
+
+module.exports = {
+  mergeServiceResources() {
+    const resources = this.serverless.service.resources;
+
+    if ((typeof resources === 'undefined') || _.isEmpty(resources)) return BbPromise.resolve();
+
+    _.mergeWith(
+      this.serverless.service.provider.compiledConfigurationTemplate,
+      resources,
+      mergeCustomizer);
+
+    return BbPromise.resolve();
+  },
+};
+
+const mergeCustomizer = (objValue, srcValue) => {
+  if (_.isArray(objValue)) return objValue.concat(srcValue);
+  return objValue;
+};

deploy/lib/mergeServiceResources.test.js

@@ -0,0 +1,101 @@
+'use stict';
+
+const GoogleProvider = require('../../provider/googleProvider');
+const GoogleDeploy = require('../googleDeploy');
+const Serverless = require('../../test/serverless');
+
+describe('MergeServiceResources', () => {
+  let serverless;
+  let googleDeploy;
+
+  beforeEach(() => {
+    serverless = new Serverless();
+    serverless.service.service = 'my-service';
+    serverless.service.provider = {
+      compiledConfigurationTemplate: {},
+    };
+    serverless.setProvider('google', new GoogleProvider(serverless));
+    const options = {
+      stage: 'dev',
+      region: 'us-central1',
+    };
+    googleDeploy = new GoogleDeploy(serverless, options);
+  });
+
+  it('should resolve if service resources are not defined', () => googleDeploy
+    .mergeServiceResources().then(() => {
+      expect(serverless.service.provider
+        .compiledConfigurationTemplate).toEqual({});
+    }));
+
+  it('should resolve if service resources is empty', () => {
+    serverless.service.resources = {};
+
+    return googleDeploy.mergeServiceResources().then(() => {
+      expect(serverless.service.provider
+        .compiledConfigurationTemplate).toEqual({});
+    });
+  });
+
+  it('should merge all the resources if provided', () => {
+    serverless.service.provider.compiledConfigurationTemplate = {
+      resources: [
+        {
+          name: 'resource1',
+          type: 'type1',
+          properties: {
+            property1: 'value1',
+          },
+        },
+      ],
+    };
+
+    serverless.service.resources = {
+      resources: [
+        {
+          name: 'resource2',
+          type: 'type2',
+          properties: {
+            property1: 'value1',
+          },
+        },
+      ],
+      imports: [
+        {
+          path: 'path/to/template.jinja',
+          name: 'my-template',
+        },
+      ],
+    };
+
+    const expectedResult = {
+      resources: [
+        {
+          name: 'resource1',
+          type: 'type1',
+          properties: {
+            property1: 'value1',
+          },
+        },
+        {
+          name: 'resource2',
+          type: 'type2',
+          properties: {
+            property1: 'value1',
+          },
+        },
+      ],
+      imports: [
+        {
+          path: 'path/to/template.jinja',
+          name: 'my-template',
+        },
+      ],
+    };
+
+    return googleDeploy.mergeServiceResources().then(() => {
+      expect(serverless.service.provider.compiledConfigurationTemplate)
+        .toEqual(expectedResult);
+    });
+  });
+});