@catladder/pipeline 0.0.0-refactore-catenv-command-validates-argument-78d05852 → 0.0.0-reference-database-url-1befbbee

package/dist/deploy/base/deploy.js

@@ -41,66 +41,82 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createDeployJob = exports.DEPLOY_JOB_NAME = void 0;
+var createJobCache_1 = require("../../build/cache/createJobCache");
 var docker_1 = require("../../build/docker");
 var sbom_1 = require("../../build/sbom");
+var context_1 = require("../../types/context");
 var sbom_2 = require("../sbom");
 var utils_1 = require("../utils");
 var stop_1 = require("./stop");
 var variables_1 = require("./variables");
 exports.DEPLOY_JOB_NAME = "🚀 Deploy";
 var createDeployJob = function (context, jobDefinition) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f;
   var hasDocker = (0, docker_1.requiresDockerBuild)(context);
   var isStoppable = (0, utils_1.contextIsStoppable)(context);
   var autoStop = context.environment.envType === "review" ? "1 week" : context.environment.envType === "dev" ? "4 weeks" : undefined;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
   // if auto or manual is configured explicitly, use that
-  var whenDeployDefined = context.componentConfig.deploy && context.componentConfig.deploy.when ? context.componentConfig.deploy.when : undefined;
+  var whenDeployDefined = deployConfig && deployConfig.when ? deployConfig.when : undefined;
   // otherwise auto deploy if env is not prod. If its prod, deploy automatically if stage is disabled
   var whenDeployDefault = context.environment.envType !== "prod" ? "auto" // is not stage, auto deploy
-  : ((_a = context.componentConfig.env) === null || _a === void 0 ? void 0 : _a.stage) === false ? "auto" // is prod, but no staging, auto deploy
+  : ((_b = context.componentConfig.env) === null || _b === void 0 ? void 0 : _b.stage) === false ? "auto" // is prod, but no staging, auto deploy
   : "manual"; // manually deploy
   var whenDeploy = whenDeployDefined ? whenDeployDefined : whenDeployDefault;
   return {
     name: exports.DEPLOY_JOB_NAME,
     script: jobDefinition.script,
     image: jobDefinition.image,
-    cache: jobDefinition.cache,
+    cache: jobDefinition.cache ? (0, createJobCache_1.createJobCacheFromCacheConfigs)(context, jobDefinition.cache) : undefined,
     artifacts: jobDefinition.artifacts,
     services: jobDefinition.services,
     envMode: "stagePerEnv",
+    // makes it easier to run manual tasks er env
     needs: __spreadArray(__spreadArray([], __read((0, sbom_2.sbomDeactivated)(context) ? [] : [{
       job: sbom_1.SBOM_BUILD_JOB_NAME,
       artifacts: true
-    }]), false), __read(context.componentConfig.deploy ? (_c = (_b = context.componentConfig.deploy.waitFor) === null || _b === void 0 ? void 0 : _b.map(function (c) {
+    }]), false), __read(deployConfig ? (_d = (_c = deployConfig.waitFor) === null || _c === void 0 ? void 0 : _c.map(function (c) {
       return {
         componentName: c,
         job: exports.DEPLOY_JOB_NAME,
         artifacts: false
       };
-    })) !== null && _c !== void 0 ? _c : [] : []), false),
+    })) !== null && _d !== void 0 ? _d : [] : []), false),
     // we don't want to deploy when there is a broken test
-    needsStages: [{
+    needsStages: __spreadArray(__spreadArray([], __read((0, context_1.componentContextHasWorkspaceBuild)(context) ? hasDocker // docker build is per component,
+    ? [
+    // we don't need artifacts, but have to wait for the component build
+    {
       stage: "build",
-      artifacts: hasDocker ? false : true
-    }, {
-      stage: "test",
       artifacts: false
-    }],
-    rules: [whenDeploy === "auto" ? {
-      when: "on_success"
-    } : {
-      when: "manual"
-    }],
+    }] : [{
+      // pick build artifacts from workspace build
+      stage: "build",
+      artifacts: true,
+      workspaceName: context.build.workspaceName
+    }] : [{
+      stage: "build",
+      artifacts: hasDocker ? false : true // we asume that no-docker deployments need build artifacts,
+    }]), false), [{
+      stage: "test",
+      artifacts: false,
+      // use test from workspace build
+      workspaceName: (0, context_1.componentContextHasWorkspaceBuild)(context) ? context.build.workspaceName : undefined
+    }], false),
+    when: whenDeploy === "auto" ? "on_success" : "manual",
     allow_failure: whenDeploy === "manual" ? true : false,
     stage: "deploy",
-    variables: __assign(__assign(__assign(__assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), context.environment.envVars), hasDocker ? (0, docker_1.getDockerImageVariables)(context) : {}), context.environment.jobOnlyVars.deploy.envVars), context.componentConfig.deploy ? (_d = context.componentConfig.deploy.extraVars) !== null && _d !== void 0 ? _d : {} : {}), jobDefinition.variables),
-    environment: __assign(__assign({}, context.environment.gitlabEnvironment), isStoppable ? {
+    variables: __assign(__assign(__assign(__assign({}, context.environment.envVars), hasDocker ? (0, docker_1.getDockerImageVariables)(context) : {}), context.environment.jobOnlyVars.deploy.envVars), jobDefinition.variables),
+    runnerVariables: __assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), (_e = jobDefinition.runnerVariables) !== null && _e !== void 0 ? _e : {}), deployConfig ? (_f = deployConfig.runnerVariables) !== null && _f !== void 0 ? _f : {} : {}),
+    environment: isStoppable ? {
       on_stop: stop_1.STOP_JOB_NAME,
       auto_stop_in: autoStop
-    } : {}),
-    jobTags: context.componentConfig.deploy ? context.componentConfig.deploy.jobTags : undefined
+    } : {},
+    jobTags: deployConfig ? deployConfig.jobTags : undefined
   };
 };
 exports.createDeployJob = createDeployJob;

package/dist/deploy/base/index.d.ts

@@ -1,9 +1,7 @@
-import type { Context } from "../../types/context";
+import type { ComponentContext } from "../../types/context";
+import type { DeployJobDefinition, RollbackJobDefinition, StopJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
-import { type DeployJobDefinition } from "./deploy";
-import { type RollbackJobDefinition } from "./rollback";
-import { type StopJobDefinition } from "./stop";
-export declare const createDeployementJobs: (context: Context, definitions: {
+export declare const createDeployementJobs: (context: ComponentContext, definitions: {
   deploy: DeployJobDefinition;
   stop?: StopJobDefinition;
   rollback?: RollbackJobDefinition;

package/dist/deploy/base/index.js

@@ -31,7 +31,9 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createDeployementJobs = void 0;
 var deploy_1 = require("./deploy");
 var rollback_1 = require("./rollback");

package/dist/deploy/base/rollback.d.ts

@@ -1,5 +1,5 @@
-import type { Context } from "../../types/context";
+import type { ComponentContext } from "../../types/context";
+import type { RollbackJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
 export declare const ROLLBACK_JOB_NAME = "\u21A9\uFE0F Rollback \u26A0\uFE0F";
-export declare type RollbackJobDefinition = Pick<CatladderJob, "script" | "variables" | "image">;
-export declare const createRollbackJob: (context: Context, jobDefinition: RollbackJobDefinition) => CatladderJob;
+export declare const createRollbackJob: (context: ComponentContext, jobDefinition: RollbackJobDefinition) => CatladderJob;

package/dist/deploy/base/rollback.js

@@ -10,27 +10,31 @@ var __assign = this && this.__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createRollbackJob = exports.ROLLBACK_JOB_NAME = void 0;
 var variables_1 = require("./variables");
 exports.ROLLBACK_JOB_NAME = "↩️ Rollback ⚠️";
 var createRollbackJob = function (context, jobDefinition) {
+  var _a;
   return {
     name: exports.ROLLBACK_JOB_NAME,
     image: jobDefinition.image,
     envMode: "stagePerEnv",
+    // makes it easier to run manual tasks er env
     needs: [],
-    rules: [{
-      when: "manual",
-      allow_failure: true
-    }],
-    variables: __assign(__assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), context.environment.jobOnlyVars.deploy.envVars), {
+    // can be executed even if the deploy job failed
+    allow_failure: true,
+    when: "manual",
+    variables: __assign(__assign({}, context.environment.jobOnlyVars.deploy.envVars), jobDefinition.variables),
+    runnerVariables: __assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), {
       GIT_STRATEGY: "none"
-    }), jobDefinition.variables),
+    }), (_a = jobDefinition.runnerVariables) !== null && _a !== void 0 ? _a : {}),
     stage: "rollback",
-    environment: __assign(__assign({}, context.environment.gitlabEnvironment), {
+    environment: {
       action: "access"
-    }),
+    },
     script: jobDefinition.script
   };
 };

package/dist/deploy/base/stop.d.ts

@@ -1,5 +1,5 @@
-import type { Context } from "../../types/context";
+import type { ComponentContext } from "../../types/context";
+import type { StopJobDefinition } from "../../types/jobDefinition";
 import type { CatladderJob } from "../../types/jobs";
 export declare const STOP_JOB_NAME = "\uD83D\uDED1 Stop \u26A0\uFE0F";
-export declare type StopJobDefinition = Pick<CatladderJob, "script" | "variables" | "image">;
-export declare const createStopJob: (context: Context, jobDefinition: StopJobDefinition) => CatladderJob;
+export declare const createStopJob: (context: ComponentContext, jobDefinition: StopJobDefinition) => CatladderJob;

package/dist/deploy/base/stop.js

@@ -10,7 +10,9 @@ var __assign = this && this.__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.createStopJob = exports.STOP_JOB_NAME = void 0;
 var variables_1 = require("./variables");
 exports.STOP_JOB_NAME = "🛑 Stop ⚠️";
@@ -19,22 +21,25 @@ var createStopJob = function (context, jobDefinition) {
     name: exports.STOP_JOB_NAME,
     image: jobDefinition.image,
     envMode: "stagePerEnv",
+    // makes it easier to run manual tasks er env
     needs: [],
+    // can be executed even if the deploy job failed
+    allow_failure: true,
+    when: "manual",
+    // stop is always manual
     rules: [{
-      "if": "$CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/",
-      when: "on_success",
-      allow_failure: true
-    }, {
-      when: "manual",
-      allow_failure: true
+      if: "$CI_COMMIT_BRANCH =~ /^[0-9]+\\.([0-9]+|x)\\.x$/",
+      // automatic on hotfix branches
+      when: "on_success"
     }],
-    variables: __assign(__assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), context.environment.jobOnlyVars.deploy.envVars), {
+    variables: __assign(__assign({}, context.environment.jobOnlyVars.deploy.envVars), jobDefinition.variables),
+    runnerVariables: __assign(__assign(__assign({}, variables_1.DEPLOY_RUNNER_VARIABLES), {
       GIT_STRATEGY: "none"
-    }), jobDefinition.variables),
+    }), jobDefinition.runnerVariables),
     stage: "stop",
-    environment: __assign(__assign({}, context.environment.gitlabEnvironment), {
+    environment: {
       action: "stop"
-    }),
+    },
     script: jobDefinition.script
   };
 };

package/dist/deploy/base/types.d.ts

@@ -1,2 +1,2 @@
 import type { CatladderJob } from "../../types/jobs";
-export declare type JobWithoutScript = Omit<CatladderJob, "script">;
+export type JobWithoutScript = Omit<CatladderJob, "script">;

package/dist/deploy/base/types.js

@@ -1,3 +1,5 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/deploy/base/variables.js

@@ -1,9 +1,11 @@
 "use strict";
 
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.DEPLOY_RUNNER_VARIABLES = void 0;
 exports.DEPLOY_RUNNER_VARIABLES = {
-  KUBERNETES_CPU_REQUEST: "0.5",
+  KUBERNETES_CPU_REQUEST: "0.22",
   KUBERNETES_MEMORY_REQUEST: "200Mi",
   KUBERNETES_MEMORY_LIMIT: "400Mi"
 };

package/dist/deploy/cloudRun/artifactsRegistry.d.ts

@@ -1,17 +1,14 @@
-import type { Context } from "../../types/context";
-export declare const getArtifactsRegistryHost: ({
-  componentConfig: {
-    deploy
-  }
-}: Context) => string;
-export declare const getArtifactsRegistryDockerUrl: (context: Context) => string;
+import type { StringOrBashExpression } from "../../bash/BashExpression";
+import type { ComponentContext } from "../../types/context";
+export declare const getArtifactsRegistryHost: (context: ComponentContext) => string;
+export declare const getArtifactsRegistryDockerUrl: (context: ComponentContext) => string;
 /**
  *
  * 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
  */
-export declare const getArtifactsRegistryImageName: (context: Context, lecacyReviewImageName?: boolean) => string;
-export declare const getArtifactsRegistryBuildCacheImage: (context: Context) => string;
-export declare const getArtifactsRegistryImage: (context: Context) => string;
+export declare const getArtifactsRegistryImageName: (context: ComponentContext, lecacyReviewImageName?: boolean) => StringOrBashExpression;
+export declare const getArtifactsRegistryBuildCacheImage: (context: ComponentContext) => string;
+export declare const getArtifactsRegistryImage: (context: ComponentContext) => string;
 /**
  * commands to delete unused images.
  *
@@ -19,4 +16,4 @@ export declare const getArtifactsRegistryImage: (context: Context) => string;
  * @param keep how many of the newest images to keep
  * @returns
  */
-export declare const getDeleteUnusedImagesCommands: (context: Context, keep?: number) => string[];
+export declare const getDeleteUnusedImagesCommands: (context: ComponentContext, keep?: number) => string[];

package/dist/deploy/cloudRun/artifactsRegistry.js

@@ -31,22 +31,26 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getDeleteUnusedImagesCommands = exports.getArtifactsRegistryImage = exports.getArtifactsRegistryBuildCacheImage = exports.getArtifactsRegistryImageName = exports.getArtifactsRegistryDockerUrl = exports.getArtifactsRegistryHost = void 0;
+var BashExpression_1 = require("../../bash/BashExpression");
 var gitlab_1 = require("../../utils/gitlab");
 var types_1 = require("../types");
 var removeFirstLinesFromCommandOutput_1 = require("./utils/removeFirstLinesFromCommandOutput");
-var getArtifactsRegistryHost = function (_a) {
-  var deploy = _a.componentConfig.deploy;
-  if (!(0, types_1.isOfDeployType)(deploy, "google-cloudrun")) {
+var getArtifactsRegistryHost = function (context) {
+  var _a;
+  if (!(0, types_1.isOfDeployType)((_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config, "google-cloudrun")) {
     // should not happen
     throw new Error("deploy config is wrong");
   }
-  return "".concat(deploy.region, "-docker.pkg.dev");
+  return "".concat(context.deploy.config.region, "-docker.pkg.dev");
 };
 exports.getArtifactsRegistryHost = getArtifactsRegistryHost;
 var getArtifactsRegistryDockerUrl = function (context) {
-  var deployConfig = context.componentConfig.deploy;
+  var _a;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
   if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
     // should not happen
     throw new Error("deploy config is wrong");
@@ -60,7 +64,6 @@ 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
  */
 var getArtifactsRegistryImageName = function (context, lecacyReviewImageName) {
-  var _a;
   if (lecacyReviewImageName === void 0) {
     lecacyReviewImageName = false;
   }
@@ -68,14 +71,14 @@ var getArtifactsRegistryImageName = function (context, lecacyReviewImageName) {
     throw new Error("lecacyReviewImageName is only allowed for review app");
   }
   var dockerUrl = (0, exports.getArtifactsRegistryDockerUrl)(context);
-  var gcloudImagePath = __spreadArray([dockerUrl, context.environment.shortName, context.componentName], __read(context.environment.envType === "review" && !lecacyReviewImageName ? [(_a = context.commitInfo) === null || _a === void 0 ? void 0 : _a.reviewSlug] : []), false);
-  return gcloudImagePath.join("/");
+  var gcloudImagePath = __spreadArray([dockerUrl, context.env, context.name], __read(context.environment.reviewSlug && !lecacyReviewImageName ? [context.environment.reviewSlug] : []), false);
+  return (0, BashExpression_1.joinBashExpressions)(gcloudImagePath, "/");
 };
 exports.getArtifactsRegistryImageName = getArtifactsRegistryImageName;
 var getArtifactsRegistryBuildCacheImage = function (context) {
   var dockerUrl = (0, exports.getArtifactsRegistryDockerUrl)(context);
   // does not include env, so that after merge, you might get more cache hits (review-->dev)
-  var gcloudImagePath = [dockerUrl, "caches", context.componentName];
+  var gcloudImagePath = [dockerUrl, "caches", context.name];
   return gcloudImagePath.join("/");
 };
 exports.getArtifactsRegistryBuildCacheImage = getArtifactsRegistryBuildCacheImage;
@@ -106,13 +109,11 @@ var getDeleteImageCommands = function (fullImageName, keepNewest) {
  * @returns
  */
 var getDeleteUnusedImagesCommands = function (context, keep) {
+  var _a;
   if (keep === void 0) {
     keep = 0;
   }
-  var deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
-    return [];
-  }
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
   if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
     // should not happen
     throw new Error("deploy config is wrong");

package/dist/deploy/cloudRun/cleanup.d.ts

@@ -1,2 +1,2 @@
-import type { Context } from "../../types/context";
-export declare const getRemoveOldRevisionsAndImagesCommand: (context: Context, when: "postDeploy" | "onStop") => string[];
+import type { ComponentContext } from "../../types/context";
+export declare const getRemoveOldRevisionsAndImagesCommand: (context: ComponentContext, when: "postDeploy" | "onStop") => string[];

package/dist/deploy/cloudRun/cleanup.js

@@ -31,7 +31,9 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
   }
   return to.concat(ar || Array.prototype.slice.call(from));
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getRemoveOldRevisionsAndImagesCommand = void 0;
 var artifactsRegistry_1 = require("./artifactsRegistry");
 var cloudRunRevisions_1 = require("./cloudRunRevisions");

package/dist/deploy/cloudRun/cloudRunRevisions.d.ts

@@ -1,2 +1,2 @@
-import type { Context } from "../../types/context";
-export declare const getDeleteUnusedRevisionsCommands: (context: Context, keep: number) => string[];
+import type { ComponentContext } from "../../types/context";
+export declare const getDeleteUnusedRevisionsCommands: (context: ComponentContext, keep: number) => string[];

package/dist/deploy/cloudRun/cloudRunRevisions.js

@@ -10,15 +10,18 @@ var __assign = this && this.__assign || function () {
   };
   return __assign.apply(this, arguments);
 };
-exports.__esModule = true;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
 exports.getDeleteUnusedRevisionsCommands = void 0;
 var types_1 = require("../types");
 var createArgsString_1 = require("./utils/createArgsString");
 var getServiceName_1 = require("./utils/getServiceName");
 var removeFirstLinesFromCommandOutput_1 = require("./utils/removeFirstLinesFromCommandOutput");
 var getListRevisionsCommand = function (context, args) {
+  var _a;
   var serviceName = (0, getServiceName_1.getServiceName)(context);
-  var deployConfig = context.componentConfig.deploy;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
   if (!deployConfig || !(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
     // should not happen
     throw new Error("deploy config is wrong");
@@ -35,10 +38,8 @@ var getListRevisionsCommand = function (context, args) {
   return "gcloud run revisions list ".concat((0, createArgsString_1.createArgsString)(filterRevisionArgs));
 };
 var getDeleteUnusedRevisionsCommands = function (context, keep) {
-  var deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
-    return [];
-  }
+  var _a;
+  var deployConfig = (_a = context.deploy) === null || _a === void 0 ? void 0 : _a.config;
   if (!(0, types_1.isOfDeployType)(deployConfig, "google-cloudrun")) {
     // should not happen
     throw new Error("deploy config is wrong");

package/dist/deploy/cloudRun/createJobs/cloudRunJobs.d.ts

@@ -1,7 +1,9 @@
-import type { Context } from "../../../types/context";
+import type { ComponentContext } from "../../../types/context";
 import type { DeployConfigCloudRunJob } from "../../types/googleCloudRun";
-export declare const getDeleteSchedulesScripts: (context: Context) => string[];
-export declare const getDeleteJobsScripts: (context: Context) => string[];
-export declare const getJobRunScripts: (context: Context, when: DeployConfigCloudRunJob["when"]) => string[];
-export declare const getJobCreateScripts: (context: Context) => string[];
-export declare const getCreateScheduleScripts: (context: Context) => string[];
+export declare const getDeleteJobsScripts: (context: ComponentContext) => string[];
+export declare const getJobCreateScripts: (context: ComponentContext) => string[];
+export declare const getCloudRunJobsWithNames: (context: ComponentContext) => {
+  fullJobName: import("../../..").StringOrBashExpression;
+  job: DeployConfigCloudRunJob;
+  jobName: string;
+}[];