@catladder/cli 0.0.0-jdbc-064ed4e2 → 0.0.0-jdbc-e0855190

package/dist/bundles/catenv/index.js

@@ -40059,7 +40059,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "jdbc-064ed4e2" || 0;
+exports.PIPELINE_IMAGE_TAG = "jdbc-e0855190" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -41745,13 +41745,12 @@ var getCloudSqlVariables = function (_a) {
 
   if (deployConfigRaw && deployConfigRaw.cloudSql) {
     var DB_NAME = [(_b = deployConfigRaw.cloudSql.dbNamePrefix) !== null && _b !== void 0 ? _b : "".concat(fullConfig.customerName, "-").concat(fullConfig.appName), environmentSlug].filter(Boolean).join("-");
-    var hostAndDb = "localhost/$DB_NAME?host=/cloudsql/$CLOUD_SQL_INSTANCE_CONNECTION_NAME";
     return {
       CLOUD_SQL_INSTANCE_CONNECTION_NAME: deployConfigRaw.cloudSql.instanceConnectionName,
       DB_NAME: DB_NAME,
       DB_USER: "postgres",
       DB_PASSWORD: "$" + (0, context_1.getSecretVarName)(env, componentName, "DB_PASSWORD"),
-      DATABASE_URL: "postgresql://$DB_USER:$DB_PASSWORD@".concat(hostAndDb),
+      DATABASE_URL: "postgresql://$DB_USER:$DB_PASSWORD@localhost/$DB_NAME?host=/cloudsql/$CLOUD_SQL_INSTANCE_CONNECTION_NAME",
       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"
     };
   }
@@ -42112,8 +42111,6 @@ var kubernetes_1 = __nccwpck_require__(5682);
 
 __exportStar(__nccwpck_require__(1344), exports);
 
-__exportStar(__nccwpck_require__(1925), exports);
-
 __exportStar(__nccwpck_require__(5682), exports);
 
 __exportStar(__nccwpck_require__(3109), exports);
@@ -42176,7 +42173,9 @@ exports.additionalKubernetesSecretKeys = additionalKubernetesSecretKeys;
 
 
 exports.__esModule = true;
-exports.getKubernetesCloudSQLConfig = exports.hasKubernetesCloudSQL = void 0;
+exports.createCloudsqlBaseConfig = exports.getKubernetesCloudSQLConfig = exports.hasKubernetesCloudSQL = void 0;
+
+var context_1 = __nccwpck_require__(2041);
 
 var types_1 = __nccwpck_require__(3109);
 
@@ -42204,23 +42203,10 @@ var getKubernetesCloudSQLConfig = function (context) {
 
 exports.getKubernetesCloudSQLConfig = getKubernetesCloudSQLConfig;
 
-/***/ }),
-
-/***/ 395:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-exports.__esModule = true;
-exports.createCloudsqlBaseConfig = void 0;
-
-var __1 = __nccwpck_require__(5355);
-
 var createCloudsqlBaseConfig = function (context) {
   return {
     cloudsql: {
-      proxyCredentials: "$".concat((0, __1.getSecretVarNameForContext)(context, "cloudsqlProxyCredentials"))
+      proxyCredentials: "$".concat((0, context_1.getSecretVarNameForContext)(context, "cloudsqlProxyCredentials"))
     }
   };
 };
@@ -42369,6 +42355,23 @@ exports.createKubernetesDeployJobs = createKubernetesDeployJobs;
 "use strict";
 
 
+var __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  Object.defineProperty(o, k2, {
+    enumerable: true,
+    get: function () {
+      return m[k];
+    }
+  });
+} : function (o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  o[k2] = m[k];
+});
+
+var __exportStar = this && this.__exportStar || function (m, exports) {
+  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+
 var __importDefault = this && this.__importDefault || function (mod) {
   return mod && mod.__esModule ? mod : {
     "default": mod
@@ -42386,6 +42389,8 @@ var additionalSecretKeys_1 = __nccwpck_require__(5775);
 
 var deployJob_1 = __nccwpck_require__(9792);
 
+__exportStar(__nccwpck_require__(1925), exports);
+
 exports.KUBERNETES_DEPLOY_TYPE = {
   jobs: deployJob_1.createKubernetesDeployJobs,
   defaults: function () {
@@ -42542,11 +42547,9 @@ var lodash_1 = __nccwpck_require__(3255);
 
 var utils_1 = __nccwpck_require__(7461);
 
-var cloudSql_1 = __nccwpck_require__(1925);
-
 var types_1 = __nccwpck_require__(3109);
 
-var cloudsql_1 = __nccwpck_require__(395);
+var cloudSql_1 = __nccwpck_require__(1925);
 
 var kubeEnv_1 = __nccwpck_require__(9449);
 
@@ -42612,7 +42615,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.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) : {});
   var kubeValues = (0, processSecretsAsFiles_1.processSecretsAsFiles)((0, utils_1.mergeWithMergingArrays)(defaultKubeValues, rest));
   return kubeValues;
 };

package/dist/bundles/cli/index.js

@@ -351005,7 +351005,7 @@ exports.readConfigSync = readConfigSync;
 
 exports.__esModule = true;
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "jdbc-064ed4e2" || 0;
+exports.PIPELINE_IMAGE_TAG = "jdbc-e0855190" || 0;
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
 
 /***/ }),
@@ -352691,13 +352691,12 @@ var getCloudSqlVariables = function (_a) {
 
   if (deployConfigRaw && deployConfigRaw.cloudSql) {
     var DB_NAME = [(_b = deployConfigRaw.cloudSql.dbNamePrefix) !== null && _b !== void 0 ? _b : "".concat(fullConfig.customerName, "-").concat(fullConfig.appName), environmentSlug].filter(Boolean).join("-");
-    var hostAndDb = "localhost/$DB_NAME?host=/cloudsql/$CLOUD_SQL_INSTANCE_CONNECTION_NAME";
     return {
       CLOUD_SQL_INSTANCE_CONNECTION_NAME: deployConfigRaw.cloudSql.instanceConnectionName,
       DB_NAME: DB_NAME,
       DB_USER: "postgres",
       DB_PASSWORD: "$" + (0, context_1.getSecretVarName)(env, componentName, "DB_PASSWORD"),
-      DATABASE_URL: "postgresql://$DB_USER:$DB_PASSWORD@".concat(hostAndDb),
+      DATABASE_URL: "postgresql://$DB_USER:$DB_PASSWORD@localhost/$DB_NAME?host=/cloudsql/$CLOUD_SQL_INSTANCE_CONNECTION_NAME",
       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"
     };
   }
@@ -353058,8 +353057,6 @@ var kubernetes_1 = __nccwpck_require__(95682);
 
 __exportStar(__nccwpck_require__(81344), exports);
 
-__exportStar(__nccwpck_require__(11925), exports);
-
 __exportStar(__nccwpck_require__(95682), exports);
 
 __exportStar(__nccwpck_require__(63109), exports);
@@ -353122,7 +353119,9 @@ exports.additionalKubernetesSecretKeys = additionalKubernetesSecretKeys;
 
 
 exports.__esModule = true;
-exports.getKubernetesCloudSQLConfig = exports.hasKubernetesCloudSQL = void 0;
+exports.createCloudsqlBaseConfig = exports.getKubernetesCloudSQLConfig = exports.hasKubernetesCloudSQL = void 0;
+
+var context_1 = __nccwpck_require__(22041);
 
 var types_1 = __nccwpck_require__(63109);
 
@@ -353150,23 +353149,10 @@ var getKubernetesCloudSQLConfig = function (context) {
 
 exports.getKubernetesCloudSQLConfig = getKubernetesCloudSQLConfig;
 
-/***/ }),
-
-/***/ 395:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
-
-"use strict";
-
-
-exports.__esModule = true;
-exports.createCloudsqlBaseConfig = void 0;
-
-var __1 = __nccwpck_require__(25355);
-
 var createCloudsqlBaseConfig = function (context) {
   return {
     cloudsql: {
-      proxyCredentials: "$".concat((0, __1.getSecretVarNameForContext)(context, "cloudsqlProxyCredentials"))
+      proxyCredentials: "$".concat((0, context_1.getSecretVarNameForContext)(context, "cloudsqlProxyCredentials"))
     }
   };
 };
@@ -353315,6 +353301,23 @@ exports.createKubernetesDeployJobs = createKubernetesDeployJobs;
 "use strict";
 
 
+var __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  Object.defineProperty(o, k2, {
+    enumerable: true,
+    get: function () {
+      return m[k];
+    }
+  });
+} : function (o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  o[k2] = m[k];
+});
+
+var __exportStar = this && this.__exportStar || function (m, exports) {
+  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+
 var __importDefault = this && this.__importDefault || function (mod) {
   return mod && mod.__esModule ? mod : {
     "default": mod
@@ -353332,6 +353335,8 @@ var additionalSecretKeys_1 = __nccwpck_require__(75775);
 
 var deployJob_1 = __nccwpck_require__(9792);
 
+__exportStar(__nccwpck_require__(11925), exports);
+
 exports.KUBERNETES_DEPLOY_TYPE = {
   jobs: deployJob_1.createKubernetesDeployJobs,
   defaults: function () {
@@ -353488,11 +353493,9 @@ var lodash_1 = __nccwpck_require__(23255);
 
 var utils_1 = __nccwpck_require__(37461);
 
-var cloudSql_1 = __nccwpck_require__(11925);
-
 var types_1 = __nccwpck_require__(63109);
 
-var cloudsql_1 = __nccwpck_require__(395);
+var cloudSql_1 = __nccwpck_require__(11925);
 
 var kubeEnv_1 = __nccwpck_require__(19449);
 
@@ -353558,7 +353561,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.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) : {});
   var kubeValues = (0, processSecretsAsFiles_1.processSecretsAsFiles)((0, utils_1.mergeWithMergingArrays)(defaultKubeValues, rest));
   return kubeValues;
 };