Merge pull request nicka#9 from nicka/release/1.2.0

Release/1.2.0

Author: nicka

lib/__snapshots__/index.test.js.snap

@@ -9,22 +9,23 @@ exports[`serverless-plugin-write-env-vars diff successfully triggers diff runs d
 `;
 
 exports[`serverless-plugin-write-env-vars diff successfully triggers diff runs diff with custom localTemplate template 1`] = `
-"1c1
-< {\"foo\":\"custom\"}
-\\ No newline at end of file
----
-> {\"foo\":\"foo\"}
-\\ No newline at end of file
+" {
+-  foo: \"custom\"
++  foo: \"foo\"
+ }
 "
 `;
 
 exports[`serverless-plugin-write-env-vars diff successfully triggers diff runs diff with defaults 1`] = `
-"1c1
-< {\"foo\":\"bar\"}
-\\ No newline at end of file
----
-> {\"foo\":\"foo\"}
-\\ No newline at end of file
+" {
+-  foo: \"bar\"
++  foo: \"foo\"
+ }
+"
+`;
+
+exports[`serverless-plugin-write-env-vars diff successfully triggers diff runs diff without changes 1`] = `
+" undefined
 "
 `;
 

lib/index.js

@@ -1,8 +1,9 @@
 'use strict';
 
 const AWS = require('aws-sdk');
-const fs = require('fs-promise');
+const diff = require('json-diff').diffString;
 const exec = require('child-process-promise').exec;
+const fs = require('fs-promise');
 const Q = require('q');
 
 class ServerlessPlugin {
@@ -45,8 +46,7 @@ class ServerlessPlugin {
     this.options.region = this.options.region
       || (this.serverless.service.defaults && this.serverless.service.defaults.region)
       || 'us-east-1';
-    this.options.diffTool = this.options.diffTool
-      || 'diff';
+    this.options.diffTool = this.options.diffTool;
     this.options.localTemplate = this.options.localTemplate
       || '.serverless/cloudformation-template-update-stack.json';
     this.options.orgTemplate = this.options.localTemplate.replace('.json', '.org.json');
@@ -92,13 +92,27 @@ class ServerlessPlugin {
 
     fs.stat(localTemplate)
       .then(() => {
-        exec(`${diffTool} ${orgTemplate} ${localTemplate} || true`)
-          .then((result) => {
-            const diffData = result.stdout;
-            console.log(diffData);
-            deferred.resolve(diffData);
-          })
-          .catch(execErr => deferred.reject(execErr.message));
+        if (typeof diffTool === 'undefined') {
+          const orgTemplateJson = JSON.parse(fs.readFileSync(orgTemplate, 'utf8'));
+          const localTemplateJson = JSON.parse(fs.readFileSync(localTemplate, 'utf8'));
+          const differences = diff(orgTemplateJson, localTemplateJson) || {};
+
+          if (differences.trim() === 'undefined') {
+            console.log('Resource templates are equal');
+          } else {
+            console.log(differences);
+          }
+
+          deferred.resolve(differences);
+        } else {
+          exec(`${diffTool} ${orgTemplate} ${localTemplate} || true`)
+            .then((result) => {
+              const diffData = result.stdout;
+              console.log(diffData);
+              deferred.resolve(diffData);
+            })
+            .catch(execErr => deferred.reject(execErr.message));
+        }
       })
       .catch((err) => {
         if (err.code === 'ENOENT') {

lib/index.test.js

@@ -32,7 +32,7 @@ describe('serverless-plugin-write-env-vars', () => {
 
       expect(plugin.options.stage).toBe('foo');
       expect(plugin.options.region).toBe('eu-west-1');
-      expect(plugin.options.diffTool).toBe('diff');
+      expect(plugin.options.diffTool).toBe(undefined);
       expect(plugin.options.localTemplate).toBe(`${templatePrefix}.json`);
       expect(plugin.options.orgTemplate).toBe(`${templatePrefix}.org.json`);
     });
@@ -125,6 +125,25 @@ describe('serverless-plugin-write-env-vars', () => {
       });
     });
 
+    describe('successfully triggers diff', () => {
+      const customTemplate = `${templatePrefix}-foo.json`;
+      const customOrgTemplate = `${templatePrefix}-foo.org.json`;
+
+      beforeEach(() =>
+        fs.writeFile(customTemplate, '{"foo":"foo"}')
+          .then(() => fs.writeFile(customOrgTemplate, '{"foo":"foo"}'))
+      );
+
+      it('runs diff without changes', () => {
+        const plugin = new Plugin(slsDefaults, {
+          localTemplate: customTemplate,
+        });
+
+        return plugin.diff()
+          .then(data => expect(data).toMatchSnapshot());
+      });
+    });
+
     describe('unsuccessfully triggers diff', () => {
       beforeEach(() => fs.unlink(exampleTemplate));