@catladder/cli 0.0.0-pipeline-variables-a7b0b5d2 → 0.0.0-pipeline-variables-ea355ef4

package/dist/bundles/catenv/index.js

@@ -40725,7 +40725,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "pipeline-variables-a7b0b5d2" || 0;
+exports.PIPELINE_IMAGE_TAG = "pipeline-variables-ea355ef4" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -44101,6 +44101,37 @@ var __generator = this && this.__generator || function (thisArg, body) {
     };
   }
 };
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
 exports.__esModule = true;
 exports.createAllJobs = void 0;
 var config_1 = __nccwpck_require__(3138);
@@ -44108,11 +44139,8 @@ var createJobsForComponent_1 = __nccwpck_require__(962);
 var getPipelineVariables_1 = __nccwpck_require__(3493);
 var addDefaultVariables = function (type, jobs) {
   return jobs.map(function (job) {
-    var _a;
     return __assign(__assign({}, job), {
-      variables: __assign(__assign({}, (0, getPipelineVariables_1.getPipelineVariables)({
-        type: type
-      })), (_a = job.variables) !== null && _a !== void 0 ? _a : {})
+      script: __spreadArray(__spreadArray([], __read((0, getPipelineVariables_1.getPipelineVariablesAssignmentCommand)(type)), false), __read(job.script), false)
     });
   });
 };
@@ -44624,17 +44652,20 @@ var __read = this && this.__read || function (o, n) {
   return ar;
 };
 exports.__esModule = true;
-exports.getPipelineVariables = void 0;
+exports.getPipelineVariablesAssignmentCommand = void 0;
 var getBuildIdCommands_1 = __nccwpck_require__(9350);
-var PIPELINE_VARIABLES_PREFIX = "CL_PIPELINE";
-var getPipelineVariables = function (_a) {
-  var type = _a.type;
+var PIPELINE_VARIABLES_PREFIX = "BUILD_INFO";
+/**
+ * key-script to assign variables
+ *
+ */
+var getPipelineVariablesCommands = function (type) {
   if (type === "gitlab") {
     return Object.fromEntries(Object.entries({
       COMMIT_REF_NAME: "$CI_COMMIT_REF_NAME",
       REVIEW_SLUG: "$([ -n \"$CI_MERGE_REQUEST_IID\" ] && echo \"mr$CI_MERGE_REQUEST_IID\" || [ -n \"$CI_COMMIT_REF_SLUG\" ] && echo \"hf$CI_COMMIT_REF_SLUG\" || echo \"unknown\")",
-      BUILD_TIME: "$CI_JOB_STARTED_AT",
-      BUILD_ID: "$(".concat((0, getBuildIdCommands_1.getBuildIdCommand)(), ")"),
+      TIME: "$CI_JOB_STARTED_AT",
+      ID: "$(".concat((0, getBuildIdCommands_1.getBuildIdCommand)(), ")"),
       CURRENT_VERSION: "$(".concat((0, getBuildIdCommands_1.getCurrentVersionStringCommand)(), ")")
     }).map(function (_a) {
       var _b = __read(_a, 2),
@@ -44646,7 +44677,15 @@ var getPipelineVariables = function (_a) {
     throw new Error("unsported pipeline type: " + type);
   }
 };
-exports.getPipelineVariables = getPipelineVariables;
+var getPipelineVariablesAssignmentCommand = function (type) {
+  return Object.entries(getPipelineVariablesCommands(type)).map(function (_a) {
+    var _b = __read(_a, 2),
+      name = _b[0],
+      script = _b[1];
+    return "export ".concat(name, "=").concat(script);
+  });
+};
+exports.getPipelineVariablesAssignmentCommand = getPipelineVariablesAssignmentCommand;
 
 /***/ }),
 

package/dist/bundles/cli/index.js

@@ -351793,7 +351793,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "pipeline-variables-a7b0b5d2" || 0;
+exports.PIPELINE_IMAGE_TAG = "pipeline-variables-ea355ef4" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -355169,6 +355169,37 @@ var __generator = this && this.__generator || function (thisArg, body) {
     };
   }
 };
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
 exports.__esModule = true;
 exports.createAllJobs = void 0;
 var config_1 = __nccwpck_require__(33138);
@@ -355176,11 +355207,8 @@ var createJobsForComponent_1 = __nccwpck_require__(80962);
 var getPipelineVariables_1 = __nccwpck_require__(33493);
 var addDefaultVariables = function (type, jobs) {
   return jobs.map(function (job) {
-    var _a;
     return __assign(__assign({}, job), {
-      variables: __assign(__assign({}, (0, getPipelineVariables_1.getPipelineVariables)({
-        type: type
-      })), (_a = job.variables) !== null && _a !== void 0 ? _a : {})
+      script: __spreadArray(__spreadArray([], __read((0, getPipelineVariables_1.getPipelineVariablesAssignmentCommand)(type)), false), __read(job.script), false)
     });
   });
 };
@@ -355692,17 +355720,20 @@ var __read = this && this.__read || function (o, n) {
   return ar;
 };
 exports.__esModule = true;
-exports.getPipelineVariables = void 0;
+exports.getPipelineVariablesAssignmentCommand = void 0;
 var getBuildIdCommands_1 = __nccwpck_require__(29350);
-var PIPELINE_VARIABLES_PREFIX = "CL_PIPELINE";
-var getPipelineVariables = function (_a) {
-  var type = _a.type;
+var PIPELINE_VARIABLES_PREFIX = "BUILD_INFO";
+/**
+ * key-script to assign variables
+ *
+ */
+var getPipelineVariablesCommands = function (type) {
   if (type === "gitlab") {
     return Object.fromEntries(Object.entries({
       COMMIT_REF_NAME: "$CI_COMMIT_REF_NAME",
       REVIEW_SLUG: "$([ -n \"$CI_MERGE_REQUEST_IID\" ] && echo \"mr$CI_MERGE_REQUEST_IID\" || [ -n \"$CI_COMMIT_REF_SLUG\" ] && echo \"hf$CI_COMMIT_REF_SLUG\" || echo \"unknown\")",
-      BUILD_TIME: "$CI_JOB_STARTED_AT",
-      BUILD_ID: "$(".concat((0, getBuildIdCommands_1.getBuildIdCommand)(), ")"),
+      TIME: "$CI_JOB_STARTED_AT",
+      ID: "$(".concat((0, getBuildIdCommands_1.getBuildIdCommand)(), ")"),
       CURRENT_VERSION: "$(".concat((0, getBuildIdCommands_1.getCurrentVersionStringCommand)(), ")")
     }).map(function (_a) {
       var _b = __read(_a, 2),
@@ -355714,7 +355745,15 @@ var getPipelineVariables = function (_a) {
     throw new Error("unsported pipeline type: " + type);
   }
 };
-exports.getPipelineVariables = getPipelineVariables;
+var getPipelineVariablesAssignmentCommand = function (type) {
+  return Object.entries(getPipelineVariablesCommands(type)).map(function (_a) {
+    var _b = __read(_a, 2),
+      name = _b[0],
+      script = _b[1];
+    return "export ".concat(name, "=").concat(script);
+  });
+};
+exports.getPipelineVariablesAssignmentCommand = getPipelineVariablesAssignmentCommand;
 
 /***/ }),
 

package/package.json

@@ -24,7 +24,7 @@
     "node": ">=12.0.0"
   },
   "devDependencies": {
-    "@catladder/pipeline": "0.0.0-pipeline-variables-a7b0b5d2",
+    "@catladder/pipeline": "0.0.0-pipeline-variables-ea355ef4",
     "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",
     "@types/common-tags": "^1.8.0",
@@ -57,6 +57,6 @@
     "typescript": "^4.5.4",
     "vorpal": "^1.12.0"
   },
-  "version": "0.0.0-pipeline-variables-a7b0b5d2",
+  "version": "0.0.0-pipeline-variables-ea355ef4",
   "stableVersion": "0.0.0"
 }