npm - @catladder/cli - Versions diffs - 5.2.0 → 5.3.0 - Mend

@catladder/cli 5.2.0 → 5.3.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.

Files changed (88) hide show

package/dist/packages/pipeline/src/context/getEnvironmentVariables.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getEnvironmentVariables.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/context/getEnvironmentVariables.ts"],"names":[],"mappings":"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~~GAAG~~,~~EACH~~,aAAa,EACb,gBAAgB,CACjB,CAAC;IAEF,MAAM,yBAAyB,GAAG,IAAA,yBAAe,EAAC,gBAAgB,CAAC,CAAC;IAEpE,MAAM,uBAAuB,GAAG,MAAM,CAAC,WAAW,CAChD,MAAM,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QAC9D,GAAG;QACH,IAAA,wDAAiD,EAAC,KAAK,EAAE;YACvD,aAAa,EAAE,GAAG,CAAC,aAAa;SACjC,CAAC;KACH,CAAC,CACH,CAAC;IAEF,qEAAqE;IACrE,2EAA2E;IAC3E,2EAA2E;IAC3E,2EAA2E;IAC3E,2CAA2C;IAC3C,MAAM,aAAa,GAAG;QACpB,GAAG,mBAAmB;QACtB,GAAG,aAAa;QAChB,GAAG,uBAAuB;KAC3B,CAAC;IAEF,MAAM,eAAe,GACnB,CAAC,MAAA,OAAO,CAAC,uBAAuB,mCAAI,IAAI,CAAC;QACvC,CAAC,CAAC,MAAM,IAAA,2BAAoB,EACxB,aAAa,EACb,KAAK,EAAE,kBAAkB,EAAE,EAAE;YAC3B,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,IAAA,+BAAuB,EAC7D;gBACE,GAAG,GAAG;gBACN,aAAa,EAAE,kBAAkB;aAClC,EACD;gBACE,uBAAuB,EAAE,KAAK,EAAE,qFAAqF;aACtH,CACF,CAAC;YACF,OAAO,YAAY,CAAC;QACtB,CAAC,CACF;QACH,CAAC,CAAC,aAAa,CAAC;IAEpB,MAAM,OAAO,GAAG,WAAW,CAAC,eAAe,CAAC,CAAC;IAE7C,OAAO;QACL,OAAO;QACP,gBAAgB;QAChB,WAAW,EAAE;YACX,KAAK,EAAE,MAAM,IAAA,2CAAoB,EAC/B,~~GAAG~~,~~EACH~~,aAAa,EACb,CAAC,cAAc;gBACb,IAAA,+BAAuB,EAAC,cAAc,CAAC;gBACvC,cAAc,CAAC,OAAO,CAAC;gBACvB,IAAI,CACP;YACD,MAAM,EAAE,MAAM,IAAA,2CAAoB,EAChC,~~GAAG~~,~~EACH~~,aAAa,EACb,CAAC,eAAe,IAAI,eAAe,CAAC,OAAO,CAAC,IAAI,IAAI,CACrD;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAxIW,QAAA,uBAAuB,2BAwIlC;AAEF,MAAM,gBAAgB,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAEtD,MAAM,gBAAgB,GAAG,CAC9B,GAAW,EACX,aAAqB,EACrB,GAAW,EACX,EAAE,CAAC,MAAM,gBAAgB,CAAC,GAAG,CAAC,IAAI,gBAAgB,CAAC,aAAa,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,kCAAkC;AAJnG,QAAA,gBAAgB,oBAIgD;AAE7E,MAAM,WAAW,GAAG,CAClB,IAAO,EAC4B,EAAE,CAAC,CAAC;IACvC,GAAG,IAAI;IACP,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;CACrD,CAAC,CAAC;AAEI,MAAM,0BAA0B,GAAG,CACxC,OAAyB,EACzB,GAAW,EACX,EAAE,CAAC,IAAA,wBAAgB,EAAC,OAAO,CAAC,~~GAAG~~,EAAE,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;~~AAHzC~~,QAAA,0BAA0B,~~8BAGe~~"}
1	+ {"version":3,"file":"getEnvironmentVariables.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/context/getEnvironmentVariables.ts"],"names":[],"mappings":";;;AAAA,sCAAyC;AASzC,0CAAsD;AACtD,0CAAyD;AAEzD,0CAAoF;AACpF,0CAAuD;AACvD,mEAAgE;AAChE,mEAAgE;AAChE,iEAA8D;AAC9D,6CAIyB;AAgBzB,MAAM,0BAA0B,GAAG,CAAC,GAAuB,EAAE,EAAE;IAC7D,OAAO;QACL,SAAS,EAAE,GAAG,CAAC,GAAG;QAClB,OAAO,EAAE,GAAG,CAAC,YAAY,CAAC,GAAG;QAC7B,QAAQ,EAAE,GAAG,CAAC,OAAO;QACrB,GAAG,CAAC,GAAG,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,CAAC,IAAA,6CAAqB,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KAC/D,CAAC;AACJ,CAAC,CAAC;AAYK,MAAM,uBAAuB,GAAG,KAAK,EAC1C,GAAkC,EAClC,UAAiD,EAAE,EACpB,EAAE;;IACjC,MAAM,kBAAkB,GAAG,IAAA,6CAAqB,EAAC,GAAG,CAAC,CAAC;IAEtD,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,GAAG,CAAC;IAC3C,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,cAAc,EAAE,OAAO,EAAE,GAC9D,kBAAkB,CAAC;IAErB,MAAM,uBAAuB,GAC3B,0BAA0B,CAAC,kBAAkB,CAAC,CAAC;IAEjD,IAAI,mBAA6D,CAAC;IAClE,IAAI,IAAmC,CAAC;IACxC,IAAI,GAAkC,CAAC;IAEvC,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;QACxB,MAAM,cAAc,GAAsB,YAAY,CAAC;QACvD,MAAM,IAAI,GACR,cAAc,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,MAAA,cAAc,CAAC,IAAI,mCAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACvE,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QACpD,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QACrC,mBAAmB,GAAG;YACpB,GAAG,uBAAuB;YAC1B,SAAS,EAAE,OAAO;YAClB,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACjC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACnC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5C,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,SAAS,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACxD,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC3C,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,MAAM,iBAAiB,GAAG,eAAe;YACvC,CAAC,CAAC,qBAAY,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,oBAAoB,CACrD,kBAA2B,CAC5B;YACH,CAAC,CAAC,EAAE,CAAC;QAEP,mEAAmE;QACnE,2CAA2C;QAC3C,MAAM,iBAAiB,GAAG,CAAC,MAAA,iBAAiB,CAAC,iBAAiB,mCAC5D,0BAA0B,CAA2B,CAAC;QAExD,IAAI,GAAG,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,IAAI,mCAAI,iBAAiB,CAAC;QAC/C,GAAG,GAAG,IAAA,0BAAmB,EAAC,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;QAE9C,mBAAmB,GAAG;YACpB,GAAG,uBAAuB;YAC1B,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,GAAG;YACb,iBAAiB;YACjB,iBAAiB,EAAE,IAAA,0BAAmB,EAAC,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;YACvE,GAAG,iBAAiB;SACrB,CAAC;IACJ,CAAC;IACD,MAAM,gBAAgB,GAAG,MAAA,MAAA,YAAY,CAAC,IAAI,0CAAE,MAAM,mCAAI,EAAE,CAAC;IAEzD,MAAM,oBAAoB,GAAG,eAAe;QAC1C,CAAC,CAAC,qBAAY,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,oBAAoB,CACrD,kBAA2B,CAC5B;QACH,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,gBAAgB,GAAmB;QACvC,GAAG,IAAA,mCAAyB,EAAC,MAAA,YAAY,CAAC,IAAI,0CAAE,MAAM,CAAC;QACvD,GAAG,oBAAoB;KACxB,CAAC;IACF,MAAM,aAAa,GAAG,IAAA,iCAAuB,EAC3C,kBAAkB,CAAC,UAAU,EAC7B,aAAa,EACb,gBAAgB,CACjB,CAAC;IAEF,MAAM,yBAAyB,GAAG,IAAA,yBAAe,EAAC,gBAAgB,CAAC,CAAC;IAEpE,MAAM,uBAAuB,GAAG,MAAM,CAAC,WAAW,CAChD,MAAM,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;QAC9D,GAAG;QACH,IAAA,wDAAiD,EAAC,KAAK,EAAE;YACvD,aAAa,EAAE,GAAG,CAAC,aAAa;SACjC,CAAC;KACH,CAAC,CACH,CAAC;IAEF,qEAAqE;IACrE,2EAA2E;IAC3E,2EAA2E;IAC3E,2EAA2E;IAC3E,2CAA2C;IAC3C,MAAM,aAAa,GAAG;QACpB,GAAG,mBAAmB;QACtB,GAAG,aAAa;QAChB,GAAG,uBAAuB;KAC3B,CAAC;IAEF,MAAM,eAAe,GACnB,CAAC,MAAA,OAAO,CAAC,uBAAuB,mCAAI,IAAI,CAAC;QACvC,CAAC,CAAC,MAAM,IAAA,2BAAoB,EACxB,aAAa,EACb,KAAK,EAAE,kBAAkB,EAAE,EAAE;YAC3B,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,IAAA,+BAAuB,EAC7D;gBACE,GAAG,GAAG;gBACN,aAAa,EAAE,kBAAkB;aAClC,EACD;gBACE,uBAAuB,EAAE,KAAK,EAAE,qFAAqF;aACtH,CACF,CAAC;YACF,OAAO,YAAY,CAAC;QACtB,CAAC,CACF;QACH,CAAC,CAAC,aAAa,CAAC;IAEpB,MAAM,OAAO,GAAG,WAAW,CAAC,eAAe,CAAC,CAAC;IAE7C,OAAO;QACL,OAAO;QACP,gBAAgB;QAChB,WAAW,EAAE;YACX,KAAK,EAAE,MAAM,IAAA,2CAAoB,EAC/B,kBAAkB,CAAC,UAAU,EAC7B,aAAa,EACb,CAAC,cAAc;gBACb,IAAA,+BAAuB,EAAC,cAAc,CAAC;gBACvC,cAAc,CAAC,OAAO,CAAC;gBACvB,IAAI,CACP;YACD,MAAM,EAAE,MAAM,IAAA,2CAAoB,EAChC,kBAAkB,CAAC,UAAU,EAC7B,aAAa,EACb,CAAC,eAAe,IAAI,eAAe,CAAC,OAAO,CAAC,IAAI,IAAI,CACrD;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAxIW,QAAA,uBAAuB,2BAwIlC;AAEF,MAAM,gBAAgB,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAEtD,MAAM,gBAAgB,GAAG,CAC9B,GAAW,EACX,aAAqB,EACrB,GAAW,EACX,EAAE,CAAC,MAAM,gBAAgB,CAAC,GAAG,CAAC,IAAI,gBAAgB,CAAC,aAAa,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,kCAAkC;AAJnG,QAAA,gBAAgB,oBAIgD;AAE7E,MAAM,WAAW,GAAG,CAClB,IAAO,EAC4B,EAAE,CAAC,CAAC;IACvC,GAAG,IAAI;IACP,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;CACrD,CAAC,CAAC;AAEI,MAAM,0BAA0B,GAAG,CACxC,OAAyB,EACzB,GAAW,EACX,EAAE,CAAC,IAAA,wBAAgB,EAAC,OAAO,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AAH5D,QAAA,0BAA0B,8BAGkC"}

package/dist/packages/pipeline/src/context/index.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 export * from "./createComponentContext";
 export * from "./getEnvConfig";
+export * from "./getEnvInherit";
 export * from "./getEnvironment";
 export * from "./getEnvironmentVariables";

package/dist/packages/pipeline/src/context/index.js CHANGED Viewed

@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./createComponentContext"), exports);
 __exportStar(require("./getEnvConfig"), exports);
+__exportStar(require("./getEnvInherit"), exports);
 __exportStar(require("./getEnvironment"), exports);
 __exportStar(require("./getEnvironmentVariables"), exports);
 //# sourceMappingURL=index.js.map

package/dist/packages/pipeline/src/context/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/context/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2DAAyC;AACzC,iDAA+B;AAC/B,mDAAiC;AACjC,4DAA0C"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/pipeline/src/context/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2DAAyC;AACzC,iDAA+B;AAC/B,kDAAgC;AAChC,mDAAiC;AACjC,4DAA0C"}

package/dist/packages/pipeline/src/deploy/base/deploy.js CHANGED Viewed

@@ -14,8 +14,11 @@ class DeployJob extends jobs_1.CatladderJob {
         var _a, _b, _c, _d, _e, _f, _g;
         const hasDocker = (0, docker_1.requiresDockerBuild)(context);
         const isStoppable = (0, utils_1.contextIsStoppable)(context);
+        // env-level autoStop config wins; the env type only supplies the
+        // default (via the project-wide `autoStop` durations)
+        const autoStopConfigured = context.environment.autoStop;
         const autoStopConfig = (0, autoStop_1.getAutoStopConfig)(context.fullConfig);
-        const autoStop = context.environment.envType === "review"
+        const autoStopDefault = context.environment.envType === "review"
             ? // review envs read the lifetime from a pipeline variable, so
                 // the pin label's workflow rule can override it to "never"
                 autoStopConfig.pinLabel === false
@@ -24,6 +27,13 @@ class DeployJob extends jobs_1.CatladderJob {
             : context.environment.envType === "dev"
                 ? autoStopConfig.dev
                 : undefined;
+        // NOTE: an explicit env-level autoStop is a literal — a review env
+        // overriding it opts out of the pin-label variable indirection
+        const autoStop = autoStopConfigured === undefined
+            ? autoStopDefault
+            : autoStopConfigured === false
+                ? undefined
+                : autoStopConfigured;
         const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
         // if auto or manual is configured explicitly, use that
         const whenDeployDefined = deployConfig && deployConfig.when ? deployConfig.when : undefined;

package/dist/packages/pipeline/src/deploy/base/deploy.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/deploy/base/deploy.ts"],"names":[],"mappings":";;;AAAA,+CAG4B;AAE5B,iDAG6B;AAE7B,2CAAgD;AAChD,oCAA8C;AAC9C,6CAA8E;AAC9E,iCAAuC;AAEvC,2CAAsD;AAEzC,QAAA,eAAe,GAAG,WAAW,CAAC;AAE3C,MAAa,SAAU,SAAQ,mBAAY;IACzC,YAAY,OAAyB,EAAE,aAAkC;;QACvE,MAAM,SAAS,GAAG,IAAA,4BAAmB,EAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,WAAW,GAAG,IAAA,0BAAkB,EAAC,OAAO,CAAC,CAAC;QAEhD,MAAM,cAAc,GAAG,IAAA,4BAAiB,EAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC7D,MAAM,~~QAAQ~~,~~GACZ~~,OAAO,CAAC,WAAW,CAAC,OAAO,KAAK,QAAQ;YACtC,CAAC,CAAC,6DAA6D;gBAC7D,2DAA2D;gBAC3D,cAAc,CAAC,QAAQ,KAAK,KAAK;oBACjC,CAAC,CAAC,cAAc,CAAC,MAAM;oBACvB,CAAC,CAAC,IAAI,oCAAyB,EAAE;YACnC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,KAAK,KAAK;gBACrC,CAAC,CAAC,cAAc,CAAC,GAAG;gBACpB,CAAC,CAAC,SAAS,CAAC;~~QAElB~~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~~AAtID~~,~~8BAsIC~~"}
1	+ {"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/deploy/base/deploy.ts"],"names":[],"mappings":"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"}

package/dist/packages/pipeline/src/deploy/cloudRun/artifactsRegistry.js CHANGED Viewed

@@ -30,7 +30,8 @@ exports.getArtifactsRegistryDockerUrl = getArtifactsRegistryDockerUrl;
  * lecacyReviewImageName is only temporary. In old versions the images had no reviewslug in review apps, which makes cleanup harder. We delete all those images now, but need the path
  */
 const getArtifactsRegistryImageName = (context, lecacyReviewImageName = false) => {
-    if (lecacyReviewImageName && context.environment.envType !== "review") {
+    const { instance } = context.environment;
+    if (lecacyReviewImageName && instance.type !== "review") {
         throw new Error("lecacyReviewImageName is only allowed for review app");
     }
     const dockerUrl = (0, exports.getArtifactsRegistryDockerUrl)(context);
@@ -38,8 +39,8 @@ const getArtifactsRegistryImageName = (context, lecacyReviewImageName = false) =
         dockerUrl,
         context.env,
         context.name,
-        ...(context.environment.reviewSlug && !lecacyReviewImageName
-            ? [context.environment.reviewSlug]
+        ...(instance.type === "review" && !lecacyReviewImageName
+            ? [instance.reviewSlug]
             : []),
     ];
     return (0, bash_1.joinBashExpressions)(gcloudImagePath, "/");
@@ -89,7 +90,7 @@ const getDeleteUnusedImagesCommands = (context, keep = 0) => {
         ...getDeleteImageCommands(buildCacheImageName, 1),
         // because a recent version of catladder had no review-slug in the image name, we have to delete those as well
         // we can later remove this line in some months
-        ...(context.environment.envType === "review"
+        ...(context.environment.instance.type === "review"
             ? (0, gitlab_1.allowFailureInScripts)(getDeleteImageCommands((0, exports.getArtifactsRegistryImageName)(context, true), 0))
             : []),
     ];

package/dist/packages/pipeline/src/deploy/cloudRun/artifactsRegistry.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"artifactsRegistry.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/deploy/cloudRun/artifactsRegistry.ts"],"names":[],"mappings":";;;AACA,0CAAsD;AAEtD,+CAA2D;AAC3D,oCAA0C;AAC1C,iGAA8F;AAEvF,MAAM,wBAAwB,GAAG,CAAC,OAAyB,EAAE,EAAE;;IACpE,IAAI,CAAC,IAAA,sBAAc,EAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,CAAC;QAC/D,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,iBAAiB,CAAC;AAC1D,CAAC,CAAC;AANW,QAAA,wBAAwB,4BAMnC;AAEK,MAAM,6BAA6B,GAAG,CAAC,OAAyB,EAAE,EAAE;;IACzE,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAE5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACrD,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,WAAW,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC,YAAY,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;IAEvF,OAAO,GAAG,IAAA,gCAAwB,EAAC,OAAO,CAAC,IACzC,YAAY,CAAC,SACf,qBAAqB,WAAW,EAAE,CAAC;AACrC,CAAC,CAAC;AAbW,QAAA,6BAA6B,iCAaxC;AAEF;;;GAGG;AACI,MAAM,6BAA6B,GAAG,CAC3C,OAAyB,EACzB,qBAAqB,GAAG,KAAK,EAC7B,EAAE;IACF,~~IAAI~~,~~qBAAqB~~,~~IAAI~~,OAAO,CAAC,WAAW,CAAC,~~OAAO~~,KAAK,QAAQ,EAAE,CAAC;~~QACtE~~,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,SAAS,GAAG,IAAA,qCAA6B,EAAC,OAAO,CAAC,CAAC;IACzD,MAAM,eAAe,GAAG;QACtB,SAAS;QACT,OAAO,CAAC,GAAG;QACX,OAAO,CAAC,IAAI;QACZ,GAAG,CAAC,~~OAAO~~,CAAC,~~WAAW~~,~~CAAC~~,~~UAAU~~,IAAI,CAAC,qBAAqB;~~YAC1D~~,CAAC,CAAC,CAAC,~~OAAO~~,CAAC,~~WAAW,CAAC,~~UAAU,CAAC;~~YAClC~~,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;IACF,OAAO,IAAA,0BAAmB,EAAC,eAAe,EAAE,GAAG,CAAC,CAAC;AACnD,CAAC,CAAC;~~AAlBW~~,QAAA,6BAA6B,~~iCAkBxC~~;AAEK,MAAM,mCAAmC,GAAG,CACjD,OAAyB,EACzB,EAAE;IACF,MAAM,SAAS,GAAG,IAAA,qCAA6B,EAAC,OAAO,CAAC,CAAC;IACzD,0FAA0F;IAC1F,MAAM,eAAe,GAAG,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5D,OAAO,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACnC,CAAC,CAAC;AAPW,QAAA,mCAAmC,uCAO9C;AAEK,MAAM,yBAAyB,GAAG,CAAC,OAAyB,EAAE,EAAE,CACrE,GAAG,IAAA,qCAA6B,EAAC,OAAO,CAAC,oBAAoB,CAAC;AADnD,QAAA,yBAAyB,6BAC0B;AAEhE,MAAM,sBAAsB,GAAG,CAC7B,aAAqC,EACrC,UAAU,GAAG,CAAC,EACd,EAAE;IACF,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;QACrB,kDAAkD;QAClD,OAAO;YACL,yCAAyC,aAAa,wBAAwB;SAC/E,CAAC;IACJ,CAAC;IACD,qBAAqB;IACrB,MAAM,oBAAoB,GAAG,uCAAuC,aAAa,mDAAmD,CAAC;IAErI,MAAM,yBAAyB,GAAG,IAAA,qEAAiC,EACjE,oBAAoB,EACpB,UAAU,CACX,CAAC;IACF,MAAM,kBAAkB,GAAG,yCAAyC,aAAa,iCAAiC,CAAC;IAEnH,MAAM,mBAAmB,GAAG,GAAG,yBAAyB,gCAAgC,kBAAkB,QAAQ,CAAC;IAEnH,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAC/B,CAAC,CAAC;AAEF;;;;;;GAMG;AACI,MAAM,6BAA6B,GAAG,CAC3C,OAAyB,EACzB,IAAI,GAAG,CAAC,EACR,EAAE;;IACF,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,iBAAiB,CAAC,EAAE,CAAC;QACrD,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,aAAa,GAAG,IAAA,qCAA6B,EAAC,OAAO,CAAC,CAAC;IAC7D,MAAM,mBAAmB,GAAG,IAAA,2CAAmC,EAAC,OAAO,CAAC,CAAC;IAEzE,OAAO;QACL,GAAG,sBAAsB,CAAC,aAAa,EAAE,IAAI,CAAC;QAC9C,GAAG,sBAAsB,CAAC,mBAAmB,EAAE,CAAC,CAAC;QACjD,8GAA8G;QAC9G,+CAA+C;QAE/C,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,~~OAAO~~,KAAK,QAAQ;~~YAC1C~~,CAAC,CAAC,IAAA,8BAAqB,EACnB,sBAAsB,CACpB,IAAA,qCAA6B,EAAC,OAAO,EAAE,IAAI,CAAC,EAC5C,CAAC,CACF,CACF;YACH,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC,CAAC;AA5BW,QAAA,6BAA6B,iCA4BxC"}
1	+ {"version":3,"file":"artifactsRegistry.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/deploy/cloudRun/artifactsRegistry.ts"],"names":[],"mappings":"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"}

package/dist/packages/pipeline/src/deploy/cloudRun/cleanup.js CHANGED Viewed

@@ -5,12 +5,18 @@ const gitlab_1 = require("../../utils/gitlab");
 const artifactsRegistry_1 = require("./artifactsRegistry");
 const cloudRunRevisions_1 = require("./cloudRunRevisions");
 const getRemoveOldRevisionsAndImagesCommand = (context, when) => {
+    var _a;
     if (when === "onStop") {
         // service is already deleted, so we don't need to delete old revisions, just delete all images
         return (0, artifactsRegistry_1.getDeleteUnusedImagesCommands)(context);
     }
-    // this number only targets inactive revisions
-    const revisionsToKeep = context.environment.envType === "prod" ? 5 : 0;
+    const deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
+    const configuredRevisionsToKeep = deployConfig && deployConfig.type === "google-cloudrun"
+        ? deployConfig.revisionsToKeep
+        : undefined;
+    // this number only targets inactive revisions; the env type only
+    // supplies the default (prod keeps a rollback history)
+    const revisionsToKeep = configuredRevisionsToKeep !== null && configuredRevisionsToKeep !== void 0 ? configuredRevisionsToKeep : (context.environment.envType === "prod" ? 5 : 0);
     // this number needs to be higher than inactive after deploy, so we add one
     const imagesToKeep = revisionsToKeep + 1;
     const deleteOldRevisionsCommands = (0, cloudRunRevisions_1.getDeleteUnusedRevisionsCommands)(context, revisionsToKeep);

package/dist/packages/pipeline/src/deploy/cloudRun/cleanup.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/deploy/cloudRun/cleanup.ts"],"names":[],"mappings":";;;AACA,+CAA2D;AAC3D,2DAAoE;AACpE,2DAAuE;AAEhE,MAAM,qCAAqC,GAAG,CACnD,OAAyB,EACzB,IAA6B,EAC7B,EAAE;IACF,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,+FAA+F;QAC/F,OAAO,IAAA,iDAA6B,EAAC,OAAO,CAAC,CAAC;IAChD,CAAC;IAED,~~8CAA8C~~;~~IAC9C~~,MAAM,eAAe,~~GAAG~~,OAAO,CAAC,WAAW,CAAC,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;~~IAEvE~~,2EAA2E;IAC3E,MAAM,YAAY,GAAG,eAAe,GAAG,CAAC,CAAC;IAEzC,MAAM,0BAA0B,GAAG,IAAA,oDAAgC,EACjE,OAAO,EACP,eAAe,CAChB,CAAC;IACF,MAAM,uBAAuB,GAAG,IAAA,iDAA6B,EAC3D,OAAO,EACP,YAAY,CACb,CAAC;IAEF,OAAO,IAAA,8BAAqB,EAAC;QAC3B,GAAG,0BAA0B;QAC7B,GAAG,uBAAuB;KAC3B,CAAC,CAAC;AACL,CAAC,CAAC;~~AA5BW~~,QAAA,qCAAqC,~~yCA4BhD~~"}
1	+ {"version":3,"file":"cleanup.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/deploy/cloudRun/cleanup.ts"],"names":[],"mappings":";;;AACA,+CAA2D;AAC3D,2DAAoE;AACpE,2DAAuE;AAEhE,MAAM,qCAAqC,GAAG,CACnD,OAAyB,EACzB,IAA6B,EAC7B,EAAE;;IACF,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;QACtB,+FAA+F;QAC/F,OAAO,IAAA,iDAA6B,EAAC,OAAO,CAAC,CAAC;IAChD,CAAC;IAED,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,MAAM,yBAAyB,GAC7B,YAAY,IAAI,YAAY,CAAC,IAAI,KAAK,iBAAiB;QACrD,CAAC,CAAC,YAAY,CAAC,eAAe;QAC9B,CAAC,CAAC,SAAS,CAAC;IAEhB,iEAAiE;IACjE,uDAAuD;IACvD,MAAM,eAAe,GACnB,yBAAyB,aAAzB,yBAAyB,cAAzB,yBAAyB,GACzB,CAAC,OAAO,CAAC,WAAW,CAAC,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEnD,2EAA2E;IAC3E,MAAM,YAAY,GAAG,eAAe,GAAG,CAAC,CAAC;IAEzC,MAAM,0BAA0B,GAAG,IAAA,oDAAgC,EACjE,OAAO,EACP,eAAe,CAChB,CAAC;IACF,MAAM,uBAAuB,GAAG,IAAA,iDAA6B,EAC3D,OAAO,EACP,YAAY,CACb,CAAC;IAEF,OAAO,IAAA,8BAAqB,EAAC;QAC3B,GAAG,0BAA0B;QAC7B,GAAG,uBAAuB;KAC3B,CAAC,CAAC;AACL,CAAC,CAAC;AArCW,QAAA,qCAAqC,yCAqChD"}

package/dist/packages/pipeline/src/deploy/cloudRun/index.js CHANGED Viewed

@@ -11,7 +11,7 @@ const cloudRunExecutionUrl_1 = require("./utils/cloudRunExecutionUrl");
 const database_1 = require("./utils/database");
 const getServiceName_1 = require("./utils/getServiceName");
 exports.GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
-const getCloudSqlVariables = ({ deployConfigRaw, environmentSlugPrefix, env, componentName, fullConfig, }) => {
+const getCloudSqlVariables = ({ deployConfigRaw, environmentSlugPrefix, secretsEnv, componentName, fullConfig, }) => {
     var _a, _b, _c;
     if (deployConfigRaw && deployConfigRaw.cloudSql) {
         const DB_NAME = (0, utils_1.getFullDbName)(deployConfigRaw.cloudSql, fullConfig, environmentSlugPrefix, componentName);
@@ -22,7 +22,7 @@ const getCloudSqlVariables = ({ deployConfigRaw, environmentSlugPrefix, env, com
             CLOUD_SQL_INSTANCE_CONNECTION_NAME: deployConfigRaw.cloudSql.instanceConnectionName,
             DB_NAME: DB_NAME,
             DB_USER: (_b = deployConfigRaw.cloudSql.dbUser) !== null && _b !== void 0 ? _b : "postgres",
-            DB_PASSWORD: "$" + (0, context_1.getSecretVarName)(env, componentName, "DB_PASSWORD"),
+            DB_PASSWORD: "$" + (0, context_1.getSecretVarName)(secretsEnv, componentName, "DB_PASSWORD"),
         };
         return {
             ...dbVars,

package/dist/packages/pipeline/src/deploy/cloudRun/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/deploy/cloudRun/index.ts"],"names":[],"mappings":";;;AACA,0CAAsD;AAEtD,2CAAiD;AACjD,uCAAqD;AAErD,+CAG4B;AAC5B,6CAAkD;AAClD,6CAA8D;AAC9D,uEAAwE;AACxE,+CAI0B;AAC1B,2DAGgC;AAEnB,QAAA,6BAA6B,GAAG,8BAA8B,CAAC;AAE5E,MAAM,oBAAoB,GAAG,CAAC,EAC5B,eAAe,EACf,qBAAqB,EACrB,~~GAAG~~,~~EACH~~,aAAa,EACb,UAAU,GAC4C,EAAE,EAAE;;IAC1D,IAAI,eAAe,IAAI,eAAe,CAAC,QAAQ,EAAE,CAAC;QAChD,MAAM,OAAO,GAAG,IAAA,qBAAa,EAC3B,eAAe,CAAC,QAAQ,EACxB,UAAU,EACV,qBAAqB,EACrB,aAAa,CACd,CAAC;QAEF,MAAM,2BAA2B,GAAG,MAAM,CAAC,OAAO,CAChD,MAAA,eAAe,CAAC,QAAQ,CAAC,uBAAuB,mCAAI,EAAE,CACvD;aACE,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,IAAI,GAAG,IAAI,KAAK,EAAE,CAAC;aACzC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEZ,MAAM,MAAM,GAAG;YACb,kCAAkC,EAChC,eAAe,CAAC,QAAQ,CAAC,sBAAsB;YACjD,OAAO,EAAE,OAAO;YAChB,OAAO,EAAE,MAAA,eAAe,CAAC,QAAQ,CAAC,MAAM,mCAAI,UAAU;YACtD,WAAW,~~EAAE~~,GAAG,GAAG,IAAA,0BAAgB,EAAC,~~GAAG~~,EAAE,aAAa,EAAE,aAAa,CAAC;~~SACvE~~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"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/deploy/cloudRun/index.ts"],"names":[],"mappings":"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"}

package/dist/packages/pipeline/src/deploy/cloudRun/utils/getServiceName.js CHANGED Viewed

@@ -156,7 +156,7 @@ const fromComponentContext = (context) => {
         environmentSlugPrefix: context.environment.slugPrefix,
         componentName: context.name,
         env: context.env,
-        isReviewEnv: context.environment.envType === "review",
+        isReviewEnv: context.environment.instance.type === "review",
         deployConfig: deployConfig && deployConfig.type === "google-cloudrun"
             ? deployConfig
             : null,
@@ -168,7 +168,7 @@ const fromEnvironmentContext = (context) => ({
     environmentSlugPrefix: context.environmentSlugPrefix,
     componentName: context.componentName,
     env: context.env,
-    isReviewEnv: context.envType === "review",
+    isReviewEnv: context.instance.type === "review",
     deployConfig: context.deployConfigRaw || null,
     config: context.fullConfig,
 });

package/dist/packages/pipeline/src/deploy/cloudRun/utils/getServiceName.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getServiceName.js","sourceRoot":"","sources":["../../../../../../../../../packages/pipeline/src/deploy/cloudRun/utils/getServiceName.ts"],"names":[],"mappings":"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~~OAAO~~,KAAK,QAAQ;~~QACrD~~,YAAY,EACV,YAAY,IAAI,YAAY,CAAC,IAAI,KAAK,iBAAiB;YACrD,CAAC,CAAC,YAAY;YACd,CAAC,CAAC,IAAI;QACV,MAAM,EAAE,OAAO,CAAC,UAAU;KAC3B,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,sBAAsB,GAAG,CAC7B,OAA8D,EAC5C,EAAE,CAAC,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC,QAAQ;IAC1B,qBAAqB,EAAE,OAAO,CAAC,qBAAqB;IACpD,aAAa,EAAE,OAAO,CAAC,aAAa;IACpC,GAAG,EAAE,OAAO,CAAC,GAAG;IAChB,WAAW,EAAE,OAAO,CAAC,~~OAAO~~,KAAK,QAAQ;~~IACzC~~,YAAY,EAAE,OAAO,CAAC,eAAe,IAAI,IAAI;IAC7C,MAAM,EAAE,OAAO,CAAC,UAAU;CAC3B,CAAC,CAAC;AAEH;;;GAGG;AACI,MAAM,cAAc,GAAG,CAAC,OAAyB,EAAE,EAAE,CAC1D,iBAAiB,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;AADpD,QAAA,cAAc,kBACsC;AAE1D,MAAM,2BAA2B,GAAG,CACzC,OAA8D,EAC9D,EAAE,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;AAFzD,QAAA,2BAA2B,+BAE8B;AAEtE;;;GAGG;AACI,MAAM,8BAA8B,GAAG,CAC5C,OAA8D,EAC9D,EAAE,CAAC,iBAAiB,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAC;AAF3C,QAAA,8BAA8B,kCAEa"}
1	+ {"version":3,"file":"getServiceName.js","sourceRoot":"","sources":["../../../../../../../../../packages/pipeline/src/deploy/cloudRun/utils/getServiceName.ts"],"names":[],"mappings":"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"}

package/dist/packages/pipeline/src/deploy/kubernetes/index.js CHANGED Viewed

@@ -28,9 +28,9 @@ exports.KUBERNETES_DEPLOY_TYPE = {
     jobs: deployJob_1.createKubernetesDeployJobs,
     defaults: () => ({}),
     additionalSecretKeys: additionalSecretKeys_1.additionalKubernetesSecretKeys,
-    getAdditionalEnvVars: ({ componentName, fullConfig, deployConfigRaw, env, reviewSlug, envType, }) => {
+    getAdditionalEnvVars: ({ componentName, fullConfig, deployConfigRaw, env, instance, }) => {
         var _a;
-        const KUBE_APP_NAME_PREFIX = envType === "review" && reviewSlug ? reviewSlug.concat("-") : "";
+        const KUBE_APP_NAME_PREFIX = instance.type === "review" ? instance.reviewSlug.concat("-") : "";
         const KUBE_APP_NAME = KUBE_APP_NAME_PREFIX.concat(componentName);
         const KUBE_NAMESPACE = (0, __1.getKubernetesNamespace)(fullConfig, env);
         const componentSlug = (0, slugify_1.default)(componentName);
@@ -39,7 +39,7 @@ exports.KUBERNETES_DEPLOY_TYPE = {
             "panter.cloud";
         const HOSTNAME_INTERNAL = (0, bash_1.joinBashExpressions)([
             componentSlug,
-            ...(envType === "review" && reviewSlug ? [reviewSlug] : []),
+            ...(instance.type === "review" ? [instance.reviewSlug] : []),
             env,
             fullConfig.appName,
             fullConfig.customerName,

package/dist/packages/pipeline/src/deploy/kubernetes/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/deploy/kubernetes/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,sDAA8B;AAE9B,0BAA4C;AAC5C,0CAAsD;AACtD,iEAAwE;AACxE,2CAAyD;AACzD,6CAA2B;AACd,QAAA,sBAAsB,GACjC;IACE,IAAI,EAAE,sCAA0B;IAChC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;IACpB,oBAAoB,EAAE,qDAA8B;IACpD,oBAAoB,EAAE,CAAC,EACrB,aAAa,EACb,UAAU,EACV,eAAe,EACf,GAAG,EACH,~~UAAU~~,~~EACV~~,~~OAAO,GACR,~~EAAE,EAAE;;QACH,MAAM,oBAAoB,GACxB,~~OAAO~~,KAAK,QAAQ,~~IAAI~~,~~UAAU,~~CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;~~QACnE~~,MAAM,aAAa,GAAG,oBAAoB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QACjE,MAAM,cAAc,GAAG,IAAA,0BAAsB,EAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAC/D,MAAM,aAAa,GAAG,IAAA,iBAAO,EAAC,aAAa,CAAC,CAAC;QAE7C,MAAM,eAAe,GACnB,CAAC,eAAe,KAAI,MAAA,eAAe,CAAC,OAAO,0CAAE,eAAe,CAAA,CAAC,IAAI,gKAAgK;YACjO,UAAU,CAAC,eAAe;YAC1B,cAAc,CAAC;QAEjB,MAAM,iBAAiB,GAAG,IAAA,0BAAmB,EAC3C;YACE,aAAa;YACb,GAAG,CAAC,~~OAAO~~,KAAK,QAAQ,~~IAAI~~,~~UAAU,~~CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;~~YAC3D~~,GAAG;YACH,UAAU,CAAC,OAAO;YAClB,UAAU,CAAC,YAAY;YACvB,eAAe;SAChB,EACD,GAAG,CACJ,CAAC,CAAC,kCAAkC;QACrC,OAAO;YACL,cAAc;YACd,aAAa;YACb,oBAAoB;YACpB,iBAAiB;SAClB,CAAC;IACJ,CAAC;CACF,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/deploy/kubernetes/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,sDAA8B;AAE9B,0BAA4C;AAC5C,0CAAsD;AACtD,iEAAwE;AACxE,2CAAyD;AACzD,6CAA2B;AACd,QAAA,sBAAsB,GACjC;IACE,IAAI,EAAE,sCAA0B;IAChC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC;IACpB,oBAAoB,EAAE,qDAA8B;IACpD,oBAAoB,EAAE,CAAC,EACrB,aAAa,EACb,UAAU,EACV,eAAe,EACf,GAAG,EACH,QAAQ,GACT,EAAE,EAAE;;QACH,MAAM,oBAAoB,GACxB,QAAQ,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACpE,MAAM,aAAa,GAAG,oBAAoB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QACjE,MAAM,cAAc,GAAG,IAAA,0BAAsB,EAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAC/D,MAAM,aAAa,GAAG,IAAA,iBAAO,EAAC,aAAa,CAAC,CAAC;QAE7C,MAAM,eAAe,GACnB,CAAC,eAAe,KAAI,MAAA,eAAe,CAAC,OAAO,0CAAE,eAAe,CAAA,CAAC,IAAI,gKAAgK;YACjO,UAAU,CAAC,eAAe;YAC1B,cAAc,CAAC;QAEjB,MAAM,iBAAiB,GAAG,IAAA,0BAAmB,EAC3C;YACE,aAAa;YACb,GAAG,CAAC,QAAQ,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5D,GAAG;YACH,UAAU,CAAC,OAAO;YAClB,UAAU,CAAC,YAAY;YACvB,eAAe;SAChB,EACD,GAAG,CACJ,CAAC,CAAC,kCAAkC;QACrC,OAAO;YACL,cAAc;YACd,aAAa;YACb,oBAAoB;YACpB,iBAAiB;SAClB,CAAC;IACJ,CAAC;CACF,CAAC"}

package/dist/packages/pipeline/src/deploy/pages/deployJob.js CHANGED Viewed

@@ -14,7 +14,8 @@ const createPagesDeployJobs = async (context) => {
         throw new Error("deploy config is not pages");
     }
     const onGithub = context.pipelineType === "github";
-    if (onGithub && context.environment.envType === "review") {
+    const isReviewApp = context.environment.instance.type === "review";
+    if (onGithub && isReviewApp) {
         // github pages serves ONE site per repository and deploy-pages
         // replaces all of it — there is no path_prefix equivalent, so per-PR
         // previews cannot exist (deploy-pages has a `preview` input, but it
@@ -25,7 +26,7 @@ const createPagesDeployJobs = async (context) => {
     }
     // review environments publish under their own path prefix (gitlab
     // parallel deployments) — every merge request gets a site preview
-    const pathPrefix = context.environment.envType === "review" ? "mr-$CI_MERGE_REQUEST_IID" : "";
+    const pathPrefix = isReviewApp ? "mr-$CI_MERGE_REQUEST_IID" : "";
     const publishDir = (_b = deployConfig.publishDir) !== null && _b !== void 0 ? _b : "public";
     const packageManagerInstall = await (0, packageManagerInstall_1.getPackageManagerInstall)(context, {
         noCustomPostInstall: true,

package/dist/packages/pipeline/src/deploy/pages/deployJob.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/deploy/pages/deployJob.ts"],"names":[],"mappings":";;;AAAA,iGAA8F;AAC9F,kFAAkF;AAClF,yCAA8C;AAG9C,kCAAgD;AAChD,oCAA0C;AAEnC,MAAM,qBAAqB,GAAG,KAAK,EACxC,OAAyB,EACA,EAAE;;IAC3B,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,OAAO,CAAC,EAAE,CAAC;QAC3C,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAChD,CAAC;IACD,MAAM,QAAQ,GAAG,OAAO,CAAC,YAAY,KAAK,QAAQ,CAAC;IACnD,~~IAAI~~,~~QAAQ~~,~~IAAI~~,OAAO,CAAC,WAAW,CAAC,~~OAAO~~,KAAK,QAAQ,EAAE,CAAC;~~QACzD~~,+DAA+D;QAC/D,qEAAqE;QACrE,oEAAoE;QACpE,qEAAqE;QACrE,mEAAmE;QACnE,OAAO,CAAC,IAAI,CACV,cAAc,OAAO,CAAC,IAAI,mHAAmH,CAC9I,CAAC;QACF,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,kEAAkE;IAClE,kEAAkE;IAClE,MAAM,UAAU,~~GACd~~,~~OAAO,CAAC,~~WAAW,CAAC,~~OAAO,KAAK,QAAQ,~~CAAC,CAAC,~~CAAC,~~0BAA0B,CAAC,CAAC,CAAC,EAAE,CAAC;~~IAC7E~~,MAAM,UAAU,GAAG,MAAA,YAAY,CAAC,UAAU,mCAAI,QAAQ,CAAC;IAEvD,MAAM,qBAAqB,GAAG,MAAM,IAAA,gDAAwB,EAAC,OAAO,EAAE;QACpE,mBAAmB,EAAE,IAAI;KAC1B,CAAC,CAAC;IAEH,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,IAAA,2DAA4B,EAAC,OAAO,EAAE,YAAY,CAAC;YAC1D,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,UAAU,CAAC,EAAE;YAClC,KAAK,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE;YAClC,MAAM,EAAE;gBACN,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;gBACzB,GAAG,CAAC,CAAC,MAAA,YAAY,CAAC,eAAe,mCAAI,YAAY,CAAC,mBAAmB,CAAC;oBACpE,CAAC,CAAC,qBAAqB;oBACvB,CAAC,CAAC,EAAE,CAAC;gBACP,GAAG,YAAY,CAAC,MAAM;gBACtB,gEAAgE;gBAChE,8DAA8D;gBAC9D,iEAAiE;gBACjE,oDAAoD;gBACpD,GAAG,CAAC,QAAQ;oBACV,CAAC,CAAC,EAAE;oBACJ,CAAC,CAAC;wBACE,iCAAiC,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG;qBACvE,CAAC;aACP;YACD,SAAS,EAAE,EAAE;YACb,eAAe,EAAE;gBACf,0DAA0D;gBAC1D,YAAY,EAAE,UAAU;gBACxB,iEAAiE;gBACjE,+DAA+D;gBAC/D,yBAAyB,EAAE,KAAK;gBAChC,uBAAuB,EAAE,KAAK;aAC/B;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAhEW,QAAA,qBAAqB,yBAgEhC"}
1	+ {"version":3,"file":"deployJob.js","sourceRoot":"","sources":["../../../../../../../../packages/pipeline/src/deploy/pages/deployJob.ts"],"names":[],"mappings":";;;AAAA,iGAA8F;AAC9F,kFAAkF;AAClF,yCAA8C;AAG9C,kCAAgD;AAChD,oCAA0C;AAEnC,MAAM,qBAAqB,GAAG,KAAK,EACxC,OAAyB,EACA,EAAE;;IAC3B,MAAM,YAAY,GAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,MAAM,CAAC;IAC5C,IAAI,CAAC,IAAA,sBAAc,EAAC,YAAY,EAAE,OAAO,CAAC,EAAE,CAAC;QAC3C,oBAAoB;QACpB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAChD,CAAC;IACD,MAAM,QAAQ,GAAG,OAAO,CAAC,YAAY,KAAK,QAAQ,CAAC;IACnD,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,KAAK,QAAQ,CAAC;IACnE,IAAI,QAAQ,IAAI,WAAW,EAAE,CAAC;QAC5B,+DAA+D;QAC/D,qEAAqE;QACrE,oEAAoE;QACpE,qEAAqE;QACrE,mEAAmE;QACnE,OAAO,CAAC,IAAI,CACV,cAAc,OAAO,CAAC,IAAI,mHAAmH,CAC9I,CAAC;QACF,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,kEAAkE;IAClE,kEAAkE;IAClE,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,EAAE,CAAC;IACjE,MAAM,UAAU,GAAG,MAAA,YAAY,CAAC,UAAU,mCAAI,QAAQ,CAAC;IAEvD,MAAM,qBAAqB,GAAG,MAAM,IAAA,gDAAwB,EAAC,OAAO,EAAE;QACpE,mBAAmB,EAAE,IAAI;KAC1B,CAAC,CAAC;IAEH,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,IAAA,2DAA4B,EAAC,OAAO,EAAE,YAAY,CAAC;YAC1D,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,UAAU,CAAC,EAAE;YAClC,KAAK,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE;YAClC,MAAM,EAAE;gBACN,MAAM,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;gBACzB,GAAG,CAAC,CAAC,MAAA,YAAY,CAAC,eAAe,mCAAI,YAAY,CAAC,mBAAmB,CAAC;oBACpE,CAAC,CAAC,qBAAqB;oBACvB,CAAC,CAAC,EAAE,CAAC;gBACP,GAAG,YAAY,CAAC,MAAM;gBACtB,gEAAgE;gBAChE,8DAA8D;gBAC9D,iEAAiE;gBACjE,oDAAoD;gBACpD,GAAG,CAAC,QAAQ;oBACV,CAAC,CAAC,EAAE;oBACJ,CAAC,CAAC;wBACE,iCAAiC,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG;qBACvE,CAAC;aACP;YACD,SAAS,EAAE,EAAE;YACb,eAAe,EAAE;gBACf,0DAA0D;gBAC1D,YAAY,EAAE,UAAU;gBACxB,iEAAiE;gBACjE,+DAA+D;gBAC/D,yBAAyB,EAAE,KAAK;gBAChC,uBAAuB,EAAE,KAAK;aAC/B;SACF;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAhEW,QAAA,qBAAqB,yBAgEhC"}

package/dist/packages/pipeline/src/deploy/types/googleCloudRun.d.ts CHANGED Viewed

@@ -398,6 +398,15 @@ export type DeployConfigCloudRun = Omit<DeployConfigBase, "execute"> & {
     workerPools?: {
         [name: string]: DeployConfigCloudRunWorkerPool | false | null;
     };
+    /**
+     * how many inactive cloud run revisions to keep after a deploy — the
+     * rollback history. Older revisions and their images are deleted by
+     * the post-deploy cleanup (images keep one more than revisions, for
+     * the currently serving one).
+     *
+     * defaults to 5 for prod envs, 0 for every other environment
+     */
+    revisionsToKeep?: number;
     /**
      * add cloudSql
      */

package/dist/packages/pipeline/src/types/config.d.ts CHANGED Viewed

@@ -13,6 +13,24 @@ import type { ProjectImageConfig } from "../customImages/projectImages";
 import type { VerifyConfig } from "../verify/types";
 export declare const ALL_PIPELINE_TRIGGERS: readonly ["mainBranch", "mr", "taggedRelease"];
 export type PipelineTrigger = (typeof ALL_PIPELINE_TRIGGERS)[number];
+/**
+ * a pipeline that runs on pushes to one specific branch (in addition to
+ * the built-in triggers). Declared by an env via its `on` config.
+ */
+export type BranchPipelineTrigger = {
+    branch: string;
+};
+/**
+ * everything a pipeline (and therefore an env's jobs) can run on
+ */
+export type EnvPipelineTrigger = PipelineTrigger | BranchPipelineTrigger;
+/**
+ * the `on` config of an env: a trigger, or `false` for an env that is
+ * not part of any pipeline (like `local`)
+ */
+export type EnvOnConfig = EnvPipelineTrigger | false;
+export declare const isBranchTrigger: (trigger: EnvPipelineTrigger) => trigger is BranchPipelineTrigger;
+export declare const envTriggerEquals: (a: EnvOnConfig | undefined, b: EnvPipelineTrigger) => boolean;
 /**
  * all env types with their trigger.
  * Each env type has a default env with the same name which is always included
@@ -34,16 +52,10 @@ export declare const ENV_TYPES: {
         readonly triggers: readonly [];
     };
 };
-/**
- *
- * @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" | "prod" | "local" | "dev" | "review")[];
 export declare const DEFAULT_ENVS: string[];
-export declare const DEFAULT_ENV_TYPES: ("stage" | "prod" | "local" | "dev" | "review")[];
+export declare const DEFAULT_ENV_TYPES: ("stage" | "prod" | "local" | "review" | "dev")[];
 export type EnvType = keyof typeof ENV_TYPES;
-export declare const isKnowEnvType: (env: string) => env is "stage" | "prod" | "local" | "dev" | "review";
+export declare const isKnowEnvType: (env: string) => env is "stage" | "prod" | "local" | "review" | "dev";
 export type EnvVars = {
     /**
      * public env vars (means: they are checked in the repo).
@@ -120,7 +132,100 @@ export type EnvConfig<E extends EnvType = EnvType> = {
      * host that is used. If not set, a "canonical" url is created
      */
     host?: string;
+    /**
+     * per-component override of the environment's autoStop (see
+     * {@link EnvironmentConfig.autoStop} — each component has its own
+     * gitlab environment, so the duration may differ per component)
+     */
+    autoStop?: string | false;
 } & PartialDeep<DefaultEnvConfig>;
+/**
+ * project-wide declaration and tuning of an environment (the top-level
+ * `environments` config). Environments are a project-wide concept —
+ * every component deploys to a declared env unless it opts out with
+ * `env.<name>: false`. Anything that must be consistent across
+ * components (which envs exist, when they deploy) lives here; the
+ * per-component `env.<name>` entries only override component-local
+ * things (vars, deploy settings, host, autoStop).
+ */
+export type EnvironmentConfig = {
+    /**
+     * the type of env this behaves like (dev, review, stage, prod) —
+     * think of it as a preset: it supplies all defaults (when the env
+     * deploys, autoStop, deploy policy like rollback history and manual
+     * prod deploys) and the env's identity for tooling (the `ENV_TYPE`
+     * env var / `env-type` label). Everything it implies can be
+     * overridden explicitly. Required for envs whose name is not itself
+     * an env type.
+     */
+    type?: EnvType;
+    /**
+     * when this env deploys. Defaults from the env type:
+     * - dev: "mainBranch" (pushes to the default branch)
+     * - review: "mr" (merge requests / pull requests; the env is created
+     *   per MR and torn down when it closes)
+     * - stage / prod: "taggedRelease" (release tags)
+     * - local: false (not part of any pipeline)
+     *
+     * `{ branch: "next" }` deploys the env on pushes to that branch —
+     * one stable environment tracking a long-lived branch.
+     *
+     * `false` removes the env from all pipelines.
+     */
+    on?: EnvOnConfig;
+    /**
+     * how long the environment stays up after its last deployment before
+     * gitlab stops it automatically (gitlab `auto_stop_in`, e.g. "3 days").
+     * `false` disables auto-stopping. Defaults from the env type, tunable
+     * project-wide via the top-level `autoStop` durations: review
+     * "1 week", dev "4 weeks", everything else never.
+     *
+     * Only applies to stoppable deployments, and only on gitlab (github
+     * review apps stop when their pull request closes). Components can
+     * override it per env (`env.<name>.autoStop`).
+     *
+     * NOTE: an explicit value here is a literal — setting it on a review
+     * env opts that env out of the pin-label mechanism (the top-level
+     * `autoStop.pinLabel`), which only steers the default review lifetime.
+     */
+    autoStop?: string | false;
+    /**
+     * inherit from another environment (see {@link EnvironmentInheritConfig}):
+     *
+     * `inherit: "dev"` makes this env use dev's per-component config
+     * overrides AND dev's secret values. The object form controls the two
+     * axes separately.
+     */
+    inherit?: EnvironmentInheritConfig;
+};
+/**
+ * what an environment inherits from another environment.
+ *
+ * The string shorthand `inherit: "dev"` means
+ * `{ config: "dev", secrets: "dev" }`.
+ *
+ * - `config`: the named env's per-component overrides (`env.<name>` in
+ *   each component — vars, deploy/build settings, autoStop) are merged
+ *   in below this env's own overrides: component base → inherited env's
+ *   overrides → own overrides. `host` and `type` are never inherited
+ *   (a host must stay unique per env). The env's `type` defaults to the
+ *   inherited env's type.
+ * - `secrets`: this env uses the named env's secret VALUES — all or
+ *   nothing: its jobs reference the other env's secret variables
+ *   (`CL_<OTHERENV>_...`) and it has no secret store of its own, so the
+ *   secrets CLI manages them via the other env and rotating them
+ *   affects both envs. Set to `false` (or omit in the object form) for
+ *   own secrets.
+ *
+ * Inheriting from `local` is not possible, chains are followed, cycles
+ * are an error.
+ */
+export type EnvironmentInheritConfig = string | {
+    /** env whose per-component config overrides are inherited */
+    config?: string;
+    /** env whose secret values are used (all-or-nothing); false = own secrets */
+    secrets?: string | false;
+};
 export type EnvConfigWithComponent = EnvConfig<EnvType> & ComponentConfig;
 export type CustomEnv = EnvConfigWithOverride & {
     type: EnvType;
@@ -134,7 +239,7 @@ export type Env<C extends ConfigProps = never> = {
     stage?: EnvConfigWithOverride<"stage"> | false;
     review?: EnvConfigWithOverride<"review"> | false;
     prod?: EnvConfigWithOverride<"prod"> | false;
-} & Record<C["CustomEnvs"], CustomEnv> & Record<string, any>;
+} & Partial<Record<C["CustomEnvs"], EnvConfigWithOverride | false>> & Record<string, any>;
 export type ComponentConfig<C extends ConfigProps = never> = {
     /**
      * specify environment configurations
@@ -315,6 +420,18 @@ export type Config<C extends ConfigProps = never> = {
      */
     images?: Record<string, ProjectImageConfig>;
     builds?: Record<string, WorkspaceBuildConfig>;
+    /**
+     * project-wide environment declarations and tuning. Environments are
+     * shared across all components, so everything that must be consistent
+     * between them (which envs exist, their type, when they deploy) is
+     * declared here — components only carry per-component overrides.
+     *
+     * - tune a default env: `environments: { review: { autoStop: "3 days" } }`
+     * - declare an extra env (every component deploys to it unless it
+     *   opts out with `env.<name>: false`):
+     *   `environments: { next: { type: "dev", on: { branch: "next" } } }`
+     */
+    environments?: Record<string, EnvironmentConfig>;
     /**
      * components (sub apps)
      */

package/dist/packages/pipeline/src/types/config.js CHANGED Viewed

@@ -1,11 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isKnowEnvType = exports.DEFAULT_ENV_TYPES = exports.DEFAULT_ENVS = exports.getEnvTypesByTrigger = exports.ENV_TYPES = exports.ALL_PIPELINE_TRIGGERS = void 0;
+exports.isKnowEnvType = exports.DEFAULT_ENV_TYPES = exports.DEFAULT_ENVS = exports.ENV_TYPES = exports.envTriggerEquals = exports.isBranchTrigger = exports.ALL_PIPELINE_TRIGGERS = void 0;
 exports.ALL_PIPELINE_TRIGGERS = [
     "mainBranch",
     "mr",
     "taggedRelease",
 ];
+const isBranchTrigger = (trigger) => typeof trigger === "object" && trigger !== null && "branch" in trigger;
+exports.isBranchTrigger = isBranchTrigger;
+const envTriggerEquals = (a, b) => {
+    if (a === undefined || a === false)
+        return false;
+    if ((0, exports.isBranchTrigger)(b))
+        return (0, exports.isBranchTrigger)(a) && a.branch === b.branch;
+    return a === b;
+};
+exports.envTriggerEquals = envTriggerEquals;
 /**
  * all env types with their trigger.
  * Each env type has a default env with the same name which is always included
@@ -27,15 +37,6 @@ exports.ENV_TYPES = {
         triggers: [],
     },
 };
-/**
- *
- * @param trigger a trigger
- * @returns array of env types for that trigger. this is also the list of default envs
- */
-const getEnvTypesByTrigger = (trigger) => Object.entries(exports.ENV_TYPES)
-    .filter(([, e]) => e.triggers.includes(trigger))
-    .map(([e]) => e);
-exports.getEnvTypesByTrigger = getEnvTypesByTrigger;
 exports.DEFAULT_ENVS = Object.keys(exports.ENV_TYPES);
 exports.DEFAULT_ENV_TYPES = exports.DEFAULT_ENVS;
 const isKnowEnvType = (env) => {

package/dist/packages/pipeline/src/types/config.js.map CHANGED Viewed

	@@ -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;~~AAGX;;;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~~;AAEX;;;;GAIG;AACI~~,~~MAAM~~,~~oBAAoB~~,~~GAAG,~~CAAC,~~OAAwB~~,~~EAAE~~,~~EAAE~~,~~CAC/D~~,MAAM,CAAC,OAAO,CAAC,~~iBAAS~~,CAAC~~;KACtB~~,~~MAAM,~~CAAC,CAAC,CAAC,~~EAAE~~,~~CAAC~~,~~CAAC~~,~~EAAE~~,EAAE,~~CACf~~,~~CAAC~~,CAAC,~~QAAuC~~,CAAC,QAAQ,CAAC,~~OAAO~~,CAAC,~~CAC7D~~;~~KACA~~,~~GAAG~~,~~CAAC~~,CAAC,~~CAAC~~,CAAC,~~CAAC~~,EAAE,EAAE,CAAC,~~CAAY~~,CAAC,~~CAAC~~;~~AALnB~~,~~QAAA~~,~~oBAAoB~~,~~wBAKD~~;~~AAEnB~~,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"}