@catladder/cli 0.0.0-main-c28a5e64 → 0.0.0-main-99253261

package/dist/bundles/catenv/index.js

@@ -40918,7 +40918,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-c28a5e64" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-99253261" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -43407,6 +43407,7 @@ var context_1 = __nccwpck_require__(2041);
 var gitlab_1 = __nccwpck_require__(4997);
 var utils_1 = __nccwpck_require__(463);
 var createJobs_1 = __nccwpck_require__(6474);
+var database_1 = __nccwpck_require__(1384);
 var jobName_1 = __nccwpck_require__(7311);
 exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
 // FIXME: rename to internalHostSuffix, but this means that project-setup needs to be rerun, so its kindof a breaking change
@@ -43431,8 +43432,8 @@ var getCloudSqlVariables = function (_a) {
       DB_NAME: DB_NAME,
       DB_USER: (_c = deployConfigRaw.cloudSql.dbUser) !== null && _c !== void 0 ? _c : "postgres",
       DB_PASSWORD: "$" + (0, context_1.getSecretVarName)(env, componentName, "DB_PASSWORD"),
-      DATABASE_URL: "postgresql://$DB_USER:$DB_PASSWORD@localhost/$DB_NAME?host=/cloudsql/$CLOUD_SQL_INSTANCE_CONNECTION_NAME".concat(additionalQueryParamsString),
-      DATABASE_JDBC_URL: "jdbc:postgresql:///$DB_NAME?cloudSqlInstance=$CLOUD_SQL_INSTANCE_CONNECTION_NAME&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=$DB_USER&password=$DB_PASSWORD".concat(additionalQueryParamsString)
+      DATABASE_URL: "".concat((0, database_1.getDatabaseConnectionString)(deployConfigRaw.cloudSql)).concat(additionalQueryParamsString),
+      DATABASE_JDBC_URL: database_1.DATABASE_JDBC_URL
     };
   }
   return {};
@@ -43583,7 +43584,7 @@ var __read = this && this.__read || function (o, n) {
   return ar;
 };
 exports.__esModule = true;
-exports.getDatabaseCreateScript = exports.getDatabaseDeleteScript = void 0;
+exports.getDatabaseConnectionString = exports.DATABASE_JDBC_URL = exports.getDatabaseCreateScript = exports.getDatabaseDeleteScript = void 0;
 var gitlab_1 = __nccwpck_require__(4997);
 var getDatabaseDeleteScript = function (context, deployConfig) {
   var _a;
@@ -43622,6 +43623,19 @@ var getDatabaseCreateScript = function (context, deployConfig) {
   return (0, gitlab_1.allowFailureInScripts)(["echo \"ensuring Database...\"", "gcloud sql databases create ".concat(DB_NAME, " --instance=").concat(instanceId, " --project ").concat(projectId)]);
 };
 exports.getDatabaseCreateScript = getDatabaseCreateScript;
+exports.DATABASE_JDBC_URL = "jdbc:postgresql:///$DB_NAME?cloudSqlInstance=$CLOUD_SQL_INSTANCE_CONNECTION_NAME&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=$DB_USER&password=$DB_PASSWORD";
+var getDatabaseConnectionString = function (config) {
+  switch (config.dbConnectionStringFormat) {
+    case "jdbc":
+      return exports.DATABASE_JDBC_URL;
+    case "rails":
+      return "postgresql://$DB_USER:$DB_PASSWORD@".concat(encodeURIComponent("/cloudsql/".concat(config.instanceConnectionName)), "/$DB_NAME?");
+    default:
+      // prisma
+      return "postgresql://$DB_USER:$DB_PASSWORD@localhost/$DB_NAME?host=/cloudsql/$CLOUD_SQL_INSTANCE_CONNECTION_NAME";
+  }
+};
+exports.getDatabaseConnectionString = getDatabaseConnectionString;
 
 /***/ }),
 
@@ -45349,77 +45363,27 @@ 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.createChildPipeline = void 0;
-var config_1 = __nccwpck_require__(3138);
-var rules_1 = __nccwpck_require__(2020);
-var runner_1 = __nccwpck_require__(5071);
-var jobs_1 = __nccwpck_require__(2339);
 var createAllJobs_1 = __nccwpck_require__(7052);
+var getPipelineStages_1 = __nccwpck_require__(5812);
 var createGitlabJobs_1 = __nccwpck_require__(3920);
+var createGitlabPipeline_1 = __nccwpck_require__(9800);
 var createChildPipeline = function (type, trigger, config) {
   return __awaiter(void 0, void 0, void 0, function () {
-    var jobs, allEnvs, stages, pipeline;
-    var _a;
-    return __generator(this, function (_b) {
-      switch (_b.label) {
+    var jobs, stages, gitlabJobs;
+    return __generator(this, function (_a) {
+      switch (_a.label) {
         case 0:
           return [4 /*yield*/, (0, createAllJobs_1.createAllJobs)(config, trigger)];
         case 1:
-          jobs = _b.sent();
-          allEnvs = (0, config_1.getAllEnvsInAllComponents)(config);
-          stages = jobs_1.BASE_STAGES.reduce(function (acc, baseStage) {
-            return __spreadArray(__spreadArray(__spreadArray([], __read(acc), false), [baseStage], false), __read(allEnvs.map(function (e) {
-              return "".concat(baseStage, " ").concat(e);
-            })), false);
-          }, []);
+          jobs = _a.sent();
+          stages = (0, getPipelineStages_1.getPipelineStages)(config);
           if (!(type === "gitlab")) return [3 /*break*/, 3];
-          _a = {
-            image: (0, runner_1.getRunnerImage)("jobs-default"),
-            variables: {
-              FF_USE_FASTZIP: "true",
-              GIT_DEPTH: 1
-            },
-            workflow: {
-              rules: rules_1.RULES_ALWAYS
-            },
-            stages: stages
-          };
           return [4 /*yield*/, (0, createGitlabJobs_1.createGitlabJobs)(jobs)];
         case 2:
-          pipeline = (_a.jobs = _b.sent(), _a);
-          return [2 /*return*/, pipeline];
+          gitlabJobs = _a.sent();
+          return [2 /*return*/, (0, createGitlabPipeline_1.createGitlabPipelineFromStagesAndJobs)(stages, gitlabJobs)];
         case 3:
           throw new Error("".concat(type, " is not supported"));
       }
@@ -45658,6 +45622,66 @@ exports.createJobsForComponent = createJobsForComponent;
 
 /***/ }),
 
+/***/ 5812:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+
+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.getPipelineStages = void 0;
+var config_1 = __nccwpck_require__(3138);
+var jobs_1 = __nccwpck_require__(2339);
+/**
+ *
+  while technically not required, we group different envs in its own stage
+  each job from `createJobs` that is defined as `envMode: "stagePerEnv"` will have `deploy dev`, etc. instead of just `deploy`
+  this is just so that it looks nicer in gitlab and makes running mutliple manual tasks more easy to use
+ */
+function getPipelineStages(config) {
+  var allEnvs = (0, config_1.getAllEnvsInAllComponents)(config);
+  var stages = jobs_1.BASE_STAGES.reduce(function (acc, baseStage) {
+    return __spreadArray(__spreadArray(__spreadArray([], __read(acc), false), [baseStage], false), __read(allEnvs.map(function (e) {
+      return "".concat(baseStage, " ").concat(e);
+    })), false);
+  }, []);
+  return stages;
+}
+exports.getPipelineStages = getPipelineStages;
+
+/***/ }),
+
 /***/ 3920:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
@@ -45940,6 +45964,34 @@ exports.createGitlabJobs = createGitlabJobs;
 
 /***/ }),
 
+/***/ 9800:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.createGitlabPipelineFromStagesAndJobs = void 0;
+var rules_1 = __nccwpck_require__(2020);
+var runner_1 = __nccwpck_require__(5071);
+function createGitlabPipelineFromStagesAndJobs(stages, gitlabJobs) {
+  return {
+    image: (0, runner_1.getRunnerImage)("jobs-default"),
+    variables: {
+      FF_USE_FASTZIP: "true",
+      GIT_DEPTH: 1
+    },
+    workflow: {
+      rules: rules_1.RULES_ALWAYS
+    },
+    stages: stages,
+    jobs: gitlabJobs
+  };
+}
+exports.createGitlabPipelineFromStagesAndJobs = createGitlabPipelineFromStagesAndJobs;
+
+/***/ }),
+
 /***/ 4011:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 

package/dist/bundles/cli/index.js

@@ -355852,7 +355852,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "main-c28a5e64" || 0;
+exports.PIPELINE_IMAGE_TAG = "main-99253261" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -358341,6 +358341,7 @@ var context_1 = __nccwpck_require__(22041);
 var gitlab_1 = __nccwpck_require__(84997);
 var utils_1 = __nccwpck_require__(70463);
 var createJobs_1 = __nccwpck_require__(26474);
+var database_1 = __nccwpck_require__(41384);
 var jobName_1 = __nccwpck_require__(77311);
 exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
 // FIXME: rename to internalHostSuffix, but this means that project-setup needs to be rerun, so its kindof a breaking change
@@ -358365,8 +358366,8 @@ var getCloudSqlVariables = function (_a) {
       DB_NAME: DB_NAME,
       DB_USER: (_c = deployConfigRaw.cloudSql.dbUser) !== null && _c !== void 0 ? _c : "postgres",
       DB_PASSWORD: "$" + (0, context_1.getSecretVarName)(env, componentName, "DB_PASSWORD"),
-      DATABASE_URL: "postgresql://$DB_USER:$DB_PASSWORD@localhost/$DB_NAME?host=/cloudsql/$CLOUD_SQL_INSTANCE_CONNECTION_NAME".concat(additionalQueryParamsString),
-      DATABASE_JDBC_URL: "jdbc:postgresql:///$DB_NAME?cloudSqlInstance=$CLOUD_SQL_INSTANCE_CONNECTION_NAME&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=$DB_USER&password=$DB_PASSWORD".concat(additionalQueryParamsString)
+      DATABASE_URL: "".concat((0, database_1.getDatabaseConnectionString)(deployConfigRaw.cloudSql)).concat(additionalQueryParamsString),
+      DATABASE_JDBC_URL: database_1.DATABASE_JDBC_URL
     };
   }
   return {};
@@ -358517,7 +358518,7 @@ var __read = this && this.__read || function (o, n) {
   return ar;
 };
 exports.__esModule = true;
-exports.getDatabaseCreateScript = exports.getDatabaseDeleteScript = void 0;
+exports.getDatabaseConnectionString = exports.DATABASE_JDBC_URL = exports.getDatabaseCreateScript = exports.getDatabaseDeleteScript = void 0;
 var gitlab_1 = __nccwpck_require__(84997);
 var getDatabaseDeleteScript = function (context, deployConfig) {
   var _a;
@@ -358556,6 +358557,19 @@ var getDatabaseCreateScript = function (context, deployConfig) {
   return (0, gitlab_1.allowFailureInScripts)(["echo \"ensuring Database...\"", "gcloud sql databases create ".concat(DB_NAME, " --instance=").concat(instanceId, " --project ").concat(projectId)]);
 };
 exports.getDatabaseCreateScript = getDatabaseCreateScript;
+exports.DATABASE_JDBC_URL = "jdbc:postgresql:///$DB_NAME?cloudSqlInstance=$CLOUD_SQL_INSTANCE_CONNECTION_NAME&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=$DB_USER&password=$DB_PASSWORD";
+var getDatabaseConnectionString = function (config) {
+  switch (config.dbConnectionStringFormat) {
+    case "jdbc":
+      return exports.DATABASE_JDBC_URL;
+    case "rails":
+      return "postgresql://$DB_USER:$DB_PASSWORD@".concat(encodeURIComponent("/cloudsql/".concat(config.instanceConnectionName)), "/$DB_NAME?");
+    default:
+      // prisma
+      return "postgresql://$DB_USER:$DB_PASSWORD@localhost/$DB_NAME?host=/cloudsql/$CLOUD_SQL_INSTANCE_CONNECTION_NAME";
+  }
+};
+exports.getDatabaseConnectionString = getDatabaseConnectionString;
 
 /***/ }),
 
@@ -360283,77 +360297,27 @@ 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.createChildPipeline = void 0;
-var config_1 = __nccwpck_require__(33138);
-var rules_1 = __nccwpck_require__(42020);
-var runner_1 = __nccwpck_require__(55071);
-var jobs_1 = __nccwpck_require__(62339);
 var createAllJobs_1 = __nccwpck_require__(17052);
+var getPipelineStages_1 = __nccwpck_require__(45812);
 var createGitlabJobs_1 = __nccwpck_require__(63920);
+var createGitlabPipeline_1 = __nccwpck_require__(59800);
 var createChildPipeline = function (type, trigger, config) {
   return __awaiter(void 0, void 0, void 0, function () {
-    var jobs, allEnvs, stages, pipeline;
-    var _a;
-    return __generator(this, function (_b) {
-      switch (_b.label) {
+    var jobs, stages, gitlabJobs;
+    return __generator(this, function (_a) {
+      switch (_a.label) {
         case 0:
           return [4 /*yield*/, (0, createAllJobs_1.createAllJobs)(config, trigger)];
         case 1:
-          jobs = _b.sent();
-          allEnvs = (0, config_1.getAllEnvsInAllComponents)(config);
-          stages = jobs_1.BASE_STAGES.reduce(function (acc, baseStage) {
-            return __spreadArray(__spreadArray(__spreadArray([], __read(acc), false), [baseStage], false), __read(allEnvs.map(function (e) {
-              return "".concat(baseStage, " ").concat(e);
-            })), false);
-          }, []);
+          jobs = _a.sent();
+          stages = (0, getPipelineStages_1.getPipelineStages)(config);
           if (!(type === "gitlab")) return [3 /*break*/, 3];
-          _a = {
-            image: (0, runner_1.getRunnerImage)("jobs-default"),
-            variables: {
-              FF_USE_FASTZIP: "true",
-              GIT_DEPTH: 1
-            },
-            workflow: {
-              rules: rules_1.RULES_ALWAYS
-            },
-            stages: stages
-          };
           return [4 /*yield*/, (0, createGitlabJobs_1.createGitlabJobs)(jobs)];
         case 2:
-          pipeline = (_a.jobs = _b.sent(), _a);
-          return [2 /*return*/, pipeline];
+          gitlabJobs = _a.sent();
+          return [2 /*return*/, (0, createGitlabPipeline_1.createGitlabPipelineFromStagesAndJobs)(stages, gitlabJobs)];
         case 3:
           throw new Error("".concat(type, " is not supported"));
       }
@@ -360592,6 +360556,66 @@ exports.createJobsForComponent = createJobsForComponent;
 
 /***/ }),
 
+/***/ 45812:
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
+
+"use strict";
+
+
+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.getPipelineStages = void 0;
+var config_1 = __nccwpck_require__(33138);
+var jobs_1 = __nccwpck_require__(62339);
+/**
+ *
+  while technically not required, we group different envs in its own stage
+  each job from `createJobs` that is defined as `envMode: "stagePerEnv"` will have `deploy dev`, etc. instead of just `deploy`
+  this is just so that it looks nicer in gitlab and makes running mutliple manual tasks more easy to use
+ */
+function getPipelineStages(config) {
+  var allEnvs = (0, config_1.getAllEnvsInAllComponents)(config);
+  var stages = jobs_1.BASE_STAGES.reduce(function (acc, baseStage) {
+    return __spreadArray(__spreadArray(__spreadArray([], __read(acc), false), [baseStage], false), __read(allEnvs.map(function (e) {
+      return "".concat(baseStage, " ").concat(e);
+    })), false);
+  }, []);
+  return stages;
+}
+exports.getPipelineStages = getPipelineStages;
+
+/***/ }),
+
 /***/ 63920:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
@@ -360874,6 +360898,34 @@ exports.createGitlabJobs = createGitlabJobs;
 
 /***/ }),
 
+/***/ 59800:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.createGitlabPipelineFromStagesAndJobs = void 0;
+var rules_1 = __nccwpck_require__(42020);
+var runner_1 = __nccwpck_require__(55071);
+function createGitlabPipelineFromStagesAndJobs(stages, gitlabJobs) {
+  return {
+    image: (0, runner_1.getRunnerImage)("jobs-default"),
+    variables: {
+      FF_USE_FASTZIP: "true",
+      GIT_DEPTH: 1
+    },
+    workflow: {
+      rules: rules_1.RULES_ALWAYS
+    },
+    stages: stages,
+    jobs: gitlabJobs
+  };
+}
+exports.createGitlabPipelineFromStagesAndJobs = createGitlabPipelineFromStagesAndJobs;
+
+/***/ }),
+
 /***/ 34011:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {