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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (14) hide show
  1. package/dist/apps/cli/commands/project/commandCloudSqlProxy.js +12 -18
  2. package/dist/apps/cli/commands/project/commandCloudSqlProxy.js.map +1 -1
  3. package/dist/apps/cli/commands/project/setup/setupContext.js +3 -10
  4. package/dist/apps/cli/commands/project/setup/setupContext.js.map +1 -1
  5. package/dist/bundles/catenv/index.js +59 -21
  6. package/dist/bundles/cli/index.js +74 -112
  7. package/dist/tsconfig.tsbuildinfo +1 -1
  8. package/package.json +2 -2
  9. package/src/apps/cli/commands/project/commandCloudSqlProxy.ts +5 -14
  10. package/src/apps/cli/commands/project/setup/setupContext.ts +2 -5
  11. package/dist/apps/cli/commands/project/setup/setupCloudSQL.d.ts +0 -3
  12. package/dist/apps/cli/commands/project/setup/setupCloudSQL.js +0 -56
  13. package/dist/apps/cli/commands/project/setup/setupCloudSQL.js.map +0 -1
  14. package/src/apps/cli/commands/project/setup/setupCloudSQL.ts +0 -22
package/dist/apps/cli/commands/project/commandCloudSqlProxy.js CHANGED
@@ -37,6 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
37
37
  };
38
38
  exports.__esModule = true;
39
39
  var pipeline_1 = require("@catladder/pipeline");
40
+ var pipeline_2 = require("@catladder/pipeline");
40
41
  var child_process_promise_1 = require("child-process-promise");
41
42
  var getProjectConfig_1 = require("../../../../config/getProjectConfig");
42
43
  var autocompletions_1 = require("./utils/autocompletions");
@@ -64,13 +65,13 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
64
65
  if (env === "review") {
65
66
  vorpal.log("⚠️ connection string does not include mr information on review environments");
66
67
  }
67
- if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) return [3 /*break*/, 3];
68
+ if (!(0, pipeline_2.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) return [3 /*break*/, 3];
68
69
  return [4 /*yield*/, getProxyInfoForKubernetes(context)];
69
70
  case 2:
70
71
  proxyInfo = _c.sent();
71
72
  return [3 /*break*/, 6];
72
73
  case 3:
73
- if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")) return [3 /*break*/, 5];
74
+ if (!(0, pipeline_2.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")) return [3 /*break*/, 5];
74
75
  return [4 /*yield*/, getProxyInfoForCloudRun(context)];
75
76
  case 4:
76
77
  proxyInfo = _c.sent();
@@ -106,27 +107,20 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
106
107
  });
107
108
  }); });
108
109
  var getProxyInfoForKubernetes = function (context) { return __awaiter(void 0, void 0, void 0, function () {
109
- var envVars, DB_PASSWORD, DB_NAME, values, projectId, defaultInstanceId, instanceId, defaultRegion, region, instanceName;
110
- var _a, _b, _c, _d;
111
- return __generator(this, function (_e) {
112
- switch (_e.label) {
110
+ var envVars, cloudSqlValues, DB_PASSWORD, DB_NAME, instanceName;
111
+ return __generator(this, function (_a) {
112
+ switch (_a.label) {
113
113
  case 0:
114
- if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
114
+ if (!(0, pipeline_2.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
115
115
  throw new Error("unsupported");
116
116
  }
117
117
  return [4 /*yield*/, (0, getProjectConfig_1.getEnvVars)(this, context.environment.shortName, context.componentName)];
118
118
  case 1:
119
- envVars = _e.sent();
119
+ envVars = _a.sent();
120
+ cloudSqlValues = (0, pipeline_1.createKubernetesCloudsqlBaseValues)(context);
120
121
  DB_PASSWORD = (envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD) || (envVars === null || envVars === void 0 ? void 0 : envVars.POSTGRESQL_PASSWORD);
121
- DB_NAME = context.environment.envVars.KUBE_APP_NAME;
122
- values = context.componentConfig.deploy.values;
123
- projectId = ((_a = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _a === void 0 ? void 0 : _a.projectId) ||
124
- ((_b = context.componentConfig.deploy.cluster) === null || _b === void 0 ? void 0 : _b.projectId);
125
- defaultInstanceId = "".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, "-").concat(context.environment.shortName);
126
- instanceId = ((_c = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _c === void 0 ? void 0 : _c.instanceId) || defaultInstanceId;
127
- defaultRegion = "europe-west6";
128
- region = ((_d = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _d === void 0 ? void 0 : _d.region) || defaultRegion;
129
- instanceName = "".concat(projectId, ":").concat(region, ":").concat(instanceId);
122
+ DB_NAME = cloudSqlValues.cloudsql.fullDbName;
123
+ instanceName = cloudSqlValues.cloudsql.instanceConnectionName;
130
124
  return [2 /*return*/, {
131
125
  instanceName: instanceName,
132
126
  DB_PASSWORD: DB_PASSWORD,
@@ -141,7 +135,7 @@ var getProxyInfoForCloudRun = function (context) { return __awaiter(void 0, void
141
135
  return __generator(this, function (_a) {
142
136
  switch (_a.label) {
143
137
  case 0:
144
- if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun") ||
138
+ if (!(0, pipeline_2.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun") ||
145
139
  !context.componentConfig.deploy.cloudSql) {
146
140
  throw new Error("unsupported");
147
141
  }
package/dist/apps/cli/commands/project/commandCloudSqlProxy.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAqD;AACrD,+DAA8C;AAI9C,wEAK6C;AAC7C,2DAA2D;AAQ3D,sBAAe,UAAO,MAAc;;;;;gBAClC,KAAA,CAAA,KAAA,MAAM;qBACH,OAAO,CAAC,wCAAwC,EAAE,uBAAuB,CAAC,CAAA;qBAC1E,YAAY,CAAA;gBAAC,qBAAM,IAAA,kCAAgB,GAAE,EAAA;oBAFxC,sBAAA,cAEgB,SAAwB,EAAC;qBACtC,MAAM,CAAC,UAAgB,EAAgB;wBAAd,YAAY,kBAAA;;;;;;oCAC9B,KAAyB,IAAA,8BAAW,EAAC,YAAY,CAAC,EAAhD,GAAG,SAAA,EAAE,aAAa,mBAAA,CAA+B;oCAEzC,qBAAM,IAAA,6CAA0B,EAAC,GAAG,EAAE,aAAa,CAAC,EAAA;;oCAA9D,OAAO,GAAG,SAAoD;oCAGpE,IAAI,GAAG,KAAK,QAAQ,EAAE;wCACpB,MAAM,CAAC,GAAG,CACR,6EAA6E,CAC9E,CAAC;qCACH;yCACG,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,YAAY,CAAC,EAA5D,wBAA4D;oCAClD,qBAAM,yBAAyB,CAAC,OAAO,CAAC,EAAA;;oCAApD,SAAS,GAAG,SAAwC,CAAC;;;yCAErD,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAjE,wBAAiE;oCAErD,qBAAM,uBAAuB,CAAC,OAAO,CAAC,EAAA;;oCAAlD,SAAS,GAAG,SAAsC,CAAC;;wCAEnD,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;;oCAIrC,WAAW,GAAqC,SAAS,YAA9C,EAAE,OAAO,GAA4B,SAAS,QAArC,EAAE,OAAO,GAAmB,SAAS,QAA5B,EAAE,YAAY,GAAK,SAAS,aAAd,CAAe;oCAC5C,qBAAM,IAAI,CAAC,MAAM,CAAC;4CACtC,IAAI,EAAE,QAAQ;4CACd,IAAI,EAAE,WAAW;4CACjB,SAAO,EAAE,OAAO;4CAChB,OAAO,EAAE,cAAc;yCACxB,CAAC,EAAA;;oCALM,SAAS,GAAK,CAAA,SAKpB,CAAA,UALe;oCAOjB,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACb,IAAI,CAAC,GAAG,CAAC,uBAAgB,WAAW,CAAE,CAAC,CAAC;oCACxC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCACb,IAAI,CAAC,GAAG,CACN,sCAA+B,OAAO,cAAI,WAAW,wBAAc,SAAS,cAAI,OAAO,mBAAgB,CACxG,CAAC;oCACF,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oCAEb,qBAAM,IAAA,6BAAK,EACT,iBAAiB,EACjB,CAAC,YAAY,EAAE,UAAG,YAAY,kBAAQ,SAAS,CAAE,CAAC,EAClD;4CACE,KAAK,EAAE,SAAS;4CAChB,KAAK,EAAE,IAAI;yCACZ,CACF,EAAA;;oCAPD,SAOC,CAAC;;;;;iBACH,CAAC,EAAA;;;KAAA,EAAC;AAEP,IAAM,yBAAyB,GAAG,UAChC,OAAgB;;;;;;gBAEhB,IAAI,CAAC,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE;oBACjE,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;iBAChC;gBAEe,qBAAM,IAAA,6BAAU,EAC9B,IAAI,EACJ,OAAO,CAAC,WAAW,CAAC,SAAS,EAC7B,OAAO,CAAC,aAAa,CACtB,EAAA;;gBAJK,OAAO,GAAG,SAIf;gBAEK,WAAW,GAAG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,MAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,mBAAmB,CAAA,CAAC;gBAEnE,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC;gBAEpD,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC;gBAE/C,SAAS,GACb,CAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,0CAAE,SAAS;qBAC3B,MAAA,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,0CAAE,SAAS,CAAA,CAAC;gBAE9C,iBAAiB,GAAG,UAAG,OAAO,CAAC,UAAU,CAAC,YAAY,cAAI,OAAO,CAAC,UAAU,CAAC,OAAO,cAAI,OAAO,CAAC,WAAW,CAAC,SAAS,CAAE,CAAC;gBACxH,UAAU,GAAG,CAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,0CAAE,UAAU,KAAI,iBAAiB,CAAC;gBAE/D,aAAa,GAAG,cAAc,CAAC;gBAC/B,MAAM,GAAG,CAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,0CAAE,MAAM,KAAI,aAAa,CAAC;gBAEnD,YAAY,GAAG,UAAG,SAAS,cAAI,MAAM,cAAI,UAAU,CAAE,CAAC;gBAE5D,sBAAO;wBACL,YAAY,cAAA;wBACZ,WAAW,aAAA;wBACX,OAAO,SAAA;wBACP,OAAO,EAAE,UAAU;qBACpB,EAAC;;;KACH,CAAC;AAEF,IAAM,uBAAuB,GAAG,UAC9B,OAAgB;;;;;gBAEhB,IACE,CAAC,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,CAAC;oBAClE,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,EACxC;oBACA,MAAM,IAAI,KAAK,CAAC,aAAa,CAAC,CAAC;iBAChC;gBAEe,qBAAM,IAAA,6BAAU,EAC9B,IAAI,EACJ,OAAO,CAAC,WAAW,CAAC,SAAS,EAC7B,OAAO,CAAC,aAAa,CACtB,EAAA;;gBAJK,OAAO,GAAG,SAIf;gBAEK,WAAW,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,CAAC;gBACnC,OAAO,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC;gBAE3B,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC;gBAEpD,sBAAO;wBACL,YAAY,EACV,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,sBAAsB;wBAChE,WAAW,aAAA;wBACX,OAAO,SAAA;wBACP,OAAO,SAAA;qBACR,EAAC;;;KACH,CAAC"}
1
+ {"version":3,"file":"commandCloudSqlProxy.js","sourceRoot":"","sources":["../../../../../src/apps/cli/commands/project/commandCloudSqlProxy.ts"],"names":[],"mappings":"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"}
package/dist/apps/cli/commands/project/setup/setupContext.js CHANGED
@@ -39,7 +39,6 @@ exports.__esModule = true;
39
39
  exports.setupContext = void 0;
40
40
  var pipeline_1 = require("@catladder/pipeline");
41
41
  var setupCloudRun_1 = require("./setupCloudRun");
42
- var setupCloudSQL_1 = require("./setupCloudSQL");
43
42
  var setupKubernetes_1 = require("./setupKubernetes");
44
43
  var setupContext = function (instance, context) { return __awaiter(void 0, void 0, void 0, function () {
45
44
  var deployConfig;
@@ -60,19 +59,13 @@ var setupContext = function (instance, context) { return __awaiter(void 0, void
60
59
  _a.sent();
61
60
  _a.label = 2;
62
61
  case 2:
63
- if (!(0, pipeline_1.hasKubernetesCloudSQL)(context)) return [3 /*break*/, 4];
64
- return [4 /*yield*/, (0, setupCloudSQL_1.setupCloudSQL)(instance, context)];
62
+ deployConfig = context.componentConfig.deploy;
63
+ if (!(0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) return [3 /*break*/, 4];
64
+ return [4 /*yield*/, (0, setupKubernetes_1.setupKubernetes)(instance, context)];
65
65
  case 3:
66
66
  _a.sent();
67
67
  _a.label = 4;
68
68
  case 4:
69
- deployConfig = context.componentConfig.deploy;
70
- if (!(0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) return [3 /*break*/, 6];
71
- return [4 /*yield*/, (0, setupKubernetes_1.setupKubernetes)(instance, context)];
72
- case 5:
73
- _a.sent();
74
- _a.label = 6;
75
- case 6:
76
69
  instance.log("");
77
70
  instance.log("✅ " +
78
71
  context.environment.shortName +
package/dist/apps/cli/commands/project/setup/setupContext.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"setupContext.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAA4E;AAE5E,iDAAgD;AAChD,iDAAgD;AAChD,qDAAoD;AAE7C,IAAM,YAAY,GAAG,UAC1B,QAAyB,EACzB,OAAgB;;;;;gBAEhB,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CACV,oFAAoF,CACrF,CAAC;gBAEF,QAAQ,CAAC,GAAG,CACV,mBAAmB;oBACjB,OAAO,CAAC,WAAW,CAAC,SAAS;oBAC7B,GAAG;oBACH,OAAO,CAAC,aAAa;oBACrB,KAAK,CACR,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;qBACb,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAjE,wBAAiE;gBACnE,qBAAM,IAAA,6BAAa,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAA;;gBAAtC,SAAsC,CAAC;;;qBAErC,IAAA,gCAAqB,EAAC,OAAO,CAAC,EAA9B,wBAA8B;gBAChC,qBAAM,IAAA,6BAAa,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAA;;gBAAtC,SAAsC,CAAC;;;gBAGnC,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;qBAChD,IAAA,yBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAA1C,wBAA0C;gBAC5C,qBAAM,IAAA,iCAAe,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAA;;gBAAxC,SAAwC,CAAC;;;gBAG3C,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CACV,IAAI;oBACF,OAAO,CAAC,WAAW,CAAC,SAAS;oBAC7B,GAAG;oBACH,OAAO,CAAC,aAAa;oBACrB,QAAQ,CACX,CAAC;gBAEF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;;;;KAClB,CAAC;AAvCW,QAAA,YAAY,gBAuCvB"}
1
+ {"version":3,"file":"setupContext.js","sourceRoot":"","sources":["../../../../../../src/apps/cli/commands/project/setup/setupContext.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gDAAqD;AAErD,iDAAgD;AAEhD,qDAAoD;AAE7C,IAAM,YAAY,GAAG,UAC1B,QAAyB,EACzB,OAAgB;;;;;gBAEhB,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CACV,oFAAoF,CACrF,CAAC;gBAEF,QAAQ,CAAC,GAAG,CACV,mBAAmB;oBACjB,OAAO,CAAC,WAAW,CAAC,SAAS;oBAC7B,GAAG;oBACH,OAAO,CAAC,aAAa;oBACrB,KAAK,CACR,CAAC;gBACF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;qBACb,IAAA,yBAAc,EAAC,OAAO,CAAC,eAAe,CAAC,MAAM,EAAE,iBAAiB,CAAC,EAAjE,wBAAiE;gBACnE,qBAAM,IAAA,6BAAa,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAA;;gBAAtC,SAAsC,CAAC;;;gBAGnC,YAAY,GAAG,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC;qBAChD,IAAA,yBAAc,EAAC,YAAY,EAAE,YAAY,CAAC,EAA1C,wBAA0C;gBAC5C,qBAAM,IAAA,iCAAe,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAA;;gBAAxC,SAAwC,CAAC;;;gBAG3C,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBACjB,QAAQ,CAAC,GAAG,CACV,IAAI;oBACF,OAAO,CAAC,WAAW,CAAC,SAAS;oBAC7B,GAAG;oBACH,OAAO,CAAC,aAAa;oBACrB,QAAQ,CACX,CAAC;gBAEF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;;;;KAClB,CAAC;AApCW,QAAA,YAAY,gBAoCvB"}
package/dist/bundles/catenv/index.js CHANGED
@@ -40107,7 +40107,7 @@ exports.readConfigSync = readConfigSync;
40107
40107
 
40108
40108
  exports.__esModule = true;
40109
40109
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
40110
- exports.PIPELINE_IMAGE_TAG = "fix-error-sql-db-delete-b3878c2e" || 0;
40110
+ exports.PIPELINE_IMAGE_TAG = "fix-error-sql-db-delete-7bf85929" || 0;
40111
40111
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
40112
40112
 
40113
40113
  /***/ }),
@@ -41545,20 +41545,21 @@ exports.__esModule = true;
41545
41545
  exports.GCLOUD_RUN_DEPLOY_TYPE = exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = void 0;
41546
41546
  var context_1 = __nccwpck_require__(2041);
41547
41547
  var gitlab_1 = __nccwpck_require__(4997);
41548
+ var utils_1 = __nccwpck_require__(463);
41548
41549
  var deployJob_1 = __nccwpck_require__(2256);
41549
41550
  var jobName_1 = __nccwpck_require__(7311);
41550
41551
  exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
41551
41552
  exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
41552
41553
  var getCloudSqlVariables = function (_a) {
41553
- var _b, _c, _d, _e;
41554
+ var _b, _c;
41554
41555
  var deployConfigRaw = _a.deployConfigRaw,
41555
41556
  environmentSlugPrefix = _a.environmentSlugPrefix,
41556
41557
  env = _a.env,
41557
41558
  componentName = _a.componentName,
41558
41559
  fullConfig = _a.fullConfig;
41559
41560
  if (deployConfigRaw && deployConfigRaw.cloudSql) {
41560
- 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("-");
41561
- var additionalQueryParamsString = Object.entries((_d = deployConfigRaw.cloudSql.dbAdditionalQueryParams) !== null && _d !== void 0 ? _d : {}).map(function (_a) {
41561
+ var DB_NAME = (0, utils_1.getFullDbName)(deployConfigRaw.cloudSql, fullConfig, environmentSlugPrefix, componentName);
41562
+ var additionalQueryParamsString = Object.entries((_b = deployConfigRaw.cloudSql.dbAdditionalQueryParams) !== null && _b !== void 0 ? _b : {}).map(function (_a) {
41562
41563
  var _b = __read(_a, 2),
41563
41564
  key = _b[0],
41564
41565
  value = _b[1];
@@ -41567,7 +41568,7 @@ var getCloudSqlVariables = function (_a) {
41567
41568
  return {
41568
41569
  CLOUD_SQL_INSTANCE_CONNECTION_NAME: deployConfigRaw.cloudSql.instanceConnectionName,
41569
41570
  DB_NAME: DB_NAME,
41570
- DB_USER: (_e = deployConfigRaw.cloudSql.dbUser) !== null && _e !== void 0 ? _e : "postgres",
41571
+ DB_USER: (_c = deployConfigRaw.cloudSql.dbUser) !== null && _c !== void 0 ? _c : "postgres",
41571
41572
  DB_PASSWORD: "$" + (0, context_1.getSecretVarName)(env, componentName, "DB_PASSWORD"),
41572
41573
  DATABASE_URL: "postgresql://$DB_USER:$DB_PASSWORD@localhost/$DB_NAME?host=/cloudsql/$CLOUD_SQL_INSTANCE_CONNECTION_NAME".concat(additionalQueryParamsString),
41573
41574
  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)
@@ -41786,6 +41787,22 @@ exports.getCloudRunJobName = getCloudRunJobName;
41786
41787
 
41787
41788
  /***/ }),
41788
41789
 
41790
+ /***/ 463:
41791
+ /***/ ((__unused_webpack_module, exports) => {
41792
+
41793
+ "use strict";
41794
+
41795
+
41796
+ exports.__esModule = true;
41797
+ exports.getFullDbName = void 0;
41798
+ var getFullDbName = function (cloudSqlConfig, fullConfig, environmentSlugPrefix, componentName) {
41799
+ var _a, _b;
41800
+ 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("-");
41801
+ };
41802
+ exports.getFullDbName = getFullDbName;
41803
+
41804
+ /***/ }),
41805
+
41789
41806
  /***/ 6531:
41790
41807
  /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
41791
41808
 
@@ -42016,8 +42033,9 @@ exports.additionalKubernetesSecretKeys = additionalKubernetesSecretKeys;
42016
42033
 
42017
42034
 
42018
42035
  exports.__esModule = true;
42019
- exports.createCloudsqlBaseConfig = exports.getKubernetesCloudSQLConfig = exports.hasKubernetesCloudSQL = void 0;
42036
+ exports.createKubernetesCloudsqlBaseValues = exports.hasKubernetesCloudSQL = void 0;
42020
42037
  var context_1 = __nccwpck_require__(2041);
42038
+ var utils_1 = __nccwpck_require__(463);
42021
42039
  var types_1 = __nccwpck_require__(3109);
42022
42040
  var hasKubernetesCloudSQL = function (context) {
42023
42041
  var _a, _b;
@@ -42027,22 +42045,42 @@ var hasKubernetesCloudSQL = function (context) {
42027
42045
  return false;
42028
42046
  };
42029
42047
  exports.hasKubernetesCloudSQL = hasKubernetesCloudSQL;
42030
- var getKubernetesCloudSQLConfig = function (context) {
42031
- var _a;
42032
- if ((0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
42033
- return (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.cloudsql;
42048
+ var createKubernetesCloudsqlBaseValues = function (context) {
42049
+ var _a, _b, _c, _d, _e;
42050
+ if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
42051
+ throw new Error("cannot get cloud sql config");
42052
+ }
42053
+ var config = (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.cloudsql;
42054
+ if (!config) {
42055
+ throw new Error("cannot get cloud sql config");
42056
+ }
42057
+ var proxyCredentials = "$".concat((0, context_1.getSecretVarNameForContext)(context, "cloudsqlProxyCredentials"));
42058
+ if ((config === null || config === void 0 ? void 0 : config.type) !== "unmanaged") {
42059
+ 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);
42060
+ return {
42061
+ cloudsql: {
42062
+ enabled: config.enabled,
42063
+ dbUser: "postgres",
42064
+ instanceConnectionName: instanceConnectionName,
42065
+ proxyCredentials: proxyCredentials,
42066
+ fullDbName: context.environment.envVars.KUBE_APP_NAME
42067
+ }
42068
+ };
42069
+ } else if (config.type === "unmanaged") {
42070
+ return {
42071
+ cloudsql: {
42072
+ enabled: config.enabled,
42073
+ dbUser: (_e = config.dbUser) !== null && _e !== void 0 ? _e : "postgres",
42074
+ instanceConnectionName: config.instanceConnectionName,
42075
+ proxyCredentials: proxyCredentials,
42076
+ fullDbName: (0, utils_1.getFullDbName)(config, context.fullConfig, context.environment.slugPrefix, context.componentName)
42077
+ }
42078
+ };
42079
+ } else {
42080
+ throw new Error("unknonw type");
42034
42081
  }
42035
- throw new Error("cannot get cloud sql config");
42036
- };
42037
- exports.getKubernetesCloudSQLConfig = getKubernetesCloudSQLConfig;
42038
- var createCloudsqlBaseConfig = function (context) {
42039
- return {
42040
- cloudsql: {
42041
- proxyCredentials: "$".concat((0, context_1.getSecretVarNameForContext)(context, "cloudsqlProxyCredentials"))
42042
- }
42043
- };
42044
42082
  };
42045
- exports.createCloudsqlBaseConfig = createCloudsqlBaseConfig;
42083
+ exports.createKubernetesCloudsqlBaseValues = createKubernetesCloudsqlBaseValues;
42046
42084
 
42047
42085
  /***/ }),
42048
42086
 
@@ -42425,7 +42463,7 @@ var createKubeValues = function (context) {
42425
42463
  var defaultKubeValues = (0, lodash_1.merge)({
42426
42464
  env: env,
42427
42465
  application: createAppConfig(context, application)
42428
- }, (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) : {});
42466
+ }, (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) : {});
42429
42467
  var kubeValues = (0, processSecretsAsFiles_1.processSecretsAsFiles)((0, utils_1.mergeWithMergingArrays)(defaultKubeValues, __assign({
42430
42468
  jobs: removeFalsy(jobs),
42431
42469
  cronjobs: removeFalsy(cronjobs)
package/dist/bundles/cli/index.js CHANGED
@@ -1455,6 +1455,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
1455
1455
  };
1456
1456
  exports.__esModule = true;
1457
1457
  var pipeline_1 = __nccwpck_require__(25355);
1458
+ var pipeline_2 = __nccwpck_require__(25355);
1458
1459
  var child_process_promise_1 = __nccwpck_require__(75763);
1459
1460
  var getProjectConfig_1 = __nccwpck_require__(24146);
1460
1461
  var autocompletions_1 = __nccwpck_require__(41373);
@@ -1482,13 +1483,13 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
1482
1483
  if (env === "review") {
1483
1484
  vorpal.log("⚠️ connection string does not include mr information on review environments");
1484
1485
  }
1485
- if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) return [3 /*break*/, 3];
1486
+ if (!(0, pipeline_2.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) return [3 /*break*/, 3];
1486
1487
  return [4 /*yield*/, getProxyInfoForKubernetes(context)];
1487
1488
  case 2:
1488
1489
  proxyInfo = _c.sent();
1489
1490
  return [3 /*break*/, 6];
1490
1491
  case 3:
1491
- if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")) return [3 /*break*/, 5];
1492
+ if (!(0, pipeline_2.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun")) return [3 /*break*/, 5];
1492
1493
  return [4 /*yield*/, getProxyInfoForCloudRun(context)];
1493
1494
  case 4:
1494
1495
  proxyInfo = _c.sent();
@@ -1524,27 +1525,20 @@ exports["default"] = (function (vorpal) { return __awaiter(void 0, void 0, void
1524
1525
  });
1525
1526
  }); });
1526
1527
  var getProxyInfoForKubernetes = function (context) { return __awaiter(void 0, void 0, void 0, function () {
1527
- var envVars, DB_PASSWORD, DB_NAME, values, projectId, defaultInstanceId, instanceId, defaultRegion, region, instanceName;
1528
- var _a, _b, _c, _d;
1529
- return __generator(this, function (_e) {
1530
- switch (_e.label) {
1528
+ var envVars, cloudSqlValues, DB_PASSWORD, DB_NAME, instanceName;
1529
+ return __generator(this, function (_a) {
1530
+ switch (_a.label) {
1531
1531
  case 0:
1532
- if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
1532
+ if (!(0, pipeline_2.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
1533
1533
  throw new Error("unsupported");
1534
1534
  }
1535
1535
  return [4 /*yield*/, (0, getProjectConfig_1.getEnvVars)(this, context.environment.shortName, context.componentName)];
1536
1536
  case 1:
1537
- envVars = _e.sent();
1537
+ envVars = _a.sent();
1538
+ cloudSqlValues = (0, pipeline_1.createKubernetesCloudsqlBaseValues)(context);
1538
1539
  DB_PASSWORD = (envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD) || (envVars === null || envVars === void 0 ? void 0 : envVars.POSTGRESQL_PASSWORD);
1539
- DB_NAME = context.environment.envVars.KUBE_APP_NAME;
1540
- values = context.componentConfig.deploy.values;
1541
- projectId = ((_a = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _a === void 0 ? void 0 : _a.projectId) ||
1542
- ((_b = context.componentConfig.deploy.cluster) === null || _b === void 0 ? void 0 : _b.projectId);
1543
- defaultInstanceId = "".concat(context.fullConfig.customerName, "-").concat(context.fullConfig.appName, "-").concat(context.environment.shortName);
1544
- instanceId = ((_c = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _c === void 0 ? void 0 : _c.instanceId) || defaultInstanceId;
1545
- defaultRegion = "europe-west6";
1546
- region = ((_d = values === null || values === void 0 ? void 0 : values.cloudsql) === null || _d === void 0 ? void 0 : _d.region) || defaultRegion;
1547
- instanceName = "".concat(projectId, ":").concat(region, ":").concat(instanceId);
1540
+ DB_NAME = cloudSqlValues.cloudsql.fullDbName;
1541
+ instanceName = cloudSqlValues.cloudsql.instanceConnectionName;
1548
1542
  return [2 /*return*/, {
1549
1543
  instanceName: instanceName,
1550
1544
  DB_PASSWORD: DB_PASSWORD,
@@ -1559,7 +1553,7 @@ var getProxyInfoForCloudRun = function (context) { return __awaiter(void 0, void
1559
1553
  return __generator(this, function (_a) {
1560
1554
  switch (_a.label) {
1561
1555
  case 0:
1562
- if (!(0, pipeline_1.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun") ||
1556
+ if (!(0, pipeline_2.isOfDeployType)(context.componentConfig.deploy, "google-cloudrun") ||
1563
1557
  !context.componentConfig.deploy.cloudSql) {
1564
1558
  throw new Error("unsupported");
1565
1559
  }
@@ -4513,69 +4507,6 @@ exports.setupCloudRun = setupCloudRun;
4513
4507
 
4514
4508
  /***/ }),
4515
4509
 
4516
- /***/ 63660:
4517
- /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
4518
-
4519
- "use strict";
4520
-
4521
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
4522
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4523
- return new (P || (P = Promise))(function (resolve, reject) {
4524
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
4525
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
4526
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
4527
- step((generator = generator.apply(thisArg, _arguments || [])).next());
4528
- });
4529
- };
4530
- var __generator = (this && this.__generator) || function (thisArg, body) {
4531
- var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
4532
- return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
4533
- function verb(n) { return function (v) { return step([n, v]); }; }
4534
- function step(op) {
4535
- if (f) throw new TypeError("Generator is already executing.");
4536
- while (_) try {
4537
- 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;
4538
- if (y = 0, t) op = [op[0] & 2, t.value];
4539
- switch (op[0]) {
4540
- case 0: case 1: t = op; break;
4541
- case 4: _.label++; return { value: op[1], done: false };
4542
- case 5: _.label++; y = op[1]; op = [0]; continue;
4543
- case 7: op = _.ops.pop(); _.trys.pop(); continue;
4544
- default:
4545
- if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
4546
- if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
4547
- if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
4548
- if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
4549
- if (t[2]) _.ops.pop();
4550
- _.trys.pop(); continue;
4551
- }
4552
- op = body.call(thisArg, _);
4553
- } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
4554
- if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
4555
- }
4556
- };
4557
- exports.__esModule = true;
4558
- exports.setupCloudSQL = void 0;
4559
- var pipeline_1 = __nccwpck_require__(25355);
4560
- var setupCloudSQL = function (instance, context) { return __awaiter(void 0, void 0, void 0, function () {
4561
- var config;
4562
- return __generator(this, function (_a) {
4563
- if (!(0, pipeline_1.hasKubernetesCloudSQL)(context)) {
4564
- throw new Error("cannot setup cloudsql, as it has none");
4565
- }
4566
- config = (0, pipeline_1.getKubernetesCloudSQLConfig)(context);
4567
- instance.log("");
4568
- instance.log("! make sure to provide cloudsqlProxyCredentials for the cloud sql service account in " +
4569
- config.projectId);
4570
- instance.log("");
4571
- return [2 /*return*/];
4572
- });
4573
- }); };
4574
- exports.setupCloudSQL = setupCloudSQL;
4575
- //# sourceMappingURL=setupCloudSQL.js.map
4576
-
4577
- /***/ }),
4578
-
4579
4510
  /***/ 40663:
4580
4511
  /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
4581
4512
 
@@ -4621,7 +4552,6 @@ exports.__esModule = true;
4621
4552
  exports.setupContext = void 0;
4622
4553
  var pipeline_1 = __nccwpck_require__(25355);
4623
4554
  var setupCloudRun_1 = __nccwpck_require__(89010);
4624
- var setupCloudSQL_1 = __nccwpck_require__(63660);
4625
4555
  var setupKubernetes_1 = __nccwpck_require__(82308);
4626
4556
  var setupContext = function (instance, context) { return __awaiter(void 0, void 0, void 0, function () {
4627
4557
  var deployConfig;
@@ -4642,19 +4572,13 @@ var setupContext = function (instance, context) { return __awaiter(void 0, void
4642
4572
  _a.sent();
4643
4573
  _a.label = 2;
4644
4574
  case 2:
4645
- if (!(0, pipeline_1.hasKubernetesCloudSQL)(context)) return [3 /*break*/, 4];
4646
- return [4 /*yield*/, (0, setupCloudSQL_1.setupCloudSQL)(instance, context)];
4575
+ deployConfig = context.componentConfig.deploy;
4576
+ if (!(0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) return [3 /*break*/, 4];
4577
+ return [4 /*yield*/, (0, setupKubernetes_1.setupKubernetes)(instance, context)];
4647
4578
  case 3:
4648
4579
  _a.sent();
4649
4580
  _a.label = 4;
4650
4581
  case 4:
4651
- deployConfig = context.componentConfig.deploy;
4652
- if (!(0, pipeline_1.isOfDeployType)(deployConfig, "kubernetes")) return [3 /*break*/, 6];
4653
- return [4 /*yield*/, (0, setupKubernetes_1.setupKubernetes)(instance, context)];
4654
- case 5:
4655
- _a.sent();
4656
- _a.label = 6;
4657
- case 6:
4658
4582
  instance.log("");
4659
4583
  instance.log("✅ " +
4660
4584
  context.environment.shortName +
@@ -351468,7 +351392,7 @@ exports.readConfigSync = readConfigSync;
351468
351392
 
351469
351393
  exports.__esModule = true;
351470
351394
  exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
351471
- exports.PIPELINE_IMAGE_TAG = "fix-error-sql-db-delete-b3878c2e" || 0;
351395
+ exports.PIPELINE_IMAGE_TAG = "fix-error-sql-db-delete-7bf85929" || 0;
351472
351396
  exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || 0;
351473
351397
 
351474
351398
  /***/ }),
@@ -352906,20 +352830,21 @@ exports.__esModule = true;
352906
352830
  exports.GCLOUD_RUN_DEPLOY_TYPE = exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = void 0;
352907
352831
  var context_1 = __nccwpck_require__(22041);
352908
352832
  var gitlab_1 = __nccwpck_require__(84997);
352833
+ var utils_1 = __nccwpck_require__(70463);
352909
352834
  var deployJob_1 = __nccwpck_require__(82256);
352910
352835
  var jobName_1 = __nccwpck_require__(77311);
352911
352836
  exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
352912
352837
  exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
352913
352838
  var getCloudSqlVariables = function (_a) {
352914
- var _b, _c, _d, _e;
352839
+ var _b, _c;
352915
352840
  var deployConfigRaw = _a.deployConfigRaw,
352916
352841
  environmentSlugPrefix = _a.environmentSlugPrefix,
352917
352842
  env = _a.env,
352918
352843
  componentName = _a.componentName,
352919
352844
  fullConfig = _a.fullConfig;
352920
352845
  if (deployConfigRaw && deployConfigRaw.cloudSql) {
352921
- 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("-");
352922
- var additionalQueryParamsString = Object.entries((_d = deployConfigRaw.cloudSql.dbAdditionalQueryParams) !== null && _d !== void 0 ? _d : {}).map(function (_a) {
352846
+ var DB_NAME = (0, utils_1.getFullDbName)(deployConfigRaw.cloudSql, fullConfig, environmentSlugPrefix, componentName);
352847
+ var additionalQueryParamsString = Object.entries((_b = deployConfigRaw.cloudSql.dbAdditionalQueryParams) !== null && _b !== void 0 ? _b : {}).map(function (_a) {
352923
352848
  var _b = __read(_a, 2),
352924
352849
  key = _b[0],
352925
352850
  value = _b[1];
@@ -352928,7 +352853,7 @@ var getCloudSqlVariables = function (_a) {
352928
352853
  return {
352929
352854
  CLOUD_SQL_INSTANCE_CONNECTION_NAME: deployConfigRaw.cloudSql.instanceConnectionName,
352930
352855
  DB_NAME: DB_NAME,
352931
- DB_USER: (_e = deployConfigRaw.cloudSql.dbUser) !== null && _e !== void 0 ? _e : "postgres",
352856
+ DB_USER: (_c = deployConfigRaw.cloudSql.dbUser) !== null && _c !== void 0 ? _c : "postgres",
352932
352857
  DB_PASSWORD: "$" + (0, context_1.getSecretVarName)(env, componentName, "DB_PASSWORD"),
352933
352858
  DATABASE_URL: "postgresql://$DB_USER:$DB_PASSWORD@localhost/$DB_NAME?host=/cloudsql/$CLOUD_SQL_INSTANCE_CONNECTION_NAME".concat(additionalQueryParamsString),
352934
352859
  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)
@@ -353147,6 +353072,22 @@ exports.getCloudRunJobName = getCloudRunJobName;
353147
353072
 
353148
353073
  /***/ }),
353149
353074
 
353075
+ /***/ 70463:
353076
+ /***/ ((__unused_webpack_module, exports) => {
353077
+
353078
+ "use strict";
353079
+
353080
+
353081
+ exports.__esModule = true;
353082
+ exports.getFullDbName = void 0;
353083
+ var getFullDbName = function (cloudSqlConfig, fullConfig, environmentSlugPrefix, componentName) {
353084
+ var _a, _b;
353085
+ 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("-");
353086
+ };
353087
+ exports.getFullDbName = getFullDbName;
353088
+
353089
+ /***/ }),
353090
+
353150
353091
  /***/ 16531:
353151
353092
  /***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
353152
353093
 
@@ -353377,8 +353318,9 @@ exports.additionalKubernetesSecretKeys = additionalKubernetesSecretKeys;
353377
353318
 
353378
353319
 
353379
353320
  exports.__esModule = true;
353380
- exports.createCloudsqlBaseConfig = exports.getKubernetesCloudSQLConfig = exports.hasKubernetesCloudSQL = void 0;
353321
+ exports.createKubernetesCloudsqlBaseValues = exports.hasKubernetesCloudSQL = void 0;
353381
353322
  var context_1 = __nccwpck_require__(22041);
353323
+ var utils_1 = __nccwpck_require__(70463);
353382
353324
  var types_1 = __nccwpck_require__(63109);
353383
353325
  var hasKubernetesCloudSQL = function (context) {
353384
353326
  var _a, _b;
@@ -353388,22 +353330,42 @@ var hasKubernetesCloudSQL = function (context) {
353388
353330
  return false;
353389
353331
  };
353390
353332
  exports.hasKubernetesCloudSQL = hasKubernetesCloudSQL;
353391
- var getKubernetesCloudSQLConfig = function (context) {
353392
- var _a;
353393
- if ((0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
353394
- return (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.cloudsql;
353333
+ var createKubernetesCloudsqlBaseValues = function (context) {
353334
+ var _a, _b, _c, _d, _e;
353335
+ if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
353336
+ throw new Error("cannot get cloud sql config");
353337
+ }
353338
+ var config = (_a = context.componentConfig.deploy.values) === null || _a === void 0 ? void 0 : _a.cloudsql;
353339
+ if (!config) {
353340
+ throw new Error("cannot get cloud sql config");
353341
+ }
353342
+ var proxyCredentials = "$".concat((0, context_1.getSecretVarNameForContext)(context, "cloudsqlProxyCredentials"));
353343
+ if ((config === null || config === void 0 ? void 0 : config.type) !== "unmanaged") {
353344
+ 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);
353345
+ return {
353346
+ cloudsql: {
353347
+ enabled: config.enabled,
353348
+ dbUser: "postgres",
353349
+ instanceConnectionName: instanceConnectionName,
353350
+ proxyCredentials: proxyCredentials,
353351
+ fullDbName: context.environment.envVars.KUBE_APP_NAME
353352
+ }
353353
+ };
353354
+ } else if (config.type === "unmanaged") {
353355
+ return {
353356
+ cloudsql: {
353357
+ enabled: config.enabled,
353358
+ dbUser: (_e = config.dbUser) !== null && _e !== void 0 ? _e : "postgres",
353359
+ instanceConnectionName: config.instanceConnectionName,
353360
+ proxyCredentials: proxyCredentials,
353361
+ fullDbName: (0, utils_1.getFullDbName)(config, context.fullConfig, context.environment.slugPrefix, context.componentName)
353362
+ }
353363
+ };
353364
+ } else {
353365
+ throw new Error("unknonw type");
353395
353366
  }
353396
- throw new Error("cannot get cloud sql config");
353397
- };
353398
- exports.getKubernetesCloudSQLConfig = getKubernetesCloudSQLConfig;
353399
- var createCloudsqlBaseConfig = function (context) {
353400
- return {
353401
- cloudsql: {
353402
- proxyCredentials: "$".concat((0, context_1.getSecretVarNameForContext)(context, "cloudsqlProxyCredentials"))
353403
- }
353404
- };
353405
353367
  };
353406
- exports.createCloudsqlBaseConfig = createCloudsqlBaseConfig;
353368
+ exports.createKubernetesCloudsqlBaseValues = createKubernetesCloudsqlBaseValues;
353407
353369
 
353408
353370
  /***/ }),
353409
353371
 
@@ -353786,7 +353748,7 @@ var createKubeValues = function (context) {
353786
353748
  var defaultKubeValues = (0, lodash_1.merge)({
353787
353749
  env: env,
353788
353750
  application: createAppConfig(context, application)
353789
- }, (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) : {});
353751
+ }, (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) : {});
353790
353752
  var kubeValues = (0, processSecretsAsFiles_1.processSecretsAsFiles)((0, utils_1.mergeWithMergingArrays)(defaultKubeValues, __assign({
353791
353753
  jobs: removeFalsy(jobs),
353792
353754
  cronjobs: removeFalsy(cronjobs)