carlin 1.21.1 → 1.21.3

package/dist/cli.js

@@ -10,6 +10,7 @@ const change_case_1 = require("change-case");
 const command_1 = require("./deploy/command");
 const ecsTaskReportCommand_1 = require("./deploy/cicd/ecsTaskReportCommand");
 const generateEnvCommand_1 = require("./generateEnv/generateEnvCommand");
+const cloudformation_1 = require("@ttoss/cloudformation");
 const aws_sdk_1 = tslib_1.__importDefault(require("aws-sdk"));
 const deep_equal_1 = tslib_1.__importDefault(require("deep-equal"));
 const deepmerge_1 = tslib_1.__importDefault(require("deepmerge"));
@@ -133,7 +134,7 @@ const cli = () => {
             }
         } while (findUpPath);
         const configs = paths.map((p) => {
-            return (0, utils_1.readObjectFile)({ path: p }) || {};
+            return (0, cloudformation_1.unstable_readObjectFile)({ path: p }) || {};
         });
         /**
          * Using configs.reverser() to get the most far config first. This way the
@@ -225,7 +226,7 @@ const cli = () => {
         .pkgConf(getPkgConfig())
         .config(getConfig())
         .config('config', (configPath) => {
-        return (0, utils_1.readObjectFile)({ path: configPath });
+        return (0, cloudformation_1.unstable_readObjectFile)({ path: configPath });
     })
         .command({
         command: 'print-args',

package/dist/deploy/cloudFormation.js

@@ -6,46 +6,16 @@ const utils_1 = require("../utils");
 const cloudFormation_core_1 = require("./cloudFormation.core");
 const deployLambdaCode_1 = require("./lambda/deployLambdaCode");
 const s3_1 = require("./s3");
+const cloudformation_1 = require("@ttoss/cloudformation");
 const stackName_1 = require("./stackName");
 const utils_2 = require("./utils");
-const fs_1 = tslib_1.__importDefault(require("fs"));
 const npmlog_1 = tslib_1.__importDefault(require("npmlog"));
-const path_1 = tslib_1.__importDefault(require("path"));
 const logPrefix = 'cloudformation';
 npmlog_1.default.addLevel('event', 10000, { fg: 'yellow' });
 npmlog_1.default.addLevel('output', 10000, { fg: 'blue' });
 exports.defaultTemplatePaths = ['ts', 'js', 'yaml', 'yml', 'json'].map((extension) => {
     return `./src/cloudformation.${extension}`;
 });
-const findAndReadCloudFormationTemplate = ({ templatePath: defaultTemplatePath, }) => {
-    const templatePath = defaultTemplatePath ||
-        exports.defaultTemplatePaths
-            /**
-             * Iterate over extensions. If the template of the current extension is
-             * found, we save it on the accumulator and return it every time until
-             * the loop ends.
-             */
-            .reduce((acc, cur) => {
-            if (acc) {
-                return acc;
-            }
-            return fs_1.default.existsSync(path_1.default.resolve(process.cwd(), cur)) ? cur : acc;
-        }, '');
-    if (!templatePath) {
-        throw new Error('Cannot find a CloudFormation template.');
-    }
-    const extension = templatePath === null || templatePath === void 0 ? void 0 : templatePath.split('.').pop();
-    const fullPath = path_1.default.resolve(process.cwd(), templatePath);
-    /**
-     * We need to read Yaml first because CloudFormation specific tags aren't
-     * recognized when parsing a simple Yaml file. I.e., a possible error:
-     * "Error message: "unknown tag !<!Ref> at line 21, column 34:\n"
-     */
-    if (['yaml', 'yml'].includes(extension)) {
-        return (0, utils_1.readCloudFormationYamlTemplate)({ templatePath });
-    }
-    return (0, utils_1.readObjectFile)({ path: fullPath });
-};
 const deployCloudFormation = async ({ lambdaDockerfile, lambdaInput, lambdaImage, lambdaExternals = [], parameters, template, templatePath, }) => {
     try {
         const { stackName } = await (0, utils_2.handleDeployInitialization)({ logPrefix });
@@ -53,7 +23,7 @@ const deployCloudFormation = async ({ lambdaDockerfile, lambdaInput, lambdaImage
             if (template) {
                 return { ...template };
             }
-            return findAndReadCloudFormationTemplate({ templatePath });
+            return (0, cloudformation_1.findAndReadCloudFormationTemplate)({ templatePath });
         })();
         await (0, cloudFormation_core_1.cloudFormationV2)()
             .validateTemplate({

package/dist/utils/index.js

@@ -13,5 +13,3 @@ tslib_1.__exportStar(require("./getEnvironment"), exports);
 tslib_1.__exportStar(require("./getIamPath"), exports);
 tslib_1.__exportStar(require("./getProjectName"), exports);
 tslib_1.__exportStar(require("./packageJson"), exports);
-tslib_1.__exportStar(require("./readCloudFormationTemplate"), exports);
-tslib_1.__exportStar(require("./readObjectFile"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carlin",
-  "version": "1.21.1",
+  "version": "1.21.3",
   "description": "",
   "license": "GPL-3.0",
   "author": "Pedro Arantes <arantespp@gmail.com> (https://twitter.com/arantespp)",
@@ -29,6 +29,7 @@
     "@aws-sdk/client-cloudformation": "^3.226.0",
     "@octokit/webhooks": "^10.3.1",
     "@slack/webhook": "^6.1.0",
+    "@ttoss/cloudformation": "^0.2.2",
     "adm-zip": "^0.5.9",
     "aws-sdk": "^2.1270.0",
     "builtin-modules": "^3.3.0",
@@ -50,7 +51,7 @@
     "yargs": "^17.6.2"
   },
   "devDependencies": {
-    "@ttoss/test-utils": "^1.19.0",
+    "@ttoss/test-utils": "^1.20.0",
     "@types/adm-zip": "^0.5.0",
     "@types/aws-lambda": "^8.10.109",
     "@types/deep-equal": "^1.0.1",
@@ -70,5 +71,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "98cf227311c2f28ab73520c793bfe0bf0df27530"
+  "gitHead": "f3b33b88d475925960f557619d710f11f831c144"
 }

package/dist/utils/readCloudFormationTemplate.js

@@ -1,35 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.readCloudFormationYamlTemplate = void 0;
-const tslib_1 = require("tslib");
-const fs = tslib_1.__importStar(require("fs"));
-const path = tslib_1.__importStar(require("path"));
-const cloudFormationTemplate_1 = require("./cloudFormationTemplate");
-const getTypes = () => {
-    return [
-        {
-            tag: `!SubString`,
-            options: {
-                kind: 'scalar',
-                construct: (filePath) => {
-                    return fs
-                        .readFileSync(path.resolve(process.cwd(), filePath))
-                        .toString();
-                },
-            },
-        },
-    ];
-};
-/**
- * CloudFormation
- * @param param0
- */
-const readCloudFormationYamlTemplate = ({ templatePath, }) => {
-    const template = fs.readFileSync(templatePath).toString();
-    const parsed = (0, cloudFormationTemplate_1.loadCloudFormationTemplate)(template, getTypes());
-    if (!parsed || typeof parsed === 'string') {
-        throw new Error('Cannot parse CloudFormation template.');
-    }
-    return parsed;
-};
-exports.readCloudFormationYamlTemplate = readCloudFormationYamlTemplate;

package/dist/utils/readObjectFile.js

@@ -1,46 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.readObjectFile = exports.readYaml = void 0;
-const tslib_1 = require("tslib");
-/* eslint-disable @typescript-eslint/no-var-requires */
-const fs_1 = tslib_1.__importDefault(require("fs"));
-const js_yaml_1 = tslib_1.__importDefault(require("js-yaml"));
-const readYaml = ({ path }) => {
-    const template = fs_1.default.readFileSync(path, 'utf8') || JSON.stringify({});
-    return js_yaml_1.default.load(template);
-};
-exports.readYaml = readYaml;
-/**
- * If your file is `.ts`, you must you must export the final object
- * `export default { ... }`. If your file is `.js`, you must you must export
- * the final object `module.exports =  { ... }`. `.json` and `.yml/yaml` must
- * define the resources in [JSON](https://www.json.org/json-en.html) and
- * [YAML](https://yaml.org/) format respectively.
- */
-const readObjectFile = ({ path }) => {
-    if (!fs_1.default.existsSync(path)) {
-        return {};
-    }
-    const extension = path.split('.').pop();
-    if (extension === 'ts') {
-        require('ts-node').register({
-            compilerOptions: { module: 'commonjs' },
-            transpileOnly: true,
-        });
-        const tsObj = require(path);
-        const obj = tsObj.default || tsObj;
-        return typeof obj === 'function' ? obj() : obj;
-    }
-    if (extension === 'js') {
-        const obj = require(path);
-        return typeof obj === 'function' ? obj() : obj;
-    }
-    if (extension === 'json') {
-        return require(path);
-    }
-    if (extension === 'yml' || extension === 'yaml') {
-        return (0, exports.readYaml)({ path });
-    }
-    return {};
-};
-exports.readObjectFile = readObjectFile;