@catladder/pipeline 1.149.3 → 1.150.0

package/examples/cloud-run-service-increase-timout.ts

@@ -0,0 +1,27 @@
+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",
+
+        service: {
+          timeout: "10m20s",
+        },
+      },
+    },
+  },
+};
+
+it("matches snapshot", async () => {
+  expect(await createAllPipelines(config)).toMatchSnapshot();
+});

package/package.json

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

package/src/deploy/cloudRun/createJobs/cloudRunServices.ts

@@ -49,6 +49,7 @@ export const getServiceDeployScript = (
       "cpu-throttling": customConfig?.noCpuThrottling !== true,
       cpu: customConfig?.cpu,
       memory: customConfig?.memory,
+      timeout: customConfig?.timeout,
       "allow-unauthenticated": customConfig?.allowUnauthenticated ?? true,
       ingress: customConfig?.ingress ?? "all",
       "cpu-boost": true,

package/src/deploy/types/googleCloudRun.ts

@@ -139,6 +139,15 @@ export type DeployConfigCloudRunService = {
    */
   memory?: Memory;
 
+  /**
+   * timeout of the service, defaults to 5 minutes.
+   *
+   * you can specify something like 10m30s. if its just a number, it will be interpreted as seconds
+   *
+   * max supported is 60min
+   */
+  timeout?: string;
+
   /**
    *
    * set the execution environment.

package/src/pipeline/createAllJobs.ts

@@ -1,11 +1,13 @@
 import { getAllEnvsByTrigger } from "../config";
+import { createComponentContext } from "../context";
 import type {
   CatladderJobWithContext,
+  ComponentContext,
   Config,
   PipelineTrigger,
   PipelineType,
 } from "../types";
-import { createJobsForComponent } from "./createJobsForComponent";
+import { createJobsForComponentContext } from "./createJobsForComponent";
 
 export type AllCatladderJobs = {
   [componentName: string]: {
@@ -19,34 +21,61 @@ export type AllJobsContext = {
   pipelineType: PipelineType;
 };
 
+const createAllComponentContext = async ({
+  config,
+  trigger,
+  pipelineType,
+}: AllJobsContext): Promise<
+  Array<{
+    env: string;
+    componentName: string;
+    context: ComponentContext;
+  }>
+> => {
+  return await Promise.all(
+    Object.keys(config.components).flatMap((componentName) => {
+      const envs = getAllEnvsByTrigger(config, componentName, trigger);
+      return envs.map(async (env) => {
+        const context = await createComponentContext({
+          config,
+          componentName,
+          env,
+          trigger,
+          pipelineType,
+        });
+
+        return {
+          env,
+          componentName,
+          context,
+        };
+      });
+    }),
+  );
+};
+
 export const createAllJobs = async ({
   config,
   trigger,
   pipelineType,
 }: AllJobsContext): Promise<AllCatladderJobs> => {
-  return Object.fromEntries(
-    await Promise.all(
-      Object.keys(config.components).map(async (componentName) => {
-        const envs = getAllEnvsByTrigger(config, componentName, trigger);
-        return [
-          componentName,
-          Object.fromEntries(
-            await Promise.all(
-              envs.map(async (env) => [
-                env,
+  const allComponentContext = await createAllComponentContext({
+    config,
+    trigger,
+    pipelineType,
+  });
 
-                await createJobsForComponent({
-                  config,
-                  componentName,
-                  env,
-                  trigger,
-                  pipelineType,
-                }),
-              ]),
-            ),
-          ),
-        ];
+  return allComponentContext.reduce((acc, { componentName, env, context }) => {
+    if (!acc[componentName]) {
+      acc[componentName] = {};
+    }
+    acc[componentName][env] = createJobsForComponentContext(context).map(
+      (job) => ({
+        ...job,
+        context,
       }),
-    ),
-  );
+    );
+
+    return acc;
+  }, {} as AllCatladderJobs);
 };

package/src/pipeline/createJobsForComponent.ts

@@ -1,12 +1,6 @@
 import { BUILD_TYPES } from "../build";
-import type { CreateComponentContextContext } from "../context";
-import { createComponentContext } from "../context";
 import { DEPLOY_TYPES } from "../deploy";
-import type {
-  CatladderJobWithContext,
-  ComponentContext,
-  Context,
-} from "../types/context";
+import type { ComponentContext } from "../types/context";
 import type { CatladderJob } from "../types/jobs";
 
 const injectDefaultVarsInCustomJobs = (
@@ -27,7 +21,9 @@ const getCustomJobs = (context: ComponentContext) => {
   const rawJobs = context.customJobs;
   return injectDefaultVarsInCustomJobs(context, rawJobs);
 };
-const createRawJobs = (context: Context): CatladderJob[] => {
+export const createJobsForComponentContext = (
+  context: ComponentContext,
+): CatladderJob[] => {
   const buildJobs = BUILD_TYPES[context.build.config.type].jobs(context);
   const deployJobs = context.deploy?.config
     ? DEPLOY_TYPES[context.deploy?.config.type].jobs(context)
@@ -36,10 +32,3 @@ const createRawJobs = (context: Context): CatladderJob[] => {
   const customJobs = getCustomJobs(context);
   return [...buildJobs, ...deployJobs, ...customJobs];
 };
-
-export const createJobsForComponent = async (
-  contextContext: CreateComponentContextContext,
-): Promise<Array<CatladderJobWithContext>> => {
-  const context = await createComponentContext(contextContext);
-  return createRawJobs(context).map((job) => ({ ...job, context }));
-};