@catladder/pipeline 3.28.0 → 3.30.0

package/examples/__snapshots__/workspace-api-www.test.ts.snap

@@ -719,8 +719,7 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production
-      RUN yarn rebuild"
+      RUN yarn workspaces focus --production"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node api/package.json /app/api/package.json
       COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
@@ -947,8 +946,7 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production
-      RUN yarn rebuild"
+      RUN yarn workspaces focus --production"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node api/package.json /app/api/package.json
       COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
@@ -1183,8 +1181,7 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production
-      RUN yarn rebuild"
+      RUN yarn workspaces focus --production"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node api/package.json /app/api/package.json
       COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
@@ -1404,8 +1401,7 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production
-      RUN yarn rebuild"
+      RUN yarn workspaces focus --production"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node api/package.json /app/api/package.json
       COPY --chown=node:node api/yarn.lock /app/api/yarn.lock
@@ -1625,8 +1621,7 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production
-      RUN yarn rebuild"
+      RUN yarn workspaces focus --production"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node www/package.json /app/www/package.json
       COPY --chown=node:node www/yarn.lock /app/www/yarn.lock
@@ -1856,8 +1851,7 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production
-      RUN yarn rebuild"
+      RUN yarn workspaces focus --production"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node www/package.json /app/www/package.json
       COPY --chown=node:node www/yarn.lock /app/www/yarn.lock
@@ -2095,8 +2089,7 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production
-      RUN yarn rebuild"
+      RUN yarn workspaces focus --production"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node www/package.json /app/www/package.json
       COPY --chown=node:node www/yarn.lock /app/www/yarn.lock
@@ -2319,8 +2312,7 @@ before_script:
       export DOCKER_COPY_AND_INSTALL_APP="ENV YARN_ENABLE_INLINE_BUILDS=1
       COPY --chown=node:node $APP_DIR .
       RUN yarn plugin import workspace-tools
-      RUN yarn workspaces focus --production
-      RUN yarn rebuild"
+      RUN yarn workspaces focus --production"
     - |-
       export DOCKER_COPY_WORKSPACE_FILES="COPY --chown=node:node www/package.json /app/www/package.json
       COPY --chown=node:node www/yarn.lock /app/www/yarn.lock

package/examples/cloud-run-execute-script-on-deploy.test.ts

@@ -0,0 +1,11 @@
+import { createYamlLocalPipeline } from "./__utils__/helpers";
+import config from "./cloud-run-execute-script-on-deploy";
+
+/**
+ * This test is auto-generated.
+ * Modifications will be overwritten on every `yarn test` run!
+ */
+
+it("matches snapshot for cloud-run-execute-script-on-deploy local pipeline YAML", async () => {
+  expect(await createYamlLocalPipeline(config)).toMatchSnapshot();
+});

package/examples/cloud-run-execute-script-on-deploy.ts

@@ -0,0 +1,47 @@
+import type { Config } from "../src";
+
+const config = {
+  appName: "test-app",
+  customerName: "pan",
+  components: {
+    app: {
+      dir: "app",
+      build: {
+        type: "node",
+      },
+      deploy: {
+        type: "google-cloudrun",
+        projectId: "google-project-id",
+        region: "europe-west6",
+        execute: {
+          "pre-deploy-script": {
+            type: "script",
+            script: ["echo 'deploying'"],
+            when: "preDeploy",
+          },
+          "post-deploy-script": {
+            type: "script",
+            script: ["echo 'deployed'"],
+            when: "postDeploy",
+          },
+          "pre-stop-script": {
+            type: "script",
+            script: ["echo 'stopping'"],
+            when: "preStop",
+          },
+          "post-stop-script": {
+            type: "script",
+            script: ["echo 'stopped'"],
+            when: "postStop",
+          },
+        },
+      },
+    },
+  },
+} satisfies Config;
+
+export default config;
+
+export const information = {
+  title: "Cloud Run: Execute script on deploy",
+};

package/examples/workspace-api-www.ts

@@ -11,6 +11,9 @@ const config = {
   builds: {
     myWorkspace: {
       type: "node",
+      dockerDefaults: {
+        yarnRebuildEnabled: false,
+      },
     },
   },
   components: {

package/package.json

@@ -53,7 +53,7 @@
     }
   ],
   "license": "MIT",
-  "version": "3.28.0",
+  "version": "3.30.0",
   "scripts": {
     "build:tsc": "yarn tsc",
     "build": "yarn build:compile && yarn build:inline-variables",

package/src/build/node/yarn.ts

@@ -69,12 +69,19 @@ RUN ${YARN_INSTALL_CLASSIC} --production
     );
   }
 
+  const yarnRebuildEnabledDefault =
+    context.build.type === "fromWorkspace"
+      ? (context.build.workspaceBuildConfig.dockerDefaults
+          ?.yarnRebuildEnabled ?? true)
+      : true;
+
   const yarnRebuildEnabled =
     "docker" in context.build.config &&
     context.build.config.docker &&
     "yarnRebuildEnabled" in context.build.config.docker
-      ? (context.build.config.docker.yarnRebuildEnabled ?? true)
-      : true;
+      ? (context.build.config.docker.yarnRebuildEnabled ??
+        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

package/src/build/types.ts

@@ -425,6 +425,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;

package/src/deploy/cloudRun/createJobs/execute/onDeploy.ts

@@ -1,10 +1,8 @@
 import type { StringOrBashExpression } from "../../../../bash";
 import type { ComponentContext } from "../../../../types/context";
-import type {
-  DeployConfigCloudRunExecuteOnDeploy,
-  DeployConfigCloudRunJob,
-  DeployConfigCloudRunService,
-} from "../../../types/googleCloudRun";
+import { ensureArray } from "../../../../utils";
+import type { DeployConfigBaseExecuteOnDeploy } from "../../../types/executeBase";
+import type { DeployConfigCloudRunExecuteOnDeploy } from "../../../types/googleCloudRun";
 import { createArgsString } from "../../utils/createArgsString";
 import { getCloudRunServiceOrJobArgsArg } from "../../utils/getJobOrServiceArgs";
 import { getFullJobName } from "../../utils/jobName";
@@ -17,7 +15,7 @@ import {
 
 type Execute = {
   jobName: StringOrBashExpression;
-  config: DeployConfigCloudRunExecuteOnDeploy;
+  config: DeployConfigCloudRunExecuteOnDeploy | DeployConfigBaseExecuteOnDeploy;
 };
 export const getOnDeployExecuteScript = (
   context: ComponentContext,
@@ -27,7 +25,7 @@ export const getOnDeployExecuteScript = (
 
   return executes
     .filter(({ config }) => config.when === when)
-    .map((execute) => {
+    .flatMap((execute) => {
       return getJobRunScriptForExecute(context, execute);
     });
 };
@@ -37,7 +35,8 @@ const getExecutes = (context: ComponentContext): Execute[] => {
   return [
     ...getLegacyExecutes(context),
     ...Object.entries(deployConfig.execute ?? {}).flatMap(([key, value]) => {
-      if (!value || (value.when !== "schedule" && value.type !== "job")) {
+      // remove all schedule executes
+      if (!value) {
         return [];
       }
       return [
@@ -81,22 +80,30 @@ const getLegacyExecutes = (context: ComponentContext): Execute[] => {
 const getJobRunScriptForExecute = (
   context: ComponentContext,
   { jobName, config }: Execute,
-) => {
-  const commonArgs = getCommonCloudRunArgs(context);
+): string[] => {
+  const type = config.type;
+  if (type === "script") {
+    return ensureArray(config.script);
+  } else if (type === "job") {
+    const commonArgs = getCommonCloudRunArgs(context);
 
-  // always wait for completion for preStop and postStop jobs
-  // since stop will delete the jobs afterwards, so they will fail
-  const waitForCompletion = ["preStop", "postStop"].includes(config.when)
-    ? true // always
-    : "waitForCompletion" in config
-      ? (config.waitForCompletion ?? false) // depends on config
-      : false;
+    // always wait for completion for preStop and postStop jobs
+    // since stop will delete the jobs afterwards, so they will fail
+    const waitForCompletion = ["preStop", "postStop"].includes(config.when)
+      ? true // always
+      : "waitForCompletion" in config
+        ? (config.waitForCompletion ?? false) // depends on config
+        : false;
 
-  const argString = createArgsString({
-    ...commonArgs,
-    wait: waitForCompletion === true ? true : undefined,
-    args: getCloudRunServiceOrJobArgsArg(config.args),
-  });
-  const fullJobName = getFullJobName(context, jobName);
-  return `${gcloudRunCmd()} jobs execute ${fullJobName.toString()} ${argString}`;
+    const argString = createArgsString({
+      ...commonArgs,
+      wait: waitForCompletion === true ? true : undefined,
+      args: getCloudRunServiceOrJobArgsArg(config.args),
+    });
+    const fullJobName = getFullJobName(context, jobName);
+    return [
+      `${gcloudRunCmd()} jobs execute ${fullJobName.toString()} ${argString}`,
+    ];
+  }
+  throw new Error(`unsupported execute type: ${type}`);
 };

package/src/deploy/types/base.ts

@@ -1,4 +1,5 @@
 import type { EnvVars } from "../../types/config";
+import type { DeployConfigBaseExecute } from "./executeBase";
 
 export type DeployConfigBase = {
   /**

package/src/deploy/types/executeBase.ts

@@ -0,0 +1,27 @@
+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;

package/src/deploy/types/googleCloudRun.ts

@@ -1,5 +1,9 @@
 import type { DBVariablesMode } from "../cloudRun/utils/database";
 import type { DeployConfigBase } from "./base";
+import type {
+  DeployConfigBaseExecute,
+  DeployConfigBaseExecuteOnDeploy,
+} from "./executeBase";
 
 export type Gcloudregion =
   | "asia-east1"
@@ -424,7 +428,7 @@ export type DeployConfigCloudRunJob =
   | DeployConfigCloudRunJobNormal
   | DeployConfigCloudRunJobWithSchedule;
 
-export type DeployConfigCloudRun = {
+export type DeployConfigCloudRun = Omit<DeployConfigBase, "execute"> & {
   /**
    * cloud run deployment.
    *
@@ -469,7 +473,7 @@ export type DeployConfigCloudRun = {
   execute?: Record<string, DeployConfigCloudRunExecute | null>;
 
   debug?: boolean;
-} & DeployConfigBase;
+};
 
 export type DeployConfigCloudRunVolumes = Record<
   string,
@@ -543,6 +547,7 @@ export type DeployConfigCloudRunExecuteOnDeploy =
     );
 
 export type DeployConfigCloudRunExecuteJob =
+  | DeployConfigBaseExecute
   | DeployConfigCloudRunExecuteJobScheduled
   | DeployConfigCloudRunExecuteOnDeploy;
 
@@ -573,6 +578,7 @@ export type DeployConfigCloudRunExecuteHttp = {
 } & WithSchedule;
 
 export type DeployConfigCloudRunExecute =
+  | DeployConfigBaseExecute
   | DeployConfigCloudRunExecuteJob
   | DeployConfigCloudRunExecuteHttp;