@catladder/pipeline 0.0.0-more-collapse-deeb54d7 → 0.0.0-multiple-gitlab-includes-3df5566d

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

@@ -0,0 +1,58 @@
+"use strict";
+
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createVolumeConfig = void 0;
+var createVolumeConfig = function (volumes, type) {
+  if (!volumes) {
+    return [];
+  }
+  return __spreadArray(__spreadArray([], __read(Object.entries(volumes).map(function (_a) {
+    var _b = __read(_a, 2),
+      volumeName = _b[0],
+      _c = _b[1],
+      type = _c.type,
+      bucket = _c.bucket,
+      mountPath = _c.mountPath,
+      readonly = _c.readonly;
+    return {
+      "add-volume": "name=".concat(volumeName, ",type=").concat(type, ",bucket=").concat(bucket).concat(readonly ? ",readonly=true" : ""),
+      "add-volume-mount": "volume=".concat(volumeName, ",mount-path=").concat(mountPath)
+    };
+  })), false), [type === "service" ? {
+    "execution-environment": "gen2"
+  } : {}], false);
+};
+exports.createVolumeConfig = createVolumeConfig;

package/dist/deploy/cloudRun/index.d.ts

@@ -1,4 +1,4 @@
-import type { DeployTypeDefinition } from "..";
+import type { DeployConfigCloudRun, DeployTypeDefinition } from "..";
 export declare const GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
 export declare const GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
-export declare const GCLOUD_RUN_DEPLOY_TYPE: DeployTypeDefinition<"google-cloudrun">;
+export declare const GCLOUD_RUN_DEPLOY_TYPE: DeployTypeDefinition<DeployConfigCloudRun>;

package/dist/deploy/cloudRun/index.js

@@ -41,14 +41,19 @@ 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");
-var deployJob_1 = require("./deployJob");
+var createJobs_1 = require("./createJobs");
+var database_1 = require("./utils/database");
 var jobName_1 = require("./utils/jobName");
 exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
+// FIXME: rename to internalHostSuffix, but this means that project-setup needs to be rerun, so its kindof a breaking change
 exports.GCLOUD_RUN_CANONICAL_HOST_SUFFIX = "GCLOUD_RUN_canonicalHostSuffix";
 var getCloudSqlVariables = function (_a) {
   var _b, _c;
@@ -70,14 +75,14 @@ var getCloudSqlVariables = function (_a) {
       DB_NAME: DB_NAME,
       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)
+      DATABASE_URL: "".concat((0, database_1.getDatabaseConnectionString)(deployConfigRaw.cloudSql)).concat(additionalQueryParamsString),
+      DATABASE_JDBC_URL: database_1.DATABASE_JDBC_URL
     };
   }
   return {};
 };
 exports.GCLOUD_RUN_DEPLOY_TYPE = {
-  jobs: deployJob_1.createGoogleCloudRunDeployJobs,
+  jobs: createJobs_1.createGoogleCloudRunDeployJobs,
   defaults: function (_a) {
     var deployConfigRaw = _a.deployConfigRaw,
       envType = _a.envType;
@@ -102,20 +107,22 @@ 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_CANONICAL = 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 HOSTNAME_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],
         job = _b[1];
       return ["CLOUD_RUN_JOB_TRIGGER_URL_" + (0, gitlab_1.sanitizeForBashVariable)(name), "https://".concat(deployConfigRaw.region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(deployConfigRaw.projectId, "/jobs/").concat((0, jobName_1.getCloudRunJobName)(fullName, name), ":run")];
     })) : {};
-    return __assign(__assign({
-      HOST_CANONICAL: HOST_CANONICAL
-    }, getCloudSqlVariables(ctx)), jobTriggers);
+    return __assign(__assign(__assign({
+      HOSTNAME_INTERNAL: HOSTNAME_INTERNAL
+    }, getCloudSqlVariables(ctx)), jobTriggers), {
+      DEPLOY_CLOUD_RUN_PROJECT_ID: deployConfigRaw ? deployConfigRaw.projectId : undefined,
+      DEPLOY_CLOUD_RUN_REGION: deployConfigRaw ? deployConfigRaw.region : undefined
+    });
   }
 };

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

@@ -1,3 +1,4 @@
+import type { BashExpression } from "../../../bash/BashExpression";
 /**
  * creates arguments string:
  *
@@ -8,4 +9,5 @@
  * @param args args record
  * @returns
  */
-export declare const createArgsString: (args: Record<string, string | number | true | false | undefined>) => string;
+export declare const createArgsString: (...args: keyValuesArg[]) => string;
+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");
 /**
@@ -35,21 +37,27 @@ var lodash_1 = require("lodash");
  * @param args args record
  * @returns
  */
-var createArgsString = function (args) {
-  return Object.entries(args).filter(function (_a) {
-    var _b = __read(_a, 2),
-      value = _b[1];
-    return !(0, lodash_1.isNil)(value);
-  }).map(function (_a) {
-    var _b = __read(_a, 2),
-      key = _b[0],
-      value = _b[1];
-    if (value === true) {
-      return "--".concat(key);
-    } else if (value === false) {
-      return "--no-".concat(key);
-    }
-    return "--".concat(key, "=").concat(value);
-  }).join(" ");
+var createArgsString = function () {
+  var args = [];
+  for (var _i = 0; _i < arguments.length; _i++) {
+    args[_i] = arguments[_i];
+  }
+  return args.map(function (argObj) {
+    return Object.entries(argObj).filter(function (_a) {
+      var _b = __read(_a, 2),
+        value = _b[1];
+      return !(0, lodash_1.isNil)(value);
+    }).map(function (_a) {
+      var _b = __read(_a, 2),
+        key = _b[0],
+        value = _b[1];
+      if (value === true) {
+        return "--".concat(key);
+      } else if (value === false) {
+        return "--no-".concat(key);
+      }
+      return "--".concat(key, "=").concat(value);
+    });
+  }).flat().join(" ");
 };
 exports.createArgsString = createArgsString;

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

@@ -1,4 +1,6 @@
-import type { Context } from "../../../types";
-import type { DeployConfigCloudRun } from "../../types";
-export declare const getDatabaseDeleteScript: (context: Context, deployConfig: DeployConfigCloudRun) => string[];
-export declare const getDatabaseCreateScript: (context: Context, deployConfig: DeployConfigCloudRun) => string[];
+import type { ComponentContext } from "../../../types";
+import type { DeployConfigCloudRun, DeployConfigCloudRunCloudSql } from "../../types";
+export declare const getDatabaseDeleteScript: (context: ComponentContext, deployConfig: DeployConfigCloudRun) => string[];
+export declare const getDatabaseCreateScript: (context: ComponentContext, deployConfig: DeployConfigCloudRun) => string[];
+export declare const 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";
+export declare const getDatabaseConnectionString: (config: DeployConfigCloudRunCloudSql) => string;

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

@@ -22,22 +22,23 @@ var __read = this && this.__read || function (o, n) {
   }
   return ar;
 };
-exports.__esModule = true;
-exports.getDatabaseCreateScript = exports.getDatabaseDeleteScript = void 0;
+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,19 +47,31 @@ 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)]);
 };
-exports.getDatabaseCreateScript = getDatabaseCreateScript;
+exports.getDatabaseCreateScript = getDatabaseCreateScript;
+exports.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";
+var getDatabaseConnectionString = function (config) {
+  switch (config.dbConnectionStringFormat) {
+    case "jdbc":
+      return exports.DATABASE_JDBC_URL;
+    case "rails":
+      return "postgresql://$DB_USER:$DB_PASSWORD@".concat(encodeURIComponent("/cloudsql/".concat(config.instanceConnectionName)), "/$DB_NAME?");
+    default:
+      // prisma
+      return "postgresql://$DB_USER:$DB_PASSWORD@localhost/$DB_NAME?host=/cloudsql/$CLOUD_SQL_INSTANCE_CONNECTION_NAME";
+  }
+};
+exports.getDatabaseConnectionString = getDatabaseConnectionString;

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

@@ -1,2 +1,2 @@
-import type { Context } from "../../../types";
-export declare const gcloudServiceAccountLoginCommands: (context: Context) => string[];
+import type { ComponentContext } from "../../../types";
+export declare const gcloudServiceAccountLoginCommands: (context: ComponentContext) => string[];

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

@@ -1,10 +1,12 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.gcloudServiceAccountLoginCommands = void 0;
 var __1 = require("..");
 var context_1 = require("../../../context");
 var gcloudServiceAccountLoginCommands = function (context) {
-  return ["echo $".concat((0, context_1.getSecretVarNameForContext)(context, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY), " > ./____keyfile.json\n          "), "gcloud auth activate-service-account --key-file=\"./____keyfile.json\""];
+  return ["gcloud auth activate-service-account --key-file=<(echo \"$".concat((0, context_1.getSecretVarNameForContext)(context, __1.GCLOUD_DEPLOY_CREDENTIALS_KEY), "\")")];
 };
 exports.gcloudServiceAccountLoginCommands = gcloudServiceAccountLoginCommands;

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

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

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

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

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.d.ts

@@ -0,0 +1,9 @@
+/**
+ *
+ * takes a command and removes the first keep lines from the output
+ *
+ * @param cmd the command, its stdout is then limited
+ * @param removeFirstN how many lines to remove at the start of the command
+ * @returns
+ */
+export declare const removeFirstLinesFromCommandOutput: (cmd: string, removeFirstN: number) => string;

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

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.removeFirstLinesFromCommandOutput = void 0;
+/**
+ *
+ * takes a command and removes the first keep lines from the output
+ *
+ * @param cmd the command, its stdout is then limited
+ * @param removeFirstN how many lines to remove at the start of the command
+ * @returns
+ */
+var removeFirstLinesFromCommandOutput = function (cmd, removeFirstN) {
+  return removeFirstN === 0 ? cmd : "".concat(cmd, " | tail -n +").concat(removeFirstN + 1);
+};
+exports.removeFirstLinesFromCommandOutput = removeFirstLinesFromCommandOutput;

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.d.ts

@@ -1,3 +1,3 @@
-import type { Context } from "../../types/context";
+import type { ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createCustomDeployJobs: (context: Context) => CatladderJob[];
+export declare const createCustomDeployJobs: (context: ComponentContext) => CatladderJob[];

package/dist/deploy/custom/deployJob.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.createCustomDeployJobs = void 0;
+var getAllCacheConfigsFromConfig_1 = require("../../build/cache/getAllCacheConfigsFromConfig");
 var yarn_1 = require("../../build/node/yarn");
 var runner_1 = require("../../runner");
 var base_1 = require("../base");
@@ -40,10 +43,7 @@ var sbom_1 = require("../sbom");
 var types_1 = require("../types");
 var createCustomDeployJobs = function (context) {
   var _a, _b, _c;
-  var deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
-    return [];
-  }
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
   if (!(0, types_1.isOfDeployType)(deployConfig, "custom")) {
     // should not happen
     throw new Error("deploy config is not custom");
@@ -52,11 +52,11 @@ var createCustomDeployJobs = function (context) {
   var yarnInstall = (0, yarn_1.getYarnInstall)(context, {
     noCustomPostInstall: true
   });
-  return (0, base_1.createDeployementJobs)(context, {
+  var result = (0, base_1.createDeployementJobs)(context, {
     deploy: {
-      image: (_a = deployConfig.jobImage) !== null && _a !== void 0 ? _a : (0, runner_1.getRunnerImage)("jobs-default"),
-      cache: (_b = deployConfig.jobCache) !== null && _b !== void 0 ? _b : [],
-      script: __spreadArray(__spreadArray(__spreadArray(["cd ".concat(context.componentConfig.dir)], __read(deployConfig.requiresYarnInstall ? yarnInstall : []), false), __read(deployConfig.script), false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false),
+      image: (_b = deployConfig.jobImage) !== null && _b !== void 0 ? _b : (0, runner_1.getRunnerImage)("jobs-default"),
+      cache: (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, deployConfig),
+      script: __spreadArray(__spreadArray(__spreadArray(["cd ".concat(context.build.dir)], __read(deployConfig.requiresYarnInstall ? yarnInstall : []), false), __read(deployConfig.script), false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false),
       variables: {}
     },
     stop: deployConfig.stopScript ? {
@@ -65,5 +65,6 @@ var createCustomDeployJobs = function (context) {
       variables: {}
     } : undefined
   });
+  return result;
 };
 exports.createCustomDeployJobs = createCustomDeployJobs;

package/dist/deploy/custom/index.d.ts

@@ -1,2 +1,2 @@
-import type { DeployTypeDefinition } from "..";
-export declare const CUSTOM_DEPLOY_TYPE: DeployTypeDefinition<"custom">;
+import type { DeployConfigCustom, DeployTypeDefinition } from "..";
+export declare const CUSTOM_DEPLOY_TYPE: DeployTypeDefinition<DeployConfigCustom>;

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.d.ts

@@ -1,3 +1,3 @@
-import type { Context } from "../../types/context";
+import type { ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
-export declare const createDockerTagDeployJobs: (context: Context) => CatladderJob[];
+export declare const createDockerTagDeployJobs: (context: ComponentContext) => CatladderJob[];

package/dist/deploy/dockerTag/deployJob.js

@@ -10,24 +10,55 @@ var __assign = this && this.__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
-exports.__esModule = true;
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
+  if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+    if (ar || !(i in from)) {
+      if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+      ar[i] = from[i];
+    }
+  }
+  return to.concat(ar || Array.prototype.slice.call(from));
+};
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createDockerTagDeployJobs = void 0;
 var docker_1 = require("../../build/docker");
 var base_1 = require("../base");
 var types_1 = require("../types");
 var createDockerTagDeployJobs = function (context) {
-  var deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
-    return [];
-  }
+  var _a;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
   if (!(0, types_1.isOfDeployType)(deployConfig, "dockerTag")) {
     // should not happen
     throw new Error("deploy config is not dockerTag");
   }
   var tag = deployConfig.tag;
   return (0, base_1.createDeployementJobs)(context, {
-    deploy: __assign(__assign({}, (0, docker_1.getDockerJobBaseProps)(context)), {
-      script: [docker_1.gitlabDockerLogin, "docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_IMAGE:".concat(tag), "docker push $DOCKER_IMAGE:".concat(tag), "echo \"pushed as $DOCKER_IMAGE:".concat(tag, "\"")]
+    deploy: __assign(__assign({}, (0, docker_1.getDockerJobBaseProps)()), {
+      script: __spreadArray(__spreadArray([], __read((0, docker_1.gitlabDockerLogin)(context)), false), ["docker pull $DOCKER_IMAGE:$DOCKER_IMAGE_TAG", "docker tag $DOCKER_IMAGE:$DOCKER_IMAGE_TAG $DOCKER_IMAGE:".concat(tag), "docker push $DOCKER_IMAGE:".concat(tag), "echo \"pushed as $DOCKER_IMAGE:".concat(tag, "\"")], false)
     })
   });
 };

package/dist/deploy/dockerTag/index.d.ts

@@ -1,2 +1,2 @@
-import type { DeployTypeDefinition } from "..";
-export declare const DOCKER_TAG_DEPLOY_TYPE: DeployTypeDefinition<"dockerTag">;
+import type { DeployConfigDockerTag, DeployTypeDefinition } from "..";
+export declare const DOCKER_TAG_DEPLOY_TYPE: DeployTypeDefinition<DeployConfigDockerTag>;

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,18 +1,19 @@
-import type { SecretEnvVar } from "..";
-import type { Context } from "../types/context";
+import type { BuildConfig, SecretEnvVar } from "..";
+import type { BashExpression } from "../bash/BashExpression";
+import type { ComponentContext } from "../types/context";
 import type { EnvironmentContext } from "../types/environmentContext";
 import type { CatladderJob } from "../types/jobs";
 import type { PartialDeep } from "../types/utils";
-import type { DeployConfigGeneric, DeployConfigType } from "./types";
+import type { DeployConfig, DeployConfigGeneric, DeployConfigType } from "./types";
 export * from "./cloudRun";
 export * from "./kubernetes";
 export * from "./types";
 export * from "./utils";
-export declare 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>;
+export type DeployTypeDefinition<D extends DeployConfig> = {
+  jobs: (context: ComponentContext) => CatladderJob[];
+  defaults: (envContext: EnvironmentContext<BuildConfig, D>) => PartialDeep<D>;
+  additionalSecretKeys: (envContext: EnvironmentContext<BuildConfig, D>) => SecretEnvVar[];
+  getAdditionalEnvVars: (envContext: EnvironmentContext<BuildConfig, D>) => Record<string, string | BashExpression | undefined | null>;
 };
-export declare type DeployTypes = { [T in DeployConfigType]: DeployTypeDefinition<T> };
+export type DeployTypes = { [T in DeployConfigType]: DeployTypeDefinition<DeployConfigGeneric<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");