@znemz/cfn-include 2.0.2 → 2.1.1

package/index.js

@@ -32,9 +32,10 @@ const { isOurExplicitFunction } = require('./lib/schema');
  *  optional and can be derived from url
  * @param  {string} [options.url] '(file|s3):///SOME_FILE_PATH.(json|yaml)'
  * @param  {boolean} options.doEnv inject environment from process.env as well
+ * @param  {boolean} options.doEval allow Fn::Eval to be used (js eval)
  * @param  {Object.<string, string>} [options.inject] object to
  *      inject { KEY: Value } from where ${KEY}
- *  is subtituted with Value
+ *  is substituted with Value
  * @param  {boolean} [options.doLog] log all arguments at the include recurse level
  *
  * Example: Load off off file system
@@ -49,6 +50,9 @@ const { isOurExplicitFunction } = require('./lib/schema');
  */
 module.exports = async function (options) {
   let { template } = options;
+  options.doEnv = getBoolEnvOpt(options.doEnv, 'CFN_INCLUDE_DO_ENV');
+  options.doEval = getBoolEnvOpt(options.doEval, 'CFN_INCLUDE_DO_EVAL');
+
   const base = parseLocation(options.url);
   const scope = options.scope || {};
   if (base.relative) throw new Error('url cannot be relative');
@@ -232,7 +236,10 @@ async function recurse({ base, scope, cft, ...opts }) {
         }
       );
     }
-    if (cft['Fn::Eval'] && opts.doEval) {
+    if (cft['Fn::Eval']) {
+      if (!opts.doEval) {
+        return Promise.reject(new Error('Fn::Eval is not allowed doEval is falsy'));
+      }
       return recurse({ base, scope, cft: cft['Fn::Eval'], ...opts }).then(function (json) {
         // **WARNING** you have now enabled god mode
         // eslint-disable-next-line no-unused-vars, prefer-const
@@ -387,7 +394,10 @@ async function recurse({ base, scope, cft, ...opts }) {
       return isString ? seq.map((i) => String.fromCharCode(i)) : seq;
     }
 
-    if (cft['Fn::IfEval'] && opts.doEval) {
+    if (cft['Fn::IfEval']) {
+      if (!opts.doEval) {
+        return Promise.reject(new Error('Fn::IfEval is not allowed doEval is falsy'));
+      }
       return recurse({ base, scope, cft: cft['Fn::IfEval'], ...opts }).then(function (json) {
         // eslint-disable-next-line prefer-const
         let { truthy, falsy, evalCond, inject, doLog } = json;
@@ -718,3 +728,7 @@ function JSONifyString(string) {
   });
   return lines;
 }
+
+function getBoolEnvOpt(opt, envKey) {
+  return process.env[envKey] ? !!process.env[envKey] : opt;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@znemz/cfn-include",
-  "version": "2.0.2",
+  "version": "2.1.1",
   "description": "Preprocessor for CloudFormation templates with support for loops and flexible include statements",
   "keywords": [
     "aws",