@catladder/pipeline 0.0.0-fix-error-sql-db-delete-b3878c2e → 0.0.0-fix-error-sql-db-delete-351d46f5

package/dist/bundles/catladder-gitlab/index.js

@@ -28351,7 +28351,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-b3878c2e" || 0;
+exports.PIPELINE_IMAGE_TAG = "fix-error-sql-db-delete-351d46f5" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -29789,20 +29789,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__(7123);
 var gitlab_1 = __nccwpck_require__(9818);
+var utils_1 = __nccwpck_require__(4335);
 var deployJob_1 = __nccwpck_require__(5565);
 var jobName_1 = __nccwpck_require__(9357);
 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];
@@ -29811,7 +29812,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)
@@ -30030,6 +30031,22 @@ exports.getCloudRunJobName = getCloudRunJobName;
 
 /***/ }),
 
+/***/ 4335:
+/***/ ((__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;
+
+/***/ }),
+
 /***/ 494:
 /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
@@ -30260,8 +30277,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__(7123);
+var utils_1 = __nccwpck_require__(4335);
 var types_1 = __nccwpck_require__(4436);
 var hasKubernetesCloudSQL = function (context) {
   var _a, _b;
@@ -30271,22 +30289,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;
 
 /***/ }),
 
@@ -30669,7 +30707,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)

package/dist/constants.js

@@ -2,5 +2,5 @@
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "fix-error-sql-db-delete-b3878c2e" || "";
+exports.PIPELINE_IMAGE_TAG = "fix-error-sql-db-delete-351d46f5" || "";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "";

package/dist/deploy/cloudRun/index.js

@@ -45,20 +45,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 = require("../../context");
 var gitlab_1 = require("../../utils/gitlab");
+var utils_1 = require("../cloudSql/utils");
 var deployJob_1 = require("./deployJob");
 var jobName_1 = require("./utils/jobName");
 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];
@@ -67,7 +68,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)

package/dist/deploy/cloudSql/utils.d.ts

@@ -0,0 +1,3 @@
+import type { Config } from "../..";
+import type { DeployConfigCloudRunCloudSql, DeployConfigKubernetesValuesCloudSQLUnmanaged } from "../types";
+export declare const getFullDbName: (cloudSqlConfig: DeployConfigCloudRunCloudSql | DeployConfigKubernetesValuesCloudSQLUnmanaged, fullConfig: Config<never>, environmentSlugPrefix: string, componentName: string) => string;

package/dist/deploy/cloudSql/utils.js

@@ -0,0 +1,9 @@
+"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;

package/dist/deploy/kubernetes/cloudSql/index.d.ts

@@ -1,13 +1,13 @@
 import type { Context } from "../../../types";
 export declare const hasKubernetesCloudSQL: (context: Context) => boolean | undefined;
-export declare const getKubernetesCloudSQLConfig: (context: Context) => {
+declare type CloudSqlValues = {
   enabled: boolean;
-  instanceId?: string | undefined;
-  projectId?: string | undefined;
-  region?: string | undefined;
-} | undefined;
-export declare const createCloudsqlBaseConfig: (context: Context) => {
-  cloudsql: {
-    proxyCredentials: string;
-  };
-};
+  proxyCredentials: string;
+  instanceConnectionName: string;
+  fullDbName: string;
+  dbUser: string;
+};
+export declare const createKubernetesCloudsqlBaseValues: (context: Context) => {
+  cloudsql: CloudSqlValues;
+};
+export {};

package/dist/deploy/kubernetes/cloudSql/index.js

@@ -1,8 +1,9 @@
 "use strict";
 
 exports.__esModule = true;
-exports.createCloudsqlBaseConfig = exports.getKubernetesCloudSQLConfig = exports.hasKubernetesCloudSQL = void 0;
+exports.createKubernetesCloudsqlBaseValues = exports.hasKubernetesCloudSQL = void 0;
 var context_1 = require("../../../context");
+var utils_1 = require("../../cloudSql/utils");
 var types_1 = require("../../types");
 var hasKubernetesCloudSQL = function (context) {
   var _a, _b;
@@ -12,19 +13,39 @@ 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;

package/dist/deploy/kubernetes/kubeValues.d.ts

@@ -64,12 +64,7 @@ export declare const createKubeValues: (context: Context) => never[] | ({
     } | undefined;
   }> | undefined;
 } & {
-  cloudsql?: {
-    enabled: boolean;
-    instanceId?: string | undefined;
-    projectId?: string | undefined;
-    region?: string | undefined;
-  } | undefined;
+  cloudsql?: import("../types").DeployConfigKubernetesValuesCloudSQL | undefined;
   mongodb?: import("../types").DeployConfigMongodb | undefined;
   mailhog?: {
     enabled: boolean;

package/dist/deploy/kubernetes/kubeValues.js

@@ -114,7 +114,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)

package/dist/deploy/kubernetes/processSecretsAsFiles.d.ts

@@ -3,12 +3,7 @@ export declare const processSecretsAsFiles: <T extends {
     secret: Record<string, string>;
   };
 } & {
-  cloudsql?: {
-    enabled: boolean;
-    instanceId?: string | undefined;
-    projectId?: string | undefined;
-    region?: string | undefined;
-  } | undefined;
+  cloudsql?: import("../types").DeployConfigKubernetesValuesCloudSQL | undefined;
   mongodb?: import("../types").DeployConfigMongodb | undefined;
   mailhog?: {
     enabled: boolean;

package/dist/deploy/types/kubernetes.d.ts

@@ -119,16 +119,64 @@ export declare type DeployConfigMongodbReplicaset = {
   replicaCount?: number;
 };
 export declare type DeployConfigMongodb = DeployConfigMongodbBase & (DeployConfigMongodbStandalone | DeployConfigMongodbReplicaset);
+/**
+ * @deprecated use config with instanceConnectionName
+ */
+declare type DeployConfigKubernetesValuesCloudSQLLegacy = {
+  enabled: boolean;
+  /**
+   * @deprecated use config with instanceConnectionName
+   */
+  instanceId?: string;
+  /**
+   * @deprecated use config with instanceConnectionName
+   */
+  projectId?: string;
+  /**
+   * @deprecated use config with instanceConnectionName
+   */
+  region?: string;
+  /**
+   * @deprecated use type "unmanaged".
+   *
+   * Be aware that "unmanaged" is not fully backward compatible with "legacy".
+   *
+   *
+   */
+  type?: "legacy";
+};
+export declare type DeployConfigKubernetesValuesCloudSQLUnmanaged = {
+  enabled: boolean;
+  instanceConnectionName: string;
+  /**
+   * the recommended type for the config.
+   *
+   * this mode is similar to cloudrun and declares fully-qualified db names including env.
+   *
+   * This makes it easier to share db instances across envs and dbs
+   */
+  type: "unmanaged";
+  /**
+   * the database username, defaults to "postgres"
+   */
+  dbUser?: string;
+  /**
+   * the prefix of the database, the full db name is this plus the environment slug prefix plus the componentName
+   *
+   * defaults to customerName-appName
+   */
+  dbNamePrefix?: string | false;
+  /**
+   * the base name of the db, defaults to the componentName
+   */
+  dbBaseName?: string;
+};
+export declare type DeployConfigKubernetesValuesCloudSQL = DeployConfigKubernetesValuesCloudSQLLegacy | DeployConfigKubernetesValuesCloudSQLUnmanaged;
 export declare type DeployConfigKubernetesValues = AllowUnknownProps<{
   /**
    * enable cloudsql db. Currently you have to manually set it up
    */
-  cloudsql?: {
-    enabled: boolean;
-    instanceId?: string;
-    projectId?: string;
-    region?: string;
-  };
+  cloudsql?: DeployConfigKubernetesValuesCloudSQL;
   /**
    * enable mongodb. The mongodb is deployed using a helm chart.
    * See https://github.com/bitnami/charts/tree/master/bitnami/mongodb