Merge branch 'master' of github.com:svdgraaf/serverless-pseudo-parameters

Author: svdgraaf

lib/index.js

@@ -1,39 +1,33 @@
 'use strict';
 
-const _ = require('lodash');
-const chalk = require('chalk');
-
-
 class ServerlessAWSPseudoParameters {
   constructor(serverless, options) {
     this.serverless = serverless;
     this.options = options;
     this.hooks = {
       'before:deploy:deploy': this.addParameters.bind(this),
     };
-    this.skipRegionReplace = _.get(serverless.service, 'custom.pseudoParameters.skipRegionReplace', false)
+    this.skipRegionReplace = get(serverless.service, 'custom.pseudoParameters.skipRegionReplace', false)
   }
 
   addParameters() {
 
-    const template = this.serverless.service.provider.compiledCloudFormationTemplate;
+    const resources = this.serverless.service.provider.compiledCloudFormationTemplate.Resources;
     const skipRegionReplace = this.skipRegionReplace;
     const consoleLog = this.serverless.cli.consoleLog;
 
-    consoleLog(`${chalk.yellow.underline('AWS Pseudo Parameters')}`);
+    consoleLog(yellow(underline('AWS Pseudo Parameters')));
 
     if (skipRegionReplace) {
       consoleLog('Skipping automatic replacement of regions with account region!');
     }
 
     // loop through all resources, and check all (string) properties for any #{AWS::}
     // reference. If found, replace the value with an Fn::Sub reference
-    _.forEach(template.Resources, function(resource, identifier){
-      replaceChildNodes(resource.Properties, identifier);
-    });
+    Object.keys(resources).forEach(identifier => replaceChildNodes(resources[identifier].Properties, identifier));
 
     function isDict(v) {
-      return typeof v==='object' && v!==null && !(v instanceof Array) && !(v instanceof Date);
+      return typeof v === 'object' && v !== null && !(v instanceof Array) && !(v instanceof Date);
     }
 
     function isArray(v) {
@@ -60,45 +54,52 @@ class ServerlessAWSPseudoParameters {
     }
 
     function replaceChildNodes(dictionary, name) {
-        _.forEach(dictionary, function(value, key){
-
-          // if a region name is mentioned, replace it with a reference (unless we are skipping automatic replacements)
-          if(typeof value === 'string' && !skipRegionReplace && containsRegion(value)) {
-            var regionFinder = new RegExp(regions().join("|"));
-            value = value.replace(regionFinder, '#{AWS::Region}');
+      Object.keys(dictionary).forEach((key) => {
+
+        let value = dictionary[key];
+        // if a region name is mentioned, replace it with a reference (unless we are skipping automatic replacements)
+        if (typeof value === 'string' && !skipRegionReplace && containsRegion(value)) {
+          const regionFinder = new RegExp(regions().join("|"));
+          value = value.replace(regionFinder, '#{AWS::Region}');
+        }
+
+        // we only want to possibly replace strings with an Fn::Sub
+        if (typeof value === 'string' && value.search(/#{AWS::([a-zA-Z]+)}/) >= 0) {
+          const aws_regex = /#{AWS::([a-zA-Z]+)}/g;
+
+          dictionary[key] = {
+            "Fn::Sub": value.replace(aws_regex, '${AWS::$1}')
+          };
+
+          // do some fancy logging
+          let m = aws_regex.exec(value);
+          while (m) {
+            consoleLog('AWS Pseudo Parameter: ' + name + '::' + key + ' Replaced ' + yellow(m[1]) + ' with ' + yellow('${AWS::' + m[1] + '}'));
+            m = aws_regex.exec(value);
           }
+        }
 
-          // we only want to possibly replace strings with an Fn::Sub
-          if(typeof value === 'string' && value.search(/#{AWS::([a-zA-Z]+)}/) >= 0) {
-            var aws_regex = /#{AWS::([a-zA-Z]+)}/g;
-            var m;
-
-            dictionary[key] = {
-              "Fn::Sub": value.replace(aws_regex, '${AWS::$1}')
-            }
-
-            // do some fancy logging
-            do {
-              var m = aws_regex.exec(value);
-              if (m) {
-                var msg = name + '::' + key + ' Replaced ' + chalk.yellow(m[1]) + ' with ' + chalk.yellow('${AWS::' + m[1] + '}');
-                // this.serverless.cli.consoleLog(message);
-                consoleLog('AWS Pseudo Parameter: ' + msg)
-              }
-            } while (m);
-          }
+        // dicts and arrays need to be looped through
+        if (isDict(value) || isArray(value)) {
+          dictionary[key] = replaceChildNodes(value, name + '::' + key);
+        }
 
-          // dicts and arrays need to be looped through
-          if (isDict(value) || isArray(value)) {
-            dictionary[key] = replaceChildNodes(value, name + '::' + key);
-          }
+      });
+      return dictionary;
+    }
 
-        });
-        return dictionary;
-      }
+    function yellow(str) {
+      return '\u001B[33m' + str + '\u001B[39m';
+    }
 
+    function underline(str) {
+      return '\u001B[4m' + str + '\u001B[24m';
+    }
   }
+}
 
+function get(obj, path, def) {
+  return path.split('.').filter(Boolean).every(step => !(step && (obj = obj[step]) === undefined)) ? obj : def;
 }
 
 module.exports = ServerlessAWSPseudoParameters;

package.json

@@ -7,8 +7,5 @@
     "git": "https://github.com/svdgraaf/serverless-pseudo-parameters"
   },
   "main": "lib/index.js",
-  "dependencies": {
-    "lodash": "^4.13.1",
-    "chalk": "^1.1.1"
-  }
+  "dependencies": {}
 }