@catladder/cli 5.4.0 → 5.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bundles/catenv/index.js +41 -13
- package/dist/bundles/cli/index.js +41 -13
- package/dist/bundles/skills/catladder-config/SKILL.md +18 -7
- package/dist/bundles/skills/catladder-pipelines/SKILL.md +21 -18
- package/dist/packages/pipeline/src/config/configruedEnvs.js +7 -1
- package/dist/packages/pipeline/src/config/configruedEnvs.js.map +1 -1
- package/dist/packages/pipeline/src/context/getEnvInherit.d.ts +2 -2
- package/dist/packages/pipeline/src/context/getEnvInherit.js +5 -2
- package/dist/packages/pipeline/src/context/getEnvInherit.js.map +1 -1
- package/dist/packages/pipeline/src/context/getEnvInstance.d.ts +2 -2
- package/dist/packages/pipeline/src/context/getEnvInstance.js.map +1 -1
- package/dist/packages/pipeline/src/context/getEnvOn.d.ts +2 -2
- package/dist/packages/pipeline/src/context/getEnvOn.js +1 -1
- package/dist/packages/pipeline/src/context/getEnvOn.js.map +1 -1
- package/dist/packages/pipeline/src/context/getEnvType.d.ts +3 -3
- package/dist/packages/pipeline/src/context/getEnvType.js +1 -1
- package/dist/packages/pipeline/src/context/getEnvType.js.map +1 -1
- package/dist/packages/pipeline/src/context/getEnvironmentContext.js +3 -2
- package/dist/packages/pipeline/src/context/getEnvironmentContext.js.map +1 -1
- package/dist/packages/pipeline/src/deploy/cloudRun/createJobs/execute/schedules.js +3 -1
- package/dist/packages/pipeline/src/deploy/cloudRun/createJobs/execute/schedules.js.map +1 -1
- package/dist/packages/pipeline/src/deploy/cloudRun/utils/cloudRunExecutionUrl.d.ts +1 -1
- package/dist/packages/pipeline/src/deploy/cloudRun/utils/cloudRunExecutionUrl.js +6 -1
- package/dist/packages/pipeline/src/deploy/cloudRun/utils/cloudRunExecutionUrl.js.map +1 -1
- package/dist/packages/pipeline/src/pipeline/packageManager.js +6 -3
- package/dist/packages/pipeline/src/pipeline/packageManager.js.map +1 -1
- package/dist/packages/pipeline/src/types/config.d.ts +20 -2
- package/dist/packages/pipeline/src/types/config.js +9 -1
- package/dist/packages/pipeline/src/types/config.js.map +1 -1
- package/dist/skills/catladder-config/SKILL.md +18 -7
- package/dist/skills/catladder-pipelines/SKILL.md +21 -18
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getEnvOn.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/context/getEnvOn.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"getEnvOn.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/context/getEnvOn.ts"],"names":[],"mappings":";;;AACA,oCAA2D;AAC3D,6CAA0C;AAE1C,MAAM,mBAAmB,GAAG,CAAC,OAAgB,EAAe,EAAE;;IAC5D,MAAM,QAAQ,GAAG,iBAAS,CAAC,OAAO,CAAC,CAAC,QAAkC,CAAC;IACvE,OAAO,MAAA,QAAQ,CAAC,CAAC,CAAC,mCAAI,KAAK,CAAC;AAC9B,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACI,MAAM,QAAQ,GAAG,CACtB,GAAW,EACX,SAEC,EACD,YAAiC,EACpB,EAAE;;IACf,MAAM,EAAE,GAAG,MAAA,IAAA,4BAAoB,EAAC,YAAY,EAAE,GAAG,CAAC,0CAAE,EAAE,CAAC;IACvD,IAAI,EAAE,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IAChC,OAAO,mBAAmB,CAAC,IAAA,uBAAU,EAAC,GAAG,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC;AACvE,CAAC,CAAC;AAVW,QAAA,QAAQ,YAUnB"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { EnvironmentsConfig, EnvType } from "../types";
|
|
2
2
|
/**
|
|
3
3
|
* the type of a project-wide declared env: its explicit `type`, its
|
|
4
4
|
* name (when it is itself an env type), or — for envs that inherit —
|
|
5
5
|
* the type of the env they inherit their config from
|
|
6
6
|
*/
|
|
7
|
-
export declare const getDeclaredEnvType: (environments:
|
|
7
|
+
export declare const getDeclaredEnvType: (environments: EnvironmentsConfig | undefined, env: string, seen?: Set<string>) => EnvType | undefined;
|
|
8
8
|
export declare const getEnvType: (env: string, envConfig: {
|
|
9
9
|
type?: EnvType;
|
|
10
|
-
}, environments?:
|
|
10
|
+
}, environments?: EnvironmentsConfig) => EnvType;
|
|
@@ -9,7 +9,7 @@ const getEnvInherit_1 = require("./getEnvInherit");
|
|
|
9
9
|
* the type of the env they inherit their config from
|
|
10
10
|
*/
|
|
11
11
|
const getDeclaredEnvType = (environments, env, seen = new Set()) => {
|
|
12
|
-
const declared =
|
|
12
|
+
const declared = (0, types_1.getEnvironmentConfig)(environments, env);
|
|
13
13
|
if (declared === null || declared === void 0 ? void 0 : declared.type)
|
|
14
14
|
return declared.type;
|
|
15
15
|
if ((0, types_1.isKnowEnvType)(env))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getEnvType.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/context/getEnvType.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"getEnvType.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/context/getEnvType.ts"],"names":[],"mappings":";;;AACA,oCAA+D;AAC/D,mDAAsD;AAEtD;;;;GAIG;AACI,MAAM,kBAAkB,GAAG,CAChC,YAA4C,EAC5C,GAAW,EACX,OAAoB,IAAI,GAAG,EAAE,EACR,EAAE;IACvB,MAAM,QAAQ,GAAG,IAAA,4BAAoB,EAAC,YAAY,EAAE,GAAG,CAAC,CAAC;IACzD,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI;QAAE,OAAO,QAAQ,CAAC,IAAI,CAAC;IACzC,IAAI,IAAA,qBAAa,EAAC,GAAG,CAAC;QAAE,OAAO,GAAG,CAAC;IAEnC,MAAM,aAAa,GAAG,IAAA,mCAAmB,EAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,CAAC,CAAC,MAAM,CAAC;IACpE,IAAI,aAAa,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;QAC9C,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACxB,OAAO,IAAA,0BAAkB,EAAC,YAAY,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAfW,QAAA,kBAAkB,sBAe7B;AAEK,MAAM,UAAU,GAAG,CACxB,GAAW,EACX,SAEC,EACD,YAAiC,EACxB,EAAE;IACX,kEAAkE;IAClE,IAAI,SAAS,CAAC,IAAI;QAAE,OAAO,SAAS,CAAC,IAAI,CAAC;IAE1C,sDAAsD;IACtD,MAAM,YAAY,GAAG,IAAA,0BAAkB,EAAC,YAAY,EAAE,GAAG,CAAC,CAAC;IAC3D,IAAI,YAAY;QAAE,OAAO,YAAY,CAAC;IAEtC,MAAM,IAAI,KAAK,CAAC,oBAAoB,GAAG,GAAG,CAAC,CAAC;AAC9C,CAAC,CAAC;AAfW,QAAA,UAAU,cAerB"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getEnvironmentContext = void 0;
|
|
4
4
|
const bash_1 = require("../../../bash/src/index.js");
|
|
5
|
+
const config_1 = require("../types/config");
|
|
5
6
|
const getEnvConfig_1 = require("./getEnvConfig");
|
|
6
7
|
const getEnvInstance_1 = require("./getEnvInstance");
|
|
7
8
|
const getEnvInherit_1 = require("./getEnvInherit");
|
|
@@ -13,7 +14,7 @@ const getEnvironmentSlugPrefix = (env, instance) => {
|
|
|
13
14
|
return env;
|
|
14
15
|
};
|
|
15
16
|
const getEnvironmentContext = ({ env, componentName, config, pipelineType, }) => {
|
|
16
|
-
var _a
|
|
17
|
+
var _a;
|
|
17
18
|
const envConfigRaw = (0, getEnvConfig_1.getEnvConfig)(config, componentName, env);
|
|
18
19
|
const envType = (0, getEnvType_1.getEnvType)(env, envConfigRaw, config.environments);
|
|
19
20
|
const instance = (0, getEnvInstance_1.getEnvInstance)(envConfigRaw, env, pipelineType, config.environments);
|
|
@@ -21,7 +22,7 @@ const getEnvironmentContext = ({ env, componentName, config, pipelineType, }) =>
|
|
|
21
22
|
// config; undefined means the env type's default applies
|
|
22
23
|
const autoStop = envConfigRaw.autoStop !== undefined
|
|
23
24
|
? envConfigRaw.autoStop
|
|
24
|
-
: (
|
|
25
|
+
: (_a = (0, config_1.getEnvironmentConfig)(config.environments, env)) === null || _a === void 0 ? void 0 : _a.autoStop;
|
|
25
26
|
const environmentSlugPrefix = getEnvironmentSlugPrefix(env, instance);
|
|
26
27
|
const environmentSlug = environmentSlugPrefix.concat(`-${componentName}`);
|
|
27
28
|
const fullName = (0, bash_1.joinBashExpressions)([config.customerName, config.appName, environmentSlug], "-");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getEnvironmentContext.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/context/getEnvironmentContext.ts"],"names":[],"mappings":";;;AAEA,0CAAsD;AAMtD,iDAA8C;AAC9C,qDAAkD;AAClD,mDAAgD;AAChD,6CAA0C;AAE1C,MAAM,wBAAwB,GAAG,CAC/B,GAAW,EACX,QAA6B,EACL,EAAE;IAC1B,IAAI,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,IAAA,0BAAmB,EAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,GAAG,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEK,MAAM,qBAAqB,GAAG,CAAC,EACpC,GAAG,EACH,aAAa,EACb,MAAM,EACN,YAAY,GACkB,EAAsB,EAAE;;IACtD,MAAM,YAAY,GAAG,IAAA,2BAAY,EAAC,MAAM,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;IAC9D,MAAM,OAAO,GAAG,IAAA,uBAAU,EAAC,GAAG,EAAE,YAAY,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IACnE,MAAM,QAAQ,GAAG,IAAA,+BAAc,EAC7B,YAAY,EACZ,GAAG,EACH,YAAY,EACZ,MAAM,CAAC,YAAY,CACpB,CAAC;IAEF,kEAAkE;IAClE,yDAAyD;IACzD,MAAM,QAAQ,GACZ,YAAY,CAAC,QAAQ,KAAK,SAAS;QACjC,CAAC,CAAC,YAAY,CAAC,QAAQ;QACvB,CAAC,CAAC,MAAA,
|
|
1
|
+
{"version":3,"file":"getEnvironmentContext.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/context/getEnvironmentContext.ts"],"names":[],"mappings":";;;AAEA,0CAAsD;AAMtD,4CAAuD;AACvD,iDAA8C;AAC9C,qDAAkD;AAClD,mDAAgD;AAChD,6CAA0C;AAE1C,MAAM,wBAAwB,GAAG,CAC/B,GAAW,EACX,QAA6B,EACL,EAAE;IAC1B,IAAI,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,IAAA,0BAAmB,EAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,GAAG,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEK,MAAM,qBAAqB,GAAG,CAAC,EACpC,GAAG,EACH,aAAa,EACb,MAAM,EACN,YAAY,GACkB,EAAsB,EAAE;;IACtD,MAAM,YAAY,GAAG,IAAA,2BAAY,EAAC,MAAM,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;IAC9D,MAAM,OAAO,GAAG,IAAA,uBAAU,EAAC,GAAG,EAAE,YAAY,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IACnE,MAAM,QAAQ,GAAG,IAAA,+BAAc,EAC7B,YAAY,EACZ,GAAG,EACH,YAAY,EACZ,MAAM,CAAC,YAAY,CACpB,CAAC;IAEF,kEAAkE;IAClE,yDAAyD;IACzD,MAAM,QAAQ,GACZ,YAAY,CAAC,QAAQ,KAAK,SAAS;QACjC,CAAC,CAAC,YAAY,CAAC,QAAQ;QACvB,CAAC,CAAC,MAAA,IAAA,6BAAoB,EAAC,MAAM,CAAC,YAAY,EAAE,GAAG,CAAC,0CAAE,QAAQ,CAAC;IAE/D,MAAM,qBAAqB,GAAG,wBAAwB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAEtE,MAAM,eAAe,GAAG,qBAAqB,CAAC,MAAM,CAAC,IAAI,aAAa,EAAE,CAAC,CAAC;IAE1E,MAAM,QAAQ,GAAG,IAAA,0BAAmB,EAClC,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,OAAO,EAAE,eAAe,CAAC,EACtD,GAAG,CACJ,CAAC;IAEF,OAAO;QACL,YAAY;QACZ,eAAe,EAAE,YAAY,CAAC,MAAM;QACpC,cAAc,EAAE,YAAY,CAAC,KAAK;QAClC,qBAAqB;QACrB,eAAe;QACf,QAAQ;QACR,UAAU,EAAE,QAAQ,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI;QACnE,YAAY;QACZ,QAAQ;QACR,OAAO;QACP,QAAQ;QACR,UAAU,EAAE,IAAA,6BAAa,EAAC,MAAM,CAAC,YAAY,EAAE,GAAG,CAAC;QACnD,aAAa;QACb,GAAG;QACH,UAAU,EAAE,MAAM;KACnB,CAAC;AACJ,CAAC,CAAC;AAhDW,QAAA,qBAAqB,yBAgDhC"}
|
|
@@ -85,7 +85,9 @@ const getSchedulerArgs = (scheduler, context) => {
|
|
|
85
85
|
appFullName: context.environment.fullName,
|
|
86
86
|
projectId,
|
|
87
87
|
region,
|
|
88
|
-
|
|
88
|
+
// lands in a script line (not an exported variable), so the
|
|
89
|
+
// raw expression is what the shell has to see
|
|
90
|
+
}).toString(),
|
|
89
91
|
"message-body": body
|
|
90
92
|
? '"' + (0, bash_1.bashEscape)(JSON.stringify(body)) + '"'
|
|
91
93
|
: undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schedules.js","sourceRoot":"","sources":["../../../../../../../../../../packages/pipeline/src/deploy/cloudRun/createJobs/execute/schedules.ts"],"names":[],"mappings":";;;AAAA,0CAA6C;AAG7C,6CAA2C;AAK3C,2EAA4E;AAC5E,mEAAgE;AAChE,iDAA2D;AAC3D,kDAA2D;AAC3D,sCAImB;AAEZ,MAAM,wBAAwB,GAAG,CAAC,OAAyB,EAAE,EAAE;IACpE,MAAM,YAAY,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IACxC,MAAM,UAAU,GAAG,IAAA,mCAAgB,EAAC;QAClC,OAAO,EAAE,YAAY,CAAC,SAAS;QAC/B,QAAQ,EAAE,YAAY,CAAC,MAAM;KAC9B,CAAC,CAAC;IAEH,OAAO,SAAS;SACb,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;QACpB,OAAO,CAAC,GAAG,IAAA,2BAAkB,GAAE,gBAAgB,QAAQ,IAAI,UAAU,EAAE,CAAC,CAAC;IAC3E,CAAC,CAAC;SACD,IAAI,EAAE,CAAC;AACZ,CAAC,CAAC;AAbW,QAAA,wBAAwB,4BAanC;AAEK,MAAM,uBAAuB,GAAG,CACrC,OAAyB,EACf,EAAE;IACZ,MAAM,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;IACxC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,GAC5C,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;IAEnC,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAU,EAAE;;QAC9D,2EAA2E;QAC3E,gEAAgE;QAChE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,gBAAgB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAEpE,MAAM,UAAU,GAAG,IAAA,mCAAgB,EAAC;YAClC,OAAO;YACP,QAAQ;YACR,GAAG,EAAE,oBAAoB;YACzB,GAAG,IAAI;YAEP,QAAQ,EAAE,IAAI,MAAM,CAAC,QAAQ,GAAG;YAChC,oBAAoB,EAAE,MAAA,MAAM,CAAC,gBAAgB,mCAAI,CAAC;SACnD,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,IAAI,IAAA,iBAAU,EAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;QACtE,MAAM,gBAAgB,GAAG,YAAY,CAAC,CAAC,CAAC,cAAc,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1E,MAAM,gBAAgB,GAAG,YAAY;YACnC,CAAC,CAAC,qBAAqB,YAAY,EAAE;YACrC,CAAC,CAAC,EAAE,CAAC;QACP,OAAO;YACL,QAAQ,KAAK,CAAC;gBACZ,CAAC,CAAC,gCAAgC,IAAA,2BAAkB,GAAE,yCAAyC,OAAO,CAAC,GAAG,KAAK,OAAO,CAAC,IAAI,oDAAoD,QAAQ,gBAAgB,OAAO,OAAO;gBACrN,CAAC,CAAC,IAAI;YACR,oBAAoB,GAAG,GAAG;YAC1B,2BAA2B,QAAQ,GAAG;YACtC,wFAAwF;YACxF,KAAK,IAAA,2BAAkB,GAAE,+CAA+C,UAAU,GAAG,gBAAgB,EAAE;YACvG,MAAM;YACN,KAAK,IAAA,2BAAkB,GAAE,+CAA+C,UAAU,GAAG,gBAAgB,EAAE;YACvG,IAAI;SACL;aACE,MAAM,CAAC,cAAM,CAAC;aACd,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAzCW,QAAA,uBAAuB,2BAyClC;AAEF,MAAM,gBAAgB,GAAG,CACvB,SAAkD,EAClD,OAAyB,EAQzB,EAAE;;IACF,IAAI,SAAS,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QAC7B,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAA,gCAAuB,EAAC,OAAO,CAAC,CAAC;QAC/D,MAAM,IAAI,GACR,SAAS,CAAC,IAAI,KAAK,SAAS;YAC1B,CAAC,CAAC;gBACE,SAAS,EAAE;oBACT,kBAAkB,EAAE;wBAClB,CAAA,MAAA,SAAS,CAAC,IAAI,0CAAE,MAAM,IAAG,CAAC;4BACxB,CAAC,CAAC;gCACE,IAAI,EAAE,SAAS,CAAC,IAAI;6BACrB;4BACH,CAAC,CAAC;gCACE,IAAI,EAAE,EAAE;gCACR,SAAS,EAAE,IAAI,EAAE,0CAA0C;6BAC5D;qBACN;iBACF;aACF;YACH,CAAC,CAAC,IAAI,CAAC;QACX,OAAO;YACL,GAAG,EAAE,IAAA,+CAAwB,EAAC,SAAS,CAAC,GAAG,EAAE;gBAC3C,WAAW,EAAE,OAAO,CAAC,WAAW,CAAC,QAAQ;gBACzC,SAAS;gBACT,MAAM;
|
|
1
|
+
{"version":3,"file":"schedules.js","sourceRoot":"","sources":["../../../../../../../../../../packages/pipeline/src/deploy/cloudRun/createJobs/execute/schedules.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getCloudRunJobExecuteUrl = void 0;
|
|
4
|
+
const bash_1 = require("../../../../../bash/src/index.js");
|
|
4
5
|
const jobName_1 = require("./jobName");
|
|
5
6
|
function getCloudRunJobExecuteUrl(jobName, { region, projectId, appFullName, }) {
|
|
6
7
|
const uriBase = `https://${region}-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/${projectId}/jobs`;
|
|
7
8
|
const fullJobName = (0, jobName_1.getCloudRunJobName)(appFullName, jobName);
|
|
8
|
-
|
|
9
|
+
// joined, not interpolated: on review envs the job name is a bash
|
|
10
|
+
// expression (the review slug), and a template string would demote
|
|
11
|
+
// it to a plain string — its quotes then get escaped as literal
|
|
12
|
+
// characters when the variable is exported
|
|
13
|
+
return (0, bash_1.joinBashExpressions)([uriBase, "/", fullJobName, ":run"]);
|
|
9
14
|
}
|
|
10
15
|
exports.getCloudRunJobExecuteUrl = getCloudRunJobExecuteUrl;
|
|
11
16
|
//# sourceMappingURL=cloudRunExecutionUrl.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloudRunExecutionUrl.js","sourceRoot":"","sources":["../../../../../../../../../packages/pipeline/src/deploy/cloudRun/utils/cloudRunExecutionUrl.ts"],"names":[],"mappings":";;;AACA,uCAA+C;AAE/C,SAAgB,wBAAwB,CACtC,OAAe,EACf,EACE,MAAM,EACN,SAAS,EACT,WAAW,GAKZ;IAED,MAAM,OAAO,GAAG,WAAW,MAAM,6DAA6D,SAAS,OAAO,CAAC;IAC/G,MAAM,WAAW,GAAG,IAAA,4BAAkB,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAE7D,OAAO,
|
|
1
|
+
{"version":3,"file":"cloudRunExecutionUrl.js","sourceRoot":"","sources":["../../../../../../../../../packages/pipeline/src/deploy/cloudRun/utils/cloudRunExecutionUrl.ts"],"names":[],"mappings":";;;AACA,0CAAsD;AACtD,uCAA+C;AAE/C,SAAgB,wBAAwB,CACtC,OAAe,EACf,EACE,MAAM,EACN,SAAS,EACT,WAAW,GAKZ;IAED,MAAM,OAAO,GAAG,WAAW,MAAM,6DAA6D,SAAS,OAAO,CAAC;IAC/G,MAAM,WAAW,GAAG,IAAA,4BAAkB,EAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IAE7D,kEAAkE;IAClE,mEAAmE;IACnE,gEAAgE;IAChE,2CAA2C;IAC3C,OAAO,IAAA,0BAAmB,EAAC,CAAC,OAAO,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;AAClE,CAAC;AApBD,4DAoBC"}
|
|
@@ -59,15 +59,18 @@ const getPackageManagerInfoForComponent = async (config, componentName) => {
|
|
|
59
59
|
const patchFiles = baseInfo.type === "pnpm"
|
|
60
60
|
? (0, pnpmUtils_1.getPnpmPatchFiles)(componentIsInWorkspace ? workspaceRoot : component.dir)
|
|
61
61
|
: [];
|
|
62
|
+
// sort the variable parts: their order depends on package.json key order
|
|
63
|
+
// and dependency traversal, and an unstable order rewrites the generated
|
|
64
|
+
// pipeline files on every regeneration without any real change
|
|
62
65
|
const pathsToCopyInDocker = [
|
|
63
66
|
...new Set([
|
|
64
67
|
packageJson,
|
|
65
68
|
...(workspacePackageJson ? [workspacePackageJson] : []),
|
|
66
69
|
lockFile,
|
|
67
70
|
...configFilePaths,
|
|
68
|
-
...allWorkspaceManifests,
|
|
69
|
-
...patchFiles,
|
|
70
|
-
...currentWorkspaceDependencies,
|
|
71
|
+
...[...allWorkspaceManifests].sort(),
|
|
72
|
+
...[...patchFiles].sort(),
|
|
73
|
+
...[...currentWorkspaceDependencies].sort(),
|
|
71
74
|
]),
|
|
72
75
|
];
|
|
73
76
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageManager.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/pipeline/packageManager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"packageManager.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/pipeline/packageManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -170,7 +170,10 @@ export type EnvironmentConfig = {
|
|
|
170
170
|
* `{ branch: "next" }` deploys the env on pushes to that branch —
|
|
171
171
|
* one stable environment tracking a long-lived branch.
|
|
172
172
|
*
|
|
173
|
-
* `false`
|
|
173
|
+
* `false` keeps the env but never deploys it from a pipeline (like
|
|
174
|
+
* `local`): it still exists for `catladder project setup`, secrets and
|
|
175
|
+
* catenv. To remove an env from the project entirely, disable it
|
|
176
|
+
* instead: `environments: { stage: false }`.
|
|
174
177
|
*/
|
|
175
178
|
on?: EnvOnConfig;
|
|
176
179
|
/**
|
|
@@ -220,6 +223,18 @@ export type EnvironmentConfig = {
|
|
|
220
223
|
* Inheriting from `local` is not possible, chains are followed, cycles
|
|
221
224
|
* are an error.
|
|
222
225
|
*/
|
|
226
|
+
/**
|
|
227
|
+
* the top-level `environments` config: per env either its project-wide
|
|
228
|
+
* declaration/tuning, or `false` to disable the env for the whole
|
|
229
|
+
* project (all components, setup, secrets, pipelines, catenv).
|
|
230
|
+
*/
|
|
231
|
+
export type EnvironmentsConfig = Record<string, EnvironmentConfig | false>;
|
|
232
|
+
/**
|
|
233
|
+
* the project-wide config of `env` (undefined when not declared or
|
|
234
|
+
* disabled)
|
|
235
|
+
*/
|
|
236
|
+
export declare const getEnvironmentConfig: (environments: EnvironmentsConfig | undefined, env: string) => EnvironmentConfig | undefined;
|
|
237
|
+
export declare const isEnvironmentDisabled: (environments: EnvironmentsConfig | undefined, env: string) => boolean;
|
|
223
238
|
export type EnvironmentInheritConfig = string | {
|
|
224
239
|
/** env whose per-component config overrides are inherited */
|
|
225
240
|
config?: string;
|
|
@@ -430,8 +445,11 @@ export type Config<C extends ConfigProps = never> = {
|
|
|
430
445
|
* - declare an extra env (every component deploys to it unless it
|
|
431
446
|
* opts out with `env.<name>: false`):
|
|
432
447
|
* `environments: { next: { type: "dev", on: { branch: "next" } } }`
|
|
448
|
+
* - disable an env for the whole project (no setup, secrets, jobs or
|
|
449
|
+
* catenv for any component): `environments: { stage: false }`.
|
|
450
|
+
* A single component opts out with `env.<name>: false` instead.
|
|
433
451
|
*/
|
|
434
|
-
environments?:
|
|
452
|
+
environments?: EnvironmentsConfig;
|
|
435
453
|
/**
|
|
436
454
|
* components (sub apps)
|
|
437
455
|
*/
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.isKnowEnvType = exports.DEFAULT_ENV_TYPES = exports.DEFAULT_ENVS = exports.ENV_TYPES = exports.envTriggerEquals = exports.isBranchTrigger = exports.ALL_PIPELINE_TRIGGERS = void 0;
|
|
3
|
+
exports.isEnvironmentDisabled = exports.getEnvironmentConfig = exports.isKnowEnvType = exports.DEFAULT_ENV_TYPES = exports.DEFAULT_ENVS = exports.ENV_TYPES = exports.envTriggerEquals = exports.isBranchTrigger = exports.ALL_PIPELINE_TRIGGERS = void 0;
|
|
4
4
|
exports.ALL_PIPELINE_TRIGGERS = [
|
|
5
5
|
"mainBranch",
|
|
6
6
|
"mr",
|
|
@@ -43,4 +43,12 @@ const isKnowEnvType = (env) => {
|
|
|
43
43
|
return env in exports.ENV_TYPES;
|
|
44
44
|
};
|
|
45
45
|
exports.isKnowEnvType = isKnowEnvType;
|
|
46
|
+
/**
|
|
47
|
+
* the project-wide config of `env` (undefined when not declared or
|
|
48
|
+
* disabled)
|
|
49
|
+
*/
|
|
50
|
+
const getEnvironmentConfig = (environments, env) => (environments === null || environments === void 0 ? void 0 : environments[env]) || undefined;
|
|
51
|
+
exports.getEnvironmentConfig = getEnvironmentConfig;
|
|
52
|
+
const isEnvironmentDisabled = (environments, env) => (environments === null || environments === void 0 ? void 0 : environments[env]) === false;
|
|
53
|
+
exports.isEnvironmentDisabled = isEnvironmentDisabled;
|
|
46
54
|
//# sourceMappingURL=config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/types/config.ts"],"names":[],"mappings":";;;AAea,QAAA,qBAAqB,GAAG;IACnC,YAAY;IACZ,IAAI;IACJ,eAAe;CACP,CAAC;AAoBJ,MAAM,eAAe,GAAG,CAC7B,OAA2B,EACO,EAAE,CACpC,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,IAAI,IAAI,QAAQ,IAAI,OAAO,CAAC;AAH5D,QAAA,eAAe,mBAG6C;AAElE,MAAM,gBAAgB,GAAG,CAC9B,CAA0B,EAC1B,CAAqB,EACZ,EAAE;IACX,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,KAAK;QAAE,OAAO,KAAK,CAAC;IACjD,IAAI,IAAA,uBAAe,EAAC,CAAC,CAAC;QAAE,OAAO,IAAA,uBAAe,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;IAC3E,OAAO,CAAC,KAAK,CAAC,CAAC;AACjB,CAAC,CAAC;AAPW,QAAA,gBAAgB,oBAO3B;AAEF;;;GAGG;AACU,QAAA,SAAS,GAAG;IACvB,GAAG,EAAE;QACH,QAAQ,EAAE,CAAC,YAAY,CAAC;KACzB;IACD,MAAM,EAAE;QACN,QAAQ,EAAE,CAAC,IAAI,CAAC;KACjB;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,CAAC,eAAe,CAAC;KAC5B;IACD,IAAI,EAAE;QACJ,QAAQ,EAAE,CAAC,eAAe,CAAC;KAC5B;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,EAAE;KACb;CACO,CAAC;AAEE,QAAA,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAS,CAAC,CAAC;AACtC,QAAA,iBAAiB,GAAG,oBAAyB,CAAC;AAGpD,MAAM,aAAa,GAAG,CAAC,GAAW,EAAkB,EAAE;IAC3D,OAAO,GAAG,IAAI,iBAAS,CAAC;AAC1B,CAAC,CAAC;AAFW,QAAA,aAAa,iBAExB"}
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/types/config.ts"],"names":[],"mappings":";;;AAea,QAAA,qBAAqB,GAAG;IACnC,YAAY;IACZ,IAAI;IACJ,eAAe;CACP,CAAC;AAoBJ,MAAM,eAAe,GAAG,CAC7B,OAA2B,EACO,EAAE,CACpC,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,KAAK,IAAI,IAAI,QAAQ,IAAI,OAAO,CAAC;AAH5D,QAAA,eAAe,mBAG6C;AAElE,MAAM,gBAAgB,GAAG,CAC9B,CAA0B,EAC1B,CAAqB,EACZ,EAAE;IACX,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,KAAK;QAAE,OAAO,KAAK,CAAC;IACjD,IAAI,IAAA,uBAAe,EAAC,CAAC,CAAC;QAAE,OAAO,IAAA,uBAAe,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,CAAC;IAC3E,OAAO,CAAC,KAAK,CAAC,CAAC;AACjB,CAAC,CAAC;AAPW,QAAA,gBAAgB,oBAO3B;AAEF;;;GAGG;AACU,QAAA,SAAS,GAAG;IACvB,GAAG,EAAE;QACH,QAAQ,EAAE,CAAC,YAAY,CAAC;KACzB;IACD,MAAM,EAAE;QACN,QAAQ,EAAE,CAAC,IAAI,CAAC;KACjB;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,CAAC,eAAe,CAAC;KAC5B;IACD,IAAI,EAAE;QACJ,QAAQ,EAAE,CAAC,eAAe,CAAC;KAC5B;IACD,KAAK,EAAE;QACL,QAAQ,EAAE,EAAE;KACb;CACO,CAAC;AAEE,QAAA,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,iBAAS,CAAC,CAAC;AACtC,QAAA,iBAAiB,GAAG,oBAAyB,CAAC;AAGpD,MAAM,aAAa,GAAG,CAAC,GAAW,EAAkB,EAAE;IAC3D,OAAO,GAAG,IAAI,iBAAS,CAAC;AAC1B,CAAC,CAAC;AAFW,QAAA,aAAa,iBAExB;AAmMF;;;GAGG;AACI,MAAM,oBAAoB,GAAG,CAClC,YAA4C,EAC5C,GAAW,EACoB,EAAE,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,GAAG,CAAC,KAAI,SAAS,CAAC;AAHxD,QAAA,oBAAoB,wBAGoC;AAE9D,MAAM,qBAAqB,GAAG,CACnC,YAA4C,EAC5C,GAAW,EACF,EAAE,CAAC,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,GAAG,CAAC,MAAK,KAAK,CAAC;AAH/B,QAAA,qBAAqB,yBAGU"}
|
|
@@ -33,20 +33,23 @@ const config = {
|
|
|
33
33
|
appName: "my-app",
|
|
34
34
|
customerName: "pan",
|
|
35
35
|
pipelines: { gitlab: true, github: true }, // which CI systems to generate
|
|
36
|
-
environments: {
|
|
36
|
+
environments: {
|
|
37
|
+
// optional: project-wide env declarations/tuning
|
|
37
38
|
review: { autoStop: "3 days" },
|
|
39
|
+
stage: false, // the project has no stage env (any component)
|
|
38
40
|
next: { type: "dev", on: { branch: "next" } }, // extra branch-tracking env
|
|
39
41
|
},
|
|
40
42
|
components: {
|
|
41
43
|
www: {
|
|
42
|
-
dir: "frontend",
|
|
43
|
-
vars: { public: {}, secret: [] },
|
|
44
|
-
build: { type: "node" },
|
|
44
|
+
dir: "frontend", // working directory of this component
|
|
45
|
+
vars: { public: {}, secret: [] }, // env vars (see catladder-secrets skill)
|
|
46
|
+
build: { type: "node" }, // node | rails | meteor | custom — see catladder-builds
|
|
45
47
|
deploy: { type: "kubernetes" }, // kubernetes | google-cloudrun | dockerTag | custom — see catladder-deploys
|
|
46
|
-
env: {
|
|
48
|
+
env: {
|
|
49
|
+
// enable/customize per environment
|
|
47
50
|
review: {},
|
|
48
51
|
dev: {},
|
|
49
|
-
stage: false,
|
|
52
|
+
stage: false, // false disables the env for this component only
|
|
50
53
|
prod: {},
|
|
51
54
|
},
|
|
52
55
|
},
|
|
@@ -68,9 +71,17 @@ Key concepts:
|
|
|
68
71
|
per-component `env.<name>` entries only carry component-local
|
|
69
72
|
overrides (vars, deploy settings, host, autoStop) or `false` to opt
|
|
70
73
|
the component out. In `environments`:
|
|
74
|
+
- `<name>: false` — disables the env for the whole project: no
|
|
75
|
+
component has it, so no setup contexts (`catladder project setup`),
|
|
76
|
+
secrets, pipeline jobs/workflows or catenv for it. This is how to
|
|
77
|
+
say "this project has no stage": `environments: { stage: false }`
|
|
78
|
+
(not `on: false`). `local` cannot be disabled; inheriting from a
|
|
79
|
+
disabled env is an error.
|
|
71
80
|
- `on` — when the env deploys: `"mainBranch"`, `"mr"`,
|
|
72
81
|
`"taggedRelease"`, `{ branch: "next" }` (a stable env deploying on
|
|
73
|
-
pushes to that branch), or `false` (
|
|
82
|
+
pushes to that branch), or `false` (never deployed by a pipeline —
|
|
83
|
+
the env still exists for setup, secrets and catenv; use
|
|
84
|
+
`environments.<name>: false` to remove it). `on: "mr"`
|
|
74
85
|
makes an env a review app (one instance per MR/PR, torn down on
|
|
75
86
|
close). Defaults from the env type.
|
|
76
87
|
- `autoStop` — how long a stoppable environment stays up after its
|
|
@@ -11,12 +11,12 @@ generated YAML.
|
|
|
11
11
|
|
|
12
12
|
## Triggers and environments
|
|
13
13
|
|
|
14
|
-
| Trigger
|
|
15
|
-
|
|
16
|
-
| `mainBranch`
|
|
17
|
-
| `mr`
|
|
18
|
-
| `taggedRelease`
|
|
19
|
-
| `{ branch: "<name>" }` | push to that branch
|
|
14
|
+
| Trigger | Runs on | Deploys to (default) |
|
|
15
|
+
| ---------------------- | ----------------------- | ---------------------------- |
|
|
16
|
+
| `mainBranch` | push to the main branch | `dev` |
|
|
17
|
+
| `mr` | merge/pull requests | `review` (one app per MR/PR) |
|
|
18
|
+
| `taggedRelease` | git tags | `stage`, `prod` |
|
|
19
|
+
| `{ branch: "<name>" }` | push to that branch | envs declaring it via `on` |
|
|
20
20
|
|
|
21
21
|
The trigger of each env is its `on` in the top-level `environments`
|
|
22
22
|
config (project-wide — components cannot diverge), defaulting from the
|
|
@@ -25,6 +25,9 @@ own pipeline (gitlab: rules on `$CI_COMMIT_BRANCH`; github: a
|
|
|
25
25
|
`catladder-branch-<name>.yml` workflow) and deploys as one stable,
|
|
26
26
|
branch-tracking environment — unlike review apps, it is not
|
|
27
27
|
per-instance and is stopped via the manual stop job/workflow.
|
|
28
|
+
`on: false` keeps an env out of every pipeline but the env still exists
|
|
29
|
+
(setup, secrets, catenv); `environments: { <name>: false }` removes it
|
|
30
|
+
entirely.
|
|
28
31
|
|
|
29
32
|
Generated layout:
|
|
30
33
|
|
|
@@ -34,12 +37,12 @@ Generated layout:
|
|
|
34
37
|
"generated by catladder" header; others are unmanaged). Manual
|
|
35
38
|
actions are per-kind `workflow_dispatch` workflows, visually grouped
|
|
36
39
|
by their emoji prefix in the Actions sidebar: `🚀 catladder create
|
|
37
|
-
|
|
38
|
-
|
|
40
|
+
release`, `▶️ catladder deploy` (manual-gated deploys), `🛑 catladder
|
|
41
|
+
stop`, `↩️ catladder rollback` — when all of a kind's tasks target one
|
|
39
42
|
env the name carries it (e.g. `▶️ catladder deploy prod`); otherwise
|
|
40
43
|
pick the task from the workflow's dropdown. Review apps are stopped
|
|
41
44
|
automatically when their pull request closes (`🛑 catladder stop
|
|
42
|
-
|
|
45
|
+
review app`); the same workflow can be dispatched with a PR number to
|
|
43
46
|
tear one down while the pull request is still open (gitlab runs these as manual jobs inside the pipeline
|
|
44
47
|
instead).
|
|
45
48
|
|
|
@@ -51,22 +54,22 @@ plus stop jobs for review-app teardown.
|
|
|
51
54
|
Pushing a new commit cancels the pipeline of the previous one, so the
|
|
52
55
|
runners are not busy with results nobody will read.
|
|
53
56
|
|
|
54
|
-
| Pipeline
|
|
55
|
-
|
|
56
|
-
| `mr`
|
|
57
|
-
| `mainBranch` (dev)
|
|
58
|
-
| `taggedRelease`
|
|
59
|
-
| agent runs (`trigger`) | **runs through** — never cancelled
|
|
57
|
+
| Pipeline | On a new commit |
|
|
58
|
+
| ---------------------- | ------------------------------------------- |
|
|
59
|
+
| `mr` | cancelled |
|
|
60
|
+
| `mainBranch` (dev) | cancelled, except a release already running |
|
|
61
|
+
| `taggedRelease` | **runs through** — never cancelled |
|
|
62
|
+
| agent runs (`trigger`) | **runs through** — never cancelled |
|
|
60
63
|
|
|
61
64
|
- **GitHub**: the generated MR workflow sets `concurrency` with
|
|
62
65
|
`cancel-in-progress: true`.
|
|
63
66
|
- **GitLab**: generated `workflow:auto_cancel:on_new_commit:
|
|
64
|
-
|
|
67
|
+
interruptible`, with per-rule `none` for tags and agent runs. Every
|
|
65
68
|
job carries an explicit `interruptible`, jobs that must finish
|
|
66
69
|
(release jobs, agent jobs) carry `interruptible: false`.
|
|
67
70
|
|
|
68
71
|
**GitLab requires the project setting too.** The generated YAML only
|
|
69
|
-
tunes
|
|
72
|
+
tunes _how_ redundant pipelines are cancelled — it does not switch the
|
|
70
73
|
feature on. If old pipelines keep running, check **Settings > CI/CD >
|
|
71
74
|
General pipelines > Auto-cancel redundant pipelines**; with that
|
|
72
75
|
checkbox off nothing is ever cancelled. (`catladder project-doctor`
|
|
@@ -74,7 +77,7 @@ does not check this.)
|
|
|
74
77
|
|
|
75
78
|
**Adding a hand-written GitLab job?** Set `interruptible` explicitly.
|
|
76
79
|
GitLab defaults it to `false`, and a non-interruptible job that has
|
|
77
|
-
started keeps
|
|
80
|
+
started keeps _itself_ alive — under gitlab's own default
|
|
78
81
|
(`conservative`, which catladder overrides) it would shield the whole
|
|
79
82
|
pipeline from cancellation.
|
|
80
83
|
|