@catladder/pipeline 0.0.0-refactore-catenv-command-validates-argument-78d05852 → 0.0.0-reference-database-url-1befbbee

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

@@ -1,24 +1,18 @@
-import { merge } from "lodash";
-
-import { getDockerJobBaseProps } from "../../../build/docker";
 import { getRunnerImage } from "../../../runner";
-import type { Context } from "../../../types/context";
+import type { ComponentContext } from "../../../types/context";
 import type { CatladderJob } from "../../../types/jobs";
 import { allowFailureInScripts } from "../../../utils/gitlab";
 import { createDeployementJobs } from "../../base";
 
 import { isOfDeployType } from "../../types";
-import { getDeployJobVariables } from "./variables";
+import { ENV_VARS_FILENAME } from "./constants";
 import { getCloudRunDeployScripts } from "./getCloudRunDeployScripts";
 import { getCloudRunStopScripts } from "./getCloudRunStopScripts";
 
 export const createGoogleCloudRunDeployJobs = (
-  context: Context
+  context: ComponentContext,
 ): CatladderJob[] => {
-  const deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
-    return [];
-  }
+  const deployConfig = context.deploy?.config;
   if (!isOfDeployType(deployConfig, "google-cloudrun")) {
     // should not happen
     throw new Error("deploy config is wrong");
@@ -28,12 +22,24 @@ export const createGoogleCloudRunDeployJobs = (
   const stopScripts = getCloudRunStopScripts(context);
 
   return createDeployementJobs(context, {
-    deploy: merge(getDockerJobBaseProps(context), {
-      artifacts: { paths: ["____envvars.yaml"] },
-      variables: getDeployJobVariables(context),
+    deploy: {
+      variables: {
+        CLOUDSDK_CORE_DISABLE_PROMPTS: "1",
+      },
+      ...(deployConfig.debug
+        ? {
+            artifacts: {
+              paths: [
+                ENV_VARS_FILENAME, // debug
+              ],
+              when: "always",
+            },
+          }
+        : {}),
+
       image: getRunnerImage("gcloud"),
       script: deployScripts,
-    }),
+    },
     stop: {
       image: getRunnerImage("gcloud"),
       variables: {

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

@@ -0,0 +1,23 @@
+import type { DeployConfigCloudRunVolumes } from "../../types";
+import type { keyValuesArg } from "../utils/createArgsString";
+
+export const createVolumeConfig = (
+  volumes: DeployConfigCloudRunVolumes | undefined,
+  type: "service" | "job",
+): keyValuesArg[] => {
+  if (!volumes) {
+    return [];
+  }
+
+  return [
+    ...Object.entries(volumes).map(
+      ([volumeName, { type, bucket, mountPath, readonly }]) => ({
+        "add-volume": `name=${volumeName},type=${type},bucket=${bucket}${
+          readonly ? ",readonly=true" : ""
+        }`,
+        "add-volume-mount": `volume=${volumeName},mount-path=${mountPath}`,
+      }),
+    ),
+    type === "service" ? { "execution-environment": "gen2" } : {},
+  ];
+};

package/src/deploy/cloudRun/index.ts

@@ -1,10 +1,20 @@
-import type { DeployTypeDefinition } from "..";
+import type { DeployConfigCloudRun, DeployTypeDefinition } from "..";
+import {
+  getBashVariable,
+  joinBashExpressions,
+} from "../../bash/BashExpression";
+import type { BuildConfig } from "../../build";
 import { getSecretVarName } from "../../context";
 import type { EnvironmentContext } from "../../types/environmentContext";
 import { sanitizeForBashVariable } from "../../utils/gitlab";
 import { getFullDbName } from "../cloudSql/utils";
 import { createGoogleCloudRunDeployJobs } from "./createJobs";
-import { getCloudRunJobName } from "./utils/jobName";
+import { getCloudRunJobExecuteUrl } from "./utils/cloudRunExecutionUrl";
+import {
+  DEFAULT_DB_VARIABLES_MODE,
+  getDatabaseConnectionString,
+  getDatabaseJdbcUrl,
+} from "./utils/database";
 
 export const GCLOUD_DEPLOY_CREDENTIALS_KEY = "GCLOUD_DEPLOY_credentialsKey";
 
@@ -18,85 +28,109 @@ const getCloudSqlVariables = ({
   env,
   componentName,
   fullConfig,
-}: EnvironmentContext<any, "google-cloudrun">) => {
+}: EnvironmentContext<BuildConfig, DeployConfigCloudRun>) => {
   if (deployConfigRaw && deployConfigRaw.cloudSql) {
     const DB_NAME = getFullDbName(
       deployConfigRaw.cloudSql,
       fullConfig,
       environmentSlugPrefix,
-      componentName
+      componentName,
     );
 
     const additionalQueryParamsString = Object.entries(
-      deployConfigRaw.cloudSql.dbAdditionalQueryParams ?? {}
+      deployConfigRaw.cloudSql.dbAdditionalQueryParams ?? {},
     )
       .map(([key, value]) => `&${key}=${value}`)
       .join("");
 
-    return {
+    const dbVars = {
       CLOUD_SQL_INSTANCE_CONNECTION_NAME:
         deployConfigRaw.cloudSql.instanceConnectionName,
       DB_NAME: DB_NAME,
       DB_USER: deployConfigRaw.cloudSql.dbUser ?? "postgres",
       DB_PASSWORD: "$" + getSecretVarName(env, componentName, "DB_PASSWORD"),
-      DATABASE_URL: `postgresql://$DB_USER:$DB_PASSWORD@localhost/$DB_NAME?host=/cloudsql/$CLOUD_SQL_INSTANCE_CONNECTION_NAME${additionalQueryParamsString}`,
-      DATABASE_JDBC_URL: `jdbc:postgresql:///$DB_NAME?cloudSqlInstance=$CLOUD_SQL_INSTANCE_CONNECTION_NAME&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=$DB_USER&password=$DB_PASSWORD${additionalQueryParamsString}`,
+    };
+    return {
+      ...dbVars,
+      DATABASE_URL: getDatabaseConnectionString(
+        deployConfigRaw.cloudSql,
+        dbVars,
+      ).concat(additionalQueryParamsString),
+      DATABASE_JDBC_URL: getDatabaseJdbcUrl(
+        dbVars,
+        deployConfigRaw.cloudSql.dbConnectionStringVariablesMode ??
+          DEFAULT_DB_VARIABLES_MODE,
+      ),
     };
   }
   return {};
 };
-export const GCLOUD_RUN_DEPLOY_TYPE: DeployTypeDefinition<"google-cloudrun"> = {
-  jobs: createGoogleCloudRunDeployJobs,
-  defaults: ({ deployConfigRaw, envType }) => {
-    if (deployConfigRaw && deployConfigRaw.cloudSql) {
-      return {
-        cloudSql: {
-          deleteDatabaseOnStop: envType === "review",
-        },
-      };
-    }
-    return {};
-  },
-  additionalSecretKeys: (ctx) => [
-    {
-      key: GCLOUD_DEPLOY_CREDENTIALS_KEY,
-      hidden: true,
-    },
-    {
-      key: GCLOUD_RUN_CANONICAL_HOST_SUFFIX,
-      hidden: true,
+export const GCLOUD_RUN_DEPLOY_TYPE: DeployTypeDefinition<DeployConfigCloudRun> =
+  {
+    jobs: createGoogleCloudRunDeployJobs,
+    defaults: ({ deployConfigRaw, envType }) => {
+      if (deployConfigRaw && deployConfigRaw.cloudSql) {
+        return {
+          cloudSql: {
+            deleteDatabaseOnStop: envType === "review",
+          },
+        };
+      }
+      return {};
     },
-    ...(ctx.deployConfigRaw && ctx.deployConfigRaw.cloudSql
-      ? [{ key: "DB_PASSWORD" }]
-      : []),
-  ],
-  getAdditionalEnvVars: (ctx) => {
-    const { fullName, env, componentName, deployConfigRaw } = ctx;
-    const HOST_INTERNAL =
-      fullName.toLowerCase() +
-      "-" +
-      (process.env[
-        getSecretVarName(env, componentName, GCLOUD_RUN_CANONICAL_HOST_SUFFIX)
-      ] ?? "unknown-host.example.com");
+    additionalSecretKeys: (ctx) => [
+      {
+        key: GCLOUD_DEPLOY_CREDENTIALS_KEY,
+        hidden: true,
+      },
+      {
+        key: GCLOUD_RUN_CANONICAL_HOST_SUFFIX,
+        hidden: true,
+      },
+      ...(ctx.deployConfigRaw && ctx.deployConfigRaw.cloudSql
+        ? [{ key: "DB_PASSWORD" }]
+        : []),
+    ],
+    getAdditionalEnvVars: (ctx) => {
+      const { fullName, env, componentName, deployConfigRaw } = ctx;
 
-    const jobTriggers =
-      deployConfigRaw && deployConfigRaw.jobs
-        ? Object.fromEntries(
-            Object.entries(deployConfigRaw.jobs).map(([name, job]) => [
-              "CLOUD_RUN_JOB_TRIGGER_URL_" + sanitizeForBashVariable(name),
-              `https://${
-                deployConfigRaw.region
-              }-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/${
-                deployConfigRaw.projectId
-              }/jobs/${getCloudRunJobName(fullName, name)}:run`,
-            ])
-          )
-        : {};
+      const HOSTNAME_INTERNAL = joinBashExpressions(
+        [
+          fullName,
+          getBashVariable(
+            getSecretVarName(
+              env,
+              componentName,
+              GCLOUD_RUN_CANONICAL_HOST_SUFFIX,
+            ),
+          ),
+        ],
+        "-",
+      ).toLowerCase();
+      const jobTriggers =
+        deployConfigRaw && deployConfigRaw.jobs
+          ? Object.fromEntries(
+              Object.entries(deployConfigRaw.jobs).map(([name, job]) => [
+                "CLOUD_RUN_JOB_TRIGGER_URL_" + sanitizeForBashVariable(name),
+                getCloudRunJobExecuteUrl(name, {
+                  appFullName: fullName,
+                  projectId: deployConfigRaw.projectId,
+                  region: deployConfigRaw.region,
+                }),
+              ]),
+            )
+          : {};
 
-    return {
-      HOST_INTERNAL,
-      ...getCloudSqlVariables(ctx),
-      ...jobTriggers,
-    };
-  },
-};
+      return {
+        HOSTNAME_INTERNAL,
+        ...getCloudSqlVariables(ctx),
+        ...jobTriggers,
+        DEPLOY_CLOUD_RUN_PROJECT_ID: deployConfigRaw
+          ? deployConfigRaw.projectId
+          : undefined,
+        DEPLOY_CLOUD_RUN_REGION: deployConfigRaw
+          ? deployConfigRaw.region
+          : undefined,
+      };
+    },
+  };

package/src/deploy/cloudRun/utils/cloudRunExecutionUrl.ts

@@ -0,0 +1,20 @@
+import type { StringOrBashExpression } from "../../../bash";
+import { getCloudRunJobName } from "./jobName";
+
+export function getCloudRunJobExecuteUrl(
+  jobName: string,
+  {
+    region,
+    projectId,
+    appFullName,
+  }: {
+    appFullName: StringOrBashExpression;
+    region: string;
+    projectId: string;
+  },
+): string {
+  const uriBase = `https://${region}-run.googleapis.com/apis/run.googleapis.com/v1/namespaces/${projectId}/jobs`;
+  const fullJobName = getCloudRunJobName(appFullName, jobName);
+
+  return `${uriBase}/${fullJobName}:run`;
+}

package/src/deploy/cloudRun/utils/createArgsString.ts

@@ -1,4 +1,5 @@
 import { isNil } from "lodash";
+import type { BashExpression } from "../../../bash/BashExpression";
 
 /**
  * creates arguments string:
@@ -22,9 +23,12 @@ export const createArgsString = (...args: keyValuesArg[]) =>
             return `--no-${key}`;
           }
           return `--${key}=${value}`;
-        })
+        }),
     )
     .flat()
     .join(" ");
 
-type keyValuesArg = Record<string, string | number | true | false | undefined>;
+export type keyValuesArg = Record<
+  string,
+  string | number | true | false | undefined | BashExpression
+>;

package/src/deploy/cloudRun/utils/database.ts

@@ -1,16 +1,24 @@
-import type { Context } from "../../../types";
+import {
+  BashExpression,
+  joinBashExpressions,
+  type StringOrBashExpression,
+} from "../../../bash";
+import type { ComponentContext } from "../../../types";
 import { allowFailureInScripts, repeatOnFailure } from "../../../utils/gitlab";
-import type { DeployConfigCloudRun } from "../../types";
+import type {
+  DeployConfigCloudRun,
+  DeployConfigCloudRunCloudSql,
+} from "../../types";
 
 export const getDatabaseDeleteScript = (
-  context: Context,
-  deployConfig: DeployConfigCloudRun
+  context: ComponentContext,
+  deployConfig: DeployConfigCloudRun,
 ): string[] => {
   if (!deployConfig.cloudSql || !deployConfig.cloudSql.deleteDatabaseOnStop) {
     throw new Error("not possible");
   }
+  const DB_NAME = context.environment.envVars["DB_NAME"];
 
-  const { DB_NAME } = context.environment.envVars ?? {};
   if (!DB_NAME) {
     throw new Error("error: env vars did not specify DB_NAME");
   }
@@ -26,20 +34,20 @@ export const getDatabaseDeleteScript = (
       `gcloud sql databases delete ${DB_NAME} --instance=${instanceId} --project ${projectId}`,
       {
         pauseInSeconds: 10,
-      }
+      },
     ),
   ];
 };
 
 export const getDatabaseCreateScript = (
-  context: Context,
-  deployConfig: DeployConfigCloudRun
+  context: ComponentContext,
+  deployConfig: DeployConfigCloudRun,
 ): string[] => {
   if (!deployConfig.cloudSql) {
     throw new Error("not possible");
   }
 
-  const { DB_NAME } = context.environment.envVars ?? {};
+  const DB_NAME = context.environment.envVars["DB_NAME"];
 
   if (!DB_NAME) {
     throw new Error("error: env vars did not specify DB_NAME");
@@ -53,3 +61,102 @@ export const getDatabaseCreateScript = (
     `gcloud sql databases create ${DB_NAME} --instance=${instanceId} --project ${projectId}`,
   ]);
 };
+
+export type DBVariables = {
+  CLOUD_SQL_INSTANCE_CONNECTION_NAME: StringOrBashExpression;
+  DB_NAME: StringOrBashExpression;
+  DB_USER: StringOrBashExpression;
+  DB_PASSWORD: StringOrBashExpression;
+};
+
+/**
+ * controls how variables in the connection string are handled
+ *
+ * - legacy: variables like $DB_USER will be kept as environment variables to be replaced at runtime (default). It is not using BashExpressions as this was not the case in the past.
+ * - embedded: variables will be replaced with their actual values in the connection string
+ *
+ * We will remove the legacy mode in the future, as it is confusing. But its unclear whether its a breaking change in some edge cases
+ */
+export type DBVariablesMode = "legacy" | "embedded";
+
+export const DEFAULT_DB_VARIABLES_MODE: DBVariablesMode = "legacy";
+
+const getVariableOrValue = (
+  key: keyof DBVariables,
+  variables: DBVariables,
+  mode: DBVariablesMode,
+): StringOrBashExpression => {
+  return mode === "legacy" ? `$${key}` : variables[key];
+};
+
+export const getDatabaseJdbcUrl = (
+  variables: DBVariables,
+  mode: DBVariablesMode,
+) => {
+  const parts = [
+    "jdbc:postgresql:///",
+    getVariableOrValue("DB_NAME", variables, mode),
+    "?cloudSqlInstance=",
+    getVariableOrValue("CLOUD_SQL_INSTANCE_CONNECTION_NAME", variables, mode),
+    "&socketFactory=com.google.cloud.sql.postgres.SocketFactory&user=",
+    getVariableOrValue("DB_USER", variables, mode),
+    "&password=",
+    getVariableOrValue("DB_PASSWORD", variables, mode),
+  ];
+
+  return joinBashExpressions(parts);
+};
+
+export const getRailsDatabaseConnectionString = (
+  variables: DBVariables,
+  mode: DBVariablesMode,
+) => {
+  const parts = [
+    "postgresql://",
+    getVariableOrValue("DB_USER", variables, mode),
+    ":",
+    getVariableOrValue("DB_PASSWORD", variables, mode),
+    "@",
+    encodeURIComponent(
+      `/cloudsql/${variables.CLOUD_SQL_INSTANCE_CONNECTION_NAME}`,
+    ),
+    "/",
+    getVariableOrValue("DB_NAME", variables, mode),
+    "?",
+  ];
+  return joinBashExpressions(parts);
+};
+
+export const getPrismaDatabaseConnectionString = (
+  variables: DBVariables,
+  mode: DBVariablesMode,
+) => {
+  const parts = [
+    "postgresql://",
+    getVariableOrValue("DB_USER", variables, mode),
+    ":",
+    getVariableOrValue("DB_PASSWORD", variables, mode),
+    "@localhost/",
+    getVariableOrValue("DB_NAME", variables, mode),
+    "?host=/cloudsql/",
+    getVariableOrValue("CLOUD_SQL_INSTANCE_CONNECTION_NAME", variables, mode),
+  ];
+  return joinBashExpressions(parts);
+};
+
+export const getDatabaseConnectionString = (
+  config: DeployConfigCloudRunCloudSql,
+  variables: DBVariables,
+): StringOrBashExpression => {
+  const mode =
+    config.dbConnectionStringVariablesMode ?? DEFAULT_DB_VARIABLES_MODE;
+  switch (config.dbConnectionStringFormat) {
+    case "jdbc":
+      return getDatabaseJdbcUrl(variables, mode);
+    case "rails":
+      return getRailsDatabaseConnectionString(variables, mode);
+    default:
+      // prisma
+      return getPrismaDatabaseConnectionString(variables, mode);
+  }
+};

package/src/deploy/cloudRun/utils/gcloudServiceAccountLoginCommands.ts

@@ -1,10 +1,12 @@
 import { GCLOUD_DEPLOY_CREDENTIALS_KEY } from "..";
 import { getSecretVarNameForContext } from "../../../context";
-import type { Context } from "../../../types";
+import type { ComponentContext } from "../../../types";
 
-export const gcloudServiceAccountLoginCommands = (context: Context) => [
+export const gcloudServiceAccountLoginCommands = (
+  context: ComponentContext,
+) => [
   `gcloud auth activate-service-account --key-file=<(echo "$${getSecretVarNameForContext(
     context,
-    GCLOUD_DEPLOY_CREDENTIALS_KEY
+    GCLOUD_DEPLOY_CREDENTIALS_KEY,
   )}")`,
 ];

package/src/deploy/cloudRun/utils/getJobOrServiceArgs.ts

@@ -0,0 +1,18 @@
+import type {
+  DeployConfigCloudRunExecuteOnDeploy,
+  DeployConfigCloudRunJob,
+  DeployConfigCloudRunService,
+} from "../../types";
+
+export const getCloudRunServiceOrJobArgsArg = (
+  args:
+    | DeployConfigCloudRunExecuteOnDeploy["args"]
+    | DeployConfigCloudRunJob["args"]
+    | DeployConfigCloudRunService["args"],
+) => {
+  return args !== undefined
+    ? args.length > 0
+      ? args?.map((arg) => `"${arg}"`).join(",")
+      : ""
+    : undefined;
+};

package/src/deploy/cloudRun/utils/getServiceName.ts

@@ -1,3 +1,3 @@
-import type { Context } from "../../../types/context";
-export const getServiceName = (context: Context) =>
+import type { ComponentContext } from "../../../types/context";
+export const getServiceName = (context: ComponentContext) =>
   context.environment.fullName.toLowerCase();

package/src/deploy/cloudRun/utils/jobName.ts

@@ -1,2 +1,22 @@
-export const getCloudRunJobName = (fullAppName: string, jobName: string) =>
-  fullAppName.toLowerCase() + "-" + jobName.toLowerCase();
+import type { StringOrBashExpression } from "../../../bash/BashExpression";
+import type { ComponentContext } from "../../../types";
+
+export const getCloudRunJobName = (
+  fullAppName: StringOrBashExpression,
+  jobName: StringOrBashExpression,
+): StringOrBashExpression =>
+  fullAppName.toLowerCase().concat("-" + jobName.toLowerCase());
+
+export const getFullJobName = (
+  context: ComponentContext,
+  name: StringOrBashExpression,
+) => getCloudRunJobName(context.environment.fullName, name);
+
+export const getCloudRunSchedulerName = (
+  fullAppName: StringOrBashExpression,
+  schedulerName: string,
+): StringOrBashExpression =>
+  fullAppName.toLowerCase().concat("-" + schedulerName.toLowerCase());
+
+export const getFullSchedulerName = (context: ComponentContext, name: string) =>
+  getCloudRunSchedulerName(context.environment.fullName, name);

package/src/deploy/cloudRun/utils/removeFirstLinesFromCommandOutput.ts

@@ -8,5 +8,5 @@
  */
 export const removeFirstLinesFromCommandOutput = (
   cmd: string,
-  removeFirstN: number
+  removeFirstN: number,
 ) => (removeFirstN === 0 ? cmd : `${cmd} | tail -n +${removeFirstN + 1}`);

package/src/deploy/cloudSql/utils.ts

@@ -1,4 +1,6 @@
 import type { Config } from "../..";
+import type { StringOrBashExpression } from "../../bash/BashExpression";
+import { joinBashExpressions } from "../../bash/BashExpression";
 import type {
   DeployConfigCloudRunCloudSql,
   DeployConfigKubernetesValuesCloudSQLUnmanaged,
@@ -9,15 +11,16 @@ export const getFullDbName = (
     | DeployConfigCloudRunCloudSql
     | DeployConfigKubernetesValuesCloudSQLUnmanaged,
   fullConfig: Config<never>,
-  environmentSlugPrefix: string,
-  componentName: string
+  environmentSlugPrefix: StringOrBashExpression,
+  componentName: string,
 ) => {
-  return [
-    cloudSqlConfig.dbNamePrefix ??
-      `${fullConfig.customerName}-${fullConfig.appName}`,
-    environmentSlugPrefix,
-    cloudSqlConfig.dbBaseName ?? componentName,
-  ]
-    .filter(Boolean)
-    .join("-");
+  return joinBashExpressions(
+    [
+      cloudSqlConfig.dbNamePrefix ??
+        `${fullConfig.customerName}-${fullConfig.appName}`,
+      environmentSlugPrefix,
+      cloudSqlConfig.dbBaseName ?? componentName,
+    ].flatMap((part) => (part ? [part] : [])),
+    "-",
+  );
 };

package/src/deploy/custom/deployJob.ts

@@ -1,6 +1,7 @@
+import { getAllCacheConfigsFromConfig } from "../../build/cache/getAllCacheConfigsFromConfig";
 import { getYarnInstall } from "../../build/node/yarn";
 import { getRunnerImage } from "../../runner";
-import type { Context } from "../../types/context";
+import type { ComponentContext } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
 import { createDeployementJobs } from "../base";
 import {
@@ -9,23 +10,26 @@ import {
 } from "../sbom";
 import { isOfDeployType } from "../types";
 
-export const createCustomDeployJobs = (context: Context): CatladderJob[] => {
-  const deployConfig = context.componentConfig.deploy;
-  if (deployConfig === false) {
-    return [];
-  }
+export const createCustomDeployJobs = (
+  context: ComponentContext,
+): CatladderJob[] => {
+  const deployConfig = context.deploy?.config;
+
   if (!isOfDeployType(deployConfig, "custom")) {
     // should not happen
     throw new Error("deploy config is not custom");
   }
   // FIXME: custom deploy currently assumes yarn-based project
-  const yarnInstall = getYarnInstall(context, { noCustomPostInstall: true });
-  return createDeployementJobs(context, {
+  const yarnInstall = getYarnInstall(context, {
+    noCustomPostInstall: true,
+  });
+
+  const result = createDeployementJobs(context, {
     deploy: {
       image: deployConfig.jobImage ?? getRunnerImage("jobs-default"),
-      cache: deployConfig.jobCache ?? [],
+      cache: getAllCacheConfigsFromConfig(context, deployConfig),
       script: [
-        `cd ${context.componentConfig.dir}`,
+        `cd ${context.build.dir}`,
         ...(deployConfig.requiresYarnInstall ? yarnInstall : []),
         ...deployConfig.script,
         ...getDependencyTrackUploadScript(context),
@@ -43,4 +47,5 @@ export const createCustomDeployJobs = (context: Context): CatladderJob[] => {
         }
       : undefined,
   });
+  return result;
 };

package/src/deploy/custom/index.ts

@@ -1,7 +1,7 @@
-import type { DeployTypeDefinition } from "..";
+import type { DeployConfigCustom, DeployTypeDefinition } from "..";
 import { createCustomDeployJobs } from "./deployJob";
 
-export const CUSTOM_DEPLOY_TYPE: DeployTypeDefinition<"custom"> = {
+export const CUSTOM_DEPLOY_TYPE: DeployTypeDefinition<DeployConfigCustom> = {
   jobs: createCustomDeployJobs,
   defaults: () => ({}),
   additionalSecretKeys: () => [],