@catladder/pipeline 0.0.0-refactor-untangle-gitlab-api-requests-from-vorpal-57cf3cf2 → 0.0.0-reference-database-url-1befbbee

package/examples/referencing-other-vars.ts

@@ -1,6 +1,6 @@
 import type { Config } from "../src";
 
-const config: Config = {
+const config = {
   appName: "test-app",
   customerName: "pan",
   components: {
@@ -74,7 +74,7 @@ const config: Config = {
       },
     },
   },
-};
+} satisfies Config;
 
 export default config;
 

package/examples/wait-for-other-deploy.ts

@@ -28,7 +28,7 @@ const config: Config<{ CustomEnvs: "asdf" | "bla" }> = {
       },
     },
   },
-};
+} satisfies Config;
 
 export default config;
 

package/examples/workspace-api-www-turbo-cache.ts

@@ -5,7 +5,7 @@ const DEPLOY_CONFIG: DeployConfig = {
   projectId: "google-project-id",
   region: "europe-west6",
 };
-const config: Config = {
+const config = {
   appName: "test-app",
   customerName: "pan",
   builds: {
@@ -43,7 +43,7 @@ const config: Config = {
       },
     },
   },
-};
+} satisfies Config;
 
 export default config;
 

package/examples/workspace-api-www.ts

@@ -5,7 +5,7 @@ const DEPLOY_CONFIG: DeployConfig = {
   projectId: "google-project-id",
   region: "europe-west6",
 };
-const config: Config = {
+const config = {
   appName: "test-app",
   customerName: "pan",
   builds: {
@@ -37,7 +37,7 @@ const config: Config = {
       },
     },
   },
-};
+} satisfies Config;
 
 export default config;
 

package/package.json

@@ -53,7 +53,7 @@
     }
   ],
   "license": "MIT",
-  "version": "0.0.0-refactor-untangle-gitlab-api-requests-from-vorpal-57cf3cf2",
+  "version": "0.0.0-reference-database-url-1befbbee",
   "stableVersion": "0.1.0",
   "scripts": {
     "build:tsc": "yarn tsc",

package/src/build/artifacts/createBuildJobArtifact.ts

@@ -41,7 +41,9 @@ const getArtifactsPathForComponent = (
   additionalPaths?: string[],
 ): string[] => {
   return [
-    ...(c.build.config.artifactsPaths ?? []),
+    ...(c.build.type !== "disabled"
+      ? (c.build.config.artifactsPaths ?? [])
+      : []),
     ...(additionalPaths ?? []),
   ]?.flatMap((artifact) =>
     c.build

package/src/build/base/index.ts

@@ -1,5 +1,8 @@
 import { sbomDeactivated } from "../../deploy/sbom";
-import type { WorkspaceContext } from "../../types/context";
+import type {
+  ComponentContextWithBuild,
+  WorkspaceContext,
+} from "../../types/context";
 import {
   componentContextHasWorkspaceBuild,
   componentContextIsStandaloneBuild,
@@ -16,7 +19,7 @@ import { APP_BUILD_JOB_NAME } from "./constants";
 import { createAppBuildJob } from "./createAppBuildJob";
 
 export const createComponentBuildJobs = (
-  context: ComponentContext,
+  context: ComponentContextWithBuild,
   definitions: {
     appBuild?: AppBuildJobDefinition;
     dockerBuild: DockerBuildJobDefinition;

package/src/build/cache/getAllCacheConfigsFromConfig.ts

@@ -16,12 +16,13 @@ export const getAllCacheConfigsFromConfig = (
       ? // also add cache configs of the components of that workspace
         // FIXNME: this only works currently for the build config
         // we would probably need to introduce a path to the right config property (build-->test or so)
-        context.components.flatMap<CacheConfig>(
-          (componentContext) =>
-            ensureArray(componentContext.build.config.cache).map((c) => ({
-              ...c,
-              baseDir: componentContext.build.dir,
-            })) ?? [],
+        context.components.flatMap<CacheConfig>((componentContext) =>
+          componentContext.build.type !== "disabled"
+            ? (ensureArray(componentContext.build.config.cache).map((c) => ({
+                ...c,
+                baseDir: componentContext.build.dir,
+              })) ?? [])
+            : [],
         )
       : []),
   ];

package/src/build/custom/buildJob.ts

@@ -1,4 +1,4 @@
-import type { ComponentContext } from "../../types/context";
+import type { ComponentContextWithBuild } from "../../types/context";
 import { getDockerBuildScriptWithBuiltInDockerFile } from "../docker";
 import { isOfBuildType } from "../types";
 
@@ -7,7 +7,7 @@ import { createComponentBuildJobs } from "../base";
 import { createBuildJobDefinition } from "../base/createBuildJobDefinition";
 
 export const createCustomBuildJobs = (
-  context: ComponentContext,
+  context: ComponentContextWithBuild,
 ): CatladderJob[] => {
   const buildConfig = context.build.config;
 

package/src/build/custom/index.ts

@@ -1,8 +1,10 @@
-import type { ComponentContext } from "../../types/context";
+import type { ComponentContextWithBuild } from "../../types";
 import type { CatladderJob } from "../../types/jobs";
 import { createCustomBuildJobs } from "./buildJob";
 import { createCustomTestJobs } from "./testJob";
 
-export const createCustomJobs = (context: ComponentContext): CatladderJob[] => {
+export const createCustomJobs = (
+  context: ComponentContextWithBuild,
+): CatladderJob[] => {
   return [...createCustomTestJobs(context), ...createCustomBuildJobs(context)];
 };

package/src/build/custom/testJob.ts

@@ -1,5 +1,5 @@
 import type { Artifacts } from "../../types";
-import type { ComponentContext } from "../../types/context";
+import type { ComponentContextWithBuild } from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
 import { ensureArray, notNil } from "../../utils";
 import { createArtifactsConfig } from "../base/createArtifactsConfig";
@@ -13,7 +13,7 @@ const RUNNER_CUSTOM_TEST_VARIABLES = {
 };
 
 export const createCustomTestJobs = (
-  context: ComponentContext,
+  context: ComponentContextWithBuild,
 ): CatladderJob[] => {
   // don't run tests after release
   // TODO: this will be replaced by using rules

package/src/build/docker.ts

@@ -10,7 +10,11 @@ import {
 } from "../deploy/cloudRun/artifactsRegistry";
 import { gcloudServiceAccountLoginCommands } from "../deploy/cloudRun/utils/gcloudServiceAccountLoginCommands";
 import { getRunnerImage } from "../runner";
-import type { ComponentContext, DockerBuildJobDefinition } from "../types";
+import type {
+  ComponentContext,
+  ComponentContextWithBuild,
+  DockerBuildJobDefinition,
+} from "../types";
 import type { CatladderJob } from "../types/jobs";
 import { collapseableSection } from "../utils/gitlab";
 import { createJobCacheFromCacheConfigs } from "./cache/createJobCache";
@@ -63,7 +67,7 @@ export const requiresDockerBuild = (context: ComponentContext): boolean => {
 
 // those need to be runner variables
 const getDockerBuildRunnerVariables = () => ({
-  DOCKER_HOST: "tcp://0.0.0.0:2375",
+  DOCKER_HOST: "tcp://docker:2375",
   DOCKER_TLS_CERTDIR: "",
   DOCKER_DRIVER: "overlay2",
   DOCKER_BUILDKIT: "1", // see https://docs.docker.com/develop/develop-images/build_enhancements/
@@ -84,7 +88,7 @@ const getDockerAdditions = (build: BuildConfig) => {
         : undefined,
   };
 };
-export const getDockerBuildVariables = (context: ComponentContext) => {
+export const getDockerBuildVariables = (context: ComponentContextWithBuild) => {
   return {
     ...getDockerAdditions(context.build.config),
     APP_DIR: context.build.dir,
@@ -120,7 +124,7 @@ export const getDockerJobBaseProps = (): Pick<
 };
 
 export const createDockerBuildJobBase = (
-  context: ComponentContext,
+  context: ComponentContextWithBuild,
   { script, cache, ...def }: DockerBuildJobDefinition,
 ): CatladderJob => {
   return merge(
@@ -163,7 +167,7 @@ const BUILT_IN_ENSURE_DOCKERFILE_SCRIPTS = {
 };
 
 export const getDockerBuildScriptWithBuiltInDockerFile = (
-  context: ComponentContext,
+  context: ComponentContextWithBuild,
   defaultType?: BuildConfigDocker["type"],
 ) => {
   const type =

package/src/build/index.ts

@@ -1,4 +1,7 @@
-import type { ComponentContext, WorkspaceContext } from "../types/context";
+import type {
+  ComponentContextWithBuild,
+  WorkspaceContext,
+} from "../types/context";
 import type { EnvironmentContext } from "../types/environmentContext";
 
 import type { CatladderJob } from "../types/jobs";
@@ -16,7 +19,7 @@ export * from "./types";
 
 export type BuildTypes = {
   [type in BuildConfigStandaloneType]: {
-    jobs: (context: ComponentContext) => CatladderJob[];
+    jobs: (context: ComponentContextWithBuild) => CatladderJob[];
     defaults: (
       envContext: EnvironmentContext,
     ) => Partial<Extract<BuildConfig, { type: type }>>;
@@ -62,10 +65,9 @@ export const BUILD_TYPES: BuildTypes = {
   rails: {
     jobs: createRailsJobs,
     defaults: () => ({
-      startCommand: "/cnb/process/web",
       cnbBuilder: {
-        image: "heroku/builder:22",
-        packVersion: "0.32.1",
+        image: "heroku/builder:24",
+        packVersion: "0.36.4",
       },
     }),
   },

package/src/build/node/buildJob.ts

@@ -1,5 +1,6 @@
 import type {
   BuildContextStandalone,
+  ComponentContextWithBuild,
   WorkspaceContext,
 } from "../../types/context";
 import {
@@ -19,7 +20,7 @@ import { getNodeCache, getYarnCache } from "./cache";
 import { getDockerAppCopyAndBuildScript, getYarnInstall } from "./yarn";
 
 export const createNodeBuildJobs = (
-  context: ComponentContext | WorkspaceContext,
+  context: ComponentContextWithBuild | WorkspaceContext,
 ): CatladderJob[] => {
   if (context.type === "workspace") {
     return createWorkspaceBuildJobs(context, {
@@ -47,8 +48,10 @@ export const createNodeBuildJobDefinition = (
   });
 };
 
+type NewType = ComponentContextWithBuild;
+
 export const createNodeDockerJobDefinition = (
-  context: ComponentContext,
+  context: NewType,
 ): DockerBuildJobDefinition => {
   // get the default docker built-in type based on the build type
   const dockerDefaultBuiltIn: BuildConfigDocker["type"] =

package/src/build/node/index.ts

@@ -1,21 +1,26 @@
-import type { ComponentContext, WorkspaceContext } from "../../types/context";
+import type {
+  ComponentContextWithBuild,
+  WorkspaceContext,
+} from "../../types/context";
 import type { CatladderJob } from "../../types/jobs";
 import { createNodeBuildJobs } from "./buildJob";
 import { createMeteorBuildJobs } from "./meteor";
 import { createNodeTestJobs } from "./testJob";
 
 export const createNodeJobs = (
-  context: ComponentContext | WorkspaceContext,
+  context: ComponentContextWithBuild | WorkspaceContext,
 ): CatladderJob[] => {
   return [...createNodeTestJobs(context), ...createNodeBuildJobs(context)];
 };
 
 export const createStorybookJobs = (
-  context: ComponentContext,
+  context: ComponentContextWithBuild,
 ): CatladderJob[] => {
   return [...createNodeBuildJobs(context)];
 };
 
-export const createMeteorJobs = (context: ComponentContext): CatladderJob[] => {
+export const createMeteorJobs = (
+  context: ComponentContextWithBuild,
+): CatladderJob[] => {
   return [...createNodeTestJobs(context), ...createMeteorBuildJobs(context)];
 };

package/src/build/node/meteor.ts

@@ -1,5 +1,8 @@
 import { getRunnerImage } from "../../runner";
-import type { ComponentContext } from "../../types/context";
+import type {
+  ComponentContext,
+  ComponentContextWithBuild,
+} from "../../types/context";
 
 import type { CatladderJob } from "../../types/jobs";
 
@@ -23,7 +26,7 @@ const getMeteorCache = (context: ComponentContext): CacheConfig[] => [
   },
 ];
 export const createMeteorBuildJobs = (
-  context: ComponentContext,
+  context: ComponentContextWithBuild,
 ): CatladderJob[] => {
   const buildConfig = context.build.config;
 

package/src/build/node/yarn.ts

@@ -1,5 +1,5 @@
 import { BashExpression } from "../../bash/BashExpression";
-import type { Context } from "../../types";
+import { type Context } from "../../types";
 import { ensureArray } from "../../utils";
 import { collapseableSection } from "../../utils/gitlab";
 
@@ -32,7 +32,9 @@ export const getYarnInstall = (
   },
 ) => {
   const postInstall =
-    context.type !== "workspace" && "postInstall" in context.build.config
+    context.type !== "workspace" &&
+    context.build.type !== "disabled" &&
+    "postInstall" in context.build.config
       ? context.build.config.postInstall
       : null;
   return [

package/src/build/rails/build.ts

@@ -1,9 +1,5 @@
-import {
-  componentContextIsStandaloneBuild,
-  type BuildConfigRails,
-  type BuildContextStandalone,
-  type ComponentContext,
-} from "../..";
+import type { ComponentContextWithBuild } from "../..";
+import { componentContextIsStandaloneBuild } from "../..";
 import type { CatladderJob } from "../../types/jobs";
 import { createComponentBuildJobs } from "../base";
 import {
@@ -14,7 +10,7 @@ import {
 import { isOfBuildType } from "../types";
 
 export const createRailsBuildJobs = (
-  context: ComponentContext,
+  context: ComponentContextWithBuild,
 ): CatladderJob[] => {
   const buildConfig = context.build.config;
   if (!isOfBuildType(buildConfig, "rails")) {
@@ -52,7 +48,6 @@ export const createRailsBuildJobs = (
       script: [
         ...gitlabDockerLogin(context),
         `cd ${context.build.dir}`,
-        `docker pull $DOCKER_CACHE_IMAGE || true`,
         `wget --output-document=- https://github.com/buildpacks/pack/releases/download/v${cnbConf?.packVersion}/pack-v${cnbConf?.packVersion}-linux.tgz | tar -zx --directory /usr/local/bin pack`,
         `chmod +x /usr/local/bin/pack`,
         //  replace private git ssh gem sources with https to make bundler with credentials via env var work

package/src/build/rails/index.ts

@@ -1,8 +1,10 @@
-import type { ComponentContext } from "../../types";
+import type { ComponentContextWithBuild } from "../../types";
 import type { CatladderJob } from "../../types/jobs";
 import { createRailsBuildJobs } from "./build";
 import { createRailsTestJobs } from "./test";
 
-export const createRailsJobs = (context: ComponentContext): CatladderJob[] => {
+export const createRailsJobs = (
+  context: ComponentContextWithBuild,
+): CatladderJob[] => {
   return [...createRailsTestJobs(context), ...createRailsBuildJobs(context)];
 };

package/src/build/rails/test.ts

@@ -93,9 +93,28 @@ export const createRailsTestJobs = (
             `cd ${context.build.dir}`,
             ...bundlerInstall,
             ...(ensureArrayOrNull(buildConfig.test?.command) ?? [
+              "bundle exec rake db:test:prepare",
+              "bundle exec rake assets:precompile assets:clean",
               "bundle exec rspec",
             ]),
           ],
+          runnerVariables: {
+            RAILS_ENV: "test",
+            DATABASE_URL: "postgresql://postgres@database",
+          },
+          services: [
+            {
+              name:
+                buildConfig.test && "databaseImage" in buildConfig.test
+                  ? (buildConfig?.test?.databaseImage ??
+                    "docker.io/postgres:latest")
+                  : "docker.io/postgres:latest",
+              alias: "database",
+              variables: {
+                POSTGRES_HOST_AUTH_METHOD: "trust",
+              },
+            },
+          ],
         }
       : null;
   return [auditJob, lintJob, testJob].filter(notNil);

package/src/build/sbom.ts

@@ -1,15 +1,20 @@
 import { isStandaloneBuildConfig } from ".";
-import type { ComponentContext } from "../types/context";
+import type { ComponentContextWithBuild } from "../types/context";
 import type { CatladderJob } from "../types/jobs";
 import { ensureArrayOrNull } from "../utils";
 
 export const SBOM_BUILD_JOB_NAME = "🧾 sbom";
 export const SBOM_FILE = "__sbom.json";
 
-export const createSbomBuildJob = (context: ComponentContext): CatladderJob => {
+export const createSbomBuildJob = (
+  context: ComponentContextWithBuild,
+): CatladderJob => {
   const buildConfig = context.build.config;
 
-  const defaultImage = "aquasec/trivy:0.38.3";
+  const defaultImage = {
+    name: "aquasec/trivy:0.58.2",
+    entrypoint: [""],
+  };
   const defaultScript = [
     `trivy fs --quiet --format cyclonedx --output "${SBOM_FILE}" ${
       context.packageManagerInfo.componentIsInWorkspace

package/src/build/types.ts

@@ -277,6 +277,14 @@ export type BuildConfigCustom = Omit<
 
 export type BuildConfigRails = BuildConfigBase & {
   type: "rails";
+  test?: Pick<BuildConfigBase, "test"> & {
+    /**
+     * The container image to use as the database.
+     * Currently only supports PostgreSQL.
+     * Defaults to `docker.io/postgres:latest`
+     */
+    databaseImage?: string;
+  };
   /**
    * The [Cloud Native Buildpacks](https://buildpacks.io/) builder configuration.
    *

package/src/context/createComponentContext.ts

@@ -42,26 +42,31 @@ export const createComponentContext = async (
 
   const componentConfigWithoutDefaults = envContext.envConfigRaw;
 
-  const resolvedBuildType = isStandaloneBuildConfig(
-    componentConfigWithoutDefaults.build,
-  )
-    ? componentConfigWithoutDefaults.build.type
-    : ctx.config.builds?.[componentConfigWithoutDefaults.build.from].type;
-  if (!resolvedBuildType) {
+  const resolvedBuildType =
+    componentConfigWithoutDefaults.build === false
+      ? false
+      : isStandaloneBuildConfig(componentConfigWithoutDefaults.build)
+        ? componentConfigWithoutDefaults.build.type
+        : ctx.config.builds?.[componentConfigWithoutDefaults.build.from].type;
+  if (resolvedBuildType === undefined) {
     throw new Error("build type not found, is the build config correct?");
   }
   const defaults: {
-    build: PartialDeep<BuildConfig>;
+    build: PartialDeep<BuildConfig | false>;
     deploy: PartialDeep<DeployConfig>;
   } = componentConfigWithoutDefaults.deploy
     ? {
-        build: BUILD_TYPES[resolvedBuildType].defaults(envContext),
+        build:
+          resolvedBuildType &&
+          BUILD_TYPES[resolvedBuildType].defaults(envContext),
         deploy: DEPLOY_TYPES[
           componentConfigWithoutDefaults.deploy.type as DeployConfigType
         ].defaults(envContext as any),
       }
     : {
-        build: BUILD_TYPES[resolvedBuildType].defaults(envContext),
+        build:
+          resolvedBuildType &&
+          BUILD_TYPES[resolvedBuildType].defaults(envContext),
         deploy: {},
       };
 
@@ -80,6 +85,14 @@ export const createComponentContext = async (
       : []),
   ];
   const _getBuildContext = (): BuildContextComponent => {
+    if (build === false) {
+      return {
+        type: "disabled",
+        getComponentDirs,
+        dir,
+      };
+    }
+
     if (isStandaloneBuildConfig(build)) {
       return {
         dir: dir,

package/src/context/getLabels.ts

@@ -14,7 +14,10 @@ export const getLabels = (context: ComponentContext) => {
     "app-name": sanitize(context.fullConfig.appName),
     "env-type": sanitize(context.environment.envType),
     "env-name": sanitize(context.env),
-    "build-type": sanitize(context.build.buildType),
+    "build-type":
+      context.build.type === "disabled"
+        ? "disabled"
+        : sanitize(context.build.buildType),
     ...(context.fullConfig.meta?.labels ?? {}),
   };
   return labels;

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

@@ -14,7 +14,7 @@ import {
 } from "./common";
 import { ENV_VARS_FILENAME } from "./constants";
 import { createVolumeConfig } from "./volumes";
-import { getCloudRunJobArgsArg } from "./execute/onDeploy";
+import { getCloudRunServiceOrJobArgsArg } from "../utils/getJobOrServiceArgs";
 
 export const getDeleteJobsScripts = (context: ComponentContext) => {
   const commonArgs = getCommonCloudRunArgs(context);
@@ -44,7 +44,7 @@ export const getJobCreateScripts = (context: ComponentContext): string[] =>
       const commonDeployArgsString = createArgsString(
         {
           command: `"${commandArray.join(",")}"`,
-          args: getCloudRunJobArgsArg(job.args),
+          args: getCloudRunServiceOrJobArgsArg(job.args),
           labels: `"${makeLabelString(getLabels(context))},cloud-run-job-name=$current_job_name"`,
           image: `"${job.image ?? commonImage}"`,
           project,

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

@@ -3,6 +3,7 @@ import type { ComponentContext } from "../../../types/context";
 
 import type { DeployConfigCloudRunService } from "../../types/googleCloudRun";
 import { createArgsString } from "../utils/createArgsString";
+import { getCloudRunServiceOrJobArgsArg } from "../utils/getJobOrServiceArgs";
 import { getServiceName } from "../utils/getServiceName";
 import {
   gcloudRunCmd,
@@ -11,6 +12,7 @@ import {
   makeLabelString,
 } from "./common";
 import { ENV_VARS_FILENAME } from "./constants";
+import { healthCheckCliArgs } from "./healthCheck";
 import { createVolumeConfig } from "./volumes";
 
 export const getServiceDeployScript = (
@@ -25,7 +27,10 @@ export const getServiceDeployScript = (
   const customConfig = service !== true ? service : undefined;
   const command =
     service !== true
-      ? (service?.command ?? context.build.config.startCommand)
+      ? (service?.command ??
+        (context.build.type !== "disabled"
+          ? context.build.config.startCommand
+          : undefined))
       : undefined;
 
   const commandArray = command
@@ -34,11 +39,14 @@ export const getServiceDeployScript = (
       : command.split(" ")
     : undefined;
   const fullServiceName = serviceName.concat(nameSuffix ?? "");
+
   const argsString = createArgsString(
     {
       // command as empty string resets it to default (uses the image's entrypoint)
       command: commandArray ? '"' + commandArray.join(",") + '"' : '""',
+      args: getCloudRunServiceOrJobArgsArg(customConfig?.args),
       ...commonDeployArgs,
+      image: customConfig?.image ?? commonDeployArgs.image,
       labels: makeLabelString({
         ...getLabels(context),
         "cloud-run-service-name": fullServiceName,
@@ -59,11 +67,14 @@ export const getServiceDeployScript = (
       ingress: customConfig?.ingress ?? "all",
       "cpu-boost": true,
       "execution-environment": customConfig?.executionEnvironment,
+      gpu: customConfig?.gpu,
+      "gpu-type": customConfig?.gpuType,
+      ...healthCheckCliArgs(customConfig?.healthCheck),
     },
     ...createVolumeConfig(customConfig?.volumes, "service"),
   );
-
-  return `${gcloudRunCmd()} deploy ${fullServiceName} ${argsString}`;
+  const version = requiresBeta(customConfig) ? "beta" : undefined;
+  return `${gcloudRunCmd(version)} deploy ${fullServiceName} ${argsString}`;
 };
 
 export const getServiceDeleteScript = (
@@ -84,3 +95,19 @@ export const getServiceDeleteScript = (
     `${gcloudRunCmd()} services delete ${fullServiceName} ${commonArgsString}`,
   ];
 };
+const requiresBeta = (config: DeployConfigCloudRunService | undefined) => {
+  if (!config) {
+    return false;
+  }
+
+  if (config.gpuType) {
+    return true;
+  }
+  if (config.gpu && config.gpu > 0) {
+    return true;
+  }
+  if (config.healthCheck !== undefined) {
+    return true;
+  }
+  return false;
+};