@catladder/cli 0.0.0-pipeline-variables-e3e4f641 → 0.0.0-pipeline-variables-326a27b2

package/dist/bundles/catenv/index.js

@@ -41217,7 +41217,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "pipeline-variables-e3e4f641" || 0;
+exports.PIPELINE_IMAGE_TAG = "pipeline-variables-326a27b2" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -43442,6 +43442,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 };
 exports.__esModule = true;
 exports.getCloudRunDeployScripts = void 0;
+var lodash_1 = __nccwpck_require__(3255);
 var gitlab_1 = __nccwpck_require__(4997);
 var sbom_1 = __nccwpck_require__(5928);
 var cleanup_1 = __nccwpck_require__(964);
@@ -43450,10 +43451,12 @@ var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(2607);
 var cloudRunJobs_1 = __nccwpck_require__(6321);
 var cloudRunServices_1 = __nccwpck_require__(7210);
 var common_1 = __nccwpck_require__(5655);
+var __1 = __nccwpck_require__(1344);
 function getCloudRunDeployScripts(context) {
   var _a;
   var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
-  return __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gitlab_1.collapseableSection)("prepare", "Prepare...")(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read((0, common_1.setGoogleProjectNumberScript)(deployConfig)), false))), false), __read((0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(["echo \"$ENV_VARS\" > ____envvars.yaml"], __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
+  var allEnvVars = (0, lodash_1.omit)(context.environment.envVars, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
+  return __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gitlab_1.collapseableSection)("prepare", "Prepare...")(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read((0, common_1.setGoogleProjectNumberScript)(deployConfig)), false))), false), __read((0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(writeEnvVarsIntoJSONFileScript(allEnvVars, "____envvars.yaml")), false), __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
   : []), false), __read((0, cloudRunJobs_1.getCreateScheduleScripts)(context)), false), __read((0, cloudRunJobs_1.getJobCreateScripts)(context)), false), __read((0, cloudRunJobs_1.getJobRunScripts)(context, "preDeploy")), false), __read(deployConfig.service !== false ? [(0, cloudRunServices_1.getServiceDeployScript)(context, deployConfig.service)] : []), false), __read(Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).map(function (_a) {
     var _b = __read(_a, 2),
       name = _b[0],
@@ -43463,6 +43466,19 @@ function getCloudRunDeployScripts(context) {
   )), false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false);
 }
 exports.getCloudRunDeployScripts = getCloudRunDeployScripts;
+var writeEnvVarsIntoJSONFileScript = function (vars, filename) {
+  return __spreadArray([
+  // create empty file
+  "echo '' > ".concat(filename)], __read(Object.entries(vars).map(function (_a) {
+    var _b = __read(_a, 2),
+      key = _b[0],
+      value = _b[1];
+    return "echo \"".concat(key, ": '").concat(value.toString().replaceAll(
+    // replace single line break with two line breaks
+    // this is because how yaml interprets single line breaks
+    /\n/g, "\\n\\n"), "'\" >> ").concat(filename);
+  })), false);
+};
 
 /***/ }),
 
@@ -43533,13 +43549,10 @@ exports.getCloudRunStopScripts = getCloudRunStopScripts;
 
 exports.__esModule = true;
 exports.createGoogleCloudRunDeployJobs = void 0;
-var lodash_1 = __nccwpck_require__(3255);
-var docker_1 = __nccwpck_require__(3219);
 var runner_1 = __nccwpck_require__(5071);
 var gitlab_1 = __nccwpck_require__(4997);
 var base_1 = __nccwpck_require__(2866);
 var types_1 = __nccwpck_require__(3109);
-var variables_1 = __nccwpck_require__(408);
 var getCloudRunDeployScripts_1 = __nccwpck_require__(1944);
 var getCloudRunStopScripts_1 = __nccwpck_require__(910);
 var createGoogleCloudRunDeployJobs = function (context) {
@@ -43554,14 +43567,16 @@ var createGoogleCloudRunDeployJobs = function (context) {
   var deployScripts = (0, getCloudRunDeployScripts_1.getCloudRunDeployScripts)(context);
   var stopScripts = (0, getCloudRunStopScripts_1.getCloudRunStopScripts)(context);
   return (0, base_1.createDeployementJobs)(context, {
-    deploy: (0, lodash_1.merge)((0, docker_1.getDockerJobBaseProps)(context), {
+    deploy: {
+      variables: {
+        CLOUDSDK_CORE_DISABLE_PROMPTS: "1"
+      },
       artifacts: {
         paths: ["____envvars.yaml"]
       },
-      variables: (0, variables_1.getDeployJobVariables)(context),
       image: (0, runner_1.getRunnerImage)("gcloud"),
       script: deployScripts
-    }),
+    },
     stop: {
       image: (0, runner_1.getRunnerImage)("gcloud"),
       variables: {
@@ -43575,33 +43590,6 @@ exports.createGoogleCloudRunDeployJobs = createGoogleCloudRunDeployJobs;
 
 /***/ }),
 
-/***/ 408:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-exports.__esModule = true;
-exports.getDeployJobVariables = void 0;
-var js_yaml_1 = __nccwpck_require__(3618);
-var lodash_1 = __nccwpck_require__(3255);
-var __1 = __nccwpck_require__(5355);
-function getDeployJobVariables(context) {
-  var allEnvVars = (0, lodash_1.omit)(context.environment.envVars, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
-  return {
-    CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
-    ENV_VARS: (0, js_yaml_1.dump)(allEnvVars, {
-      lineWidth: -1,
-      quotingType: "'",
-      forceQuotes: true,
-      noRefs: true
-    })
-  };
-}
-exports.getDeployJobVariables = getDeployJobVariables;
-
-/***/ }),
-
 /***/ 8662:
 /***/ (function(__unused_webpack_module, exports) {
 
@@ -46314,9 +46302,7 @@ var makeGitlabJob = function (componentName, env, _a, allJobs) {
   }
   var modified = addGitlabEnvironment(context, environment, __assign(__assign({}, job), {
     variables: __assign(__assign({}, legacyRunnerVariables), runnerVariables),
-    script: __spreadArray(__spreadArray([], __read(varsInjectScripts), false), __read(((_b = script === null || script === void 0 ? void 0 : script.filter(utils_1.notNil)) !== null && _b !== void 0 ? _b : []).flatMap(function (s) {
-      return ["echo \"".concat(s, "\""), s];
-    })), false),
+    script: __spreadArray(__spreadArray([], __read(varsInjectScripts), false), __read((_b = script === null || script === void 0 ? void 0 : script.filter(utils_1.notNil)) !== null && _b !== void 0 ? _b : []), false),
     tags: jobTags,
     stage: stage,
     // sort in a predictable manner for snapshot tests

package/dist/bundles/cli/index.js

@@ -356149,7 +356149,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "pipeline-variables-e3e4f641" || 0;
+exports.PIPELINE_IMAGE_TAG = "pipeline-variables-326a27b2" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -358374,6 +358374,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
 };
 exports.__esModule = true;
 exports.getCloudRunDeployScripts = void 0;
+var lodash_1 = __nccwpck_require__(23255);
 var gitlab_1 = __nccwpck_require__(84997);
 var sbom_1 = __nccwpck_require__(65928);
 var cleanup_1 = __nccwpck_require__(10964);
@@ -358382,10 +358383,12 @@ var gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(22607);
 var cloudRunJobs_1 = __nccwpck_require__(66321);
 var cloudRunServices_1 = __nccwpck_require__(77210);
 var common_1 = __nccwpck_require__(75655);
+var __1 = __nccwpck_require__(81344);
 function getCloudRunDeployScripts(context) {
   var _a;
   var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
-  return __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gitlab_1.collapseableSection)("prepare", "Prepare...")(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read((0, common_1.setGoogleProjectNumberScript)(deployConfig)), false))), false), __read((0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(["echo \"$ENV_VARS\" > ____envvars.yaml"], __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
+  var allEnvVars = (0, lodash_1.omit)(context.environment.envVars, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
+  return __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gitlab_1.collapseableSection)("prepare", "Prepare...")(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read((0, common_1.setGoogleProjectNumberScript)(deployConfig)), false))), false), __read((0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(writeEnvVarsIntoJSONFileScript(allEnvVars, "____envvars.yaml")), false), __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
   : []), false), __read((0, cloudRunJobs_1.getCreateScheduleScripts)(context)), false), __read((0, cloudRunJobs_1.getJobCreateScripts)(context)), false), __read((0, cloudRunJobs_1.getJobRunScripts)(context, "preDeploy")), false), __read(deployConfig.service !== false ? [(0, cloudRunServices_1.getServiceDeployScript)(context, deployConfig.service)] : []), false), __read(Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).map(function (_a) {
     var _b = __read(_a, 2),
       name = _b[0],
@@ -358395,6 +358398,19 @@ function getCloudRunDeployScripts(context) {
   )), false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false);
 }
 exports.getCloudRunDeployScripts = getCloudRunDeployScripts;
+var writeEnvVarsIntoJSONFileScript = function (vars, filename) {
+  return __spreadArray([
+  // create empty file
+  "echo '' > ".concat(filename)], __read(Object.entries(vars).map(function (_a) {
+    var _b = __read(_a, 2),
+      key = _b[0],
+      value = _b[1];
+    return "echo \"".concat(key, ": '").concat(value.toString().replaceAll(
+    // replace single line break with two line breaks
+    // this is because how yaml interprets single line breaks
+    /\n/g, "\\n\\n"), "'\" >> ").concat(filename);
+  })), false);
+};
 
 /***/ }),
 
@@ -358465,13 +358481,10 @@ exports.getCloudRunStopScripts = getCloudRunStopScripts;
 
 exports.__esModule = true;
 exports.createGoogleCloudRunDeployJobs = void 0;
-var lodash_1 = __nccwpck_require__(23255);
-var docker_1 = __nccwpck_require__(33219);
 var runner_1 = __nccwpck_require__(55071);
 var gitlab_1 = __nccwpck_require__(84997);
 var base_1 = __nccwpck_require__(82866);
 var types_1 = __nccwpck_require__(63109);
-var variables_1 = __nccwpck_require__(20408);
 var getCloudRunDeployScripts_1 = __nccwpck_require__(21944);
 var getCloudRunStopScripts_1 = __nccwpck_require__(40910);
 var createGoogleCloudRunDeployJobs = function (context) {
@@ -358486,14 +358499,16 @@ var createGoogleCloudRunDeployJobs = function (context) {
   var deployScripts = (0, getCloudRunDeployScripts_1.getCloudRunDeployScripts)(context);
   var stopScripts = (0, getCloudRunStopScripts_1.getCloudRunStopScripts)(context);
   return (0, base_1.createDeployementJobs)(context, {
-    deploy: (0, lodash_1.merge)((0, docker_1.getDockerJobBaseProps)(context), {
+    deploy: {
+      variables: {
+        CLOUDSDK_CORE_DISABLE_PROMPTS: "1"
+      },
       artifacts: {
         paths: ["____envvars.yaml"]
       },
-      variables: (0, variables_1.getDeployJobVariables)(context),
       image: (0, runner_1.getRunnerImage)("gcloud"),
       script: deployScripts
-    }),
+    },
     stop: {
       image: (0, runner_1.getRunnerImage)("gcloud"),
       variables: {
@@ -358507,33 +358522,6 @@ exports.createGoogleCloudRunDeployJobs = createGoogleCloudRunDeployJobs;
 
 /***/ }),
 
-/***/ 20408:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-exports.__esModule = true;
-exports.getDeployJobVariables = void 0;
-var js_yaml_1 = __nccwpck_require__(3618);
-var lodash_1 = __nccwpck_require__(23255);
-var __1 = __nccwpck_require__(25355);
-function getDeployJobVariables(context) {
-  var allEnvVars = (0, lodash_1.omit)(context.environment.envVars, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
-  return {
-    CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
-    ENV_VARS: (0, js_yaml_1.dump)(allEnvVars, {
-      lineWidth: -1,
-      quotingType: "'",
-      forceQuotes: true,
-      noRefs: true
-    })
-  };
-}
-exports.getDeployJobVariables = getDeployJobVariables;
-
-/***/ }),
-
 /***/ 84497:
 /***/ (function(__unused_webpack_module, exports) {
 
@@ -361246,9 +361234,7 @@ var makeGitlabJob = function (componentName, env, _a, allJobs) {
   }
   var modified = addGitlabEnvironment(context, environment, __assign(__assign({}, job), {
     variables: __assign(__assign({}, legacyRunnerVariables), runnerVariables),
-    script: __spreadArray(__spreadArray([], __read(varsInjectScripts), false), __read(((_b = script === null || script === void 0 ? void 0 : script.filter(utils_1.notNil)) !== null && _b !== void 0 ? _b : []).flatMap(function (s) {
-      return ["echo \"".concat(s, "\""), s];
-    })), false),
+    script: __spreadArray(__spreadArray([], __read(varsInjectScripts), false), __read((_b = script === null || script === void 0 ? void 0 : script.filter(utils_1.notNil)) !== null && _b !== void 0 ? _b : []), false),
     tags: jobTags,
     stage: stage,
     // sort in a predictable manner for snapshot tests

package/package.json

@@ -52,7 +52,7 @@
     }
   ],
   "license": "MIT",
-  "version": "0.0.0-pipeline-variables-e3e4f641",
+  "version": "0.0.0-pipeline-variables-326a27b2",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",
@@ -74,7 +74,7 @@
     "ts-node": "^10.9.1"
   },
   "devDependencies": {
-    "@catladder/pipeline": "0.0.0-pipeline-variables-e3e4f641",
+    "@catladder/pipeline": "0.0.0-pipeline-variables-326a27b2",
     "@gitbeaker/rest": "^39.28.0",
     "@kubernetes/client-node": "^0.16.2",
     "@tsconfig/node14": "^1.0.1",