@catladder/cli 0.0.0-fix-error-sql-db-delete-a719775a → 0.0.0-fix-error-sql-db-delete-7bf85929

package/dist/bundles/cli/index.js

@@ -1453,20 +1453,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-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;
 var pipeline_1 = __nccwpck_require__(25355);
+var pipeline_2 = __nccwpck_require__(25355);
 var child_process_promise_1 = __nccwpck_require__(75763);
-var fs_extra_1 = __nccwpck_require__(85501);
-var tmp_promise_1 = __nccwpck_require__(68841);
 var getProjectConfig_1 = __nccwpck_require__(24146);
 var autocompletions_1 = __nccwpck_require__(41373);
 exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void 0, function () {
@@ -1482,8 +1472,7 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                     .action(function (_a) {
                     var envComponent = _a.envComponent;
                     return __awaiter(this, void 0, void 0, function () {
-                        var _b, env, componentName, context, proxyInfo, DB_PASSWORD, DB_NAME, DB_USER, instanceName, localPort, cloudsqlProxyCredentials;
-                        var _this = this;
+                        var _b, env, componentName, context, proxyInfo, DB_PASSWORD, DB_NAME, DB_USER, instanceName, localPort;
                         return __generator(this, function (_c) {
                             switch (_c.label) {
                                 case 0:
@@ -1494,13 +1483,13 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                                     if (env === "review") {
                                         vorpal.log("⚠️ connection string does not include mr information on review environments");
                                     }
-                                    if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) return [3 /*break*/, 3];
+                                    if (!(0, pipeline_2.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) return [3 /*break*/, 3];
                                     return [4 /*yield*/, getProxyInfoForKubernetes(context)];
                                 case 2:
                                     proxyInfo = _c.sent();
                                     return [3 /*break*/, 6];
                                 case 3:
-                                    if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")) return [3 /*break*/, 5];
+                                    if (!(0, pipeline_2.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")) return [3 /*break*/, 5];
                                     return [4 /*yield*/, getProxyInfoForCloudRun(context)];
                                 case 4:
                                     proxyInfo = _c.sent();
@@ -1521,37 +1510,11 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
                                     this.log("");
                                     this.log("POSTGRESQL_URL=postgresql://".concat(DB_USER, ":").concat(DB_PASSWORD, "@localhost:").concat(localPort, "/").concat(DB_NAME, "?schema=public"));
                                     this.log("");
-                                    return [4 /*yield*/, (0, getProjectConfig_1.getGitlabVar)(this, env, componentName, "cloudsqlProxyCredentials")];
-                                case 8:
-                                    cloudsqlProxyCredentials = _c.sent();
-                                    return [4 /*yield*/, (0, tmp_promise_1.withFile)(function (_a) {
-                                            var tmpFilePath = _a.path;
-                                            return __awaiter(_this, void 0, void 0, function () {
-                                                return __generator(this, function (_b) {
-                                                    switch (_b.label) {
-                                                        case 0:
-                                                            if (!cloudsqlProxyCredentials) return [3 /*break*/, 2];
-                                                            return [4 /*yield*/, (0, fs_extra_1.writeFile)(tmpFilePath, cloudsqlProxyCredentials)];
-                                                        case 1:
-                                                            _b.sent();
-                                                            _b.label = 2;
-                                                        case 2: return [4 /*yield*/, (0, child_process_promise_1.spawn)("cloud_sql_proxy", __spreadArray([
-                                                                "-instances",
-                                                                "".concat(instanceName, "=tcp:").concat(localPort)
-                                                            ], (cloudsqlProxyCredentials
-                                                                ? ["-credential_file", tmpFilePath]
-                                                                : []), true), {
-                                                                stdio: "inherit",
-                                                                shell: true
-                                                            })];
-                                                        case 3:
-                                                            _b.sent();
-                                                            return [2 /*return*/];
-                                                    }
-                                                });
-                                            });
+                                    return [4 /*yield*/, (0, child_process_promise_1.spawn)("cloud_sql_proxy", ["-instances", "".concat(instanceName, "=tcp:").concat(localPort)], {
+                                            stdio: "inherit",
+                                            shell: true
                                         })];
-                                case 9:
+                                case 8:
                                     _c.sent();
                                     return [2 /*return*/];
                             }
@@ -1562,27 +1525,20 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
     });
 }); });
 var getProxyInfoForKubernetes = function (context) { return __awaiter(void 0, void 0, void 0, function () {
-    var envVars, DB_PASSWORD, DB_NAME, values, projectId, defaultInstanceId, instanceId, defaultRegion, region, instanceName;
-    var _a, _b, _c, _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var envVars, cloudSqlValues, DB_PASSWORD, DB_NAME, instanceName;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
             case 0:
-                if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
+                if (!(0, pipeline_2.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
                     throw new Error("unsupported");
                 }
                 return [4 /*yield*/, (0, getProjectConfig_1.getEnvVars)(this, context.environment.shortName, context.componentName)];
             case 1:
-                envVars = _e.sent();
+                envVars = _a.sent();
+                cloudSqlValues = (0, pipeline_1.createKubernetesCloudsqlBaseValues)(context);
                 DB_PASSWORD = (envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD) || (envVars === null || envVars === void 0 ? void 0 : envVars.POSTGRESQL_PASSWORD);
-                DB_NAME = context.environment.envVars.KUBE_APP_NAME;
-                values = context.componentConfig.deploy.values;
-                projectId = ((_a = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _a === void 0 ? void 0 : _a.projectId) ||
-                    ((_b = context.componentConfig.deploy.cluster) === null || _b === void 0 ? void 0 : _b.projectId);
-                defaultInstanceId = "".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, "-").concat(context.environment.shortName);
-                instanceId = ((_c = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _c === void 0 ? void 0 : _c.instanceId) || defaultInstanceId;
-                defaultRegion = "europe-west6";
-                region = ((_d = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _d === void 0 ? void 0 : _d.region) || defaultRegion;
-                instanceName = "".concat(projectId, ":").concat(region, ":").concat(instanceId);
+                DB_NAME = cloudSqlValues.cloudsql.fullDbName;
+                instanceName = cloudSqlValues.cloudsql.instanceConnectionName;
                 return [2 /*return*/, {
                         instanceName: instanceName,
                         DB_PASSWORD: DB_PASSWORD,
@@ -1597,7 +1553,7 @@ var getProxyInfoForCloudRun = function (context) { return __awaiter(void 0, void
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun") ||
+                if (!(0, pipeline_2.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun") ||
                     !context.componentConfig.deploy.cloudSql) {
                     throw new Error("unsupported");
                 }
@@ -4551,69 +4507,6 @@ exports.setupCloudRun = setupCloudRun;
 
 /***/ }),
 
-/***/ 63660:
-/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
-
-"use strict";
-
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-exports.__esModule = true;
-exports.setupCloudSQL = void 0;
-var pipeline_1 = __nccwpck_require__(25355);
-var setupCloudSQL = function (instance, context) { return __awaiter(void 0, void 0, void 0, function () {
-    var config;
-    return __generator(this, function (_a) {
-        if (!(0, pipeline_1.hasKubernetesCloudSQL)(context)) {
-            throw new Error("cannot setup cloudsql, as it has none");
-        }
-        config = (0, pipeline_1.getKubernetesCloudSQLConfig)(context);
-        instance.log("");
-        instance.log("! make sure to provide cloudsqlProxyCredentials for the cloud sql service account in " +
-            config.projectId);
-        instance.log("");
-        return [2 /*return*/];
-    });
-}); };
-exports.setupCloudSQL = setupCloudSQL;
-//# sourceMappingURL=setupCloudSQL.js.map
-
-/***/ }),
-
 /***/ 40663:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
@@ -4659,7 +4552,6 @@ exports.__esModule = true;
 exports.setupContext = void 0;
 var pipeline_1 = __nccwpck_require__(25355);
 var setupCloudRun_1 = __nccwpck_require__(89010);
-var setupCloudSQL_1 = __nccwpck_require__(63660);
 var setupKubernetes_1 = __nccwpck_require__(82308);
 var setupContext = function (instance, context) { return __awaiter(void 0, void 0, void 0, function () {
     var deployConfig;
@@ -4680,19 +4572,13 @@ var setupContext = function (instance, context) { return __awaiter(void 0, void
                 _a.sent();
                 _a.label = 2;
             case 2:
-                if (!(0, pipeline_1.hasKubernetesCloudSQL)(context)) return [3 /*break*/, 4];
-                return [4 /*yield*/, (0, setupCloudSQL_1.setupCloudSQL)(instance, context)];
+                deployConfig = context.componentConfig.deploy;
+                if (!(0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) return [3 /*break*/, 4];
+                return [4 /*yield*/, (0, setupKubernetes_1.setupKubernetes)(instance, context)];
             case 3:
                 _a.sent();
                 _a.label = 4;
             case 4:
-                deployConfig = context.componentConfig.deploy;
-                if (!(0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) return [3 /*break*/, 6];
-                return [4 /*yield*/, (0, setupKubernetes_1.setupKubernetes)(instance, context)];
-            case 5:
-                _a.sent();
-                _a.label = 6;
-            case 6:
                 instance.log("");
                 instance.log("✅ " +
                     context.environment.shortName +
@@ -351506,7 +351392,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "fix-error-sql-db-delete-a719775a" || 0;
+exports.PIPELINE_IMAGE_TAG = "fix-error-sql-db-delete-7bf85929" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -352944,20 +352830,21 @@ exports.__esModule = true;
 exports.GCLOUD_RUN_DEPLOY_TYPE = exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = void 0;
 var context_1 = __nccwpck_require__(22041);
 var gitlab_1 = __nccwpck_require__(84997);
+var utils_1 = __nccwpck_require__(70463);
 var deployJob_1 = __nccwpck_require__(82256);
 var jobName_1 = __nccwpck_require__(77311);
 exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
 exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
 var getCloudSqlVariables = function (_a) {
-  var _b, _c, _d, _e;
+  var _b, _c;
   var deployConfigRaw = _a.deployConfigRaw,
     environmentSlugPrefix = _a.environmentSlugPrefix,
     env = _a.env,
     componentName = _a.componentName,
     fullConfig = _a.fullConfig;
   if (deployConfigRaw && deployConfigRaw.cloudSql) {
-    var DB_NAME = [(_b = deployConfigRaw.cloudSql.dbNamePrefix) !== null && _b !== void 0 ? _b : "".concat(fullConfig.customerName, "-").concat(fullConfig.appName), environmentSlugPrefix, (_c = deployConfigRaw.cloudSql.dbBaseName) !== null && _c !== void 0 ? _c : componentName].filter(Boolean).join("-");
-    var additionalQueryParamsString = Object.entries((_d = deployConfigRaw.cloudSql.dbAdditionalQueryParams) !== null && _d !== void 0 ? _d : {}).map(function (_a) {
+    var DB_NAME = (0, utils_1.getFullDbName)(deployConfigRaw.cloudSql, fullConfig, environmentSlugPrefix, componentName);
+    var additionalQueryParamsString = Object.entries((_b = deployConfigRaw.cloudSql.dbAdditionalQueryParams) !== null && _b !== void 0 ? _b : {}).map(function (_a) {
       var _b = __read(_a, 2),
         key = _b[0],
         value = _b[1];
@@ -352966,7 +352853,7 @@ var getCloudSqlVariables = function (_a) {
     return {
       CLOUD_SQL_INSTANCE_CONNECTION_NAME: deployConfigRaw.cloudSql.instanceConnectionName,
       DB_NAME: DB_NAME,
-      DB_USER: (_e = deployConfigRaw.cloudSql.dbUser) !== null && _e !== void 0 ? _e : "postgres",
+      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)
@@ -353185,6 +353072,22 @@ exports.getCloudRunJobName = getCloudRunJobName;
 
 /***/ }),
 
+/***/ 70463:
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+exports.__esModule = true;
+exports.getFullDbName = void 0;
+var getFullDbName = function (cloudSqlConfig, fullConfig, environmentSlugPrefix, componentName) {
+  var _a, _b;
+  return [(_a = cloudSqlConfig.dbNamePrefix) !== null && _a !== void 0 ? _a : "".concat(fullConfig.customerName, "-").concat(fullConfig.appName), environmentSlugPrefix, (_b = cloudSqlConfig.dbBaseName) !== null && _b !== void 0 ? _b : componentName].filter(Boolean).join("-");
+};
+exports.getFullDbName = getFullDbName;
+
+/***/ }),
+
 /***/ 16531:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
@@ -353415,8 +353318,9 @@ exports.additionalKubernetesSecretKeys = additionalKubernetesSecretKeys;
 
 
 exports.__esModule = true;
-exports.createCloudsqlBaseConfig = exports.getKubernetesCloudSQLConfig = exports.hasKubernetesCloudSQL = void 0;
+exports.createKubernetesCloudsqlBaseValues = exports.hasKubernetesCloudSQL = void 0;
 var context_1 = __nccwpck_require__(22041);
+var utils_1 = __nccwpck_require__(70463);
 var types_1 = __nccwpck_require__(63109);
 var hasKubernetesCloudSQL = function (context) {
   var _a, _b;
@@ -353426,22 +353330,42 @@ var hasKubernetesCloudSQL = function (context) {
   return false;
 };
 exports.hasKubernetesCloudSQL = hasKubernetesCloudSQL;
-var getKubernetesCloudSQLConfig = function (context) {
-  var _a;
-  if ((0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
-    return (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.cloudsql;
+var createKubernetesCloudsqlBaseValues = function (context) {
+  var _a, _b, _c, _d, _e;
+  if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
+    throw new Error("cannot get cloud sql config");
+  }
+  var config = (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.cloudsql;
+  if (!config) {
+    throw new Error("cannot get cloud sql config");
+  }
+  var proxyCredentials = "$".concat((0, context_1.getSecretVarNameForContext)(context, "cloudsqlProxyCredentials"));
+  if ((config === null || config === void 0 ? void 0 : config.type) !== "unmanaged") {
+    var instanceConnectionName = "".concat((_b = config.projectId) !== null && _b !== void 0 ? _b : "skynet-164509", ":").concat((_c = config.region) !== null && _c !== void 0 ? _c : "europe-west6", ":").concat((_d = config.instanceId) !== null && _d !== void 0 ? _d : context.environment.envVars.KUBE_NAMESPACE);
+    return {
+      cloudsql: {
+        enabled: config.enabled,
+        dbUser: "postgres",
+        instanceConnectionName: instanceConnectionName,
+        proxyCredentials: proxyCredentials,
+        fullDbName: context.environment.envVars.KUBE_APP_NAME
+      }
+    };
+  } else if (config.type === "unmanaged") {
+    return {
+      cloudsql: {
+        enabled: config.enabled,
+        dbUser: (_e = config.dbUser) !== null && _e !== void 0 ? _e : "postgres",
+        instanceConnectionName: config.instanceConnectionName,
+        proxyCredentials: proxyCredentials,
+        fullDbName: (0, utils_1.getFullDbName)(config, context.fullConfig, context.environment.slugPrefix, context.componentName)
+      }
+    };
+  } else {
+    throw new Error("unknonw type");
   }
-  throw new Error("cannot get cloud sql config");
-};
-exports.getKubernetesCloudSQLConfig = getKubernetesCloudSQLConfig;
-var createCloudsqlBaseConfig = function (context) {
-  return {
-    cloudsql: {
-      proxyCredentials: "$".concat((0, context_1.getSecretVarNameForContext)(context, "cloudsqlProxyCredentials"))
-    }
-  };
 };
-exports.createCloudsqlBaseConfig = createCloudsqlBaseConfig;
+exports.createKubernetesCloudsqlBaseValues = createKubernetesCloudsqlBaseValues;
 
 /***/ }),
 
@@ -353824,7 +353748,7 @@ var createKubeValues = function (context) {
   var defaultKubeValues = (0, lodash_1.merge)({
     env: env,
     application: createAppConfig(context, application)
-  }, (0, cloudSql_1.hasKubernetesCloudSQL)(context) ? (0, cloudSql_1.createCloudsqlBaseConfig)(context) : {}, ((_b = (_a = deployConfig.values) === null || _a === void 0 ? void 0 : _a.mongodb) === null || _b === void 0 ? void 0 : _b.enabled) ? (0, mongodb_1.createMongodbBaseConfig)(context) : {});
+  }, (0, cloudSql_1.hasKubernetesCloudSQL)(context) ? (0, cloudSql_1.createKubernetesCloudsqlBaseValues)(context) : {}, ((_b = (_a = deployConfig.values) === null || _a === void 0 ? void 0 : _a.mongodb) === null || _b === void 0 ? void 0 : _b.enabled) ? (0, mongodb_1.createMongodbBaseConfig)(context) : {});
   var kubeValues = (0, processSecretsAsFiles_1.processSecretsAsFiles)((0, utils_1.mergeWithMergingArrays)(defaultKubeValues, __assign({
     jobs: removeFalsy(jobs),
     cronjobs: removeFalsy(cronjobs)