@catladder/cli 0.0.0-main-ed835115 → 0.0.0-main-8a770211

package/dist/bundles/cli/index.js

@@ -5772,16 +5772,16 @@ exports.createRailsBuildJobs = createRailsBuildJobs;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.createRailsJobs = void 0;
 const build_1 = __nccwpck_require__(67261);
-const test_1 = __nccwpck_require__(47910);
+const testJob_1 = __nccwpck_require__(65771);
 const createRailsJobs = (context) => {
-    return [...(0, test_1.createRailsTestJobs)(context), ...(0, build_1.createRailsBuildJobs)(context)];
+    return [...(0, testJob_1.createRailsTestJobs)(context), ...(0, build_1.createRailsBuildJobs)(context)];
 };
 exports.createRailsJobs = createRailsJobs;
 //# sourceMappingURL=index.js.map
 
 /***/ }),
 
-/***/ 47910:
+/***/ 65771:
 /***/ ((__unused_webpack_module, exports, __nccwpck_require__) => {
 
 "use strict";
@@ -5888,7 +5888,7 @@ const createRailsTestJobs = (context) => {
     return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };
 exports.createRailsTestJobs = createRailsTestJobs;
-//# sourceMappingURL=test.js.map
+//# sourceMappingURL=testJob.js.map
 
 /***/ }),
 
@@ -7466,6 +7466,7 @@ exports.ENV_VARS_FILENAME = "____envvars.yaml";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getOnDeployExecuteScript = void 0;
+const utils_1 = __nccwpck_require__(32497);
 const createArgsString_1 = __nccwpck_require__(49598);
 const getJobOrServiceArgs_1 = __nccwpck_require__(61741);
 const jobName_1 = __nccwpck_require__(9626);
@@ -7475,7 +7476,7 @@ const getOnDeployExecuteScript = (context, when) => {
     const executes = getExecutes(context);
     return executes
         .filter(({ config }) => config.when === when)
-        .map((execute) => {
+        .flatMap((execute) => {
         return getJobRunScriptForExecute(context, execute);
     });
 };
@@ -7486,7 +7487,8 @@ const getExecutes = (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")) {
+            // remove all schedule executes
+            if (!value) {
                 return [];
             }
             return [
@@ -7524,21 +7526,30 @@ const getLegacyExecutes = (context) => {
 };
 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, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(config.args),
-    });
-    const fullJobName = (0, jobName_1.getFullJobName)(context, jobName);
-    return `${(0, common_1.gcloudRunCmd)()} jobs execute ${fullJobName.toString()} ${argString}`;
+    const type = config.type;
+    if (type === "script") {
+        return (0, utils_1.ensureArray)(config.script);
+    }
+    else if (type === "job") {
+        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, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(config.args),
+        });
+        const fullJobName = (0, jobName_1.getFullJobName)(context, jobName);
+        return [
+            `${(0, common_1.gcloudRunCmd)()} jobs execute ${fullJobName.toString()} ${argString}`,
+        ];
+    }
+    throw new Error(`unsupported execute type: ${type}`);
 };
 //# sourceMappingURL=onDeploy.js.map
 
@@ -120278,6 +120289,120 @@ class AggregateError extends Error {
 module.exports = AggregateError;
 
 
+/***/ }),
+
+/***/ 56575:
+/***/ ((module) => {
+
+"use strict";
+
+var ESC = '\u001b[';
+var x = module.exports;
+
+x.cursorTo = function (x, y) {
+	if (arguments.length === 0) {
+		return ESC + 'H';
+	}
+
+	if (arguments.length === 1) {
+		return ESC + (x + 1) + 'G';
+	}
+
+	return ESC + (y + 1) + ';' + (x + 1) + 'H';
+};
+
+x.cursorMove = function (x, y) {
+	var ret = '';
+
+	if (x < 0) {
+		ret += ESC + (-x) + 'D';
+	} else if (x > 0) {
+		ret += ESC + x + 'C';
+	}
+
+	if (y < 0) {
+		ret += ESC + (-y) + 'A';
+	} else if (y > 0) {
+		ret += ESC + y + 'B';
+	}
+
+	return ret;
+};
+
+x.cursorUp = function (count) {
+	return ESC + (typeof count === 'number' ? count : 1) + 'A';
+};
+
+x.cursorDown = function (count) {
+	return ESC + (typeof count === 'number' ? count : 1) + 'B';
+};
+
+x.cursorForward = function (count) {
+	return ESC + (typeof count === 'number' ? count : 1) + 'C';
+};
+
+x.cursorBackward = function (count) {
+	return ESC + (typeof count === 'number' ? count : 1) + 'D';
+};
+
+x.cursorLeft = ESC + '1000D';
+x.cursorSavePosition = ESC + 's';
+x.cursorRestorePosition = ESC + 'u';
+x.cursorGetPosition = ESC + '6n';
+x.cursorNextLine = ESC + 'E';
+x.cursorPrevLine = ESC + 'F';
+x.cursorHide = ESC + '?25l';
+x.cursorShow = ESC + '?25h';
+
+x.eraseLines = function (count) {
+	var clear = '';
+
+	for (var i = 0; i < count; i++) {
+		clear += x.cursorLeft + x.eraseEndLine + (i < count - 1 ? x.cursorUp() : '');
+	}
+
+	return clear;
+};
+
+x.eraseEndLine = ESC + 'K';
+x.eraseStartLine = ESC + '1K';
+x.eraseLine = ESC + '2K';
+x.eraseDown = ESC + 'J';
+x.eraseUp = ESC + '1J';
+x.eraseScreen = ESC + '2J';
+x.scrollUp = ESC + 'S';
+x.scrollDown = ESC + 'T';
+
+x.clearScreen = '\u001bc';
+x.beep = '\u0007';
+
+x.image = function (buf, opts) {
+	opts = opts || {};
+
+	var ret = '\u001b]1337;File=inline=1';
+
+	if (opts.width) {
+		ret += ';width=' + opts.width;
+	}
+
+	if (opts.height) {
+		ret += ';height=' + opts.height;
+	}
+
+	if (opts.preserveAspectRatio === false) {
+		ret += ';preserveAspectRatio=0';
+	}
+
+	return ret + ':' + buf.toString('base64') + '\u0007';
+};
+
+x.iTerm = {};
+
+x.iTerm.setCwd = function (cwd) {
+	return '\u001b]50;CurrentDir=' + (cwd || process.cwd()) + '\u0007';
+};
+
+
 /***/ }),
 
 /***/ 45067:
@@ -188071,7 +188196,7 @@ Paginator.prototype.paginate = function (output, active) {
 
 "use strict";
 
-var ansiEscapes = __nccwpck_require__(14497);
+var ansiEscapes = __nccwpck_require__(56575);
 
 /**
  * Move cursor left by `x`
@@ -188299,120 +188424,6 @@ exports.fetchAsyncQuestionProperty = function (question, prop, answers) {
 };
 
 
-/***/ }),
-
-/***/ 14497:
-/***/ ((module) => {
-
-"use strict";
-
-var ESC = '\u001b[';
-var x = module.exports;
-
-x.cursorTo = function (x, y) {
-	if (arguments.length === 0) {
-		return ESC + 'H';
-	}
-
-	if (arguments.length === 1) {
-		return ESC + (x + 1) + 'G';
-	}
-
-	return ESC + (y + 1) + ';' + (x + 1) + 'H';
-};
-
-x.cursorMove = function (x, y) {
-	var ret = '';
-
-	if (x < 0) {
-		ret += ESC + (-x) + 'D';
-	} else if (x > 0) {
-		ret += ESC + x + 'C';
-	}
-
-	if (y < 0) {
-		ret += ESC + (-y) + 'A';
-	} else if (y > 0) {
-		ret += ESC + y + 'B';
-	}
-
-	return ret;
-};
-
-x.cursorUp = function (count) {
-	return ESC + (typeof count === 'number' ? count : 1) + 'A';
-};
-
-x.cursorDown = function (count) {
-	return ESC + (typeof count === 'number' ? count : 1) + 'B';
-};
-
-x.cursorForward = function (count) {
-	return ESC + (typeof count === 'number' ? count : 1) + 'C';
-};
-
-x.cursorBackward = function (count) {
-	return ESC + (typeof count === 'number' ? count : 1) + 'D';
-};
-
-x.cursorLeft = ESC + '1000D';
-x.cursorSavePosition = ESC + 's';
-x.cursorRestorePosition = ESC + 'u';
-x.cursorGetPosition = ESC + '6n';
-x.cursorNextLine = ESC + 'E';
-x.cursorPrevLine = ESC + 'F';
-x.cursorHide = ESC + '?25l';
-x.cursorShow = ESC + '?25h';
-
-x.eraseLines = function (count) {
-	var clear = '';
-
-	for (var i = 0; i < count; i++) {
-		clear += x.cursorLeft + x.eraseEndLine + (i < count - 1 ? x.cursorUp() : '');
-	}
-
-	return clear;
-};
-
-x.eraseEndLine = ESC + 'K';
-x.eraseStartLine = ESC + '1K';
-x.eraseLine = ESC + '2K';
-x.eraseDown = ESC + 'J';
-x.eraseUp = ESC + '1J';
-x.eraseScreen = ESC + '2J';
-x.scrollUp = ESC + 'S';
-x.scrollDown = ESC + 'T';
-
-x.clearScreen = '\u001bc';
-x.beep = '\u0007';
-
-x.image = function (buf, opts) {
-	opts = opts || {};
-
-	var ret = '\u001b]1337;File=inline=1';
-
-	if (opts.width) {
-		ret += ';width=' + opts.width;
-	}
-
-	if (opts.height) {
-		ret += ';height=' + opts.height;
-	}
-
-	if (opts.preserveAspectRatio === false) {
-		ret += ';preserveAspectRatio=0';
-	}
-
-	return ret + ':' + buf.toString('base64') + '\u0007';
-};
-
-x.iTerm = {};
-
-x.iTerm.setCwd = function (cwd) {
-	return '\u001b]50;CurrentDir=' + (cwd || process.cwd()) + '\u0007';
-};
-
-
 /***/ }),
 
 /***/ 86695:
@@ -291130,120 +291141,6 @@ Object.defineProperty(vorpal, 'activeCommand', {
   }
 });
 
-/***/ }),
-
-/***/ 37374:
-/***/ ((module) => {
-
-"use strict";
-
-var ESC = '\u001b[';
-var x = module.exports;
-
-x.cursorTo = function (x, y) {
-	if (arguments.length === 0) {
-		return ESC + 'H';
-	}
-
-	if (arguments.length === 1) {
-		return ESC + (x + 1) + 'G';
-	}
-
-	return ESC + (y + 1) + ';' + (x + 1) + 'H';
-};
-
-x.cursorMove = function (x, y) {
-	var ret = '';
-
-	if (x < 0) {
-		ret += ESC + (-x) + 'D';
-	} else if (x > 0) {
-		ret += ESC + x + 'C';
-	}
-
-	if (y < 0) {
-		ret += ESC + (-y) + 'A';
-	} else if (y > 0) {
-		ret += ESC + y + 'B';
-	}
-
-	return ret;
-};
-
-x.cursorUp = function (count) {
-	return ESC + (typeof count === 'number' ? count : 1) + 'A';
-};
-
-x.cursorDown = function (count) {
-	return ESC + (typeof count === 'number' ? count : 1) + 'B';
-};
-
-x.cursorForward = function (count) {
-	return ESC + (typeof count === 'number' ? count : 1) + 'C';
-};
-
-x.cursorBackward = function (count) {
-	return ESC + (typeof count === 'number' ? count : 1) + 'D';
-};
-
-x.cursorLeft = ESC + '1000D';
-x.cursorSavePosition = ESC + 's';
-x.cursorRestorePosition = ESC + 'u';
-x.cursorGetPosition = ESC + '6n';
-x.cursorNextLine = ESC + 'E';
-x.cursorPrevLine = ESC + 'F';
-x.cursorHide = ESC + '?25l';
-x.cursorShow = ESC + '?25h';
-
-x.eraseLines = function (count) {
-	var clear = '';
-
-	for (var i = 0; i < count; i++) {
-		clear += x.cursorLeft + x.eraseEndLine + (i < count - 1 ? x.cursorUp() : '');
-	}
-
-	return clear;
-};
-
-x.eraseEndLine = ESC + 'K';
-x.eraseStartLine = ESC + '1K';
-x.eraseLine = ESC + '2K';
-x.eraseDown = ESC + 'J';
-x.eraseUp = ESC + '1J';
-x.eraseScreen = ESC + '2J';
-x.scrollUp = ESC + 'S';
-x.scrollDown = ESC + 'T';
-
-x.clearScreen = '\u001bc';
-x.beep = '\u0007';
-
-x.image = function (buf, opts) {
-	opts = opts || {};
-
-	var ret = '\u001b]1337;File=inline=1';
-
-	if (opts.width) {
-		ret += ';width=' + opts.width;
-	}
-
-	if (opts.height) {
-		ret += ';height=' + opts.height;
-	}
-
-	if (opts.preserveAspectRatio === false) {
-		ret += ';preserveAspectRatio=0';
-	}
-
-	return ret + ':' + buf.toString('base64') + '\u0007';
-};
-
-x.iTerm = {};
-
-x.iTerm.setCwd = function (cwd) {
-	return '\u001b]50;CurrentDir=' + (cwd || process.cwd()) + '\u0007';
-};
-
-
 /***/ }),
 
 /***/ 41982:
@@ -291522,7 +291419,7 @@ module.exports = function (x) {
 
 "use strict";
 
-var ansiEscapes = __nccwpck_require__(37374);
+var ansiEscapes = __nccwpck_require__(56575);
 var cliCursor = __nccwpck_require__(22701);
 
 function main(stream) {

package/dist/pipeline/src/build/rails/index.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRailsJobs = void 0;
 const build_1 = require("./build");
-const test_1 = require("./test");
+const testJob_1 = require("./testJob");
 const createRailsJobs = (context) => {
-    return [...(0, test_1.createRailsTestJobs)(context), ...(0, build_1.createRailsBuildJobs)(context)];
+    return [...(0, testJob_1.createRailsTestJobs)(context), ...(0, build_1.createRailsBuildJobs)(context)];
 };
 exports.createRailsJobs = createRailsJobs;
 //# sourceMappingURL=index.js.map

package/dist/pipeline/src/build/rails/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/index.ts"],"names":[],"mappings":";;;AAEA,mCAA+C;AAC/C,iCAA6C;AAEtC,MAAM,eAAe,GAAG,CAC7B,OAAkC,EAClB,EAAE;IAClB,OAAO,CAAC,GAAG,IAAA,0BAAmB,EAAC,OAAO,CAAC,EAAE,GAAG,IAAA,4BAAoB,EAAC,OAAO,CAAC,CAAC,CAAC;AAC7E,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/index.ts"],"names":[],"mappings":";;;AAEA,mCAA+C;AAC/C,uCAAgD;AAEzC,MAAM,eAAe,GAAG,CAC7B,OAAkC,EAClB,EAAE;IAClB,OAAO,CAAC,GAAG,IAAA,6BAAmB,EAAC,OAAO,CAAC,EAAE,GAAG,IAAA,4BAAoB,EAAC,OAAO,CAAC,CAAC,CAAC;AAC7E,CAAC,CAAC;AAJW,QAAA,eAAe,mBAI1B"}

package/dist/pipeline/src/build/rails/{test.js → testJob.js}

@@ -101,4 +101,4 @@ const createRailsTestJobs = (context) => {
     return [auditJob, lintJob, testJob].filter(utils_1.notNil);
 };
 exports.createRailsTestJobs = createRailsTestJobs;
-//# sourceMappingURL=test.js.map
+//# sourceMappingURL=testJob.js.map

package/dist/pipeline/src/build/rails/testJob.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"testJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/build/rails/testJob.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOnDeployExecuteScript = void 0;
+const utils_1 = require("../../../../utils");
 const createArgsString_1 = require("../../utils/createArgsString");
 const getJobOrServiceArgs_1 = require("../../utils/getJobOrServiceArgs");
 const jobName_1 = require("../../utils/jobName");
@@ -10,7 +11,7 @@ const getOnDeployExecuteScript = (context, when) => {
     const executes = getExecutes(context);
     return executes
         .filter(({ config }) => config.when === when)
-        .map((execute) => {
+        .flatMap((execute) => {
         return getJobRunScriptForExecute(context, execute);
     });
 };
@@ -21,7 +22,8 @@ const getExecutes = (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")) {
+            // remove all schedule executes
+            if (!value) {
                 return [];
             }
             return [
@@ -59,20 +61,29 @@ const getLegacyExecutes = (context) => {
 };
 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, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(config.args),
-    });
-    const fullJobName = (0, jobName_1.getFullJobName)(context, jobName);
-    return `${(0, common_1.gcloudRunCmd)()} jobs execute ${fullJobName.toString()} ${argString}`;
+    const type = config.type;
+    if (type === "script") {
+        return (0, utils_1.ensureArray)(config.script);
+    }
+    else if (type === "job") {
+        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, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(config.args),
+        });
+        const fullJobName = (0, jobName_1.getFullJobName)(context, jobName);
+        return [
+            `${(0, common_1.gcloudRunCmd)()} jobs execute ${fullJobName.toString()} ${argString}`,
+        ];
+    }
+    throw new Error(`unsupported execute type: ${type}`);
 };
 //# sourceMappingURL=onDeploy.js.map

package/dist/pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.js.map

@@ -1 +1 @@
-{"version":3,"file":"onDeploy.js","sourceRoot":"","sources":["../../../../../../../../pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"onDeploy.js","sourceRoot":"","sources":["../../../../../../../../pipeline/src/deploy/cloudRun/createJobs/execute/onDeploy.ts"],"names":[],"mappings":"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"}

package/dist/pipeline/src/deploy/types/executeBase.d.ts

@@ -0,0 +1,24 @@
+type DeployConfigBaseExecuteScript = {
+    type: "script";
+    script: string | string[];
+};
+/**
+ * currently only supported for cloud run deployments
+ */
+export type DeployConfigBaseExecuteOnDeploy = DeployConfigBaseExecuteScript & ({
+    /**
+     * run the job before or after the deploy
+     */
+    when: "preDeploy" | "postDeploy";
+    /**
+     * whether to wait for completion of the job
+     */
+    waitForCompletion?: boolean;
+} | {
+    /**
+     * run the job before or after the environment is stopped
+     */
+    when: "preStop" | "postStop";
+});
+export type DeployConfigBaseExecute = DeployConfigBaseExecuteOnDeploy;
+export {};

package/dist/pipeline/src/deploy/types/executeBase.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=executeBase.js.map

package/dist/pipeline/src/deploy/types/executeBase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"executeBase.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/types/executeBase.ts"],"names":[],"mappings":""}

package/dist/pipeline/src/deploy/types/googleCloudRun.d.ts

@@ -1,5 +1,6 @@
 import type { DBVariablesMode } from "../cloudRun/utils/database";
 import type { DeployConfigBase } from "./base";
+import type { DeployConfigBaseExecute } from "./executeBase";
 export type Gcloudregion = "asia-east1" | "asia-northeast1" | "asia-northeast2" | "europe-north1" | "europe-southwest1" | "europe-west1" | "europe-west4" | "europe-west8" | "europe-west9" | "me-west1" | "us-central1" | "us-east1" | "us-east4" | "us-east5" | "us-south1" | "us-west1" | "asia-east2" | "asia-northeast3" | "asia-southeast1" | "asia-southeast2" | "asia-south1" | "asia-south2" | "australia-southeast1" | "australia-southeast2" | "europe-central2" | "europe-west2" | "europe-west3" | "europe-west6" | "northamerica-northeast1" | "northamerica-northeast2" | "southamerica-east1" | "southamerica-west1" | "us-west2" | "us-west3" | "us-west4";
 export type DeployConfigCloudRunCloudSql = {
     type: "unmanaged";
@@ -315,7 +316,7 @@ export type DeployConfigCloudRunWithVolumes = {
     volumes?: DeployConfigCloudRunVolumes;
 };
 export type DeployConfigCloudRunJob = DeployConfigCloudRunJobNormal | DeployConfigCloudRunJobWithSchedule;
-export type DeployConfigCloudRun = {
+export type DeployConfigCloudRun = Omit<DeployConfigBase, "execute"> & {
     /**
      * cloud run deployment.
      *
@@ -354,7 +355,7 @@ export type DeployConfigCloudRun = {
      */
     execute?: Record<string, DeployConfigCloudRunExecute | null>;
     debug?: boolean;
-} & DeployConfigBase;
+};
 export type DeployConfigCloudRunVolumes = Record<string, DeployConfigCloudRunVolume>;
 export type DeployConfigCloudRunVolume = {
     type: "cloud-storage";
@@ -409,7 +410,7 @@ export type DeployConfigCloudRunExecuteOnDeploy = DeployConfigCloudRunExecuteJob
      */
     when: "preStop" | "postStop";
 });
-export type DeployConfigCloudRunExecuteJob = DeployConfigCloudRunExecuteJobScheduled | DeployConfigCloudRunExecuteOnDeploy;
+export type DeployConfigCloudRunExecuteJob = DeployConfigBaseExecute | DeployConfigCloudRunExecuteJobScheduled | DeployConfigCloudRunExecuteOnDeploy;
 export type DeployConfigCloudRunExecuteHttp = {
     /**
      * set to "http" to run a http request
@@ -432,6 +433,6 @@ export type DeployConfigCloudRunExecuteHttp = {
      */
     headers?: Record<string, string>;
 } & WithSchedule;
-export type DeployConfigCloudRunExecute = DeployConfigCloudRunExecuteJob | DeployConfigCloudRunExecuteHttp;
+export type DeployConfigCloudRunExecute = DeployConfigBaseExecute | DeployConfigCloudRunExecuteJob | DeployConfigCloudRunExecuteHttp;
 export type DeployConfigCloudRunExecuteWithSchedule = Extract<DeployConfigCloudRunExecute, WithSchedule>;
 export {};