bdy 1.22.25-dev-pipeline → 1.22.27-dev-pipeline

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.22.25-dev-pipeline",
+  "version": "1.22.27-dev-pipeline",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {
@@ -45,6 +45,7 @@
     "content-disposition": "0.5.4",
     "cookie": "1.1.1",
     "cross-spawn": "7.0.6",
+    "dotenv": "16.6.1",
     "eventsource": "4.1.0",
     "fastify": "5.8.5",
     "fdir": "6.5.0",

package/distTs/src/input.js

@@ -42,6 +42,7 @@ const punycode_1 = __importDefault(require("punycode/"));
 const node_fs_1 = __importStar(require("node:fs"));
 const tls_1 = __importDefault(require("tls"));
 const node_crypto_1 = __importDefault(require("node:crypto"));
+const dotenv_1 = __importDefault(require("dotenv"));
 const utils_1 = require("./utils");
 const texts_1 = require("./texts");
 const tunnel_1 = require("./types/tunnel");
@@ -420,56 +421,36 @@ class Input {
         output_1.default.exitError(texts_1.ERR_RUN_PIPELINE_WRONG_DELAY);
     }
     static pipelineRunVariablesFromFile(p, encrypted) {
-        const list = [];
         const s = (0, node_path_1.resolve)(p);
         if (!node_fs_1.default.existsSync(s)) {
             output_1.default.exitError(texts_1.ERR_PIPELINE_RUN_VAR_FILE_NOT_FOUND);
         }
-        let lines;
+        let parsed;
         try {
-            lines = node_fs_1.default.readFileSync(s, 'utf8').split(/\r?\n/);
+            parsed = dotenv_1.default.parse(node_fs_1.default.readFileSync(s));
         }
-        catch (err) {
-            if (err.code === 'ENOENT')
-                output_1.default.exitError(texts_1.ERR_PIPELINE_RUN_VAR_FILE_NOT_FOUND);
+        catch {
             output_1.default.exitError(texts_1.ERR_PIPELINE_RUN_VAR_FILE_INVALID);
         }
-        for (let i = 0; i < lines.length; i += 1) {
-            const line = lines[i].trim();
-            if (line.startsWith('#'))
-                continue;
-            if (line) {
-                const ci = line.indexOf(':');
-                const ei = line.indexOf('=');
-                const sep = ci >= 0 && (ei < 0 || ci < ei) ? ':' : '=';
-                const l = line.split(sep);
-                if (l.length < 2) {
-                    output_1.default.exitError(texts_1.ERR_PIPELINE_RUN_VAR_FILE_INVALID);
-                }
-                const key = l.shift().trim();
-                const value = l.join(sep).trim();
-                if (!key) {
-                    output_1.default.exitError(texts_1.ERR_PIPELINE_RUN_VAR_FILE_INVALID);
-                }
-                list.push({
-                    key,
-                    value,
-                    encrypted
-                });
-            }
-        }
-        return list;
+        return Object.entries(parsed).map(([key, value]) => ({
+            key,
+            value,
+            encrypted,
+        }));
     }
     static pipelineRunVariable(variable, encrypted) {
         const list = [];
         variable.forEach((v) => {
-            const s = v.split(':');
+            const ei = v.indexOf('=');
+            const ci = v.indexOf(':');
+            const sep = ei >= 0 && (ci < 0 || ei < ci) ? '=' : ':';
+            const s = v.split(sep);
             if (s.length < 2) {
                 output_1.default.exitError((0, texts_1.ERR_RUN_PIPELINE_WRONG_VARIABLE)(v));
             }
             list.push({
-                key: s.shift() || '',
-                value: s.join(':'),
+                key: (s.shift() || '').trim(),
+                value: s.join(sep).trim(),
                 encrypted,
             });
         });

package/distTs/src/output/pipeline.js

@@ -471,7 +471,7 @@ class OutputPipeline {
     static _jsonActionsLogsHelp(identifier, runId, actionRunId) {
         if (!actionRunId)
             actionRunId = '<action-run-id>';
-        return `To view action logs run: \`bdy pip run logs ${identifier} ${runId} ${actionRunId}\``;
+        return `To view action logs run: \`bdy pip run logs ${identifier} ${runId} ${actionRunId} --format jsonl\``;
     }
     static _runDetailsFinished(status, finished, tabs) {
         if (finished &&
@@ -1105,13 +1105,21 @@ class OutputPipeline {
         const a = {
             ...action,
         };
-        if (action.runId) {
+        if (action.runId && !a.logs) {
             a.logs = this._jsonActionsLogsHelp(identifier, runId, action.runId);
         }
         output_1.default.json({ type: 'action', action: a });
     }
-    static jsonRun(run) {
-        output_1.default.json({ type: 'run', run });
+    static jsonRun(identifier, run) {
+        const r = {
+            ...run,
+        };
+        (r.actions || []).forEach((a) => {
+            if (a.runId && !a.logs) {
+                a.logs = this._jsonActionsLogsHelp(identifier, run.runId, a.runId);
+            }
+        });
+        output_1.default.json({ type: 'run', run: r });
     }
     static jsonLog(log) {
         output_1.default.json({ type: 'log', log });
@@ -1328,7 +1336,7 @@ class OutputPipeline {
             totalFetchesCount += 1;
             if (!noFollow || noWait) {
                 if (isJson)
-                    this.jsonRun(run);
+                    this.jsonRun(identifier, run);
                 else
                     draw(run);
             }
@@ -1337,7 +1345,7 @@ class OutputPipeline {
             }
         });
         if (isJson) {
-            this.jsonRun(run);
+            this.jsonRun(identifier, run);
             this.jsonInfo(this._jsonActionsLogsHelp(identifier, runId));
         }
         else {

package/distTs/src/texts.js

@@ -371,8 +371,8 @@ exports.OPTION_PIPELINE_RUN_COMMENT = 'Run comment';
 exports.OPTION_PIPELINE_RUN_REFRESH = 'Deploy from scratch';
 exports.OPTION_PIPELINE_RUN_CLEAR_CACHE = 'Clear cache before running the pipeline';
 exports.OPTION_PIPELINE_RUN_PRIORITY = 'Run priority. Can be one of "LOW", "NORMAL" or "HIGH". Default is "NORMAL"';
-exports.OPTION_PIPELINE_RUN_VAR = 'Variable key:value. Can be passed multiple times to pass multiple variables';
-exports.OPTION_PIPELINE_RUN_VAR_FILE = 'File with variables, key:value or key=value. Each variable in new line';
+exports.OPTION_PIPELINE_RUN_VAR = 'Variable key=value or key:value. Can be passed multiple times to pass multiple variables';
+exports.OPTION_PIPELINE_RUN_VAR_FILE = 'File with variables, key=value. Each variable in new line';
 exports.ERR_PIPELINE_RUN_VAR_FILE_NOT_FOUND = 'File with variables not found';
 exports.ERR_PIPELINE_RUN_VAR_FILE_INVALID = 'File with variables invalid';
 exports.OPTION_PIPELINE_RUN_DELAY = 'The date when the execution should be run. Should be set in the format: 2016-11-18T12:38:16.000Z or 30s, 10m, 3h10m30s';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.22.25-dev-pipeline",
+  "version": "1.22.27-dev-pipeline",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {
@@ -45,6 +45,7 @@
     "content-disposition": "0.5.4",
     "cookie": "1.1.1",
     "cross-spawn": "7.0.6",
+    "dotenv": "16.6.1",
     "eventsource": "4.1.0",
     "fastify": "5.8.5",
     "fdir": "6.5.0",