@catladder/cli 0.0.0-main-cda13e03 → 0.0.0-main-10fc114c

package/dist/bundles/catenv/index.js

@@ -2415,7 +2415,7 @@ const getYarnInstall = (context, options) => {
 exports.getYarnInstall = getYarnInstall;
 const DOCKER_COPY_FILES = `COPY --chown=node:node $APP_DIR .`;
 const getDockerAppCopyAndBuildScript = (context) => {
-    var _a;
+    var _a, _b, _c;
     if (context.packageManagerInfo.isClassic) {
         return new BashExpression_1.BashExpression(`
 RUN ${YARN_INSTALL_CLASSIC} --production --ignore-scripts
@@ -2423,11 +2423,14 @@ ${DOCKER_COPY_FILES}
 RUN ${YARN_INSTALL_CLASSIC} --production 
     `.trim());
     }
+    const yarnRebuildEnabledDefault = context.build.type === "fromWorkspace"
+        ? ((_b = (_a = context.build.workspaceBuildConfig.dockerDefaults) === null || _a === void 0 ? void 0 : _a.yarnRebuildEnabled) !== null && _b !== void 0 ? _b : true)
+        : true;
     const yarnRebuildEnabled = "docker" in context.build.config &&
         context.build.config.docker &&
         "yarnRebuildEnabled" in context.build.config.docker
-        ? ((_a = context.build.config.docker.yarnRebuildEnabled) !== null && _a !== void 0 ? _a : true)
-        : true;
+        ? ((_c = context.build.config.docker.yarnRebuildEnabled) !== null && _c !== void 0 ? _c : yarnRebuildEnabledDefault)
+        : yarnRebuildEnabledDefault;
     // yarn >= 4 ships with build in plugins, see https://github.com/yarnpkg/berry/pull/4253
     // trying to import those fail on this version
     const doesNotShipWithBuiltInPlugins = ["2", "3"].some((v) => context.packageManagerInfo.version.startsWith(v));
@@ -4211,6 +4214,7 @@ exports.ENV_VARS_FILENAME = "____envvars.yaml";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.getOnDeployExecuteScript = void 0;
+const utils_1 = __nccwpck_require__(2497);
 const createArgsString_1 = __nccwpck_require__(9598);
 const getJobOrServiceArgs_1 = __nccwpck_require__(1741);
 const jobName_1 = __nccwpck_require__(9626);
@@ -4220,7 +4224,7 @@ const getOnDeployExecuteScript = (context, when) => {
     const executes = getExecutes(context);
     return executes
         .filter(({ config }) => config.when === when)
-        .map((execute) => {
+        .flatMap((execute) => {
         return getJobRunScriptForExecute(context, execute);
     });
 };
@@ -4231,7 +4235,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 [
@@ -4269,21 +4274,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
 

package/dist/bundles/cli/index.js

@@ -5667,7 +5667,7 @@ const getYarnInstall = (context, options) => {
 exports.getYarnInstall = getYarnInstall;
 const DOCKER_COPY_FILES = `COPY --chown=node:node $APP_DIR .`;
 const getDockerAppCopyAndBuildScript = (context) => {
-    var _a;
+    var _a, _b, _c;
     if (context.packageManagerInfo.isClassic) {
         return new BashExpression_1.BashExpression(`
 RUN ${YARN_INSTALL_CLASSIC} --production --ignore-scripts
@@ -5675,11 +5675,14 @@ ${DOCKER_COPY_FILES}
 RUN ${YARN_INSTALL_CLASSIC} --production 
     `.trim());
     }
+    const yarnRebuildEnabledDefault = context.build.type === "fromWorkspace"
+        ? ((_b = (_a = context.build.workspaceBuildConfig.dockerDefaults) === null || _a === void 0 ? void 0 : _a.yarnRebuildEnabled) !== null && _b !== void 0 ? _b : true)
+        : true;
     const yarnRebuildEnabled = "docker" in context.build.config &&
         context.build.config.docker &&
         "yarnRebuildEnabled" in context.build.config.docker
-        ? ((_a = context.build.config.docker.yarnRebuildEnabled) !== null && _a !== void 0 ? _a : true)
-        : true;
+        ? ((_c = context.build.config.docker.yarnRebuildEnabled) !== null && _c !== void 0 ? _c : yarnRebuildEnabledDefault)
+        : yarnRebuildEnabledDefault;
     // yarn >= 4 ships with build in plugins, see https://github.com/yarnpkg/berry/pull/4253
     // trying to import those fail on this version
     const doesNotShipWithBuiltInPlugins = ["2", "3"].some((v) => context.packageManagerInfo.version.startsWith(v));
@@ -7463,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);
@@ -7472,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);
     });
 };
@@ -7483,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 [
@@ -7521,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
 

package/dist/pipeline/src/build/node/yarn.js

@@ -37,7 +37,7 @@ const getYarnInstall = (context, options) => {
 exports.getYarnInstall = getYarnInstall;
 const DOCKER_COPY_FILES = `COPY --chown=node:node $APP_DIR .`;
 const getDockerAppCopyAndBuildScript = (context) => {
-    var _a;
+    var _a, _b, _c;
     if (context.packageManagerInfo.isClassic) {
         return new BashExpression_1.BashExpression(`
 RUN ${YARN_INSTALL_CLASSIC} --production --ignore-scripts
@@ -45,11 +45,14 @@ ${DOCKER_COPY_FILES}
 RUN ${YARN_INSTALL_CLASSIC} --production 
     `.trim());
     }
+    const yarnRebuildEnabledDefault = context.build.type === "fromWorkspace"
+        ? ((_b = (_a = context.build.workspaceBuildConfig.dockerDefaults) === null || _a === void 0 ? void 0 : _a.yarnRebuildEnabled) !== null && _b !== void 0 ? _b : true)
+        : true;
     const yarnRebuildEnabled = "docker" in context.build.config &&
         context.build.config.docker &&
         "yarnRebuildEnabled" in context.build.config.docker
-        ? ((_a = context.build.config.docker.yarnRebuildEnabled) !== null && _a !== void 0 ? _a : true)
-        : true;
+        ? ((_c = context.build.config.docker.yarnRebuildEnabled) !== null && _c !== void 0 ? _c : yarnRebuildEnabledDefault)
+        : yarnRebuildEnabledDefault;
     // yarn >= 4 ships with build in plugins, see https://github.com/yarnpkg/berry/pull/4253
     // trying to import those fail on this version
     const doesNotShipWithBuiltInPlugins = ["2", "3"].some((v) => context.packageManagerInfo.version.startsWith(v));

package/dist/pipeline/src/build/node/yarn.js.map

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

package/dist/pipeline/src/build/types.d.ts

@@ -348,6 +348,11 @@ export type WorkspaceBuildConfigBase = {
 export type WorkspaceBuildConfigNode = {
     type: "node";
     buildCommand?: string | string[];
+    /**
+     * set docker config defaults for the node build type.
+     * Currently not all options are supported.
+     */
+    dockerDefaults?: Pick<BuildConfigDockerBuiltInNode, "yarnRebuildEnabled">;
 } & WorkspaceBuildConfigBase;
 export type WorkspaceBuildConfig = WorkspaceBuildConfigNode;
 export {};

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":";;;AAOA,mEAAgE;AAChE,yEAAiF;AACjF,iDAAqD;AACrD,kDAA2D;AAC3D,sCAImB;AAMZ,MAAM,wBAAwB,GAAG,CACtC,OAAyB,EACzB,IAAiD,EACjD,EAAE;IACF,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;IAEtC,OAAO,QAAQ;SACZ,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC;SAC5C,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;QACf,OAAO,yBAAyB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAXW,QAAA,wBAAwB,4BAWnC;AAEF,MAAM,WAAW,GAAG,CAAC,OAAyB,EAAa,EAAE;;IAC3D,MAAM,YAAY,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,OAAO;QACL,GAAG,iBAAiB,CAAC,OAAO,CAAC;QAC7B,GAAG,MAAM,CAAC,OAAO,CAAC,MAAA,YAAY,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACrE,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;gBAClE,OAAO,EAAE,CAAC;YACZ,CAAC;YACD,OAAO;gBACL;oBACE,OAAO,EAAE,GAAG;oBACZ,MAAM,EAAE,KAAK;iBACH;aACb,CAAC;QACJ,CAAC,CAAC;KACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,CAAC,OAAyB,EAAa,EAAE;IACjE,MAAM,aAAa,GAAG,IAAA,uCAAwB,EAAC,OAAO,CAAC,CAAC;IAExD,OAAO,aAAa,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE;QAChD,IACE,CAAC,GAAG,CAAC,IAAI;YACT,CAAC,CAAC,WAAW,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EACtE,CAAC;YACD,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO;YACL;gBACE,OAAO;gBACP,MAAM,EAAE;oBACN,GAAG,EAAE,OAAO;oBACZ,IAAI,EAAE,KAAK;oBACX,IAAI,EAAE,GAAG,CAAC,IAAI;oBACd,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,WAAW,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY;wBACvD,CAAC,CAAC;4BACE,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;yBACzC;wBACH,CAAC,CAAC,EAAE,CAAC;iBACa;aACvB;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,CAChC,OAAyB,EACzB,EAAE,OAAO,EAAE,MAAM,EAAW,EAC5B,EAAE;;IACF,MAAM,UAAU,GAAG,IAAA,8BAAqB,EAAC,OAAO,CAAC,CAAC;IAElD,2DAA2D;IAC3D,gEAAgE;IAChE,MAAM,iBAAiB,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;QACrE,CAAC,CAAC,IAAI,CAAC,SAAS;QAChB,CAAC,CAAC,mBAAmB,IAAI,MAAM;YAC7B,CAAC,CAAC,CAAC,MAAA,MAAM,CAAC,iBAAiB,mCAAI,KAAK,CAAC,CAAC,oBAAoB;YAC1D,CAAC,CAAC,KAAK,CAAC;IAEZ,MAAM,SAAS,GAAG,IAAA,mCAAgB,EAAC;QACjC,GAAG,UAAU;QACb,IAAI,EAAE,iBAAiB,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;QACnD,IAAI,EAAE,IAAA,oDAA8B,EAAC,MAAM,CAAC,IAAI,CAAC;KAClD,CAAC,CAAC;IACH,MAAM,WAAW,GAAG,IAAA,wBAAc,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACrD,OAAO,GAAG,IAAA,qBAAY,GAAE,iBAAiB,WAAW,CAAC,QAAQ,EAAE,IAAI,SAAS,EAAE,CAAC;AACjF,CAAC,CAAC"}
+{"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 {};

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

@@ -1 +1 @@
-{"version":3,"file":"googleCloudRun.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/types/googleCloudRun.ts"],"names":[],"mappings":";;;AAuOa,QAAA,mBAAmB,GAA8B;IAC5D,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,WAAW;IAEjB,mBAAmB,EAAE,CAAC;IACtB,cAAc,EAAE,CAAC;IACjB,aAAa,EAAE,EAAE;IACjB,gBAAgB,EAAE,CAAC;CACpB,CAAC;AAEW,QAAA,oBAAoB,GAA8B;IAC7D,GAAG,2BAAmB;IAEtB,mBAAmB,EAAE,CAAC;IACtB,cAAc,EAAE,EAAE;IAClB,aAAa,EAAE,EAAE;IACjB,gBAAgB,EAAE,CAAC;CACpB,CAAC"}
+{"version":3,"file":"googleCloudRun.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/types/googleCloudRun.ts"],"names":[],"mappings":";;;AA2Oa,QAAA,mBAAmB,GAA8B;IAC5D,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,WAAW;IAEjB,mBAAmB,EAAE,CAAC;IACtB,cAAc,EAAE,CAAC;IACjB,aAAa,EAAE,EAAE;IACjB,gBAAgB,EAAE,CAAC;CACpB,CAAC;AAEW,QAAA,oBAAoB,GAA8B;IAC7D,GAAG,2BAAmB;IAEtB,mBAAmB,EAAE,CAAC;IACtB,cAAc,EAAE,EAAE;IAClB,aAAa,EAAE,EAAE;IACjB,gBAAgB,EAAE,CAAC;CACpB,CAAC"}