@catladder/pipeline 1.100.0 → 1.100.2

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

@@ -22,7 +22,6 @@ exports[`matches snapshot 1`] = `
             "policy": "pull-push",
           },
         ],
-        "environment": undefined,
         "interruptible": true,
         "needs": [],
         "retry": {
@@ -81,7 +80,6 @@ exports[`matches snapshot 1`] = `
             "policy": "pull-push",
           },
         ],
-        "environment": undefined,
         "image": "path/to/docker/jobs-default:the-version",
         "interruptible": true,
         "needs": [],
@@ -173,8 +171,6 @@ exports[`matches snapshot 1`] = `
       },
       "api 🛡 audit": {
         "allow_failure": true,
-        "cache": undefined,
-        "environment": undefined,
         "interruptible": true,
         "needs": [],
         "retry": {
@@ -214,7 +210,6 @@ exports[`matches snapshot 1`] = `
             "policy": "pull-push",
           },
         ],
-        "environment": undefined,
         "image": "path/to/docker/jobs-testing-chrome:the-version",
         "interruptible": true,
         "needs": [],
@@ -242,8 +237,6 @@ exports[`matches snapshot 1`] = `
       },
       "api 🧾 sbom upload | dev ": {
         "allow_failure": true,
-        "cache": undefined,
-        "environment": undefined,
         "image": "git.panter.ch:5001/open-source/dependency-track-uploader:dtrackuploader-v0.2.1",
         "interruptible": true,
         "needs": [
@@ -269,8 +262,6 @@ exports[`matches snapshot 1`] = `
             "__sbom.json",
           ],
         },
-        "cache": undefined,
-        "environment": undefined,
         "image": "aquasec/trivy:0.38.3",
         "interruptible": true,
         "needs": [
@@ -306,7 +297,6 @@ exports[`matches snapshot 1`] = `
             "policy": "pull-push",
           },
         ],
-        "environment": undefined,
         "interruptible": true,
         "needs": [],
         "retry": {
@@ -365,7 +355,6 @@ exports[`matches snapshot 1`] = `
             "policy": "pull-push",
           },
         ],
-        "environment": undefined,
         "image": "path/to/docker/jobs-default:the-version",
         "interruptible": true,
         "needs": [],
@@ -461,8 +450,6 @@ exports[`matches snapshot 1`] = `
       },
       "www 🛡 audit": {
         "allow_failure": true,
-        "cache": undefined,
-        "environment": undefined,
         "interruptible": true,
         "needs": [],
         "retry": {
@@ -502,7 +489,6 @@ exports[`matches snapshot 1`] = `
             "policy": "pull-push",
           },
         ],
-        "environment": undefined,
         "image": "path/to/docker/jobs-testing-chrome:the-version",
         "interruptible": true,
         "needs": [],
@@ -530,8 +516,6 @@ exports[`matches snapshot 1`] = `
       },
       "www 🧾 sbom upload | dev ": {
         "allow_failure": true,
-        "cache": undefined,
-        "environment": undefined,
         "image": "git.panter.ch:5001/open-source/dependency-track-uploader:dtrackuploader-v0.2.1",
         "interruptible": true,
         "needs": [
@@ -557,8 +541,6 @@ exports[`matches snapshot 1`] = `
             "__sbom.json",
           ],
         },
-        "cache": undefined,
-        "environment": undefined,
         "image": "aquasec/trivy:0.38.3",
         "interruptible": true,
         "needs": [
@@ -666,7 +648,6 @@ exports[`matches snapshot 1`] = `
             "policy": "pull-push",
           },
         ],
-        "environment": undefined,
         "interruptible": true,
         "needs": [],
         "retry": {
@@ -725,7 +706,6 @@ exports[`matches snapshot 1`] = `
             "policy": "pull-push",
           },
         ],
-        "environment": undefined,
         "image": "path/to/docker/jobs-default:the-version",
         "interruptible": true,
         "needs": [],
@@ -817,8 +797,6 @@ exports[`matches snapshot 1`] = `
       },
       "api 🛡 audit": {
         "allow_failure": true,
-        "cache": undefined,
-        "environment": undefined,
         "interruptible": true,
         "needs": [],
         "retry": {
@@ -858,7 +836,6 @@ exports[`matches snapshot 1`] = `
             "policy": "pull-push",
           },
         ],
-        "environment": undefined,
         "image": "path/to/docker/jobs-testing-chrome:the-version",
         "interruptible": true,
         "needs": [],
@@ -886,8 +863,6 @@ exports[`matches snapshot 1`] = `
       },
       "api 🧾 sbom upload | review ": {
         "allow_failure": true,
-        "cache": undefined,
-        "environment": undefined,
         "image": "git.panter.ch:5001/open-source/dependency-track-uploader:dtrackuploader-v0.2.1",
         "interruptible": true,
         "needs": [
@@ -913,8 +888,6 @@ exports[`matches snapshot 1`] = `
             "__sbom.json",
           ],
         },
-        "cache": undefined,
-        "environment": undefined,
         "image": "aquasec/trivy:0.38.3",
         "interruptible": true,
         "needs": [
@@ -950,7 +923,6 @@ exports[`matches snapshot 1`] = `
             "policy": "pull-push",
           },
         ],
-        "environment": undefined,
         "interruptible": true,
         "needs": [],
         "retry": {
@@ -1009,7 +981,6 @@ exports[`matches snapshot 1`] = `
             "policy": "pull-push",
           },
         ],
-        "environment": undefined,
         "image": "path/to/docker/jobs-default:the-version",
         "interruptible": true,
         "needs": [],
@@ -1105,8 +1076,6 @@ exports[`matches snapshot 1`] = `
       },
       "www 🛡 audit": {
         "allow_failure": true,
-        "cache": undefined,
-        "environment": undefined,
         "interruptible": true,
         "needs": [],
         "retry": {
@@ -1146,7 +1115,6 @@ exports[`matches snapshot 1`] = `
             "policy": "pull-push",
           },
         ],
-        "environment": undefined,
         "image": "path/to/docker/jobs-testing-chrome:the-version",
         "interruptible": true,
         "needs": [],
@@ -1174,8 +1142,6 @@ exports[`matches snapshot 1`] = `
       },
       "www 🧾 sbom upload | review ": {
         "allow_failure": true,
-        "cache": undefined,
-        "environment": undefined,
         "image": "git.panter.ch:5001/open-source/dependency-track-uploader:dtrackuploader-v0.2.1",
         "interruptible": true,
         "needs": [
@@ -1201,8 +1167,6 @@ exports[`matches snapshot 1`] = `
             "__sbom.json",
           ],
         },
-        "cache": undefined,
-        "environment": undefined,
         "image": "aquasec/trivy:0.38.3",
         "interruptible": true,
         "needs": [
@@ -1327,7 +1291,6 @@ exports[`matches snapshot 1`] = `
             "policy": "pull-push",
           },
         ],
-        "environment": undefined,
         "image": "path/to/docker/jobs-default:the-version",
         "interruptible": true,
         "needs": [],
@@ -1394,7 +1357,6 @@ exports[`matches snapshot 1`] = `
             "policy": "pull-push",
           },
         ],
-        "environment": undefined,
         "image": "path/to/docker/jobs-default:the-version",
         "interruptible": true,
         "needs": [],
@@ -1519,8 +1481,6 @@ exports[`matches snapshot 1`] = `
       },
       "api 🧾 sbom upload | prod ": {
         "allow_failure": true,
-        "cache": undefined,
-        "environment": undefined,
         "image": "git.panter.ch:5001/open-source/dependency-track-uploader:dtrackuploader-v0.2.1",
         "interruptible": true,
         "needs": [
@@ -1541,8 +1501,6 @@ exports[`matches snapshot 1`] = `
       },
       "api 🧾 sbom upload | stage ": {
         "allow_failure": true,
-        "cache": undefined,
-        "environment": undefined,
         "image": "git.panter.ch:5001/open-source/dependency-track-uploader:dtrackuploader-v0.2.1",
         "interruptible": true,
         "needs": [
@@ -1568,8 +1526,6 @@ exports[`matches snapshot 1`] = `
             "__sbom.json",
           ],
         },
-        "cache": undefined,
-        "environment": undefined,
         "image": "aquasec/trivy:0.38.3",
         "interruptible": true,
         "needs": [
@@ -1595,8 +1551,6 @@ exports[`matches snapshot 1`] = `
             "__sbom.json",
           ],
         },
-        "cache": undefined,
-        "environment": undefined,
         "image": "aquasec/trivy:0.38.3",
         "interruptible": true,
         "needs": [
@@ -1649,7 +1603,6 @@ exports[`matches snapshot 1`] = `
             "policy": "pull-push",
           },
         ],
-        "environment": undefined,
         "image": "path/to/docker/jobs-default:the-version",
         "interruptible": true,
         "needs": [],
@@ -1716,7 +1669,6 @@ exports[`matches snapshot 1`] = `
             "policy": "pull-push",
           },
         ],
-        "environment": undefined,
         "image": "path/to/docker/jobs-default:the-version",
         "interruptible": true,
         "needs": [],
@@ -1849,8 +1801,6 @@ exports[`matches snapshot 1`] = `
       },
       "www 🧾 sbom upload | prod ": {
         "allow_failure": true,
-        "cache": undefined,
-        "environment": undefined,
         "image": "git.panter.ch:5001/open-source/dependency-track-uploader:dtrackuploader-v0.2.1",
         "interruptible": true,
         "needs": [
@@ -1871,8 +1821,6 @@ exports[`matches snapshot 1`] = `
       },
       "www 🧾 sbom upload | stage ": {
         "allow_failure": true,
-        "cache": undefined,
-        "environment": undefined,
         "image": "git.panter.ch:5001/open-source/dependency-track-uploader:dtrackuploader-v0.2.1",
         "interruptible": true,
         "needs": [
@@ -1898,8 +1846,6 @@ exports[`matches snapshot 1`] = `
             "__sbom.json",
           ],
         },
-        "cache": undefined,
-        "environment": undefined,
         "image": "aquasec/trivy:0.38.3",
         "interruptible": true,
         "needs": [
@@ -1925,8 +1871,6 @@ exports[`matches snapshot 1`] = `
             "__sbom.json",
           ],
         },
-        "cache": undefined,
-        "environment": undefined,
         "image": "aquasec/trivy:0.38.3",
         "interruptible": true,
         "needs": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catladder/pipeline",
-  "version": "1.100.0",
+  "version": "1.100.2",
   "scripts": {
     "build:tsc": "yarn tsc",
     "build": "yarn build:compile && yarn build:inline-variables && yarn build:bundle",

package/src/pipeline/gitlab/createGitlabJobs.ts

@@ -6,6 +6,10 @@ import type { AllCatladderJobs } from "../createAllJobs";
 
 type AllGitlabJobs = Record<string, GitlabJobDef>;
 
+const removeUndefined = <T extends Record<string, unknown>>(obj: T): T =>
+  Object.fromEntries(
+    Object.entries(obj).filter(([, value]) => value !== undefined)
+  ) as T;
 const getFullJobName = (
   name: string,
   componentName: string,
@@ -95,7 +99,7 @@ export const makeGitlabJob = (
     envMode !== "none" ? env : undefined
   );
 
-  const gitlabJob = {
+  const gitlabJob: GitlabJobDef = removeUndefined({
     ...job,
     stage,
     environment: job.environment?.on_stop
@@ -113,7 +117,7 @@ export const makeGitlabJob = (
     needs: gitlabNeeds,
     retry: BASE_RETRY,
     interruptible: true,
-  };
+  });
 
   return [fullJobName, gitlabJob];
 };