@catladder/pipeline 1.124.4 → 1.125.1

package/examples/cloud-run-meteor-with-worker.ts

@@ -0,0 +1,35 @@
+import type { Config } from "../src";
+import { createAllPipelines } from "./__utils__/helpers";
+const config: Config = {
+  appName: "test-app",
+  customerName: "pan",
+  components: {
+    web: {
+      dir: "web",
+      build: {
+        type: "meteor",
+      },
+      deploy: {
+        type: "google-cloudrun",
+        projectId: "google-project-id",
+        region: "europe-west6",
+        additionalServices: {
+          // its usually better to create another catladder component for the worker
+          // but in some legacy cases it might be easier to add an extra service
+          // notice that you can't use different secrets on the worker, it will receive the same env vars as the normal service
+          // you can specify extra vars though
+          worker: {
+            noCpuThrottling: true,
+            maxInstances: 1,
+            minInstances: 1,
+            command: ["/bin/sh -c", "BACKGROUND_JOBS_ENABLED=1 node main.js"],
+          },
+        },
+      },
+    },
+  },
+};
+
+it("matches snapshot", async () => {
+  expect(await createAllPipelines(config)).toMatchSnapshot();
+});

package/examples/cloud-run-with-worker.ts

@@ -0,0 +1,35 @@
+import type { Config } from "../src";
+import { createAllPipelines } from "./__utils__/helpers";
+const config: Config = {
+  appName: "test-app",
+  customerName: "pan",
+  components: {
+    api: {
+      dir: "api",
+      build: {
+        type: "node",
+      },
+      deploy: {
+        type: "google-cloudrun",
+        projectId: "google-project-id",
+        region: "europe-west6",
+        additionalServices: {
+          // its usually better to create another catladder component for the worker
+          // but in some legacy cases it might be easier to add an extra service
+          // notice that you can't use different secrets on the worker, it will receive the same env vars as the normal service
+          // you can specify extra vars though
+          worker: {
+            noCpuThrottling: true,
+            maxInstances: 1,
+            minInstances: 1,
+            command: "yarn start:worker",
+          },
+        },
+      },
+    },
+  },
+};
+
+it("matches snapshot", async () => {
+  expect(await createAllPipelines(config)).toMatchSnapshot();
+});

package/package.json

@@ -52,7 +52,7 @@
     }
   ],
   "license": "MIT",
-  "version": "1.124.4",
+  "version": "1.125.1",
   "scripts": {
     "build:tsc": "yarn tsc",
     "build": "yarn build:compile && yarn build:inline-variables && yarn build:bundle",

package/src/deploy/cloudRun/deployJob.ts

@@ -109,9 +109,15 @@ export const createGoogleCloudRunDeployJobs = (
         ? service?.command ?? context.componentConfig.build.startCommand
         : undefined;
 
+    const commandArray = command
+      ? Array.isArray(command)
+        ? command
+        : command.split(" ")
+      : undefined;
+
     const argsString = createArgsString({
       // command as empty string resets it to default (uses the image's entrypoint)
-      command: command ? '"' + command.split(" ").join(",") + '"' : '""',
+      command: commandArray ? '"' + commandArray.join(",") + '"' : '""',
       ...commonDeployArgs,
       "env-vars-file": "____envvars.yaml",
       "min-instances": customConfig?.minInstances ?? 0,

package/src/deploy/types/googleCloudRun.ts

@@ -78,7 +78,7 @@ export type DeployConfigCloudRunService = {
   /**
    * command / entrypoint, fallsback to buildConfig.startcommand
    */
-  command?: string;
+  command?: string | string[];
 
   /**
    * how many instances to keep around when there are no requests. defaults to 0.