@catladder/cli 0.0.0-fix-config-move-not-working-again-8ba85846 → 0.0.0-fix-handle-missing-cloud-sql-proxy-command-error-and-show-nice-17045900

package/dist/bundles/cli/index.js

@@ -982,61 +982,30 @@ exports["default"] = async (vorpal) => vorpal
 /***/ }),
 
 /***/ 102:
-/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
 
 "use strict";
 
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 const pipeline_1 = __nccwpck_require__(10603);
+const clipboardy_1 = __importDefault(__nccwpck_require__(89881));
 const getProjectConfig_1 = __nccwpck_require__(12145);
 const autocompletions_1 = __nccwpck_require__(39855);
 const startProxy_1 = __nccwpck_require__(90742);
-exports["default"] = async (vorpal) => vorpal
-    .command("project-cloud-sql-proxy <envComponent>", "proxy to cloud sql db")
-    .autocomplete(await (0, autocompletions_1.envAndComponents)())
-    .action(async function ({ envComponent }) {
-    var _a, _b;
-    const { env, componentName } = (0, getProjectConfig_1.parseChoice)(envComponent);
-    if (!componentName) {
-        this.log("need componentName");
-        return;
-    }
-    const context = await (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName);
-    let proxyInfo;
-    if (env === "review") {
-        vorpal.log("⚠️ connection string does not include mr information on review environments");
-    }
+const log_1 = __nccwpck_require__(66921);
+const getProxyInfo = (context) => {
+    var _a, _b, _c, _d;
     if ((0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "kubernetes")) {
-        proxyInfo = await getProxyInfoForKubernetes(this, context);
+        return getProxyInfoForKubernetes(this, context);
     }
     else if ((0, pipeline_1.isOfDeployType)((_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config, "google-cloudrun")) {
-        proxyInfo = await getProxyInfoForCloudRun(this, context);
+        return getProxyInfoForCloudRun(this, context);
     }
-    else {
-        throw new Error("unsupported environment");
-    }
-    // skynet-164509:europe-west6:pvl-cyclomania-review=tcp:5432
-    const { DB_PASSWORD, DB_NAME, DB_USER, instanceName } = proxyInfo;
-    const { localPort } = await this.prompt({
-        type: "number",
-        name: "localPort",
-        default: "54320",
-        message: "Local port: ",
-    });
-    this.log("");
-    this.log(`postgres-PW: ${DB_PASSWORD}`);
-    this.log("");
-    this.log("connection strings:");
-    this.log("");
-    this.log(`DATABASE_URL=postgresql://${DB_USER}:${DB_PASSWORD}@localhost:${localPort}/${DB_NAME}?schema=public`);
-    this.log("");
-    this.log(`DATABASE_JDBC_URL=jdbc:postgresql://localhost:${localPort}/${DB_NAME}?schema=public&user=${DB_USER}&password=${DB_PASSWORD}`);
-    this.log("");
-    await (0, startProxy_1.startCloudSqlProxyInCurrentShell)({
-        instanceName,
-        localPort,
-    });
-});
+    throw new Error(`unsupported environment: ${(_d = (_c = context.deploy) === null || _c === void 0 ? void 0 : _c.config) === null || _d === void 0 ? void 0 : _d.type}`);
+};
 const getProxyInfoForKubernetes = async (vorpal, context) => {
     var _a, _b;
     if (!(0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "kubernetes")) {
@@ -1056,22 +1025,86 @@ const getProxyInfoForKubernetes = async (vorpal, context) => {
     };
 };
 const getProxyInfoForCloudRun = async (vorpal, context) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f;
     if (!(0, pipeline_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "google-cloudrun") ||
         !((_b = context.deploy) === null || _b === void 0 ? void 0 : _b.config.cloudSql)) {
-        throw new Error("unsupported");
+        const deployType = (0, pipeline_1.getDeployConfigType)((_c = context.deploy) === null || _c === void 0 ? void 0 : _c.config);
+        const errorMessage = deployType === "google-cloudrun"
+            ? `DeployConfig is missing the cloudSql property`
+            : `Unsupported DeployConfig type: ${deployType}`;
+        (0, log_1.logError)(vorpal, errorMessage);
+        throw new Error(errorMessage);
     }
     const envVars = await (0, getProjectConfig_1.getEnvVarsResolved)(vorpal, context.env, context.name);
-    const DB_PASSWORD = (_c = envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD) === null || _c === void 0 ? void 0 : _c.toString();
-    const DB_USER = (_d = envVars === null || envVars === void 0 ? void 0 : envVars.DB_USER) === null || _d === void 0 ? void 0 : _d.toString();
-    const DB_NAME = context.environment.envVars.DB_NAME.toString();
     return {
-        instanceName: (_e = context.deploy) === null || _e === void 0 ? void 0 : _e.config.cloudSql.instanceConnectionName,
-        DB_PASSWORD,
-        DB_NAME,
-        DB_USER,
+        instanceName: (_d = context.deploy) === null || _d === void 0 ? void 0 : _d.config.cloudSql.instanceConnectionName,
+        DB_PASSWORD: (_e = envVars === null || envVars === void 0 ? void 0 : envVars.DB_PASSWORD) === null || _e === void 0 ? void 0 : _e.toString(),
+        DB_NAME: context.environment.envVars.DB_NAME.toString(),
+        DB_USER: (_f = envVars === null || envVars === void 0 ? void 0 : envVars.DB_USER) === null || _f === void 0 ? void 0 : _f.toString(),
     };
 };
+const getDbUrl = ({ DB_PASSWORD, DB_NAME, DB_USER }, localPort, additional = "") => `DATABASE_URL="postgresql://${DB_USER}:${DB_PASSWORD}@localhost:${localPort}/${DB_NAME}${additional}"`;
+const getJdbcUrl = ({ DB_PASSWORD, DB_NAME, DB_USER }, localPort) => `DATABASE_JDBC_URL="jdbc:postgresql://localhost:${localPort}/${DB_NAME}?schema=public&user=${DB_USER}&password=${DB_PASSWORD}"`;
+exports["default"] = async (vorpal) => vorpal
+    .command("project-cloud-sql-proxy <envComponent>", "proxy to cloud sql db")
+    .autocomplete(await (0, autocompletions_1.envAndComponents)())
+    .action(async function ({ envComponent }) {
+    const { env, componentName } = (0, getProjectConfig_1.parseChoice)(envComponent);
+    if (!componentName) {
+        (0, log_1.logWarning)(this, "need componentName");
+        return;
+    }
+    const context = await (0, getProjectConfig_1.getPipelineContextByChoice)(env, componentName);
+    if (env === "review") {
+        (0, log_1.logWarning)(this, "connection string does not include mr information on review environments");
+    }
+    const { localPort } = await this.prompt({
+        type: "number",
+        name: "localPort",
+        default: "54320",
+        message: "Local port: ",
+    });
+    const proxyInfo = await getProxyInfo(context);
+    /**
+     * Env variables for libpq (e.g. psql client)
+     * https://www.postgresql.org/docs/current/libpq-envars.html#LIBPQ-ENVARS
+     */
+    const psqlEnvVars = {
+        PGPASSWORD: proxyInfo.DB_PASSWORD,
+        PGUSER: proxyInfo.DB_USER,
+        PGDATABASE: proxyInfo.DB_NAME,
+        PGHOST: "localhost",
+        PGPORT: localPort,
+    };
+    const lipbqEnvVarDeclarations = Object.entries(psqlEnvVars).map(([key, value]) => `${key}="${value}"`);
+    const dbUrl = getDbUrl(proxyInfo, localPort);
+    const jdbcUrl = getJdbcUrl(proxyInfo, localPort);
+    clipboardy_1.default.writeSync([
+        "",
+        "## CloudSQL proxy connection .env variables",
+        dbUrl,
+        jdbcUrl,
+        "## DATABASE_URL with schema=public parameter (e. g. Prisma requires this):",
+        `# ${getDbUrl(proxyInfo, localPort, `?schema=public`)}`,
+        "## Env variables for libpq (e.g. psql client https://www.postgresql.org/docs/current/libpq-envars.html#LIBPQ-ENVARS)",
+        ...lipbqEnvVarDeclarations,
+        "",
+    ].join("\n"));
+    (0, log_1.logLines)(this, null, "Connection strings env variables DATABASE_URL and those for the 'psql' client (copied to your clipboard for .env file):", dbUrl, jdbcUrl, ...lipbqEnvVarDeclarations, null, "DATABASE_URL with schema=public parameter (e. g. Prisma requires this):", getDbUrl(proxyInfo, localPort, `?schema=public`), null);
+    try {
+        await (0, startProxy_1.startCloudSqlProxyInCurrentShell)({
+            instanceName: proxyInfo.instanceName,
+            localPort,
+        });
+    }
+    catch (error) {
+        if (!(error instanceof Error))
+            throw error;
+        if (error.message !== startProxy_1.ERROR_NOT_INSTALLED)
+            throw error;
+        (0, log_1.logError)(this, error.message, null, "Please install the Cloud SQL Auth Proxy from:", `https://cloud.google.com/sql/docs/postgres/connect-auth-proxy#install`, null);
+    }
+});
 //# sourceMappingURL=commandCloudSqlProxy.js.map
 
 /***/ }),
@@ -3528,17 +3561,75 @@ exports.upsertAllVariables = upsertAllVariables;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.logError = void 0;
-const logError = (cmd, message, additionalMessage) => {
-    cmd.log("");
-    cmd.log(`[ERROR] 🙀 :${message}`);
-    cmd.log("");
-    if (additionalMessage) {
-        cmd.log(additionalMessage);
-        cmd.log("");
+exports.logWarning = exports.logError = exports.logLines = void 0;
+/**
+ * Logs multiple lines using the log method of the provided {@link LoggerCmdInstance}.
+ *
+ * Line items that are `null` or `undefined` are logged as empty lines.
+ *
+ * @param cmd - The logger instance to use. If `null` or `undefined`, `console` will be used.
+ *
+ * @example
+ * ```ts
+ * logLines(cmd, "line 1", "line 2", null, "line 3");
+ * logLines(cmd, ...linesArray); // arrays can be spread into the function
+ * logLines(cmd, linesArray); // but it will flatten the plain array for convenience
+ * ```
+ */
+function logLines(cmd = console, ...lines) {
+    const logger = cmd !== null && cmd !== void 0 ? cmd : console;
+    for (const line of lines.flat()) {
+        if (line === null || line === undefined) {
+            logger.log("");
+        }
+        else {
+            logger.log(line);
+        }
+    }
+}
+exports.logLines = logLines;
+/**
+ * Logs an error message using the log method of the provided {@link LoggerCmdInstance}.
+ *
+ * Line items that are `null` or `undefined` are logged as empty lines.
+ *
+ * @example
+ * ```ts
+ * logError(cmd, "Message");
+ * logError(cmd, "Message", "Additional message");
+ * logError(cmd, "Message", "Additional message", "Another additional message line");
+ * logError(cmd, "Message", ...additionalMessages); // arrays can be spread into the function
+ * logError(cmd, "Message", additionalMessages); // but it will flatten the plain array for convenience
+ * ```
+ */
+const logError = (cmd = console, message, ...additionalMessages) => {
+    logLines(cmd, null, `[ERROR] 🙀 :${message}`, null);
+    if (additionalMessages === null || additionalMessages === void 0 ? void 0 : additionalMessages.length) {
+        logLines(cmd, ...additionalMessages.flat(), null);
     }
 };
 exports.logError = logError;
+/**
+ * Logs a warning message using the log method of the provided {@link LoggerCmdInstance}.
+ *
+ * Line items that are `null` or `undefined` are logged as empty lines.
+ *
+ * @example
+ * ```ts
+ * logWarning(cmd, "Message");
+ * logWarning(cmd, "Message", "Additional message");
+ * logWarning(cmd, "Message", "Additional message", "Another additional message line");
+ * logWarning(cmd, "Message", ...additionalMessages); // arrays can be spread into the function
+ * logWarning(cmd, "Message", additionalMessages); // but it will flatten the plain array for convenience
+ * ```
+ */
+const logWarning = (cmd = console, message, ...additionalMessages) => {
+    logLines(cmd, `[WARNING] ⚠️: ${message}`);
+    if (additionalMessages === null || additionalMessages === void 0 ? void 0 : additionalMessages.length) {
+        logLines(cmd, ...additionalMessages.flat(), null);
+    }
+};
+exports.logWarning = logWarning;
 //# sourceMappingURL=log.js.map
 
 /***/ }),
@@ -3613,21 +3704,19 @@ const yaml_1 = __nccwpck_require__(68033);
 const legacyPreferencesPath = (0, path_1.join)((0, os_1.homedir)(), ".catladder/preferences.yml");
 const preferencesPath = (0, path_1.join)((0, os_1.homedir)(), ".config/catladder/preferences.yml");
 const ensurePreferencesFile = async () => {
-    if ((0, fs_1.existsSync)(legacyPreferencesPath) && !(0, fs_1.existsSync)(preferencesPath)) {
-        await (0, promises_1.mkdir)((0, path_1.dirname)(preferencesPath), { recursive: true, mode: 0o700 });
-        await (0, promises_1.cp)(legacyPreferencesPath, preferencesPath);
-        await (0, promises_1.chmod)(preferencesPath, 0o600);
-        await (0, promises_1.cp)(preferencesPath, (0, path_1.join)((0, path_1.dirname)(preferencesPath), "old_preferences_backup.yml"));
-        return;
-    }
     if ((0, fs_1.existsSync)(preferencesPath)) {
         return;
     }
     await (0, promises_1.mkdir)((0, path_1.dirname)(preferencesPath), { recursive: true, mode: 0o700 });
-    await (0, promises_1.writeFile)(preferencesPath, "---\n{}", {
-        encoding: "utf-8",
-        mode: 0o600,
-    });
+    if (!(0, fs_1.existsSync)(legacyPreferencesPath)) {
+        return (0, promises_1.writeFile)(preferencesPath, "---\n{}", {
+            encoding: "utf-8",
+            mode: 0o600,
+        });
+    }
+    await (0, promises_1.cp)(legacyPreferencesPath, preferencesPath);
+    await (0, promises_1.chmod)(preferencesPath, 0o600);
+    await (0, promises_1.cp)(preferencesPath, (0, path_1.join)((0, path_1.dirname)(preferencesPath), "old_preferences_backup.yml"));
 };
 const loadPreferences = async () => {
     await ensurePreferencesFile();
@@ -3898,14 +3987,16 @@ exports.escapeSingleQuotes = escapeSingleQuotes;
  *
  * - other languages are currently only partially supported, since most .env implementations are slightly different
  */
-const escapeForDotEnv = (value) => {
+const escapeForDotEnv = (value, options = {
+    quoteMode: "auto",
+}) => {
     if (value === undefined || value === null) {
         return "";
     }
     if (typeof value === "string") {
         // if string contains newlines, we need to wrap it in quotes
         // we additionaly escape newlines, that give best compatibility
-        if (value.includes("\n")) {
+        if (options.quoteMode === "always" || value.includes("\n")) {
             const newlinesReplaces = value.replace(/\n/g, "\\n");
             // default to ", but if this is not possible, we try to use ' or `
             const quote = value.includes(`"`)
@@ -5934,7 +6025,7 @@ exports.getBuildInfoVariables = getBuildInfoVariables;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getEnvConfig = void 0;
-const utils_1 = __nccwpck_require__(32497);
+const lodash_1 = __nccwpck_require__(23255);
 const getEnvConfig = (config, componentName, env) => {
     var _a, _b;
     const defaultConfig = config.components[componentName];
@@ -5946,7 +6037,19 @@ const getEnvConfig = (config, componentName, env) => {
         // env is disabled, still return the default config
         return defaultConfig;
     }
-    return (0, utils_1.mergeWithMergingArrays)(defaultConfig, envCustomizations);
+    /**
+     *   env config is merged with default. Arrays are not merged.
+     * you can customize this by providing a function that takes the default value as argument
+     */
+    return (0, lodash_1.mergeWith)({}, defaultConfig, envCustomizations, (defaultValue, customValue) => {
+        // check if custom value is a function (and default is not),
+        // we currently don't have config options that are functions, but we might in the future
+        if (typeof customValue === "function" &&
+            typeof defaultValue !== "function") {
+            return customValue(defaultValue);
+        }
+        return undefined;
+    });
 };
 exports.getEnvConfig = getEnvConfig;
 //# sourceMappingURL=getEnvConfig.js.map
@@ -6780,69 +6883,35 @@ exports.getDeleteUnusedRevisionsCommands = getDeleteUnusedRevisionsCommands;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getCreateScheduleScripts = exports.getJobCreateScripts = exports.getJobRunScripts = exports.getDeleteJobsScripts = exports.getDeleteSchedulesScripts = void 0;
+exports.getCloudRunJobsWithNames = exports.getJobCreateScripts = exports.getDeleteJobsScripts = void 0;
+const getLabels_1 = __nccwpck_require__(30920);
+const utils_1 = __nccwpck_require__(32497);
 const createArgsString_1 = __nccwpck_require__(49598);
 const jobName_1 = __nccwpck_require__(9626);
 const common_1 = __nccwpck_require__(73325);
-const getLabels_1 = __nccwpck_require__(30920);
-const volumes_1 = __nccwpck_require__(60847);
 const constants_1 = __nccwpck_require__(38865);
-const utils_1 = __nccwpck_require__(32497);
-const getJobRunScriptForJob = (context, jobName, wait) => {
-    const commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
-    const commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
-    return `${(0, common_1.gcloudRunCmd)()} jobs execute ${jobName.toString()} ${commonArgsString}${wait ? " --wait" : ""}`;
-};
-const getDeleteSchedulesScripts = (context) => {
-    const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
-    const schedules = getSchedules(context);
-    const argsString = (0, createArgsString_1.createArgsString)({
-        project: deployConfig.projectId,
-        location: deployConfig.region,
-    });
-    return schedules
-        .map(({ name }) => {
-        return [`${(0, common_1.gcloudSchedulerCmd)()} jobs delete ${name} ${argsString}`];
-    })
-        .flat();
-};
-exports.getDeleteSchedulesScripts = getDeleteSchedulesScripts;
+const volumes_1 = __nccwpck_require__(60847);
+const onDeploy_1 = __nccwpck_require__(2358);
 const getDeleteJobsScripts = (context) => {
     const commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
     const commonArgsString = (0, createArgsString_1.createArgsString)(commonArgs);
-    const jobsWithNames = getCloudRunJobsWithNames(context);
-    return jobsWithNames.flatMap(({ jobName }) => [
+    const jobsWithNames = (0, exports.getCloudRunJobsWithNames)(context);
+    return jobsWithNames.flatMap(({ fullJobName }) => [
         // first delete all job executions. Otherwise delete might fail if one of those is still running
-        `${(0, common_1.gcloudRunCmd)()} jobs executions list ${commonArgsString} --job ${jobName} --format="value(name)" | xargs -I {} ${(0, common_1.gcloudRunCmd)()} jobs executions delete {}  --quiet ${commonArgsString}`,
-        `${(0, common_1.gcloudRunCmd)()} jobs delete ${jobName} ${commonArgsString}`,
+        `${(0, common_1.gcloudRunCmd)()} jobs executions list ${commonArgsString} --job ${fullJobName} --format="value(name)" | xargs -I {} ${(0, common_1.gcloudRunCmd)()} jobs executions delete {}  --quiet ${commonArgsString}`,
+        `${(0, common_1.gcloudRunCmd)()} jobs delete ${fullJobName} ${commonArgsString}`,
     ]);
 };
 exports.getDeleteJobsScripts = getDeleteJobsScripts;
-const getJobRunScripts = (context, when) => {
-    const jobsWithNames = getCloudRunJobsWithNames(context);
-    return jobsWithNames
-        .filter(({ job }) => job.when === when)
-        .map(({ jobName, job }) => {
-        var _a;
-        // always wait for completion for preStop and postStop jobs
-        // since stop will delete the jobs afterwards, so they will fail
-        const waitForCompletion = ["preStop", "postStop"].includes(when)
-            ? true
-            : "waitForCompletion" in job
-                ? ((_a = job.waitForCompletion) !== null && _a !== void 0 ? _a : false)
-                : false;
-        return getJobRunScriptForJob(context, jobName, waitForCompletion);
-    });
-};
-exports.getJobRunScripts = getJobRunScripts;
-const getJobCreateScripts = (context) => getCloudRunJobsWithNames(context).map(({ job, jobName }, jobIndex) => {
-    var _a, _b, _c, _d;
+const getJobCreateScripts = (context) => (0, exports.getCloudRunJobsWithNames)(context).map(({ job, fullJobName }, jobIndex) => {
+    var _a, _b, _c, _d, _e;
     const commandArray = Array.isArray(job.command)
         ? job.command
         : job.command.split(" ");
     const { image: commonImage, project, region, ...deployArgs } = (0, common_1.getCommonDeployArgs)(context);
     const commonDeployArgsString = (0, createArgsString_1.createArgsString)({
         command: `"${commandArray.join(",")}"`,
+        args: (0, onDeploy_1.getCloudRunJobArgsArg)(job.args),
         labels: `"${(0, common_1.makeLabelString)((0, getLabels_1.getLabels)(context))},cloud-run-job-name=$current_job_name"`,
         image: `"${(_a = job.image) !== null && _a !== void 0 ? _a : commonImage}"`,
         project,
@@ -6852,7 +6921,7 @@ const getJobCreateScripts = (context) => getCloudRunJobsWithNames(context).map((
         parallelism: (_c = job.parallelism) !== null && _c !== void 0 ? _c : 1,
         "task-timeout": (_d = job.timeout) !== null && _d !== void 0 ? _d : "10m",
         "env-vars-file": constants_1.ENV_VARS_FILENAME,
-        "max-retries": 0,
+        "max-retries": (_e = job.maxRetries) !== null && _e !== void 0 ? _e : 0,
         ...deployArgs,
         // network
         "vpc-connector": job === null || job === void 0 ? void 0 : job.vpcConnector,
@@ -6864,7 +6933,7 @@ const getJobCreateScripts = (context) => getCloudRunJobsWithNames(context).map((
         jobIndex === 0
             ? `exist_job_names="$(\n  ${(0, common_1.gcloudRunCmd)()} jobs list --filter='metadata.name ~ ${context.env}.*${context.name}' --format='value(name)' --limit=999 --project='${project}' --region='${region}'\n)"`
             : null,
-        `current_job_name="${jobName}"`,
+        `current_job_name="${fullJobName}"`,
         'if grep "$current_job_name" <<<"$exist_job_names" >/dev/null; then',
         `  ${(0, common_1.gcloudRunCmd)()} jobs update "$current_job_name" ${commonDeployArgsString}`,
         "else",
@@ -6875,75 +6944,20 @@ const getJobCreateScripts = (context) => getCloudRunJobsWithNames(context).map((
         .join("\n");
 });
 exports.getJobCreateScripts = getJobCreateScripts;
-const getCreateScheduleScripts = (context) => {
-    const schedules = getSchedules(context);
-    const { region: location, projectId: project } = (0, common_1.getCloudRunDeployConfig)(context);
-    return schedules.map((scheduler, jobIndex) => {
-        var _a;
-        const uri = getSchedulerUrl(scheduler, context);
-        const argsString = (0, createArgsString_1.createArgsString)({
-            project,
-            location,
-            uri: `"$current_job_uri"`,
-            "http-method": "POST",
-            "oauth-service-account-email": `"$GCLOUD_PROJECT_NUMBER-compute@developer.gserviceaccount.com"`,
-            schedule: `"${scheduler.schedule}"`,
-            "max-retry-attempts": (_a = scheduler.maxRetryAttempts) !== null && _a !== void 0 ? _a : 0,
-        });
-        return [
-            jobIndex === 0
-                ? `exist_scheduler_names="$(\n  ${(0, common_1.gcloudSchedulerCmd)()} jobs list --filter='httpTarget.uri ~ ${context.env}.*${context.name}' --format='value(name)' --limit=999 --location='${location}' --project='${project}'\n)"`
-                : null,
-            `current_job_uri="${uri}"`,
-            `current_scheduler_name="${scheduler.name}"`,
-            `if grep "$current_scheduler_name" <<<"$exist_scheduler_names" >/dev/null; then`,
-            `  ${(0, common_1.gcloudSchedulerCmd)()} jobs update http "$current_scheduler_name" ${argsString}`,
-            `else`,
-            `  ${(0, common_1.gcloudSchedulerCmd)()} jobs create http "$current_scheduler_name" ${argsString}`,
-            `fi`,
-        ]
-            .filter(utils_1.notNil)
-            .join("\n");
-    });
-};
-exports.getCreateScheduleScripts = getCreateScheduleScripts;
-const getSchedulerUrl = (scheduler, context) => {
-    if (scheduler.type === "cloudRunJob") {
-        const { region: location, projectId: project } = (0, common_1.getCloudRunDeployConfig)(context);
-        const uriBase = `https://${location}-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/${project}/jobs`;
-        return `${uriBase}/${scheduler.jobName}:run`;
-    }
-    throw new Error(`Unknown scheduler type: ${scheduler.type}`);
-};
-const getSchedules = (context) => {
-    const jobsWithNames = getCloudRunJobsWithNames(context);
-    return jobsWithNames
-        .filter((entry) => entry.job.when === "schedule")
-        .map(({ job: { maxRetryAttempts, schedule }, jobName }) => {
-        const schedulerName = jobName.concat("-scheduler");
-        return {
-            name: schedulerName,
-            maxRetryAttempts,
-            schedule,
-            type: "cloudRunJob",
-            jobName,
-        };
-    });
-};
 const getCloudRunJobsWithNames = (context) => {
     var _a;
     const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
-    const getFullJobName = (name) => (0, jobName_1.getCloudRunJobName)(context.environment.fullName, name);
     const jobsWithNames = Object.entries((_a = deployConfig.jobs) !== null && _a !== void 0 ? _a : {})
         // filter out disabled jobs
         .filter((entry) => Boolean(entry[1]))
-        .map(([jobKey, job]) => ({
-        jobName: getFullJobName(jobKey),
+        .map(([jobName, job]) => ({
+        fullJobName: (0, jobName_1.getFullJobName)(context, jobName),
         job,
-        jobKey,
+        jobName,
     }));
     return jobsWithNames;
 };
+exports.getCloudRunJobsWithNames = getCloudRunJobsWithNames;
 //# sourceMappingURL=cloudRunJobs.js.map
 
 /***/ }),
@@ -7095,6 +7109,241 @@ exports.ENV_VARS_FILENAME = "____envvars.yaml";
 
 /***/ }),
 
+/***/ 2358:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.getCloudRunJobArgsArg = exports.getOnDeployExecuteScript = void 0;
+const createArgsString_1 = __nccwpck_require__(49598);
+const jobName_1 = __nccwpck_require__(9626);
+const cloudRunJobs_1 = __nccwpck_require__(61224);
+const common_1 = __nccwpck_require__(73325);
+const getOnDeployExecuteScript = (context, when) => {
+    const executes = getExecutes(context);
+    return executes
+        .filter(({ config }) => config.when === when)
+        .map((execute) => {
+        return getJobRunScriptForExecute(context, execute);
+    });
+};
+exports.getOnDeployExecuteScript = getOnDeployExecuteScript;
+const getExecutes = (context) => {
+    var _a;
+    const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+    return [
+        ...getLegacyExecutes(context),
+        ...Object.entries((_a = deployConfig.execute) !== null && _a !== void 0 ? _a : {}).flatMap(([key, value]) => {
+            if (!value || (value.when !== "schedule" && value.type !== "job")) {
+                return [];
+            }
+            return [
+                {
+                    jobName: key,
+                    config: value,
+                },
+            ];
+        }),
+    ];
+};
+const getLegacyExecutes = (context) => {
+    const jobsWithNames = (0, cloudRunJobs_1.getCloudRunJobsWithNames)(context);
+    return jobsWithNames.flatMap(({ jobName, job }) => {
+        if (!job.when ||
+            !["preDeploy", "postDeploy", "preStop", "postStop"].includes(job.when)) {
+            return [];
+        }
+        return [
+            {
+                jobName,
+                config: {
+                    job: jobName,
+                    type: "job",
+                    when: job.when,
+                    ...(job.when === "preDeploy" || job.when === "postDeploy"
+                        ? {
+                            waitForCompletion: job.waitForCompletion,
+                        }
+                        : {}),
+                },
+            },
+        ];
+    });
+};
+const getJobRunScriptForExecute = (context, { jobName, config }) => {
+    var _a;
+    const commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
+    // always wait for completion for preStop and postStop jobs
+    // since stop will delete the jobs afterwards, so they will fail
+    const waitForCompletion = ["preStop", "postStop"].includes(config.when)
+        ? true // always
+        : "waitForCompletion" in config
+            ? ((_a = config.waitForCompletion) !== null && _a !== void 0 ? _a : false) // depends on config
+            : false;
+    const argString = (0, createArgsString_1.createArgsString)({
+        ...commonArgs,
+        wait: waitForCompletion === true ? true : undefined,
+        args: (0, exports.getCloudRunJobArgsArg)(config.args),
+    });
+    const fullJobName = (0, jobName_1.getFullJobName)(context, jobName);
+    return `${(0, common_1.gcloudRunCmd)()} jobs execute ${fullJobName.toString()} ${argString}`;
+};
+const getCloudRunJobArgsArg = (args) => {
+    return args !== undefined
+        ? args.length > 0
+            ? args === null || args === void 0 ? void 0 : args.map((arg) => `"${arg}"`).join(",")
+            : ""
+        : undefined;
+};
+exports.getCloudRunJobArgsArg = getCloudRunJobArgsArg;
+//# sourceMappingURL=onDeploy.js.map
+
+/***/ }),
+
+/***/ 3697:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.getCreateScheduleScript = exports.getDeleteSchedulesScript = void 0;
+const bash_1 = __nccwpck_require__(22990);
+const utils_1 = __nccwpck_require__(32497);
+const cloudRunExecutionUrl_1 = __nccwpck_require__(24856);
+const createArgsString_1 = __nccwpck_require__(49598);
+const jobName_1 = __nccwpck_require__(9626);
+const cloudRunJobs_1 = __nccwpck_require__(61224);
+const common_1 = __nccwpck_require__(73325);
+const getDeleteSchedulesScript = (context) => {
+    const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+    const schedules = getSchedules(context);
+    const argsString = (0, createArgsString_1.createArgsString)({
+        project: deployConfig.projectId,
+        location: deployConfig.region,
+    });
+    return schedules
+        .map(({ fullName }) => {
+        return [`${(0, common_1.gcloudSchedulerCmd)()} jobs delete ${fullName} ${argsString}`];
+    })
+        .flat();
+};
+exports.getDeleteSchedulesScript = getDeleteSchedulesScript;
+const getCreateScheduleScript = (context) => {
+    const schedules = getSchedules(context);
+    const { region: location, projectId: project } = (0, common_1.getCloudRunDeployConfig)(context);
+    return schedules.map(({ fullName, config }, jobIndex) => {
+        var _a;
+        const { uri, ...args } = getSchedulerArgs(config, context);
+        const argsString = (0, createArgsString_1.createArgsString)({
+            project,
+            location,
+            uri: `"$current_job_uri"`,
+            ...args,
+            schedule: `"${config.schedule}"`,
+            "max-retry-attempts": (_a = config.maxRetryAttempts) !== null && _a !== void 0 ? _a : 0,
+        });
+        return [
+            jobIndex === 0
+                ? `exist_scheduler_names="$(\n  ${(0, common_1.gcloudSchedulerCmd)()} jobs list --filter='httpTarget.uri ~ ${context.env}.*${context.name}' --format='value(name)' --limit=999 --location='${location}' --project='${project}'\n)"`
+                : null,
+            `current_job_uri="${uri}"`,
+            `current_scheduler_name="${fullName}"`,
+            `if grep "$current_scheduler_name" <<<"$exist_scheduler_names" >/dev/null; then`,
+            `  ${(0, common_1.gcloudSchedulerCmd)()} jobs update http "$current_scheduler_name" ${argsString}`,
+            `else`,
+            `  ${(0, common_1.gcloudSchedulerCmd)()} jobs create http "$current_scheduler_name" ${argsString}`,
+            `fi`,
+        ]
+            .filter(utils_1.notNil)
+            .join("\n");
+    });
+};
+exports.getCreateScheduleScript = getCreateScheduleScript;
+const getSchedulerArgs = (scheduler, context) => {
+    var _a;
+    if (scheduler.type === "job") {
+        const { projectId, region } = (0, common_1.getCloudRunDeployConfig)(context);
+        const 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,
+                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: ${scheduler.type}`);
+};
+const getSchedules = (context) => {
+    const legacyScheduleJobs = getLegacyJobSchedules(context);
+    const schedules = getScheduledExecutes(context);
+    return Object.entries({ ...legacyScheduleJobs, ...schedules }).map(([name, config]) => ({
+        name,
+        fullName: (0, jobName_1.getFullSchedulerName)(context, name),
+        config,
+    }));
+};
+const getLegacyJobSchedules = (context) => {
+    const jobsWithNames = (0, cloudRunJobs_1.getCloudRunJobsWithNames)(context);
+    return Object.fromEntries(jobsWithNames
+        .filter((entry) => entry.job.when === "schedule")
+        .map(({ job: { maxRetryAttempts, schedule }, jobName }) => {
+        const schedulerName = jobName.concat("-scheduler");
+        return [
+            schedulerName,
+            {
+                type: "job",
+                job: jobName,
+                maxRetryAttempts,
+                schedule,
+                when: "schedule",
+            },
+        ];
+    }));
+};
+const getScheduledExecutes = (context) => {
+    var _a;
+    const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
+    return Object.fromEntries(Object.entries((_a = deployConfig.execute) !== null && _a !== void 0 ? _a : {}).flatMap(([key, value]) => {
+        if (!value || value.when !== "schedule") {
+            return [];
+        }
+        return [[key, value]];
+    }));
+};
+//# sourceMappingURL=schedules.js.map
+
+/***/ }),
+
 /***/ 53695:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
@@ -7111,9 +7360,11 @@ const cleanup_1 = __nccwpck_require__(67888);
 const database_1 = __nccwpck_require__(28206);
 const gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(46320);
 const cloudRunJobs_1 = __nccwpck_require__(61224);
+const onDeploy_1 = __nccwpck_require__(2358);
 const cloudRunServices_1 = __nccwpck_require__(17334);
 const common_1 = __nccwpck_require__(73325);
 const constants_1 = __nccwpck_require__(38865);
+const schedules_1 = __nccwpck_require__(3697);
 function getCloudRunDeployScripts(context) {
     var _a;
     const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
@@ -7128,14 +7379,14 @@ function getCloudRunDeployScripts(context) {
             ...(deployConfig.cloudSql
                 ? (0, database_1.getDatabaseCreateScript)(context, deployConfig) // we create the db, so that we can also delete it afterwards
                 : []),
-            ...(0, cloudRunJobs_1.getCreateScheduleScripts)(context),
+            ...(0, schedules_1.getCreateScheduleScript)(context),
             ...(0, cloudRunJobs_1.getJobCreateScripts)(context),
-            ...(0, cloudRunJobs_1.getJobRunScripts)(context, "preDeploy"),
+            ...(0, onDeploy_1.getOnDeployExecuteScript)(context, "preDeploy"),
             ...(deployConfig.service !== false
                 ? [(0, cloudRunServices_1.getServiceDeployScript)(context, deployConfig.service)]
                 : []),
             ...Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).map(([name, service]) => (0, cloudRunServices_1.getServiceDeployScript)(context, service, "-" + name)),
-            ...(0, cloudRunJobs_1.getJobRunScripts)(context, "postDeploy"),
+            ...(0, onDeploy_1.getOnDeployExecuteScript)(context, "postDeploy"),
         ]),
         ...(0, gitlab_1.collapseableSection)("cleanup", "Cleanup")((0, cleanup_1.getRemoveOldRevisionsAndImagesCommand)(context, "postDeploy")),
         ...(0, sbom_1.getDependencyTrackUploadScript)(context),
@@ -7158,6 +7409,8 @@ const cleanup_1 = __nccwpck_require__(67888);
 const database_1 = __nccwpck_require__(28206);
 const gcloudServiceAccountLoginCommands_1 = __nccwpck_require__(46320);
 const cloudRunJobs_1 = __nccwpck_require__(61224);
+const onDeploy_1 = __nccwpck_require__(2358);
+const schedules_1 = __nccwpck_require__(3697);
 const cloudRunServices_1 = __nccwpck_require__(17334);
 const common_1 = __nccwpck_require__(73325);
 function getCloudRunStopScripts(context) {
@@ -7165,11 +7418,11 @@ function getCloudRunStopScripts(context) {
     const deployConfig = (0, common_1.getCloudRunDeployConfig)(context);
     return [
         ...(0, gcloudServiceAccountLoginCommands_1.gcloudServiceAccountLoginCommands)(context),
-        ...(0, cloudRunJobs_1.getJobRunScripts)(context, "preStop"),
+        ...(0, onDeploy_1.getOnDeployExecuteScript)(context, "preStop"),
         ...(deployConfig.service !== false ? (0, cloudRunServices_1.getServiceDeleteScript)(context) : []),
         ...Object.entries((_a = deployConfig.additionalServices) !== null && _a !== void 0 ? _a : {}).flatMap(([name]) => (0, cloudRunServices_1.getServiceDeleteScript)(context, name)),
-        ...(0, cloudRunJobs_1.getJobRunScripts)(context, "postStop"),
-        ...(0, cloudRunJobs_1.getDeleteSchedulesScripts)(context),
+        ...(0, onDeploy_1.getOnDeployExecuteScript)(context, "postStop"),
+        ...(0, schedules_1.getDeleteSchedulesScript)(context),
         ...(0, cloudRunJobs_1.getDeleteJobsScripts)(context),
         ...(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop
             ? (0, database_1.getDatabaseDeleteScript)(context, deployConfig)
@@ -7274,8 +7527,8 @@ const context_1 = __nccwpck_require__(5875);
 const gitlab_1 = __nccwpck_require__(38490);
 const utils_1 = __nccwpck_require__(62089);
 const createJobs_1 = __nccwpck_require__(34069);
+const cloudRunExecutionUrl_1 = __nccwpck_require__(24856);
 const database_1 = __nccwpck_require__(28206);
-const jobName_1 = __nccwpck_require__(9626);
 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";
@@ -7331,7 +7584,11 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
         const jobTriggers = deployConfigRaw && deployConfigRaw.jobs
             ? Object.fromEntries(Object.entries(deployConfigRaw.jobs).map(([name, job]) => [
                 "CLOUD_RUN_JOB_TRIGGER_URL_" + (0, gitlab_1.sanitizeForBashVariable)(name),
-                `https://${deployConfigRaw.region}-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/${deployConfigRaw.projectId}/jobs/${(0, jobName_1.getCloudRunJobName)(fullName, name)}:run`,
+                (0, cloudRunExecutionUrl_1.getCloudRunJobExecuteUrl)(name, {
+                    appFullName: fullName,
+                    projectId: deployConfigRaw.projectId,
+                    region: deployConfigRaw.region,
+                }),
             ]))
             : {};
         return {
@@ -7351,6 +7608,24 @@ exports.GCLOUD_RUN_DEPLOY_TYPE = {
 
 /***/ }),
 
+/***/ 24856:
+/***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.getCloudRunJobExecuteUrl = void 0;
+const jobName_1 = __nccwpck_require__(9626);
+function getCloudRunJobExecuteUrl(jobName, { region, projectId, appFullName, }) {
+    const uriBase = `https://${region}-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/${projectId}/jobs`;
+    const fullJobName = (0, jobName_1.getCloudRunJobName)(appFullName, jobName);
+    return `${uriBase}/${fullJobName}:run`;
+}
+exports.getCloudRunJobExecuteUrl = getCloudRunJobExecuteUrl;
+//# sourceMappingURL=cloudRunExecutionUrl.js.map
+
+/***/ }),
+
 /***/ 49598:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
@@ -7485,9 +7760,15 @@ exports.getServiceName = getServiceName;
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getCloudRunJobName = void 0;
+exports.getFullSchedulerName = exports.getCloudRunSchedulerName = exports.getFullJobName = exports.getCloudRunJobName = void 0;
 const getCloudRunJobName = (fullAppName, jobName) => fullAppName.toLowerCase().concat("-" + jobName.toLowerCase());
 exports.getCloudRunJobName = getCloudRunJobName;
+const getFullJobName = (context, name) => (0, exports.getCloudRunJobName)(context.environment.fullName, name);
+exports.getFullJobName = getFullJobName;
+const getCloudRunSchedulerName = (fullAppName, schedulerName) => fullAppName.toLowerCase().concat("-" + schedulerName.toLowerCase());
+exports.getCloudRunSchedulerName = getCloudRunSchedulerName;
+const getFullSchedulerName = (context, name) => (0, exports.getCloudRunSchedulerName)(context.environment.fullName, name);
+exports.getFullSchedulerName = getFullSchedulerName;
 //# sourceMappingURL=jobName.js.map
 
 /***/ }),
@@ -8258,7 +8539,7 @@ 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);
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.isOfDeployType = void 0;
+exports.getDeployConfigType = exports.isOfDeployType = void 0;
 __exportStar(__nccwpck_require__(30461), exports);
 __exportStar(__nccwpck_require__(66938), exports);
 __exportStar(__nccwpck_require__(60835), exports);
@@ -8267,6 +8548,12 @@ const isOfDeployType = (t, ...types) => {
     return t && types.includes(t.type) ? true : false;
 };
 exports.isOfDeployType = isOfDeployType;
+const getDeployConfigType = (t) => {
+    if (!t)
+        return undefined;
+    return t.type;
+};
+exports.getDeployConfigType = getDeployConfigType;
 //# sourceMappingURL=index.js.map
 
 /***/ }),