@catladder/pipeline 3.28.0 → 3.30.0

package/dist/build/node/yarn.js

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

package/dist/build/types.d.ts

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

package/dist/constants.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DOCKER_REGISTRY = exports.PIPELINE_IMAGE_TAG = void 0;
-exports.PIPELINE_IMAGE_TAG = "v3-28-0-aec9220c" || "latest";
+exports.PIPELINE_IMAGE_TAG = "v3-30-0-134740e2" || "latest";
 exports.DOCKER_REGISTRY = "git.panter.ch:5001/catladder/catladder" || "git.panter.ch:5001/catladder/catladder";

package/dist/deploy/cloudRun/createJobs/execute/onDeploy.js

@@ -45,6 +45,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getOnDeployExecuteScript = void 0;
+var utils_1 = require("../../../../utils");
 var createArgsString_1 = require("../../utils/createArgsString");
 var getJobOrServiceArgs_1 = require("../../utils/getJobOrServiceArgs");
 var jobName_1 = require("../../utils/jobName");
@@ -55,7 +56,7 @@ var getOnDeployExecuteScript = function (context, when) {
   return executes.filter(function (_a) {
     var config = _a.config;
     return config.when === when;
-  }).map(function (execute) {
+  }).flatMap(function (execute) {
     return getJobRunScriptForExecute(context, execute);
   });
 };
@@ -67,7 +68,8 @@ var getExecutes = function (context) {
     var _b = __read(_a, 2),
       key = _b[0],
       value = _b[1];
-    if (!value || value.when !== "schedule" && value.type !== "job") {
+    // remove all schedule executes
+    if (!value) {
       return [];
     }
     return [{
@@ -100,16 +102,22 @@ var getJobRunScriptForExecute = function (context, _a) {
   var _b;
   var jobName = _a.jobName,
     config = _a.config;
-  var commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
-  // always wait for completion for preStop and postStop jobs
-  // since stop will delete the jobs afterwards, so they will fail
-  var waitForCompletion = ["preStop", "postStop"].includes(config.when) ? true // always
-  : "waitForCompletion" in config ? (_b = config.waitForCompletion) !== null && _b !== void 0 ? _b : false // depends on config
-  : false;
-  var argString = (0, createArgsString_1.createArgsString)(__assign(__assign({}, commonArgs), {
-    wait: waitForCompletion === true ? true : undefined,
-    args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(config.args)
-  }));
-  var fullJobName = (0, jobName_1.getFullJobName)(context, jobName);
-  return "".concat((0, common_1.gcloudRunCmd)(), " jobs execute ").concat(fullJobName.toString(), " ").concat(argString);
+  var type = config.type;
+  if (type === "script") {
+    return (0, utils_1.ensureArray)(config.script);
+  } else if (type === "job") {
+    var commonArgs = (0, common_1.getCommonCloudRunArgs)(context);
+    // always wait for completion for preStop and postStop jobs
+    // since stop will delete the jobs afterwards, so they will fail
+    var waitForCompletion = ["preStop", "postStop"].includes(config.when) ? true // always
+    : "waitForCompletion" in config ? (_b = config.waitForCompletion) !== null && _b !== void 0 ? _b : false // depends on config
+    : false;
+    var argString = (0, createArgsString_1.createArgsString)(__assign(__assign({}, commonArgs), {
+      wait: waitForCompletion === true ? true : undefined,
+      args: (0, getJobOrServiceArgs_1.getCloudRunServiceOrJobArgsArg)(config.args)
+    }));
+    var fullJobName = (0, jobName_1.getFullJobName)(context, jobName);
+    return ["".concat((0, common_1.gcloudRunCmd)(), " jobs execute ").concat(fullJobName.toString(), " ").concat(argString)];
+  }
+  throw new Error("unsupported execute type: ".concat(type));
 };

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

@@ -0,0 +1,24 @@
+type DeployConfigBaseExecuteScript = {
+  type: "script";
+  script: string | string[];
+};
+/**
+ * currently only supported for cloud run deployments
+ */
+export type DeployConfigBaseExecuteOnDeploy = DeployConfigBaseExecuteScript & ({
+  /**
+   * run the job before or after the deploy
+   */
+  when: "preDeploy" | "postDeploy";
+  /**
+   * whether to wait for completion of the job
+   */
+  waitForCompletion?: boolean;
+} | {
+  /**
+   * run the job before or after the environment is stopped
+   */
+  when: "preStop" | "postStop";
+});
+export type DeployConfigBaseExecute = DeployConfigBaseExecuteOnDeploy;
+export {};

package/dist/deploy/types/executeBase.js

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

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

@@ -1,5 +1,6 @@
 import type { DBVariablesMode } from "../cloudRun/utils/database";
 import type { DeployConfigBase } from "./base";
+import type { DeployConfigBaseExecute } from "./executeBase";
 export type Gcloudregion = "asia-east1" | "asia-northeast1" | "asia-northeast2" | "europe-north1" | "europe-southwest1" | "europe-west1" | "europe-west4" | "europe-west8" | "europe-west9" | "me-west1" | "us-central1" | "us-east1" | "us-east4" | "us-east5" | "us-south1" | "us-west1" | "asia-east2" | "asia-northeast3" | "asia-southeast1" | "asia-southeast2" | "asia-south1" | "asia-south2" | "australia-southeast1" | "australia-southeast2" | "europe-central2" | "europe-west2" | "europe-west3" | "europe-west6" | "northamerica-northeast1" | "northamerica-northeast2" | "southamerica-east1" | "southamerica-west1" | "us-west2" | "us-west3" | "us-west4";
 export type DeployConfigCloudRunCloudSql = {
   type: "unmanaged";
@@ -315,7 +316,7 @@ export type DeployConfigCloudRunWithVolumes = {
   volumes?: DeployConfigCloudRunVolumes;
 };
 export type DeployConfigCloudRunJob = DeployConfigCloudRunJobNormal | DeployConfigCloudRunJobWithSchedule;
-export type DeployConfigCloudRun = {
+export type DeployConfigCloudRun = Omit<DeployConfigBase, "execute"> & {
   /**
    * cloud run deployment.
    *
@@ -354,7 +355,7 @@ export type DeployConfigCloudRun = {
    */
   execute?: Record<string, DeployConfigCloudRunExecute | null>;
   debug?: boolean;
-} & DeployConfigBase;
+};
 export type DeployConfigCloudRunVolumes = Record<string, DeployConfigCloudRunVolume>;
 export type DeployConfigCloudRunVolume = {
   type: "cloud-storage";
@@ -409,7 +410,7 @@ export type DeployConfigCloudRunExecuteOnDeploy = DeployConfigCloudRunExecuteJob
    */
   when: "preStop" | "postStop";
 });
-export type DeployConfigCloudRunExecuteJob = DeployConfigCloudRunExecuteJobScheduled | DeployConfigCloudRunExecuteOnDeploy;
+export type DeployConfigCloudRunExecuteJob = DeployConfigBaseExecute | DeployConfigCloudRunExecuteJobScheduled | DeployConfigCloudRunExecuteOnDeploy;
 export type DeployConfigCloudRunExecuteHttp = {
   /**
    * set to "http" to run a http request
@@ -432,6 +433,6 @@ export type DeployConfigCloudRunExecuteHttp = {
    */
   headers?: Record<string, string>;
 } & WithSchedule;
-export type DeployConfigCloudRunExecute = DeployConfigCloudRunExecuteJob | DeployConfigCloudRunExecuteHttp;
+export type DeployConfigCloudRunExecute = DeployConfigBaseExecute | DeployConfigCloudRunExecuteJob | DeployConfigCloudRunExecuteHttp;
 export type DeployConfigCloudRunExecuteWithSchedule = Extract<DeployConfigCloudRunExecute, WithSchedule>;
 export {};