@catladder/pipeline 1.111.0 → 1.111.2

package/examples/meteor-kubernetes.ts

@@ -0,0 +1,65 @@
+import type { Config } from "../src";
+import { createAllPipelines } from "./__utils__/helpers";
+
+const config: Config = {
+  customerName: "pan",
+  appName: "my-app",
+  components: {
+    web: {
+      dir: "app",
+
+      build: { type: "meteor" },
+      deploy: {
+        type: "kubernetes",
+        values: {
+          mongodb: {
+            enabled: true,
+            architecture: "standalone",
+          },
+          application: {
+            worker: { enabled: true },
+          },
+        },
+        cluster: {
+          name: "some-cluster-name",
+          region: "europe-west6",
+          projectId: "some-project-id",
+          type: "gcloud",
+          domainCanonical: "panter.cloud",
+        },
+      },
+      env: {
+        prod: {
+          host: "www.example.com",
+
+          deploy: {
+            values: {
+              application: {
+                redirects: [{ host: "example.com" }],
+              },
+              mongodb: {
+                enabled: true,
+                architecture: "replicaset",
+                replicaCount: 2,
+                persistence: {
+                  storageClass: "premium-rwo", // SSD
+                  size: "50Gi",
+                },
+                resources: {
+                  limits: { memory: "8Gi" },
+                  requests: { memory: "8Gi" },
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+};
+
+export default config;
+
+it("matches snapshot", async () => {
+  expect(await createAllPipelines(config)).toMatchSnapshot();
+});

package/package.json

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

package/src/build/docker.ts

@@ -24,26 +24,14 @@ export const getDockerImageVariables = (context: Context) => {
   };
 };
 
-export const requiresDockerBuild = (context: Context) => {
-  const deployConfig = context.componentConfig.deploy;
-  if (isOfDeployType(deployConfig, "kubernetes")) {
-    return true;
-  }
-
-  if (isOfDeployType(deployConfig, "google-cloudrun")) {
-    return true;
-  }
-
-  if (isOfDeployType(deployConfig, "custom") && deployConfig.requiresDocker) {
-    return true;
-  }
-
-  if (isOfDeployType(deployConfig, "dockerTag")) {
-    return true;
-  }
-
-  return false;
-};
+/**
+ * Weather the context requires a docker build
+ */
+export const requiresDockerBuild = ({
+  componentConfig: { deploy },
+}: Context): boolean =>
+  isOfDeployType(deploy, "kubernetes", "google-cloudrun", "dockerTag") ||
+  (isOfDeployType(deploy, "custom") && deploy.requiresDocker);
 
 const getDockerBaseVariables = () => ({
   DOCKER_HOST: "tcp://0.0.0.0:2375",

package/src/build/node/meteor.ts

@@ -11,6 +11,8 @@ import { createDockerBuildJobDefault } from "../docker";
 import { isOfBuildType } from "../types";
 import { getNodeCache } from "./cache";
 import { getYarnInstall } from "./yarn";
+import { sbomDeactivated } from "../../deploy/sbom";
+import { createSbomBuildJob } from "../sbom";
 
 const getMeteorCache = (context: Context): GitlabJobCache[] => [
   {
@@ -71,5 +73,6 @@ export const createMeteorBuildJobs = (context: Context): CatladderJob[] => {
       },
       needs: appBuildJob ? [APP_BUILD_JOB_NAME] : [],
     }),
+    ...(sbomDeactivated(context) ? [] : [createSbomBuildJob(context)]),
   ];
 };