@catladder/pipeline 1.144.0 → 1.145.0

package/dist/deploy/cloudRun/createJobs/cloudRunJobs.js

@@ -41,7 +41,9 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getCreateScheduleScripts = exports.getJobCreateScripts = exports.getJobRunScripts = exports.getDeleteJobsScripts = exports.getDeleteSchedulesScripts = void 0;
 var gitlab_1 = require("../../../utils/gitlab");
 var createArgsString_1 = require("../utils/createArgsString");
@@ -49,10 +51,11 @@ var jobName_1 = require("../utils/jobName");
 var common_1 = require("./common");
 var getLabels_1 = require("../../../context/getLabels");
 var volumes_1 = require("./volumes");
+var constants_1 = require("./constants");
 var getJobRunScriptForJob = function (context, jobName, wait) {
   var commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
   var commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
-  return "".concat((0, common_1.gcloudRunCmd)(), " jobs execute ").concat(jobName, " ").concat(commonArgsString).concat(wait ? " --wait" : "");
+  return "".concat((0, common_1.gcloudRunCmd)(), " jobs execute ").concat(jobName.toString(), " ").concat(commonArgsString).concat(wait ? " --wait" : "");
 };
 var getDeleteSchedulesScripts = function (context) {
   var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
@@ -111,14 +114,14 @@ var getJobCreateScriptsForJob = function (context, jobName, job) {
     command: '"' + commandArray.join(",") + '"'
   }, commonDeployArgs), {
     labels: (0, common_1.makeLabelString)(__assign(__assign({}, (0, getLabels_1.getLabels)(context)), {
-      "cloud-run-job-name": jobName
+      "cloud-run-job-name": jobName.toString()
     })),
     image: job.image || commonDeployArgs.image,
     cpu: job === null || job === void 0 ? void 0 : job.cpu,
     memory: job.memory || "512Mi",
     "task-timeout": job.timeout || "10m",
     parallelism: job.parallelism || 1,
-    "env-vars-file": "____envvars.yaml",
+    "env-vars-file": constants_1.ENV_VARS_FILENAME,
     "max-retries": 0
   }));
   var requiresBeta = (job === null || job === void 0 ? void 0 : job.volumes) && Object.keys(job === null || job === void 0 ? void 0 : job.volumes).length > 0;
@@ -157,7 +160,7 @@ var getCloudRunJobsWithSchedule = function (context) {
     return {
       job: job,
       jobName: jobName,
-      schedulerName: jobName + "-scheduler"
+      schedulerName: jobName.concat("-scheduler")
     };
   });
 };

package/dist/deploy/cloudRun/createJobs/cloudRunServices.d.ts

@@ -1,4 +1,4 @@
 import type { Context } from "../../../types/context";
 import type { DeployConfigCloudRunService } from "../../types/googleCloudRun";
-export declare const getServiceDeployScript: (context: Context, service: DeployConfigCloudRunService | true | undefined, nameSuffix?: string | undefined) => string;
-export declare const getServiceDeleteScript: (context: Context, serviceSuffix?: string | undefined) => string[];
+export declare const getServiceDeployScript: (context: Context, service: DeployConfigCloudRunService | true | undefined, nameSuffix?: string) => string;
+export declare const getServiceDeleteScript: (context: Context, serviceSuffix?: string) => string[];

package/dist/deploy/cloudRun/createJobs/cloudRunServices.js

@@ -41,12 +41,15 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getServiceDeleteScript = exports.getServiceDeployScript = void 0;
 var getLabels_1 = require("../../../context/getLabels");
 var createArgsString_1 = require("../utils/createArgsString");
 var getServiceName_1 = require("../utils/getServiceName");
 var common_1 = require("./common");
+var constants_1 = require("./constants");
 var volumes_1 = require("./volumes");
 var getServiceDeployScript = function (context, service, nameSuffix) {
   var _a, _b, _c, _d, _e;
@@ -55,7 +58,7 @@ var getServiceDeployScript = function (context, service, nameSuffix) {
   var customConfig = service !== true ? service : undefined;
   var command = service !== true ? (_a = service === null || service === void 0 ? void 0 : service.command) !== null && _a !== void 0 ? _a : context.componentConfig.build.startCommand : undefined;
   var commandArray = command ? Array.isArray(command) ? command : command.split(" ") : undefined;
-  var fullServiceName = "".concat(serviceName).concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "");
+  var fullServiceName = serviceName.concat(nameSuffix !== null && nameSuffix !== void 0 ? nameSuffix : "");
   var argsString = createArgsString_1.createArgsString.apply(void 0, __spreadArray([__assign(__assign({
     // command as empty string resets it to default (uses the image's entrypoint)
     command: commandArray ? '"' + commandArray.join(",") + '"' : '""'
@@ -63,7 +66,7 @@ var getServiceDeployScript = function (context, service, nameSuffix) {
     labels: (0, common_1.makeLabelString)(__assign(__assign({}, (0, getLabels_1.getLabels)(context)), {
       "cloud-run-service-name": fullServiceName
     })),
-    "env-vars-file": "____envvars.yaml",
+    "env-vars-file": constants_1.ENV_VARS_FILENAME,
     "min-instances": (_b = customConfig === null || customConfig === void 0 ? void 0 : customConfig.minInstances) !== null && _b !== void 0 ? _b : 0,
     "max-instances": (_c = customConfig === null || customConfig === void 0 ? void 0 : customConfig.maxInstances) !== null && _c !== void 0 ? _c : 100,
     "cpu-throttling": (customConfig === null || customConfig === void 0 ? void 0 : customConfig.noCpuThrottling) !== true,

package/dist/deploy/cloudRun/createJobs/common.d.ts

@@ -1,8 +1,8 @@
 import type { Context } from "../../../types/context";
 import type { DeployConfigCloudRun } from "../../types/googleCloudRun";
-export declare const gcloudCmd: (version?: "beta" | undefined) => string;
-export declare const gcloudRunCmd: (version?: "beta" | undefined) => string;
-export declare const gcloudSchedulerCmd: (version?: "beta" | undefined) => string;
+export declare const gcloudCmd: (version?: "beta") => string;
+export declare const gcloudRunCmd: (version?: "beta") => string;
+export declare const gcloudSchedulerCmd: (version?: "beta") => string;
 export declare const setGoogleProjectNumberScript: (deployConfig: DeployConfigCloudRun) => string[];
 export declare const makeLabelString: (obj: Record<string, unknown>) => string;
 export declare const getCloudRunDeployConfig: (context: Context) => DeployConfigCloudRun;

package/dist/deploy/cloudRun/createJobs/common.js

@@ -32,7 +32,9 @@ var __read = this && this.__read || function (o, n) {
   }
   return ar;
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getCommonDeployArgs = exports.getCommonCloudRunArgs = exports.getCloudRunDeployConfig = exports.makeLabelString = exports.setGoogleProjectNumberScript = exports.gcloudSchedulerCmd = exports.gcloudRunCmd = exports.gcloudCmd = void 0;
 var types_1 = require("../../types");
 var artifactsRegistry_1 = require("../artifactsRegistry");

package/dist/deploy/cloudRun/createJobs/constants.d.ts

@@ -0,0 +1 @@
+export declare const ENV_VARS_FILENAME = "____envvars.yaml";

package/dist/deploy/cloudRun/createJobs/constants.js

@@ -0,0 +1,7 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ENV_VARS_FILENAME = void 0;
+exports.ENV_VARS_FILENAME = "____envvars.yaml";

package/dist/deploy/cloudRun/createJobs/getCloudRunDeployScripts.js

@@ -31,8 +31,11 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getCloudRunDeployScripts = void 0;
+var lodash_1 = require("lodash");
 var gitlab_1 = require("../../../utils/gitlab");
 var sbom_1 = require("../../sbom");
 var cleanup_1 = require("../cleanup");
@@ -41,10 +44,14 @@ var gcloudServiceAccountLoginCommands_1 = require("../utils/gcloudServiceAccount
 var cloudRunJobs_1 = require("./cloudRunJobs");
 var cloudRunServices_1 = require("./cloudRunServices");
 var common_1 = require("./common");
+var __1 = require("..");
+var constants_1 = require("./constants");
+var bashYaml_1 = require("../../../bash/bashYaml");
 function getCloudRunDeployScripts(context) {
   var _a;
   var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
-  return __spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gitlab_1.collapseableSection)("prepare", "Prepare...")(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read((0, common_1.setGoogleProjectNumberScript)(deployConfig)), false))), false), __read((0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(["echo \"$ENV_VARS\" > ____envvars.yaml"], __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
+  var allEnvVars = (0, lodash_1.omit)(context.environment.envVars, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY);
+  return __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gitlab_1.collapseableSection)("prepare", "Prepare...")(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read((0, common_1.setGoogleProjectNumberScript)(deployConfig)), false))), false), __read((0, gitlab_1.collapseableSection)("writeenvvars", "Write env vars to file")((0, bashYaml_1.writeBashYamlToFileScript)(allEnvVars, constants_1.ENV_VARS_FILENAME))), false), __read((0, gitlab_1.collapseableSection)("deploy", "Deploy to cloud run")(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read(deployConfig.cloudSql ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
   : []), false), __read((0, cloudRunJobs_1.getCreateScheduleScripts)(context)), false), __read((0, cloudRunJobs_1.getJobCreateScripts)(context)), false), __read((0, cloudRunJobs_1.getJobRunScripts)(context, "preDeploy")), false), __read(deployConfig.service !== false ? [(0, cloudRunServices_1.getServiceDeployScript)(context, deployConfig.service)] : []), false), __read(Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).map(function (_a) {
     var _b = __read(_a, 2),
       name = _b[0],

package/dist/deploy/cloudRun/createJobs/getCloudRunStopScripts.js

@@ -31,7 +31,9 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getCloudRunStopScripts = void 0;
 var sbom_1 = require("../../sbom");
 var cleanup_1 = require("../cleanup");

package/dist/deploy/cloudRun/createJobs/index.js

@@ -1,14 +1,24 @@
 "use strict";
 
-exports.__esModule = true;
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+    }
+    return t;
+  };
+  return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createGoogleCloudRunDeployJobs = void 0;
-var lodash_1 = require("lodash");
-var docker_1 = require("../../../build/docker");
 var runner_1 = require("../../../runner");
 var gitlab_1 = require("../../../utils/gitlab");
 var base_1 = require("../../base");
 var types_1 = require("../../types");
-var variables_1 = require("./variables");
+var constants_1 = require("./constants");
 var getCloudRunDeployScripts_1 = require("./getCloudRunDeployScripts");
 var getCloudRunStopScripts_1 = require("./getCloudRunStopScripts");
 var createGoogleCloudRunDeployJobs = function (context) {
@@ -23,11 +33,18 @@ var createGoogleCloudRunDeployJobs = function (context) {
   var deployScripts = (0, getCloudRunDeployScripts_1.getCloudRunDeployScripts)(context);
   var stopScripts = (0, getCloudRunStopScripts_1.getCloudRunStopScripts)(context);
   return (0, base_1.createDeployementJobs)(context, {
-    deploy: (0, lodash_1.merge)((0, docker_1.getDockerJobBaseProps)(context), {
+    deploy: __assign(__assign({
+      variables: {
+        CLOUDSDK_CORE_DISABLE_PROMPTS: "1"
+      }
+    }, deployConfig.debug ? {
       artifacts: {
-        paths: ["____envvars.yaml"]
-      },
-      variables: (0, variables_1.getDeployJobVariables)(context),
+        paths: [constants_1.ENV_VARS_FILENAME // debug
+        ],
+
+        when: "always"
+      }
+    } : {}), {
       image: (0, runner_1.getRunnerImage)("gcloud"),
       script: deployScripts
     }),

package/dist/deploy/cloudRun/createJobs/volumes.js

@@ -31,7 +31,9 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createVolumeConfig = void 0;
 var createVolumeConfig = function (volumes, type) {
   if (!volumes) {

package/dist/deploy/cloudRun/index.js

@@ -41,8 +41,11 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.GCLOUD_RUN_DEPLOY_TYPE = exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = void 0;
+var BashExpression_1 = require("../../bash/BashExpression");
 var context_1 = require("../../context");
 var gitlab_1 = require("../../utils/gitlab");
 var utils_1 = require("../cloudSql/utils");
@@ -104,12 +107,11 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
     }] : []), false);
   },
   getAdditionalEnvVars: function (ctx) {
-    var _a;
     var fullName = ctx.fullName,
       env = ctx.env,
       componentName = ctx.componentName,
       deployConfigRaw = ctx.deployConfigRaw;
-    var HOST_INTERNAL = fullName.toLowerCase() + "-" + ((_a = process.env[(0, context_1.getSecretVarName)(env, componentName, exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX)]) !== null && _a !== void 0 ? _a : "unknown-host.example.com");
+    var HOST_INTERNAL = (0, BashExpression_1.joinBashExpressions)([fullName, (0, BashExpression_1.getBashVariable)((0, context_1.getSecretVarName)(env, componentName, exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX))], "-").toLowerCase();
     var jobTriggers = deployConfigRaw && deployConfigRaw.jobs ? Object.fromEntries(Object.entries(deployConfigRaw.jobs).map(function (_a) {
       var _b = __read(_a, 2),
         name = _b[0],

package/dist/deploy/cloudRun/utils/createArgsString.d.ts

@@ -1,3 +1,4 @@
+import type { BashExpression } from "../../../bash/BashExpression";
 /**
  * creates arguments string:
  *
@@ -9,4 +10,4 @@
  * @returns
  */
 export declare const createArgsString: (...args: keyValuesArg[]) => string;
-export declare type keyValuesArg = Record<string, string | number | true | false | undefined>;
+export type keyValuesArg = Record<string, string | number | true | false | undefined | BashExpression>;

package/dist/deploy/cloudRun/utils/createArgsString.js

@@ -22,7 +22,9 @@ var __read = this && this.__read || function (o, n) {
   }
   return ar;
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createArgsString = void 0;
 var lodash_1 = require("lodash");
 /**

package/dist/deploy/cloudRun/utils/database.js

@@ -22,22 +22,23 @@ var __read = this && this.__read || function (o, n) {
   }
   return ar;
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getDatabaseConnectionString = exports.DATABASE_JDBC_URL = exports.getDatabaseCreateScript = exports.getDatabaseDeleteScript = void 0;
 var gitlab_1 = require("../../../utils/gitlab");
 var getDatabaseDeleteScript = function (context, deployConfig) {
-  var _a;
   if (!deployConfig.cloudSql || !deployConfig.cloudSql.deleteDatabaseOnStop) {
     throw new Error("not possible");
   }
-  var DB_NAME = ((_a = context.environment.envVars) !== null && _a !== void 0 ? _a : {}).DB_NAME;
+  var DB_NAME = context.environment.envVars["DB_NAME"];
   if (!DB_NAME) {
     throw new Error("error: env vars did not specify DB_NAME");
   }
-  var _b = __read(deployConfig.cloudSql.instanceConnectionName.split(":"), 3),
-    projectId = _b[0],
-    region = _b[1],
-    instanceId = _b[2];
+  var _a = __read(deployConfig.cloudSql.instanceConnectionName.split(":"), 3),
+    projectId = _a[0],
+    region = _a[1],
+    instanceId = _a[2];
   // unfortunatly the database cannot be deleted right after the service has stopped, as it might still have connections
   // we have to repeate this process
   return ["echo \"deleting database ".concat(DB_NAME, "...\""), "echo \"\uD83D\uDC46 this can take multiple attemps (3-5min), because google cloud run may still have a connection to the database after the cloud run service is shut down\"", (0, gitlab_1.repeatOnFailure)("gcloud sql databases delete ".concat(DB_NAME, " --instance=").concat(instanceId, " --project ").concat(projectId), {
@@ -46,18 +47,17 @@ var getDatabaseDeleteScript = function (context, deployConfig) {
 };
 exports.getDatabaseDeleteScript = getDatabaseDeleteScript;
 var getDatabaseCreateScript = function (context, deployConfig) {
-  var _a;
   if (!deployConfig.cloudSql) {
     throw new Error("not possible");
   }
-  var DB_NAME = ((_a = context.environment.envVars) !== null && _a !== void 0 ? _a : {}).DB_NAME;
+  var DB_NAME = context.environment.envVars["DB_NAME"];
   if (!DB_NAME) {
     throw new Error("error: env vars did not specify DB_NAME");
   }
-  var _b = __read(deployConfig.cloudSql.instanceConnectionName.split(":"), 3),
-    projectId = _b[0],
-    region = _b[1],
-    instanceId = _b[2];
+  var _a = __read(deployConfig.cloudSql.instanceConnectionName.split(":"), 3),
+    projectId = _a[0],
+    region = _a[1],
+    instanceId = _a[2];
   // may fail if it already exists
   return (0, gitlab_1.allowFailureInScripts)(["echo \"ensuring Database...\"", "gcloud sql databases create ".concat(DB_NAME, " --instance=").concat(instanceId, " --project ").concat(projectId)]);
 };

package/dist/deploy/cloudRun/utils/gcloudServiceAccountLoginCommands.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.gcloudServiceAccountLoginCommands = void 0;
 var __1 = require("..");
 var context_1 = require("../../../context");

package/dist/deploy/cloudRun/utils/getServiceName.d.ts

@@ -1,2 +1,2 @@
 import type { Context } from "../../../types/context";
-export declare const getServiceName: (context: Context) => string;
+export declare const getServiceName: (context: Context) => string | import("../../../bash/BashExpression").BashExpression;

package/dist/deploy/cloudRun/utils/getServiceName.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getServiceName = void 0;
 var getServiceName = function (context) {
   return context.environment.fullName.toLowerCase();

package/dist/deploy/cloudRun/utils/jobName.d.ts

@@ -1 +1,2 @@
-export declare const getCloudRunJobName: (fullAppName: string, jobName: string) => string;
+import type { StringOrBashExpression } from "../../../bash/BashExpression";
+export declare const getCloudRunJobName: (fullAppName: StringOrBashExpression, jobName: string) => StringOrBashExpression;

package/dist/deploy/cloudRun/utils/jobName.js

@@ -1,8 +1,10 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getCloudRunJobName = void 0;
 var getCloudRunJobName = function (fullAppName, jobName) {
-  return fullAppName.toLowerCase() + "-" + jobName.toLowerCase();
+  return fullAppName.toLowerCase().concat("-" + jobName.toLowerCase());
 };
 exports.getCloudRunJobName = getCloudRunJobName;

package/dist/deploy/cloudRun/utils/removeFirstLinesFromCommandOutput.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.removeFirstLinesFromCommandOutput = void 0;
 /**
  *

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

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

package/dist/deploy/cloudSql/utils.js

@@ -1,9 +1,14 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getFullDbName = void 0;
+var BashExpression_1 = require("../../bash/BashExpression");
 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("-");
+  return (0, BashExpression_1.joinBashExpressions)([(_a = cloudSqlConfig.dbNamePrefix) !== null && _a !== void 0 ? _a : "".concat(fullConfig.customerName, "-").concat(fullConfig.appName), environmentSlugPrefix, (_b = cloudSqlConfig.dbBaseName) !== null && _b !== void 0 ? _b : componentName].flatMap(function (part) {
+    return part ? [part] : [];
+  }), "-");
 };
 exports.getFullDbName = getFullDbName;

package/dist/deploy/custom/deployJob.js

@@ -31,7 +31,9 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createCustomDeployJobs = void 0;
 var yarn_1 = require("../../build/node/yarn");
 var runner_1 = require("../../runner");

package/dist/deploy/custom/index.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.CUSTOM_DEPLOY_TYPE = void 0;
 var deployJob_1 = require("./deployJob");
 exports.CUSTOM_DEPLOY_TYPE = {

package/dist/deploy/dockerTag/deployJob.js

@@ -41,7 +41,9 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createDockerTagDeployJobs = void 0;
 var docker_1 = require("../../build/docker");
 var base_1 = require("../base");

package/dist/deploy/dockerTag/index.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.DOCKER_TAG_DEPLOY_TYPE = void 0;
 var deployJob_1 = require("./deployJob");
 exports.DOCKER_TAG_DEPLOY_TYPE = {

package/dist/deploy/index.d.ts

@@ -1,4 +1,5 @@
 import type { SecretEnvVar } from "..";
+import type { BashExpression } from "../bash/BashExpression";
 import type { Context } from "../types/context";
 import type { EnvironmentContext } from "../types/environmentContext";
 import type { CatladderJob } from "../types/jobs";
@@ -8,11 +9,11 @@ export * from "./cloudRun";
 export * from "./kubernetes";
 export * from "./types";
 export * from "./utils";
-export declare type DeployTypeDefinition<T extends DeployConfigType> = {
+export type DeployTypeDefinition<T extends DeployConfigType> = {
   jobs: (context: Context) => CatladderJob[];
   defaults: (envContext: EnvironmentContext<any, T>) => PartialDeep<DeployConfigGeneric<T>>;
   additionalSecretKeys: (envContext: EnvironmentContext<any, T>) => SecretEnvVar[];
-  getAdditionalEnvVars: (envContext: EnvironmentContext<any, T>) => Record<string, string | undefined | null>;
+  getAdditionalEnvVars: (envContext: EnvironmentContext<any, T>) => Record<string, string | BashExpression | undefined | null>;
 };
-export declare type DeployTypes = { [T in DeployConfigType]: DeployTypeDefinition<T> };
+export type DeployTypes = { [T in DeployConfigType]: DeployTypeDefinition<T> };
 export declare const DEPLOY_TYPES: DeployTypes;

package/dist/deploy/index.js

@@ -2,12 +2,16 @@
 
 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];
-    }
-  });
+  var desc = Object.getOwnPropertyDescriptor(m, k);
+  if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+    desc = {
+      enumerable: true,
+      get: function () {
+        return m[k];
+      }
+    };
+  }
+  Object.defineProperty(o, k2, desc);
 } : function (o, m, k, k2) {
   if (k2 === undefined) k2 = k;
   o[k2] = m[k];
@@ -15,7 +19,9 @@ var __createBinding = this && this.__createBinding || (Object.create ? function
 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);
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.DEPLOY_TYPES = void 0;
 var cloudRun_1 = require("./cloudRun");
 var custom_1 = require("./custom");

package/dist/deploy/kubernetes/additionalSecretKeys.js

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.additionalKubernetesSecretKeys = void 0;
 var additionalKubernetesSecretKeys = function (_a) {
   var _b, _c, _d, _e;

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

@@ -1,10 +1,11 @@
+import type { StringOrBashExpression } from "../../../bash/BashExpression";
 import type { Context } from "../../../types";
 export declare const hasKubernetesCloudSQL: (context: Context) => boolean | undefined;
-declare type CloudSqlValues = {
+type CloudSqlValues = {
   enabled: boolean;
   proxyCredentials: string;
   instanceConnectionName: string;
-  fullDbName: string;
+  fullDbName: StringOrBashExpression;
   dbUser: string;
 };
 export declare const createKubernetesCloudsqlBaseValues: (context: Context) => {

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

@@ -1,6 +1,8 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createKubernetesCloudsqlBaseValues = exports.hasKubernetesCloudSQL = void 0;
 var context_1 = require("../../../context");
 var utils_1 = require("../../cloudSql/utils");
@@ -14,7 +16,7 @@ var hasKubernetesCloudSQL = function (context) {
 };
 exports.hasKubernetesCloudSQL = hasKubernetesCloudSQL;
 var createKubernetesCloudsqlBaseValues = function (context) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   if (!(0, types_1.isOfDeployType)(context.componentConfig.deploy, "kubernetes")) {
     throw new Error("cannot get cloud sql config");
   }
@@ -31,14 +33,14 @@ var createKubernetesCloudsqlBaseValues = function (context) {
         dbUser: "postgres",
         instanceConnectionName: instanceConnectionName,
         proxyCredentials: proxyCredentials,
-        fullDbName: context.environment.envVars.KUBE_APP_NAME
+        fullDbName: (_e = context.environment.envVars.KUBE_APP_NAME) !== null && _e !== void 0 ? _e : ""
       }
     };
   } else if (config.type === "unmanaged") {
     return {
       cloudsql: {
         enabled: config.enabled,
-        dbUser: (_e = config.dbUser) !== null && _e !== void 0 ? _e : "postgres",
+        dbUser: (_f = config.dbUser) !== null && _f !== void 0 ? _f : "postgres",
         instanceConnectionName: config.instanceConnectionName,
         proxyCredentials: proxyCredentials,
         fullDbName: (0, utils_1.getFullDbName)(config, context.fullConfig, context.environment.slugPrefix, context.componentName)