@catladder/pipeline 3.39.0 → 3.40.0

package/examples/__snapshots__/local-dot-env.test.ts.snap

@@ -115,7 +115,7 @@ before_script:
     - export APP_PATH="api"
     - collapseable_section_end "injectvars"
     - cd api
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -512,7 +512,7 @@ before_script:
     - export APP_PATH="api"
     - collapseable_section_end "injectvars"
     - cd api
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"

package/examples/__snapshots__/meteor-kubernetes.test.ts.snap

@@ -115,7 +115,7 @@ before_script:
     - export APP_PATH="app"
     - collapseable_section_end "injectvars"
     - cd app
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -627,7 +627,7 @@ before_script:
     - export APP_PATH="app"
     - collapseable_section_end "injectvars"
     - cd app
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"

package/examples/__snapshots__/modify-generated-files.test.ts.snap

@@ -115,7 +115,7 @@ before_script:
     - export APP_PATH="api"
     - collapseable_section_end "injectvars"
     - cd api
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -317,7 +317,7 @@ before_script:
     - export APP_PATH="api"
     - collapseable_section_end "injectvars"
     - cd api
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"

package/examples/__snapshots__/modify-generated-yaml.test.ts.snap

@@ -115,7 +115,7 @@ before_script:
     - export APP_PATH="api"
     - collapseable_section_end "injectvars"
     - cd api
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -317,7 +317,7 @@ before_script:
     - export APP_PATH="api"
     - collapseable_section_end "injectvars"
     - cd api
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"

package/examples/__snapshots__/multiline-var.test.ts.snap

@@ -115,7 +115,7 @@ before_script:
     - export APP_PATH="app1"
     - collapseable_section_end "injectvars"
     - cd app1
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -578,7 +578,7 @@ before_script:
     - export APP_PATH="app1"
     - collapseable_section_end "injectvars"
     - cd app1
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -1764,7 +1764,7 @@ before_script:
     - export APP_PATH="app2"
     - collapseable_section_end "injectvars"
     - cd app2
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -2246,7 +2246,7 @@ before_script:
     - export APP_PATH="app2"
     - collapseable_section_end "injectvars"
     - cd app2
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -3492,7 +3492,7 @@ before_script:
     - export APP_PATH="kube"
     - collapseable_section_end "injectvars"
     - cd kube
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -4200,7 +4200,7 @@ before_script:
     - export APP_PATH="kube"
     - collapseable_section_end "injectvars"
     - cd kube
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"

package/examples/__snapshots__/native-app.test.ts.snap

@@ -117,7 +117,7 @@ before_script:
     - export LANG="en_US.UTF-8"
     - collapseable_section_end "injectvars"
     - cd app
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -416,7 +416,7 @@ before_script:
     - export LANG="en_US.UTF-8"
     - collapseable_section_end "injectvars"
     - cd app
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -1090,7 +1090,7 @@ before_script:
     - export APP_PATH="api"
     - collapseable_section_end "injectvars"
     - cd api
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -1504,7 +1504,7 @@ before_script:
     - export APP_PATH="api"
     - collapseable_section_end "injectvars"
     - cd api
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"

package/examples/__snapshots__/node-build-with-custom-image.test.ts.snap

@@ -115,7 +115,7 @@ before_script:
     - export APP_PATH="www"
     - collapseable_section_end "injectvars"
     - cd www
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -530,7 +530,7 @@ before_script:
     - export APP_PATH="www"
     - collapseable_section_end "injectvars"
     - cd www
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"

package/examples/__snapshots__/node-build-with-docker-additions.test.ts.snap

@@ -115,7 +115,7 @@ before_script:
     - export APP_PATH="www"
     - collapseable_section_end "injectvars"
     - cd www
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -532,7 +532,7 @@ before_script:
     - export APP_PATH="www"
     - collapseable_section_end "injectvars"
     - cd www
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"

package/examples/__snapshots__/override-secrets.test.ts.snap

@@ -115,7 +115,7 @@ before_script:
     - export APP_PATH="app"
     - collapseable_section_end "injectvars"
     - cd app
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -535,7 +535,7 @@ before_script:
     - export APP_PATH="app"
     - collapseable_section_end "injectvars"
     - cd app
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"

package/examples/__snapshots__/referencing-other-vars.test.ts.snap

@@ -115,7 +115,7 @@ before_script:
     - export APP_PATH="app1"
     - collapseable_section_end "injectvars"
     - cd app1
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -555,7 +555,7 @@ before_script:
     - export APP_PATH="app1"
     - collapseable_section_end "injectvars"
     - cd app1
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -1672,7 +1672,7 @@ before_script:
     - export APP_PATH="app2"
     - collapseable_section_end "injectvars"
     - cd app2
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -2121,7 +2121,7 @@ before_script:
     - export APP_PATH="app2"
     - collapseable_section_end "injectvars"
     - cd app2
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -3268,7 +3268,7 @@ before_script:
     - export APP_PATH="kube"
     - collapseable_section_end "injectvars"
     - cd kube
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -3797,7 +3797,7 @@ before_script:
     - export APP_PATH="kube"
     - collapseable_section_end "injectvars"
     - cd kube
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"

package/examples/__snapshots__/wait-for-other-deploy.test.ts.snap

@@ -115,7 +115,7 @@ before_script:
     - export APP_PATH="api"
     - collapseable_section_end "injectvars"
     - cd api
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -368,7 +368,7 @@ before_script:
     - export APP_PATH="api"
     - collapseable_section_end "injectvars"
     - cd api
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -918,7 +918,7 @@ before_script:
     - export APP_PATH="www"
     - collapseable_section_end "injectvars"
     - cd www
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -1172,7 +1172,7 @@ before_script:
     - export APP_PATH="www"
     - collapseable_section_end "injectvars"
     - cd www
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"

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

@@ -115,7 +115,7 @@ before_script:
     - export APP_PATH="."
     - collapseable_section_end "injectvars"
     - cd .
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -314,7 +314,7 @@ before_script:
     - export APP_PATH="."
     - collapseable_section_end "injectvars"
     - cd .
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"

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

@@ -115,7 +115,7 @@ before_script:
     - export APP_PATH="."
     - collapseable_section_end "injectvars"
     - cd .
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"
@@ -312,7 +312,7 @@ before_script:
     - export APP_PATH="."
     - collapseable_section_end "injectvars"
     - cd .
-    - yarn npm audit --environment production
+    - yarn npm audit --environment production --level critical
   rules:
     - when: never
       if: $CI_PIPELINE_SOURCE  == "trigger"

package/examples/cloud-run-post-stop-job.ts

@@ -29,7 +29,7 @@ const config = {
               },
             },
             execute: {
-              ["drop-db"]: {
+              ["drop-db-on-stop"]: {
                 type: "job",
                 job: "drop-db",
                 when: "postStop",

package/package.json

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

package/src/build/custom/__tests__/testJob.test.ts

@@ -27,4 +27,74 @@ describe("createCustomTestJobs", () => {
     const jobs = createCustomTestJobs(baseContext);
     expect(jobs).toEqual([]);
   });
+
+  it("sets allow_failure on audit job to true by default", () => {
+    const context = {
+      ...baseContext,
+      build: {
+        ...baseContext.build,
+        config: {
+          ...baseContext.build.config,
+          audit: { command: "audit-cmd" },
+        },
+      },
+    } as ComponentContext<BuildContextStandalone>;
+    const jobs = createCustomTestJobs(context);
+    const auditJob = jobs.find((j) => j.name.includes("audit"));
+    expect(auditJob?.allow_failure).toBe(true);
+  });
+
+  it("respects allowFailure: false on audit job", () => {
+    const context = {
+      ...baseContext,
+      build: {
+        ...baseContext.build,
+        config: {
+          ...baseContext.build.config,
+          audit: { command: "audit-cmd", allowFailure: false },
+        },
+      },
+    } as ComponentContext<BuildContextStandalone>;
+    const jobs = createCustomTestJobs(context);
+    const auditJob = jobs.find((j) => j.name.includes("audit"));
+    expect(auditJob?.allow_failure).toBe(false);
+  });
+
+  it("passes allowFailure through to lint and test jobs", () => {
+    const context = {
+      ...baseContext,
+      build: {
+        ...baseContext.build,
+        config: {
+          ...baseContext.build.config,
+          lint: { command: "lint-cmd", allowFailure: true },
+          test: { command: "test-cmd", allowFailure: true },
+        },
+      },
+    } as ComponentContext<BuildContextStandalone>;
+    const jobs = createCustomTestJobs(context);
+    const lintJob = jobs.find((j) => j.name.includes("lint"));
+    const testJob = jobs.find((j) => j.name.includes("test"));
+    expect(lintJob?.allow_failure).toBe(true);
+    expect(testJob?.allow_failure).toBe(true);
+  });
+
+  it("leaves allow_failure undefined on lint and test jobs when not configured", () => {
+    const context = {
+      ...baseContext,
+      build: {
+        ...baseContext.build,
+        config: {
+          ...baseContext.build.config,
+          lint: { command: "lint-cmd" },
+          test: { command: "test-cmd" },
+        },
+      },
+    } as ComponentContext<BuildContextStandalone>;
+    const jobs = createCustomTestJobs(context);
+    const lintJob = jobs.find((j) => j.name.includes("lint"));
+    const testJob = jobs.find((j) => j.name.includes("test"));
+    expect(lintJob?.allow_failure).toBeUndefined();
+    expect(testJob?.allow_failure).toBeUndefined();
+  });
 });

package/src/build/custom/testJob.ts

@@ -48,7 +48,7 @@ export const createCustomTestJobs = (
         image: buildConfig.audit?.jobImage ?? buildConfig.jobImage,
         cache: undefined,
         script: [...ensureArray(buildConfig.audit?.command)],
-        allow_failure: true,
+        allow_failure: buildConfig.audit?.allowFailure ?? true,
         ...createArtifactsConfig(
           context.build.dir,
           buildConfig.audit?.artifactsReports,
@@ -68,6 +68,7 @@ export const createCustomTestJobs = (
         },
         image: buildConfig.lint?.jobImage ?? buildConfig.jobImage,
         script: [...ensureArray(buildConfig.lint?.command)],
+        allow_failure: buildConfig.lint?.allowFailure,
         ...createArtifactsConfig(
           context.build.dir,
           buildConfig.lint?.artifactsReports,
@@ -86,6 +87,7 @@ export const createCustomTestJobs = (
         },
         image: buildConfig.test?.jobImage ?? buildConfig.jobImage,
         script: [...ensureArray(buildConfig.test?.command)],
+        allow_failure: buildConfig.test?.allowFailure,
         ...createArtifactsConfig(
           context.build.dir,
           buildConfig.test?.artifactsReports,

package/src/build/node/testJob.ts

@@ -59,11 +59,11 @@ export const createNodeTestJobs = (
             `cd ${context.build.dir}`,
             ...(ensureArrayOrNull(buildConfig.audit?.command) ?? [
               context.packageManagerInfo.isClassic
-                ? "yarn audit"
-                : "yarn npm audit --environment production", // yarn 2
+                ? "yarn audit --level critical"
+                : "yarn npm audit --environment production --level critical", // yarn 2
             ]),
           ],
-          allow_failure: true,
+          allow_failure: buildConfig.audit?.allowFailure ?? true,
           ...createArtifactsConfig(
             context.build.dir,
             buildConfig.audit?.artifactsReports,
@@ -88,6 +88,7 @@ export const createNodeTestJobs = (
             ...yarnInstall,
             ...(ensureArrayOrNull(buildConfig.lint?.command) ?? ["yarn lint"]),
           ],
+          allow_failure: buildConfig.lint?.allowFailure,
           ...createArtifactsConfig(
             context.build.dir,
             buildConfig.lint?.artifactsReports,
@@ -114,6 +115,7 @@ export const createNodeTestJobs = (
             ...yarnInstall,
             ...(ensureArrayOrNull(buildConfig.test?.command) ?? ["yarn test"]),
           ],
+          allow_failure: buildConfig.test?.allowFailure,
           ...createArtifactsConfig(
             context.build.dir,
             buildConfig.test?.artifactsReports,

package/src/build/rails/testJob.ts

@@ -57,7 +57,7 @@ export const createRailsTestJobs = (
               "bundle audit check",
             ]),
           ],
-          allow_failure: true,
+          allow_failure: buildConfig.audit?.allowFailure ?? true,
         }
       : null;
 
@@ -77,6 +77,7 @@ export const createRailsTestJobs = (
               "bundle exec rubocop",
             ]),
           ],
+          allow_failure: buildConfig.lint?.allowFailure,
         }
       : null;
   const testJob: CatladderJob | null =
@@ -97,6 +98,7 @@ export const createRailsTestJobs = (
               "bundle exec rspec",
             ]),
           ],
+          allow_failure: buildConfig.test?.allowFailure,
           runnerVariables: {
             RAILS_ENV: "test",
             DATABASE_URL: "postgresql://postgres@database",

package/src/build/types.ts

@@ -81,6 +81,12 @@ export type TestJobCustom = {
    * additional vars for this job runner
    */
   runnerVariables?: Record<string, string>;
+
+  /**
+   * Whether the job is allowed to fail without blocking the pipeline.
+   * Defaults to `true` for audit jobs, `undefined` (not set) for lint and test jobs.
+   */
+  allowFailure?: boolean;
 };
 
 export type BuildConfigBase = {

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

@@ -13,10 +13,9 @@ import {
   getCommonCloudRunArgs,
 } from "../common";
 
-type Execute = {
-  jobName: StringOrBashExpression;
-  config: DeployConfigCloudRunExecuteOnDeploy | DeployConfigBaseExecuteOnDeploy;
-};
+type Execute =
+  | DeployConfigCloudRunExecuteOnDeploy
+  | DeployConfigBaseExecuteOnDeploy;
 export const getOnDeployExecuteScript = (
   context: ComponentContext,
   when: DeployConfigCloudRunExecuteOnDeploy["when"],
@@ -24,7 +23,7 @@ export const getOnDeployExecuteScript = (
   const executes = getExecutes(context);
 
   return executes
-    .filter(({ config }) => config.when === when)
+    .filter((config) => config.when === when)
     .flatMap((execute) => {
       return getJobRunScriptForExecute(context, execute);
     });
@@ -39,12 +38,7 @@ const getExecutes = (context: ComponentContext): Execute[] => {
       if (!value) {
         return [];
       }
-      return [
-        {
-          jobName: key,
-          config: value,
-        } as Execute,
-      ];
+      return [value as Execute];
     }),
   ];
 };
@@ -61,25 +55,22 @@ const getLegacyExecutes = (context: ComponentContext): Execute[] => {
     }
     return [
       {
-        jobName,
-        config: {
-          job: jobName,
-          type: "job",
-          when: job.when,
-          ...(job.when === "preDeploy" || job.when === "postDeploy"
-            ? {
-                waitForCompletion: job.waitForCompletion,
-              }
-            : {}),
-        } as Execute["config"],
-      },
+        job: jobName,
+        type: "job",
+        when: job.when,
+        ...(job.when === "preDeploy" || job.when === "postDeploy"
+          ? {
+              waitForCompletion: job.waitForCompletion,
+            }
+          : {}),
+      } as Execute,
     ];
   });
 };
 
 const getJobRunScriptForExecute = (
   context: ComponentContext,
-  { jobName, config }: Execute,
+  config: Execute,
 ): string[] => {
   const type = config.type;
   if (type === "script") {
@@ -100,7 +91,7 @@ const getJobRunScriptForExecute = (
       wait: waitForCompletion === true ? true : undefined,
       args: getCloudRunServiceOrJobArgsArg(config.args),
     });
-    const fullJobName = getFullJobName(context, jobName);
+    const fullJobName = getFullJobName(context, config.job);
     return [
       `${gcloudRunCmd()} jobs execute ${fullJobName.toString()} ${argString}`,
     ];