@znemz/cfn-include 2.1.2 → 2.1.4

package/bin/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-/* eslint-disable global-require, no-console */
+ 
 const exec = require('child_process').execSync;
 const path = require('path');
 const _ = require('lodash');
@@ -15,14 +15,14 @@ const replaceEnv = require('../lib/replaceEnv');
 yargs.version(false);
 
 const { env } = process;
-// eslint-disable-next-line global-require
+ 
 const opts = yargs
   .command('$0 [path] [options]', pkg.description, (y) =>
     y.positional('path', {
       positional: true,
       desc: 'location of template. Either path to a local file, URL or file on an S3 bucket (e.g. s3://bucket-name/example.template)',
       required: false,
-    })
+    }),
   )
   .options({
     minimize: {
@@ -59,7 +59,7 @@ const opts = yargs
     },
     context: {
       desc:
-        // eslint-disable-next-line max-len
+         
         'template full path. only utilized for stdin when the template is piped to this script',
       required: false,
       string: true,
@@ -77,13 +77,13 @@ const opts = yargs
     inject: {
       alias: 'i',
       string: true,
-      // eslint-disable-next-line max-len
+       
       desc: `JSON string payload to use for template injection.`,
       coerce: (valStr) => JSON.parse(valStr),
     },
     doLog: {
       boolean: true,
-      // eslint-disable-next-line max-len
+       
       desc: `console log out include options in recurse step`,
     },
     version: {
@@ -154,8 +154,8 @@ promise
         })
           .toString()
           .trim();
-      } catch (e) {
-        // eslint-disable-next-line no-empty
+      } catch {
+         
       }
       _.defaultsDeep(template, {
         Metadata: {
@@ -180,7 +180,7 @@ promise
     console.log(
       opts.yaml
         ? yaml.dump(template, opts)
-        : JSON.stringify(template, null, opts.minimize ? null : 2)
+        : JSON.stringify(template, null, opts.minimize ? null : 2),
     );
   })
   .catch(function (err) {

package/index.js

@@ -92,7 +92,7 @@ module.exports = async function (options) {
  */
 async function recurse({ base, scope, cft, ...opts }) {
   if (opts.doLog) {
-    // eslint-disable-next-line no-console
+
     console.log({ base, scope, cft, ...opts });
   }
   scope = _.clone(scope);
@@ -168,7 +168,7 @@ async function recurse({ base, scope, cft, ...opts }) {
       return recurse({ base, scope, cft: cft['Fn::FlattenDeep'], ...opts }).then(
         function (json) {
           return _.flattenDeep(json);
-        }
+        },
       );
     }
     if (cft['Fn::Uniq']) {
@@ -195,7 +195,7 @@ async function recurse({ base, scope, cft, ...opts }) {
       return recurse({ base, scope, cft: cft['Fn::SortedUniq'], ...opts }).then(
         function (array) {
           return _.sortedUniq(array.sort());
-        }
+        },
       );
     }
     if (cft['Fn::SortBy']) {
@@ -208,7 +208,7 @@ async function recurse({ base, scope, cft, ...opts }) {
     }
     if (cft['Fn::SortObject']) {
       return recurse({ base, scope, cft: cft['Fn::SortObject'], ...opts }).then(function ({
-        // eslint-disable-next-line no-shadow
+
         object,
         options,
         ...rest // allow object to be optional (implied)
@@ -233,7 +233,7 @@ async function recurse({ base, scope, cft, ...opts }) {
         function (json) {
           // omit falsy values except false, and 0
           return _.omitBy(json, (v) => !v && v !== false && v !== 0);
-        }
+        },
       );
     }
     if (cft['Fn::Eval']) {
@@ -242,14 +242,14 @@ async function recurse({ base, scope, cft, ...opts }) {
       }
       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
+
         let { state, script, inject, doLog } = json;
         script = replaceEnv(script, _.merge(_.cloneDeep(opts.inject), inject), opts.doEnv);
         if (doLog) {
-          // eslint-disable-next-line no-console
+
           console.log({ state, script, inject });
         }
-        // eslint-disable-next-line no-eval
+
         return eval(script);
       });
     }
@@ -258,7 +258,7 @@ async function recurse({ base, scope, cft, ...opts }) {
         function (json) {
           json = _.isPlainObject(json) ? { ...json } : { location: json };
           if (json.doLog) {
-            // eslint-disable-next-line no-console
+
             console.log(json);
           }
           const location = parseLocation(json.location);
@@ -277,13 +277,13 @@ async function recurse({ base, scope, cft, ...opts }) {
             return globs;
           }
           return 'Unsupported File Type';
-        }
+        },
       );
     }
     if (cft['Fn::Merge']) {
       return recurse({ base, scope, cft: cft['Fn::Merge'], ...opts }).then(function (json) {
         delete cft['Fn::Merge'];
-        // eslint-disable-next-line prefer-spread
+
         return recurse({ base, scope, cft: _.defaults(cft, _.merge.apply(_, json)), ...opts });
       });
     }
@@ -298,24 +298,24 @@ async function recurse({ base, scope, cft, ...opts }) {
             });
           }
           return recurse({ base, scope, cft: _.defaults(cft, mergedObj), ...opts });
-        }
+        },
       );
     }
     if (cft['Fn::ObjectKeys']) {
       return recurse({ base, scope, cft: cft['Fn::ObjectKeys'], ...opts }).then((json) =>
-        Object.keys(json)
+        Object.keys(json),
       );
     }
     if (cft['Fn::ObjectValues']) {
       return recurse({ base, scope, cft: cft['Fn::ObjectValues'], ...opts }).then((json) =>
-        Object.values(json)
+        Object.values(json),
       );
     }
     if (cft['Fn::Stringify']) {
       return recurse({ base, scope, cft: cft['Fn::Stringify'], ...opts }).then(
         function (json) {
           return JSON.stringify(json);
-        }
+        },
       );
     }
     if (cft['Fn::StringSplit']) {
@@ -324,13 +324,13 @@ async function recurse({ base, scope, cft, ...opts }) {
           if (!string) {
             string = '';
           }
-          // eslint-disable-next-line no-console
+
           if (doLog) console.log({ string, separator });
           if (!separator) {
             separator = ',';
           }
           return string.split(separator);
-        }
+        },
       );
     }
     if (cft['Fn::UpperCamelCase']) {
@@ -356,7 +356,7 @@ async function recurse({ base, scope, cft, ...opts }) {
     if (cft['Fn::Outputs']) {
       const outputs = await recurse({ base, scope, cft: cft['Fn::Outputs'], ...opts });
       const result = {};
-      // eslint-disable-next-line no-restricted-syntax, guard-for-in
+
       for (const output in outputs) {
         const val = outputs[output];
         const exp = {
@@ -380,7 +380,7 @@ async function recurse({ base, scope, cft, ...opts }) {
 
     if (cft['Fn::Sequence']) {
       const outputs = await recurse({ base, scope, cft: cft['Fn::Sequence'], ...opts });
-      // eslint-disable-next-line prefer-const
+
       let [start, stop, step = 1] = outputs;
       const isString = typeof start === 'string';
       if (isString) {
@@ -389,7 +389,7 @@ async function recurse({ base, scope, cft, ...opts }) {
       }
       const seq = Array.from(
         { length: Math.floor((stop - start) / step) + 1 },
-        (__, i) => start + i * step
+        (__, i) => start + i * step,
       );
       return isString ? seq.map((i) => String.fromCharCode(i)) : seq;
     }
@@ -399,7 +399,7 @@ async function recurse({ base, scope, cft, ...opts }) {
         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;
         if (!evalCond) {
           return Promise.reject(new Error('Fn::IfEval evalCond is required'));
@@ -418,11 +418,11 @@ async function recurse({ base, scope, cft, ...opts }) {
           falsy = replaceEnv(falsy, _.merge(_.cloneDeep(opts.inject), inject), opts.doEnv);
         }
 
-        // eslint-disable-next-line no-eval
+
         const condResult = eval(evalCond);
 
         if (doLog) {
-          // eslint-disable-next-line no-console
+
           console.log({ truthy, falsy, inject, evalCond, condResult });
         }
 
@@ -456,11 +456,11 @@ async function recurse({ base, scope, cft, ...opts }) {
                       Tags: tags,
                     },
                   },
-                  val
+                  val,
                 );
               }
               return resources[id];
-            })
+            }),
           );
         });
         return Promise.all(promises).then(() => resources);
@@ -468,7 +468,7 @@ async function recurse({ base, scope, cft, ...opts }) {
     }
 
     return Promise.props(
-      _.mapValues(cft, (template) => recurse({ base, scope, cft: template, ...opts }))
+      _.mapValues(cft, (template) => recurse({ base, scope, cft: template, ...opts })),
     );
   }
 
@@ -573,7 +573,7 @@ async function fnInclude({ base, scope, cft, ...opts }) {
           const inject = await recurse({ base, scope, cft: cft.inject, ...opts });
           const processed = await origProcTemplate(template, inject, opts.doEnv);
           return replaceEnv(processed, inject, opts.doEnv);
-        } catch (e) {
+        } catch {
           return '';
         }
       };
@@ -583,7 +583,7 @@ async function fnInclude({ base, scope, cft, ...opts }) {
   cft = fnIncludeOpts(cft, opts);
 
   if (cft.doLog) {
-    // eslint-disable-next-line no-console
+
     console.log({ base, scope, args: cft, ...opts });
   }
   // console.log(args)
@@ -610,7 +610,7 @@ async function fnInclude({ base, scope, cft, ...opts }) {
   } else if (location.protocol === 's3') {
     const basedir = pathParse(base.path).dir;
     const bucket = location.relative ? base.host : location.host;
-    // eslint-disable-next-line n/no-deprecated-api
+     
     let key = location.relative ? url.resolve(`${basedir}/`, location.raw) : location.path;
     key = key.replace(/^\//, '');
     absolute = `${location.protocol}://${[bucket, key].join('/')}`;
@@ -619,17 +619,17 @@ async function fnInclude({ base, scope, cft, ...opts }) {
         new GetObjectCommand({
           Bucket: bucket,
           Key: key,
-        })
+        }),
       )
       .then((res) => res.Body.toString())
       .then(procTemplate);
   } else if (location.protocol && location.protocol.match(/^https?$/)) {
     const basepath = `${pathParse(base.path).dir}/`;
-    /* eslint-disable n/no-deprecated-api */
+     
     absolute = location.relative
       ? url.resolve(`${location.protocol}://${base.host}${basepath}`, location.raw)
       : location.raw;
-    /* eslint-enable n/no-deprecated-api */
+     
     body = request(absolute).then(procTemplate);
   }
   return handleIncludeBody({ scope, args: cft, body, absolute });
@@ -678,13 +678,13 @@ async function handleIncludeBody({ scope, args, body, absolute }) {
           const query = _.isString(args.query)
             ? replaceEnv(args.query, args.inject, args.doEnv)
             : await recurse({
-                base: parseLocation(absolute),
-                scope,
-                cft: args.query,
-                doEnv: args.doEnv,
-                doLog: args.doLog,
-                inject: args.inject,
-              });
+              base: parseLocation(absolute),
+              scope,
+              cft: args.query,
+              doEnv: args.doEnv,
+              doLog: args.doLog,
+              inject: args.inject,
+            });
           return getParser(args.parser)(temp, query);
         });
       }

package/lib/cfnclient.js

@@ -35,7 +35,7 @@ class Client {
         Body: tpl,
         Bucket: this.bucket,
         Key: key,
-      })
+      }),
     );
 
     let res, err;
@@ -49,7 +49,7 @@ class Client {
         new DeleteObjectCommand({
           Bucket: this.bucket,
           Key: key,
-        })
+        }),
       )
       .catch(() => {});
     if (err) throw err;
@@ -70,16 +70,16 @@ class Client {
           .send(
             new ValidateTemplateCommand({
               TemplateURL: `https://s3.${this.region}.amazonaws.com/${this.bucket}/${key}`,
-            })
+            }),
           )
-          .promise()
+          .promise(),
       );
     }
 
     return this.client.send(
       new ValidateTemplateCommand({
         TemplateBody: tpl,
-      })
+      }),
     );
   }
 }

package/lib/include/api.js

@@ -1,10 +1,9 @@
-var _ = require('lodash'),
-  AWS = require('aws-sdk-proxy'),
+let AWS = require('aws-sdk-proxy'),
   jmespath = require('jmespath');
 
-module.exports = function(args) {
+module.exports = function (args) {
   var service = new AWS[args.service](args.region ? { region: args.region } : null);
-  return service[args.action](args.parameters ? args.parameters : {}).promise().then(function(res) {
+  return service[args.action](args.parameters ? args.parameters : {}).promise().then(function (res) {
     return args.query ? jmespath.search(res, args.query) : res;
   });
 }

package/lib/promise.js

@@ -12,7 +12,7 @@ const mapWhatever = (promises, cb) =>
       }
       const size = Object.values(arrayOrObject).length;
       return Promise.all(_.map(arrayOrObject, (value, key) => cb(value, key, size)));
-    })
+    }),
   );
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@znemz/cfn-include",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "description": "Preprocessor for CloudFormation templates with support for loops and flexible include statements",
   "keywords": [
     "aws",
@@ -43,36 +43,35 @@
   "dependencies": {
     "@aws-sdk/client-cloudformation": "^3.637.0",
     "@aws-sdk/client-s3": "^3.637.0",
-    "@znemz/cft-utils": "0.1.7",
+    "@znemz/cft-utils": "0.1.19",
     "@znemz/sort-object": "^3.0.4",
-    "aws-sdk-v3-proxy": "2.1.2",
+    "aws-sdk-v3-proxy": "2.2.0",
     "bluebird": "^3.7.2",
     "deepmerge": "^4.2.2",
     "glob": "^11.0.1",
     "jmespath": "^0.16.0",
-    "js-yaml": "^3.14.0",
+    "js-yaml": "^3.14.1",
     "jsonminify": "^0.4.1",
     "lodash": "^4.17.21",
     "path-parse": "~1.0.7",
-    "proxy-agent": "6.3.1",
-    "yargs": "17"
+    "proxy-agent": "6.5.0",
+    "yargs": "~17.7.2"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19",
-    "@commitlint/config-conventional": "^19",
-    "better-npm-audit": "3.7.3",
+    "@commitlint/cli": "^20",
+    "@commitlint/config-conventional": "^20",
+    "better-npm-audit": "3.11.0",
     "commit-and-tag-version": "12",
-    "commitlint": "19",
-    "eslint": "8",
+    "commitlint": "20",
+    "eslint": "9",
     "eslint-config-prettier": "10",
-    "eslint-config-standard": "17",
-    "eslint-plugin-mocha": "10",
+    "eslint-plugin-mocha": "11",
     "eslint-plugin-prettier": "5",
-    "mocha": "10.2.0",
+    "mocha": "11.7.2",
     "npm-run-all": "4.1.5",
     "prettier": "3",
-    "serve": "14.2.4",
-    "sort-package-json": "3.2.1"
+    "serve": "14.2.5",
+    "sort-package-json": "3.4.0"
   },
   "originalAuthor": {
     "name": "Moritz Onken",