@catladder/pipeline 0.0.0-refactore-catenv-command-validates-argument-78d05852 → 0.0.0-reference-database-url-1befbbee

package/dist/deploy/cloudRun/createJobs/execute/schedules.js

@@ -0,0 +1,173 @@
+"use strict";
+
+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);
+};
+var __rest = this && this.__rest || function (s, e) {
+  var t = {};
+  for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+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;
+};
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getCreateScheduleScript = exports.getDeleteSchedulesScript = void 0;
+var bash_1 = require("../../../../bash");
+var utils_1 = require("../../../../utils");
+var cloudRunExecutionUrl_1 = require("../../utils/cloudRunExecutionUrl");
+var createArgsString_1 = require("../../utils/createArgsString");
+var jobName_1 = require("../../utils/jobName");
+var cloudRunJobs_1 = require("../cloudRunJobs");
+var common_1 = require("../common");
+var getDeleteSchedulesScript = function (context) {
+  var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+  var schedules = getSchedules(context);
+  var argsString = (0, createArgsString_1.createArgsString)({
+    project: deployConfig.projectId,
+    location: deployConfig.region
+  });
+  return schedules.map(function (_a) {
+    var fullName = _a.fullName;
+    return ["".concat((0, common_1.gcloudSchedulerCmd)(), " jobs delete ").concat(fullName, " ").concat(argsString)];
+  }).flat();
+};
+exports.getDeleteSchedulesScript = getDeleteSchedulesScript;
+var getCreateScheduleScript = function (context) {
+  var schedules = getSchedules(context);
+  var _a = (0, common_1.getCloudRunDeployConfig)(context),
+    location = _a.region,
+    project = _a.projectId;
+  return schedules.map(function (_a, jobIndex) {
+    var _b;
+    var fullName = _a.fullName,
+      config = _a.config;
+    var _c = getSchedulerArgs(config, context),
+      uri = _c.uri,
+      args = __rest(_c, ["uri"]);
+    var argsString = (0, createArgsString_1.createArgsString)(__assign(__assign({
+      project: project,
+      location: location,
+      uri: "\"$current_job_uri\""
+    }, args), {
+      schedule: "\"".concat(config.schedule, "\""),
+      "max-retry-attempts": (_b = config.maxRetryAttempts) !== null && _b !== void 0 ? _b : 0
+    }));
+    return [jobIndex === 0 ? "exist_scheduler_names=\"$(\n  ".concat((0, common_1.gcloudSchedulerCmd)(), " jobs list --filter='httpTarget.uri ~ ").concat(context.env, ".*").concat(context.name, "' --format='value(name)' --limit=999 --location='").concat(location, "' --project='").concat(project, "'\n)\"") : null, "current_job_uri=\"".concat(uri, "\""), "current_scheduler_name=\"".concat(fullName, "\""), "if grep \"$current_scheduler_name\" <<<\"$exist_scheduler_names\" >/dev/null; then", "  ".concat((0, common_1.gcloudSchedulerCmd)(), " jobs update http \"$current_scheduler_name\" ").concat(argsString), "else", "  ".concat((0, common_1.gcloudSchedulerCmd)(), " jobs create http \"$current_scheduler_name\" ").concat(argsString), "fi"].filter(utils_1.notNil).join("\n");
+  });
+};
+exports.getCreateScheduleScript = getCreateScheduleScript;
+var getSchedulerArgs = function (scheduler, context) {
+  var _a;
+  if (scheduler.type === "job") {
+    var _b = (0, common_1.getCloudRunDeployConfig)(context),
+      projectId = _b.projectId,
+      region = _b.region;
+    var body = scheduler.args !== undefined ? {
+      overrides: {
+        containerOverrides: [((_a = scheduler.args) === null || _a === void 0 ? void 0 : _a.length) > 0 ? {
+          args: scheduler.args
+        } : {
+          args: [],
+          clearArgs: true // not sure why this is neeeded, but it is
+        }]
+      }
+    } : null;
+    return {
+      uri: (0, cloudRunExecutionUrl_1.getCloudRunJobExecuteUrl)(scheduler.job, {
+        appFullName: context.environment.fullName,
+        projectId: projectId,
+        region: region
+      }),
+      "message-body": body ? '"' + (0, bash_1.bashEscape)(JSON.stringify(body)) + '"' : undefined,
+      "http-method": "POST",
+      "oauth-service-account-email": "\"$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com\""
+    };
+  }
+  if (scheduler.type === "http") {
+    return {
+      uri: scheduler.url,
+      "message-body": scheduler.body,
+      "http-method": scheduler.method,
+      "oidc-service-account-email": "\"$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com\""
+    };
+  }
+  throw new Error("Unknown scheduler type: ".concat(scheduler.type));
+};
+var getSchedules = function (context) {
+  var legacyScheduleJobs = getLegacyJobSchedules(context);
+  var schedules = getScheduledExecutes(context);
+  return Object.entries(__assign(__assign({}, legacyScheduleJobs), schedules)).map(function (_a) {
+    var _b = __read(_a, 2),
+      name = _b[0],
+      config = _b[1];
+    return {
+      name: name,
+      fullName: (0, jobName_1.getFullSchedulerName)(context, name),
+      config: config
+    };
+  });
+};
+var getLegacyJobSchedules = function (context) {
+  var jobsWithNames = (0, cloudRunJobs_1.getCloudRunJobsWithNames)(context);
+  return Object.fromEntries(jobsWithNames.filter(function (entry) {
+    return entry.job.when === "schedule";
+  }).map(function (_a) {
+    var _b = _a.job,
+      maxRetryAttempts = _b.maxRetryAttempts,
+      schedule = _b.schedule,
+      jobName = _a.jobName;
+    var schedulerName = jobName.concat("-scheduler");
+    return [schedulerName, {
+      type: "job",
+      job: jobName,
+      maxRetryAttempts: maxRetryAttempts,
+      schedule: schedule,
+      when: "schedule"
+    }];
+  }));
+};
+var getScheduledExecutes = function (context) {
+  var _a;
+  var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+  return Object.fromEntries(Object.entries((_a = deployConfig.execute) !== null && _a !== void 0 ? _a : {}).flatMap(function (_a) {
+    var _b = __read(_a, 2),
+      key = _b[0],
+      value = _b[1];
+    if (!value || value.when !== "schedule") {
+      return [];
+    }
+    return [[key, value]];
+  }));
+};

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

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

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

@@ -31,26 +31,34 @@ 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 __1 = require("..");
+var bashYaml_1 = require("../../../bash/bashYaml");
 var cleanup_1 = require("../cleanup");
 var database_1 = require("../utils/database");
 var gcloudServiceAccountLoginCommands_1 = require("../utils/gcloudServiceAccountLoginCommands");
 var cloudRunJobs_1 = require("./cloudRunJobs");
+var onDeploy_1 = require("./execute/onDeploy");
 var cloudRunServices_1 = require("./cloudRunServices");
 var common_1 = require("./common");
+var constants_1 = require("./constants");
+var schedules_1 = require("./execute/schedules");
 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
-  : []), 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 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, schedules_1.getCreateScheduleScript)(context)), false), __read((0, cloudRunJobs_1.getJobCreateScripts)(context)), false), __read((0, onDeploy_1.getOnDeployExecuteScript)(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],
       service = _b[1];
     return (0, cloudRunServices_1.getServiceDeployScript)(context, service, "-" + name);
-  })), false), __read((0, cloudRunJobs_1.getJobRunScripts)(context, "postDeploy")), false))), false), __read((0, gitlab_1.collapseableSection)("cleanup", "Cleanup")((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "postDeploy") // we cleanup inactive images both on deploy and stop
-  )), false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false);
+  })), false), __read((0, onDeploy_1.getOnDeployExecuteScript)(context, "postDeploy")), false))), false), __read((0, gitlab_1.collapseableSection)("cleanup", "Cleanup")((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "postDeploy"))), false), __read((0, sbom_1.getDependencyTrackUploadScript)(context)), false);
 }
 exports.getCloudRunDeployScripts = getCloudRunDeployScripts;

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

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

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

@@ -31,22 +31,26 @@ 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");
 var database_1 = require("../utils/database");
 var gcloudServiceAccountLoginCommands_1 = require("../utils/gcloudServiceAccountLoginCommands");
 var cloudRunJobs_1 = require("./cloudRunJobs");
+var onDeploy_1 = require("./execute/onDeploy");
+var schedules_1 = require("./execute/schedules");
 var cloudRunServices_1 = require("./cloudRunServices");
 var common_1 = require("./common");
 function getCloudRunStopScripts(context) {
   var _a;
   var deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
-  return __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read((0, cloudRunJobs_1.getJobRunScripts)(context, "preStop")), false), __read(deployConfig.service !== false ? (0, cloudRunServices_1.getServiceDeleteScript)(context) : []), false), __read(Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).flatMap(function (_a) {
+  return __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context)), false), __read((0, onDeploy_1.getOnDeployExecuteScript)(context, "preStop")), false), __read(deployConfig.service !== false ? (0, cloudRunServices_1.getServiceDeleteScript)(context) : []), false), __read(Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).flatMap(function (_a) {
     var _b = __read(_a, 1),
       name = _b[0];
     return (0, cloudRunServices_1.getServiceDeleteScript)(context, name);
-  })), false), __read((0, cloudRunJobs_1.getJobRunScripts)(context, "postStop")), false), __read((0, cloudRunJobs_1.getDeleteSchedulesScripts)(context)), false), __read((0, cloudRunJobs_1.getDeleteJobsScripts)(context)), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false), __read((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "onStop")), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false);
+  })), false), __read((0, onDeploy_1.getOnDeployExecuteScript)(context, "postStop")), false), __read((0, schedules_1.getDeleteSchedulesScript)(context)), false), __read((0, cloudRunJobs_1.getDeleteJobsScripts)(context)), false), __read(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig) : []), false), __read((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "onStop")), false), __read((0, sbom_1.getDependencyTrackDeleteScript)(context)), false);
 }
 exports.getCloudRunStopScripts = getCloudRunStopScripts;

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

@@ -0,0 +1,5 @@
+import { type DeployConfigCloudRunService } from "../../types";
+export declare function healthCheckCliArgs(healthCheck: DeployConfigCloudRunService["healthCheck"]): {
+  "startup-probe": string;
+  "liveness-probe": string;
+} | undefined;

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

@@ -0,0 +1,82 @@
+"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.healthCheckCliArgs = void 0;
+var types_1 = require("../../types");
+var PORT = 8080;
+function healthCheckCliArgs(healthCheck) {
+  var shouldNotSetHealthCheck = healthCheck === undefined;
+  if (shouldNotSetHealthCheck) {
+    return undefined;
+  }
+  var shouldUseDefaultProbe = healthCheck === true;
+  if (shouldUseDefaultProbe) {
+    return {
+      "startup-probe": toArgValue(probeToKeyValuePairs(types_1.defaultStartupProbe)),
+      "liveness-probe": toArgValue(probeToKeyValuePairs(types_1.defaultLivenessProbe))
+    };
+  }
+  return {
+    "startup-probe": toArgValue(probeToKeyValuePairs(healthCheck.startupProbe)),
+    "liveness-probe": healthCheck.livenessProbe ? toArgValue(probeToKeyValuePairs(healthCheck.livenessProbe)) : "" // NOTE: empty string ("") removes liveness probe
+  };
+}
+exports.healthCheckCliArgs = healthCheckCliArgs;
+function probeToKeyValuePairs(probe) {
+  var sharedArgs = Object.entries({
+    initialDelaySeconds: probe.initialDelaySeconds,
+    timeoutSeconds: probe.timeoutSeconds,
+    periodSeconds: probe.periodSeconds,
+    failureThreshold: probe.failureThreshold
+  });
+  switch (probe.type) {
+    case "tcp":
+      return __spreadArray(__spreadArray([], __read(sharedArgs), false), [["tcpSocket.port", PORT]], false);
+    case "http1":
+      return __spreadArray(__spreadArray([], __read(sharedArgs), false), [["httpGet.port", PORT], ["httpGet.path", probe.path]], false);
+    default:
+      probe;
+      return [];
+  }
+}
+function toArgValue(keyValues) {
+  return keyValues.map(function (_a) {
+    var _b = __read(_a, 2),
+      key = _b[0],
+      value = _b[1];
+    return "".concat(key, "=").concat(value);
+  }).join(",");
+}

package/dist/deploy/cloudRun/createJobs/index.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 createGoogleCloudRunDeployJobs: (context: Context) => CatladderJob[];
+export declare const createGoogleCloudRunDeployJobs: (context: ComponentContext) => CatladderJob[];

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

@@ -1,21 +1,29 @@
 "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) {
-  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, "google-cloudrun")) {
     // should not happen
     throw new Error("deploy config is wrong");
@@ -23,11 +31,17 @@ 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.d.ts

@@ -0,0 +1,3 @@
+import type { DeployConfigCloudRunVolumes } from "../../types";
+import type { keyValuesArg } from "../utils/createArgsString";
+export declare const createVolumeConfig: (volumes: DeployConfigCloudRunVolumes | undefined, type: "service" | "job") => keyValuesArg[];

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,18 +41,22 @@ 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 createJobs_1 = require("./createJobs");
-var jobName_1 = require("./utils/jobName");
+var cloudRunExecutionUrl_1 = require("./utils/cloudRunExecutionUrl");
+var database_1 = require("./utils/database");
 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;
+  var _b, _c, _d;
   var deployConfigRaw = _a.deployConfigRaw,
     environmentSlugPrefix = _a.environmentSlugPrefix,
     env = _a.env,
@@ -66,14 +70,16 @@ var getCloudSqlVariables = function (_a) {
         value = _b[1];
       return "&".concat(key, "=").concat(value);
     }).join("");
-    return {
+    var dbVars = {
       CLOUD_SQL_INSTANCE_CONNECTION_NAME: deployConfigRaw.cloudSql.instanceConnectionName,
       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)
+      DB_PASSWORD: "$" + (0, context_1.getSecretVarName)(env, componentName, "DB_PASSWORD")
     };
+    return __assign(__assign({}, dbVars), {
+      DATABASE_URL: (0, database_1.getDatabaseConnectionString)(deployConfigRaw.cloudSql, dbVars).concat(additionalQueryParamsString),
+      DATABASE_JDBC_URL: (0, database_1.getDatabaseJdbcUrl)(dbVars, (_d = deployConfigRaw.cloudSql.dbConnectionStringVariablesMode) !== null && _d !== void 0 ? _d : database_1.DEFAULT_DB_VARIABLES_MODE)
+    });
   }
   return {};
 };
@@ -103,20 +109,26 @@ 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 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 ["CLOUD_RUN_JOB_TRIGGER_URL_" + (0, gitlab_1.sanitizeForBashVariable)(name), (0, cloudRunExecutionUrl_1.getCloudRunJobExecuteUrl)(name, {
+        appFullName: fullName,
+        projectId: deployConfigRaw.projectId,
+        region: deployConfigRaw.region
+      })];
     })) : {};
-    return __assign(__assign({
-      HOST_INTERNAL: HOST_INTERNAL
-    }, 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/cloudRunExecutionUrl.d.ts

@@ -0,0 +1,10 @@
+import type { StringOrBashExpression } from "../../../bash";
+export declare function getCloudRunJobExecuteUrl(jobName: string, {
+  region,
+  projectId,
+  appFullName
+}: {
+  appFullName: StringOrBashExpression;
+  region: string;
+  projectId: string;
+}): string;

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

@@ -0,0 +1,16 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getCloudRunJobExecuteUrl = void 0;
+var jobName_1 = require("./jobName");
+function getCloudRunJobExecuteUrl(jobName, _a) {
+  var region = _a.region,
+    projectId = _a.projectId,
+    appFullName = _a.appFullName;
+  var uriBase = "https://".concat(region, "-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/").concat(projectId, "/jobs");
+  var fullJobName = (0, jobName_1.getCloudRunJobName)(appFullName, jobName);
+  return "".concat(uriBase, "/").concat(fullJobName, ":run");
+}
+exports.getCloudRunJobExecuteUrl = getCloudRunJobExecuteUrl;

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

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