@catladder/pipeline 1.149.4 → 1.150.1

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.4",
+  "version": "1.150.1",
   "scripts": {
     "build:tsc": "yarn tsc",
     "build": "yarn build:compile && yarn build:inline-variables && yarn build:bundle",

package/src/context/createComponentContext.ts

@@ -10,7 +10,7 @@ import type { PartialDeep } from "../types/utils";
 import { mergeWithMergingArrays } from "../utils";
 import { getEnvironment } from "./getEnvironment";
 import { getEnvironmentContext } from "./getEnvironmentContext";
-import { getPackageManagerInfo } from "../pipeline/packageManager";
+import { getPackageManagerInfoForComponent } from "../pipeline/packageManager";
 
 export type CreateComponentContextContext = {
   config: Config;
@@ -29,7 +29,7 @@ export const createComponentContext = async (
     );
   }
 
-  const packageManagerInfo = await getPackageManagerInfo(
+  const packageManagerInfo = await getPackageManagerInfoForComponent(
     ctx.config,
     ctx.componentName,
   );

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

@@ -21,41 +21,36 @@ export type AllJobsContext = {
   pipelineType: PipelineType;
 };
 
-type AllComponentContext = {
-  [componentName: string]: {
-    [env: string]: ComponentContext;
-  };
-};
-
 const createAllComponentContext = async ({
   config,
   trigger,
   pipelineType,
-}: AllJobsContext): Promise<AllComponentContext> => {
-  return Object.fromEntries(
-    await Promise.all(
-      Object.keys(config.components).map(async (componentName) => {
-        const envs = getAllEnvsByTrigger(config, componentName, trigger);
-        return [
+}: 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,
-          Object.fromEntries(
-            await Promise.all(
-              envs.map(async (env) => {
-                const context = await createComponentContext({
-                  config,
-                  componentName,
-                  env,
-                  trigger,
-                  pipelineType,
-                });
+          env,
+          trigger,
+          pipelineType,
+        });
 
-                return [env, context];
-              }),
-            ),
-          ),
-        ];
-      }),
-    ),
+        return {
+          env,
+          componentName,
+          context,
+        };
+      });
+    }),
   );
 };
 
@@ -70,18 +65,17 @@ export const createAllJobs = async ({
     pipelineType,
   });
 
-  return Object.fromEntries(
-    Object.entries(allComponentContext).map(([componentName, envs]) => [
-      componentName,
-      Object.fromEntries(
-        Object.entries(envs).map(([env, context]) => [
-          env,
-          createJobsForComponentContext(context).map((job) => ({
-            ...job,
-            context,
-          })),
-        ]),
-      ),
-    ]),
-  );
+  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/packageManager.ts

@@ -1,17 +1,17 @@
 import { existsSync } from "fs";
 import { join } from "path";
 import { pathEqual } from "path-equal";
-import type { Config, PackageManagerInfo } from "../types";
+import type { Config, PackageManagerInfoComponent } from "../types";
 import {
   getWorkspaces,
   getYarnVersion,
   getWorkspaceDependencies,
 } from "./yarn/yarnUtils";
 
-export const getPackageManagerInfo = async (
+export const getPackageManagerInfoForComponent = async (
   config: Config,
   componentName: string,
-): Promise<PackageManagerInfo> => {
+): Promise<PackageManagerInfoComponent> => {
   // currently only supports yarn
   const version = await getYarnVersion();
   if (!version) throw new Error("could not get yarn version");

package/src/pipeline/yarn/yarnUtils.ts

@@ -1,6 +1,6 @@
 import { exec } from "child-process-promise";
 import memoizee from "memoizee";
-import type { PackageManagerInfo, YarnWorkspace } from "../../types";
+import type { PackageManagerInfoComponent, YarnWorkspace } from "../../types";
 
 const execOrFail = async (cmd: string, onFail: string): Promise<string> => {
   try {
@@ -18,7 +18,7 @@ export const getYarnVersion = memoizee(
 );
 // export for mocking
 export const getWorkspaces = memoizee(
-  async (isClassic: boolean): Promise<PackageManagerInfo["workspaces"]> => {
+  async (isClassic: boolean): Promise<Array<YarnWorkspace>> => {
     return isClassic
       ? Object.values(
           JSON.parse(

package/src/types/context.ts

@@ -66,7 +66,7 @@ export type YarnWorkspace = {
   workspaceDependencies: string[];
   mismatchedWorkspaceDependencies: string[];
 };
-export type YarnPackageManagerInfo = {
+export type YarnPackageManagerInfoComponent = {
   type: "yarn";
   version: string;
   workspaces: YarnWorkspace[];
@@ -77,20 +77,21 @@ export type YarnPackageManagerInfo = {
   currentWorkspaceDependencies: string[];
 };
 
-export type PackageManagerInfo = YarnPackageManagerInfo;
+export type PackageManagerInfoComponent = YarnPackageManagerInfoComponent;
 
 export type ContextBeforeConfig = {
   componentName: string;
   fullConfig: Config;
-  packageManagerInfo?: PackageManagerInfo;
+  packageManagerInfo?: PackageManagerInfoComponent;
 };
 
-export type BuildContext = {
+export type BuildContextComponent = {
   dir: string;
-  packageManagerInfo: PackageManagerInfo;
+  packageManagerInfo: PackageManagerInfoComponent;
   config: BuildConfig;
 };
 
+export type BuildContext = BuildContextComponent;
 export type DeployContext = {
   config: DeployConfig;
 };
@@ -104,7 +105,7 @@ export type ComponentContext = {
    *
    */
   componentConfig: ComponentConfig;
-  build: BuildContext;
+  build: BuildContextComponent;
   deploy?: DeployContext | null;
   fullConfig: Config;
   environment: Environment;
@@ -114,7 +115,7 @@ export type ComponentContext = {
   /**
    * @deprecated use buildContext.packageManagerInfo instead
    */
-  packageManagerInfo: PackageManagerInfo;
+  packageManagerInfo: PackageManagerInfoComponent;
 
   customJobs?: CatladderJob[];
 };