@catladder/cli 0.0.0-main-2f2f483e → 0.0.0-main-b38c122b

package/dist/pipeline/src/deploy/custom/deployJob.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCustomDeployJobs = void 0;
+const getAllCacheConfigsFromConfig_1 = require("../../build/cache/getAllCacheConfigsFromConfig");
 const yarn_1 = require("../../build/node/yarn");
 const runner_1 = require("../../runner");
 const base_1 = require("../base");
 const sbom_1 = require("../sbom");
 const types_1 = require("../types");
 const createCustomDeployJobs = (context) => {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
     if (!(0, types_1.isOfDeployType)(deployConfig, "custom")) {
         // should not happen
@@ -17,10 +18,10 @@ const createCustomDeployJobs = (context) => {
     const yarnInstall = (0, yarn_1.getYarnInstall)(context, {
         noCustomPostInstall: true,
     });
-    return (0, base_1.createDeployementJobs)(context, {
+    const result = (0, base_1.createDeployementJobs)(context, {
         deploy: {
             image: (_b = deployConfig.jobImage) !== null && _b !== void 0 ? _b : (0, runner_1.getRunnerImage)("jobs-default"),
-            cache: (_c = deployConfig.jobCache) !== null && _c !== void 0 ? _c : [],
+            cache: (0, getAllCacheConfigsFromConfig_1.getAllCacheConfigsFromConfig)(context, deployConfig),
             script: [
                 `cd ${context.build.dir}`,
                 ...(deployConfig.requiresYarnInstall ? yarnInstall : []),
@@ -31,7 +32,7 @@ const createCustomDeployJobs = (context) => {
         },
         stop: deployConfig.stopScript
             ? {
-                image: (_d = deployConfig.jobImage) !== null && _d !== void 0 ? _d : (0, runner_1.getRunnerImage)("jobs-default"),
+                image: (_c = deployConfig.jobImage) !== null && _c !== void 0 ? _c : (0, runner_1.getRunnerImage)("jobs-default"),
                 script: [
                     ...deployConfig.stopScript,
                     ...(0, sbom_1.getDependencyTrackDeleteScript)(context),
@@ -40,6 +41,7 @@ const createCustomDeployJobs = (context) => {
             }
             : undefined,
     });
+    return result;
 };
 exports.createCustomDeployJobs = createCustomDeployJobs;
 //# sourceMappingURL=deployJob.js.map

package/dist/pipeline/src/deploy/custom/deployJob.js.map

@@ -1 +1 @@
-{"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/custom/deployJob.ts"],"names":[],"mappings":";;;AAAA,gDAAuD;AACvD,yCAA8C;AAG9C,kCAAgD;AAChD,kCAGiB;AACjB,oCAA0C;AAEnC,MAAM,sBAAsB,GAAG,CACpC,OAAyB,EACT,EAAE;;IAClB,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC5C,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IACD,4DAA4D;IAC5D,MAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE;QAC1C,mBAAmB,EAAE,IAAI;KAC1B,CAAC,CAAC;IACH,OAAO,IAAA,4BAAqB,EAAC,OAAO,EAAE;QACpC,MAAM,EAAE;YACN,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;YAC9D,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,EAAE;YAClC,MAAM,EAAE;gBACN,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;gBACzB,GAAG,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxD,GAAG,YAAY,CAAC,MAAM;gBACtB,GAAG,IAAA,qCAA8B,EAAC,OAAO,CAAC;aAC3C;YACD,SAAS,EAAE,EAAE;SACd;QACD,IAAI,EAAE,YAAY,CAAC,UAAU;YAC3B,CAAC,CAAC;gBACE,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;gBAC9D,MAAM,EAAE;oBACN,GAAG,YAAY,CAAC,UAAU;oBAC1B,GAAG,IAAA,qCAA8B,EAAC,OAAO,CAAC;iBAC3C;gBACD,SAAS,EAAE,EAAE;aACd;YACH,CAAC,CAAC,SAAS;KACd,CAAC,CAAC;AACL,CAAC,CAAC;AApCW,QAAA,sBAAsB,0BAoCjC"}
+{"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../pipeline/src/deploy/custom/deployJob.ts"],"names":[],"mappings":";;;AAAA,iGAA8F;AAC9F,gDAAuD;AACvD,yCAA8C;AAG9C,kCAAgD;AAChD,kCAGiB;AACjB,oCAA0C;AAEnC,MAAM,sBAAsB,GAAG,CACpC,OAAyB,EACT,EAAE;;IAClB,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC5C,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IACD,4DAA4D;IAC5D,MAAM,WAAW,GAAG,IAAA,qBAAc,EAAC,OAAO,EAAE;QAC1C,mBAAmB,EAAE,IAAI;KAC1B,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,IAAA,4BAAqB,EAAC,OAAO,EAAE;QAC5C,MAAM,EAAE;YACN,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;YAC9D,KAAK,EAAE,IAAA,2DAA4B,EAAC,OAAO,EAAE,YAAY,CAAC;YAC1D,MAAM,EAAE;gBACN,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;gBACzB,GAAG,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;gBACxD,GAAG,YAAY,CAAC,MAAM;gBACtB,GAAG,IAAA,qCAA8B,EAAC,OAAO,CAAC;aAC3C;YACD,SAAS,EAAE,EAAE;SACd;QACD,IAAI,EAAE,YAAY,CAAC,UAAU;YAC3B,CAAC,CAAC;gBACE,KAAK,EAAE,MAAA,YAAY,CAAC,QAAQ,mCAAI,IAAA,uBAAc,EAAC,cAAc,CAAC;gBAC9D,MAAM,EAAE;oBACN,GAAG,YAAY,CAAC,UAAU;oBAC1B,GAAG,IAAA,qCAA8B,EAAC,OAAO,CAAC;iBAC3C;gBACD,SAAS,EAAE,EAAE;aACd;YACH,CAAC,CAAC,SAAS;KACd,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAtCW,QAAA,sBAAsB,0BAsCjC"}

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

@@ -1,5 +1,5 @@
+import type { WithCacheConfig } from "../../build";
 import type { GitlabJobImage } from "../../types";
-import type { CatladderJob } from "../../types/jobs";
 import type { DeployConfigBase } from "./base";
 export type DeployConfigCustom = {
     /**
@@ -26,8 +26,4 @@ export type DeployConfigCustom = {
      * image to use
      */
     jobImage?: GitlabJobImage;
-    /**
-     * customize cache for the job
-     */
-    jobCache?: CatladderJob["cache"];
-} & DeployConfigBase;
+} & DeployConfigBase & WithCacheConfig;

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

@@ -11,12 +11,12 @@ export type DeployConfigType = DeployConfig["type"];
 export type DeployConfigGeneric<T extends DeployConfigType> = Extract<DeployConfig, {
     type: T;
 }>;
-export declare const isOfDeployType: <T extends ("custom" | "kubernetes" | "dockerTag" | "google-cloudrun")[]>(t: DeployConfig | false | null | undefined, ...types: T) => t is Extract<DeployConfigCustom, {
+export declare const isOfDeployType: <T extends ("custom" | "kubernetes" | "google-cloudrun" | "dockerTag")[]>(t: DeployConfig | false | null | undefined, ...types: T) => t is Extract<DeployConfigKubernetes, {
     type: T[number];
-}> | Extract<DeployConfigDockerTag, {
+}> | Extract<DeployConfigCustom, {
     type: T[number];
 }> | Extract<DeployConfigCloudRun, {
     type: T[number];
-}> | Extract<DeployConfigKubernetes, {
+}> | Extract<DeployConfigDockerTag, {
     type: T[number];
 }>;

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

@@ -32,11 +32,11 @@ export declare const ENV_TYPES: {
  * @param trigger a trigger
  * @returns array of env types for that trigger. this is also the list of default envs
  */
-export declare const getEnvTypesByTrigger: (trigger: PipelineTrigger) => ("stage" | "dev" | "review" | "prod" | "local")[];
+export declare const getEnvTypesByTrigger: (trigger: PipelineTrigger) => ("stage" | "local" | "dev" | "review" | "prod")[];
 export declare const DEFAULT_ENVS: string[];
-export declare const DEFAULT_ENV_TYPES: ("stage" | "dev" | "review" | "prod" | "local")[];
+export declare const DEFAULT_ENV_TYPES: ("stage" | "local" | "dev" | "review" | "prod")[];
 export type EnvType = keyof typeof ENV_TYPES;
-export declare const isKnowEnvType: (env: string) => env is "stage" | "dev" | "review" | "prod" | "local";
+export declare const isKnowEnvType: (env: string) => env is "stage" | "local" | "dev" | "review" | "prod";
 export type EnvVars = {
     /**
      * public env vars (means: they are checked in the repo).

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

@@ -1,5 +1,11 @@
 import type { CacheConfig } from "../build";
 import type { CatladderJob } from "./jobs";
-export type JobDefintion = Partial<Omit<CatladderJob, "artifacts" | "cache">> & {
+export type AppBuildJobDefinition = Partial<Omit<CatladderJob, "artifacts" | "cache">> & {
     cache?: CacheConfig[];
 };
+export type DockerBuildJobDefinition = AppBuildJobDefinition;
+export type DeployJobDefinition = Pick<CatladderJob, "script" | "variables" | "image" | "artifacts" | "services" | "runnerVariables"> & {
+    cache?: CacheConfig[];
+};
+export type StopJobDefinition = Pick<CatladderJob, "script" | "variables" | "image" | "runnerVariables">;
+export type RollbackJobDefinition = Pick<CatladderJob, "script" | "variables" | "runnerVariables" | "image">;