@catladder/pipeline 1.125.1 → 1.126.0

package/examples/__snapshots__/cloud-run-with-sql-reuse-db.ts.snap

@@ -1277,7 +1277,7 @@ COPY --chown=node:node .yarn /app/.yarn",
           ],
         },
         "environment": {
-          "auto_stop_in": "2 week",
+          "auto_stop_in": "1 week",
           "name": "review/some-commit/api",
           "on_stop": "api 🛑 Stop ⚠️ | review ",
           "url": "https://pan-test-app-review-mr1234-api-unknown-host.example.com",
@@ -1783,7 +1783,7 @@ COPY --chown=node:node .yarn /app/.yarn",
           ],
         },
         "environment": {
-          "auto_stop_in": "2 week",
+          "auto_stop_in": "1 week",
           "name": "review/some-commit/worker",
           "on_stop": "worker 🛑 Stop ⚠️ | review ",
           "url": "https://pan-test-app-review-mr1234-worker-unknown-host.example.com",

package/examples/__snapshots__/cloud-run-with-sql.ts.snap

@@ -1284,7 +1284,7 @@ COPY --chown=node:node .yarn /app/.yarn",
           ],
         },
         "environment": {
-          "auto_stop_in": "2 week",
+          "auto_stop_in": "1 week",
           "name": "review/some-commit/api",
           "on_stop": "api 🛑 Stop ⚠️ | review ",
           "url": "https://pan-test-app-review-mr1234-api-unknown-host.example.com",
@@ -1807,7 +1807,7 @@ COPY --chown=node:node .yarn /app/.yarn",
           ],
         },
         "environment": {
-          "auto_stop_in": "2 week",
+          "auto_stop_in": "1 week",
           "name": "review/some-commit/www",
           "on_stop": "www 🛑 Stop ⚠️ | review ",
           "url": "https://pan-test-app-review-mr1234-www-unknown-host.example.com",

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

@@ -760,7 +760,7 @@ COPY --chown=node:node .yarn /app/.yarn",
           ],
         },
         "environment": {
-          "auto_stop_in": "2 week",
+          "auto_stop_in": "1 week",
           "name": "review/some-commit/api",
           "on_stop": "api 🛑 Stop ⚠️ | review ",
           "url": "https://pan-test-app-review-mr1234-api-unknown-host.example.com",

package/examples/__snapshots__/custom-build-job-with-tests.ts.snap

@@ -670,7 +670,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           ],
         },
         "environment": {
-          "auto_stop_in": "2 week",
+          "auto_stop_in": "1 week",
           "name": "review/some-commit/www",
           "on_stop": "www 🛑 Stop ⚠️ | review ",
           "url": "https://pan-test-app-review-mr1234-www-unknown-host.example.com",

package/examples/__snapshots__/custom-build-job.ts.snap

@@ -484,7 +484,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           ],
         },
         "environment": {
-          "auto_stop_in": "2 week",
+          "auto_stop_in": "1 week",
           "name": "review/some-commit/www",
           "on_stop": "www 🛑 Stop ⚠️ | review ",
           "url": "https://pan-test-app-review-mr1234-www-unknown-host.example.com",

package/examples/__snapshots__/custom-deploy.ts.snap

@@ -693,7 +693,7 @@ COPY --chown=node:node .yarn /app/.yarn",
         "allow_failure": false,
         "cache": [],
         "environment": {
-          "auto_stop_in": "2 week",
+          "auto_stop_in": "1 week",
           "name": "review/some-commit/www",
           "on_stop": "www 🛑 Stop ⚠️ | review ",
           "url": "https://unknown-host.example.com",

package/examples/__snapshots__/custom-sbom-java.ts.snap

@@ -487,7 +487,7 @@ _ALL_ENV_VAR_KEYS: '["ENV_SHORT","APP_DIR","ENV_TYPE","BUILD_INFO_ID","BUILD_INF
           ],
         },
         "environment": {
-          "auto_stop_in": "2 week",
+          "auto_stop_in": "1 week",
           "name": "review/some-commit/app",
           "on_stop": "app 🛑 Stop ⚠️ | review ",
           "url": "https://pan-test-app-review-mr1234-app-unknown-host.example.com",

package/examples/__snapshots__/kubernetes-application-customization.ts.snap

@@ -1025,7 +1025,7 @@ COPY --chown=node:node .yarn /app/.yarn",
       "api 🚀 Deploy | review ": {
         "allow_failure": false,
         "environment": {
-          "auto_stop_in": "2 week",
+          "auto_stop_in": "1 week",
           "name": "review/some-commit/api",
           "on_stop": "api 🛑 Stop ⚠️ | review ",
           "url": "https://api.mr1234.review.test-app.pan.panter.cloud",

package/examples/__snapshots__/kubernetes-with-cloud-sql-legacy.ts.snap

@@ -1013,7 +1013,7 @@ COPY --chown=node:node .yarn /app/.yarn",
       "api 🚀 Deploy | review ": {
         "allow_failure": false,
         "environment": {
-          "auto_stop_in": "2 week",
+          "auto_stop_in": "1 week",
           "name": "review/some-commit/api",
           "on_stop": "api 🛑 Stop ⚠️ | review ",
           "url": "https://api.mr1234.review.test-app.pan.panter.cloud",

package/examples/__snapshots__/kubernetes-with-cloud-sql.ts.snap

@@ -1017,7 +1017,7 @@ COPY --chown=node:node .yarn /app/.yarn",
       "api 🚀 Deploy | review ": {
         "allow_failure": false,
         "environment": {
-          "auto_stop_in": "2 week",
+          "auto_stop_in": "1 week",
           "name": "review/some-commit/api",
           "on_stop": "api 🛑 Stop ⚠️ | review ",
           "url": "https://api.mr1234.review.test-app.pan.panter.cloud",

package/examples/__snapshots__/kubernetes-with-jobs.ts.snap

@@ -1593,7 +1593,7 @@ COPY --chown=node:node .yarn /app/.yarn",
       "api 🚀 Deploy | review ": {
         "allow_failure": false,
         "environment": {
-          "auto_stop_in": "2 week",
+          "auto_stop_in": "1 week",
           "name": "review/some-commit/api",
           "on_stop": "api 🛑 Stop ⚠️ | review ",
           "url": "https://api.mr1234.review.test-app.pan.panter.cloud",
@@ -2200,7 +2200,7 @@ COPY --chown=node:node .yarn /app/.yarn",
       "www 🚀 Deploy | review ": {
         "allow_failure": false,
         "environment": {
-          "auto_stop_in": "2 week",
+          "auto_stop_in": "1 week",
           "name": "review/some-commit/www",
           "on_stop": "www 🛑 Stop ⚠️ | review ",
           "url": "https://www.mr1234.review.test-app.pan.panter.cloud",

package/examples/__snapshots__/kubernetes-with-mongodb.ts.snap

@@ -1081,7 +1081,7 @@ COPY --chown=node:node .yarn /app/.yarn",
       "api 🚀 Deploy | review ": {
         "allow_failure": false,
         "environment": {
-          "auto_stop_in": "2 week",
+          "auto_stop_in": "1 week",
           "name": "review/some-commit/api",
           "on_stop": "api 🛑 Stop ⚠️ | review ",
           "url": "https://api.mr1234.review.test-app.pan.panter.cloud",

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

@@ -1035,7 +1035,7 @@ mongodb:
       "web 🚀 Deploy | review ": {
         "allow_failure": false,
         "environment": {
-          "auto_stop_in": "2 week",
+          "auto_stop_in": "1 week",
           "name": "review/some-commit/web",
           "on_stop": "web 🛑 Stop ⚠️ | review ",
           "url": "https://web.mr1234.review.my-app.pan.panter.cloud",

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

@@ -1112,7 +1112,7 @@ COPY --chown=node:node .yarn /app/.yarn",
           ],
         },
         "environment": {
-          "auto_stop_in": "2 week",
+          "auto_stop_in": "1 week",
           "name": "review/some-commit/api",
           "on_stop": "api 🛑 Stop ⚠️ | review ",
           "url": "https://pan-test-app-review-mr1234-api-unknown-host.example.com",

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

@@ -758,7 +758,7 @@ COPY --chown=node:node .yarn /app/.yarn",
           ],
         },
         "environment": {
-          "auto_stop_in": "2 week",
+          "auto_stop_in": "1 week",
           "name": "review/some-commit/www",
           "on_stop": "www 🛑 Stop ⚠️ | review ",
           "url": "https://pan-test-app-review-mr1234-www-unknown-host.example.com",

package/examples/__snapshots__/rails-k8s-with-worker.ts.snap

@@ -781,7 +781,7 @@ jobs:
       "app 🚀 Deploy | review ": {
         "allow_failure": false,
         "environment": {
-          "auto_stop_in": "2 week",
+          "auto_stop_in": "1 week",
           "name": "review/some-commit/app",
           "on_stop": "app 🛑 Stop ⚠️ | review ",
           "url": "https://app.mr1234.review.test-app.pan.panter.cloud",
@@ -2880,7 +2880,7 @@ jobs:
       "app 🚀 Deploy | review ": {
         "allow_failure": false,
         "environment": {
-          "auto_stop_in": "2 week",
+          "auto_stop_in": "1 week",
           "name": "review/some-commit/app",
           "on_stop": "app 🛑 Stop ⚠️ | review ",
           "url": "https://app.mr1234.review.test-app.pan.panter.cloud",

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

@@ -0,0 +1,40 @@
+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",
+      },
+      env: {
+        review: {
+          deploy: {
+            jobs: {
+              ["drop-db"]: {
+                command: [
+                  "/bin/sh",
+                  "-c", // in cloud run, you can't use env-vars in commands, so we have to do this trick
+                  "mongosh \\$MONGO_URL --eval 'db.dropDatabase()'",
+                ],
+                image: "rtsp/mongosh:latest",
+                when: "postStop",
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+};
+
+it("matches snapshot", async () => {
+  expect(await createAllPipelines(config)).toMatchSnapshot();
+});

package/package.json

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

package/src/deploy/base/deploy.ts

@@ -26,7 +26,7 @@ export const createDeployJob = (
 
   const autoStop =
     context.environment.envType === "review"
-      ? "2 week"
+      ? "1 week"
       : context.environment.envType === "dev"
       ? "4 weeks"
       : undefined;

package/src/deploy/cloudRun/deployJob.ts

@@ -140,9 +140,15 @@ export const createGoogleCloudRunDeployJobs = (
     // lucky, update on the other hand accepts it... so let's just imediatly update it
 
     // also we cannot upsert a job, so we have to create it and catch the error and then update
+
+    const commandArray = Array.isArray(job.command)
+      ? job.command
+      : job.command.split(" ");
+
     const commonDeployArgsString = createArgsString({
-      command: '"' + job.command.split(" ").join(",") + '"',
+      command: '"' + commandArray.join(",") + '"',
       ...commonDeployArgs,
+      image: job.image || commonDeployArgs.image,
       memory: job.memory || "512Mi",
       "task-timeout": job.timeout || "10m",
     });
@@ -161,14 +167,22 @@ export const createGoogleCloudRunDeployJobs = (
       .map(({ job, jobName }) => getJobCreateScriptsForJob(jobName, job))
       .flat();
 
-  const getJobRunScriptForJob = (jobName: string) => {
-    return `gcloud beta run jobs execute ${jobName} ${commonArgsString}`;
+  const getJobRunScriptForJob = (jobName: string, wait: boolean) => {
+    return `gcloud beta run jobs execute ${jobName} ${commonArgsString}${
+      wait ? " --wait" : ""
+    }`;
   };
 
   const getJobRunScripts = (when: DeployConfigCloudRunJob["when"]) =>
     jobsWithNames
       .filter(({ job }) => job.when === when)
-      .map(({ jobName }) => getJobRunScriptForJob(jobName));
+      .map(({ jobName }) =>
+        getJobRunScriptForJob(
+          jobName,
+          // wait for completin on stop jobs, since stop will delete the jobs afterwards, so they will fail
+          ["preStop", "postStop"].includes(when)
+        )
+      );
 
   const getCreateScheduleScripts = () => {
     return jobsWithSchedule
@@ -253,6 +267,7 @@ export const createGoogleCloudRunDeployJobs = (
 
   const stopScripts = [
     ...gcloudServiceAccountLoginCommands(context),
+    ...getJobRunScripts("preStop"),
     ...(deployConfig.service !== false
       ? [`gcloud run services delete ${serviceName} ${commonArgsString}`]
       : []),
@@ -260,6 +275,7 @@ export const createGoogleCloudRunDeployJobs = (
       ([name]) =>
         `gcloud run services delete ${serviceName}-${name} ${commonArgsString}`
     ),
+    ...getJobRunScripts("postStop"),
     ...getDeleteSchedulesScripts(),
     ...getDeleteJobsScripts(),
     ...(deployConfig.cloudSql && deployConfig.cloudSql.deleteDatabaseOnStop

package/src/deploy/types/googleCloudRun.ts

@@ -123,7 +123,12 @@ export type DeployConfigCloudRunJobBase = {
   /**
    * command
    */
-  command: string;
+  command: string | string[];
+
+  /**
+   * custom image to use. Defaults to the image from the build
+   */
+  image?: string;
 
   /**
    * memory limit of the job, defaults to 51Mi
@@ -151,7 +156,7 @@ export type DeployConfigCloudRunJobWithSchedule =
   };
 
 export type DeployConfigCloudRunJobNormal = DeployConfigCloudRunJobBase & {
-  when: "manual" | "preDeploy" | "postDeploy";
+  when: "manual" | "preDeploy" | "postDeploy" | "preStop" | "postStop";
 };
 
 export type DeployConfigCloudRunJob =