@catladder/pipeline 2.0.4 → 2.1.0

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

@@ -3325,7 +3325,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - &a2
@@ -3345,7 +3344,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - *a2

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

@@ -1851,7 +1851,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - &a2
@@ -1871,7 +1870,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - *a2

package/examples/__snapshots__/local-dot-env.test.ts.snap

@@ -1310,7 +1310,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - &a2
@@ -1330,7 +1329,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - *a2

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

@@ -1804,7 +1804,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - &a2
@@ -1824,7 +1823,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - *a2

package/examples/__snapshots__/multiline-var.test.ts.snap

@@ -5647,7 +5647,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - &a2
@@ -5667,7 +5666,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - *a2

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

@@ -2174,7 +2174,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - &a2
@@ -2194,7 +2193,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - *a2

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

@@ -1386,7 +1386,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - &a2
@@ -1406,7 +1405,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - *a2

package/examples/__snapshots__/node-build-with-docker-additions.test.ts.snap

@@ -1394,7 +1394,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - &a2
@@ -1414,7 +1413,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - *a2

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

@@ -1455,7 +1455,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - &a3
@@ -1475,7 +1474,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - *a3

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

@@ -1439,7 +1439,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - &a3
@@ -1459,7 +1458,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - *a3

package/examples/__snapshots__/referencing-other-vars.test.ts.snap

@@ -4707,7 +4707,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - &a2
@@ -4727,7 +4726,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - *a2

package/examples/__snapshots__/wait-for-other-deploy.test.ts.snap

@@ -1336,7 +1336,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - &a2
@@ -1356,7 +1355,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - *a2

package/examples/__snapshots__/workspace-api-www-turbo-cache.test.ts.snap

@@ -2306,7 +2306,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - &a2
@@ -2326,7 +2325,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - *a2

package/examples/__snapshots__/workspace-api-www.test.ts.snap

@@ -2298,7 +2298,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - &a2
@@ -2318,7 +2317,6 @@ create release:
   image: path/to/docker/semantic-release:the-version
   script:
     - semanticRelease
-  after_script:
     - echo '👉 The project access token might be invald - run \`project-renew-token\` in catladder CLI to fix.'
   rules:
     - *a2

package/examples/__utils__/helpers.ts

@@ -1,23 +1,7 @@
 import { stringify } from "yaml";
 
 import type { Config } from "../../src";
-import {
-  createChildPipeline,
-  generateLocalPipelineContent,
-  yamlStringifyOptions,
-} from "../../src";
-
-const ALL_TRIGGERS = ["mainBranch", "taggedRelease", "mr"] as const;
-
-export const createAllPipelines = async (config: Config) =>
-  Object.fromEntries(
-    await Promise.all(
-      ALL_TRIGGERS.map(async (trigger) => [
-        trigger,
-        await createChildPipeline("gitlab", trigger, config),
-      ]),
-    ),
-  );
+import { generateLocalPipelineContent, yamlStringifyOptions } from "../../src";
 
 export const createYamlLocalPipeline = async (
   config: Config,

package/package.json

@@ -53,7 +53,7 @@
     }
   ],
   "license": "MIT",
-  "version": "2.0.4",
+  "version": "2.1.0",
   "scripts": {
     "build:tsc": "yarn tsc",
     "build": "yarn build:compile && yarn build:inline-variables",
@@ -69,28 +69,27 @@
   "main": "dist/index.js",
   "sideEffects": false,
   "devDependencies": {
-    "@babel/cli": "^7.16.0",
-    "@babel/core": "^7.0.0-0",
-    "@babel/plugin-syntax-typescript": "^7.16.7",
-    "@babel/preset-typescript": "^7.16.5",
-    "@jest/globals": "^29.3.1",
-    "@types/child-process-promise": "^2.2.2",
-    "@types/jest": "^27.4.0",
-    "@types/lodash": "^4.14.185",
-    "@types/node": "^20.14.2",
+    "@babel/cli": "^7.24.8",
+    "@babel/core": "^7.25.2",
+    "@babel/plugin-syntax-typescript": "^7.25.4",
+    "@babel/preset-typescript": "^7.24.7",
+    "@jest/globals": "^29.7.0",
+    "@types/child-process-promise": "^2.2.6",
+    "@types/jest": "^29.5.12",
+    "@types/lodash": "^4.17.7",
+    "@types/node": "^22.5.1",
     "babel-plugin-transform-inline-environment-variables": "^0.4.3",
     "child-process-promise": "^2.2.1",
-    "glob": "^10.4.2",
+    "glob": "^11.0.0",
     "json-schema-to-typescript": "^13.0.2",
     "lodash": "^4.17.21",
-    "memoizee": "^0.4.15",
-    "path-equal": "1.1.3",
-    "slugify": "^1.6.3",
-    "tsx": "^4.16.2",
+    "memoizee": "^0.4.17",
+    "path-equal": "1.2.5",
+    "slugify": "^1.6.6",
     "typescript": "^5.4.5",
-    "yaml": "^2.4.5"
+    "yaml": "^2.5.0"
   },
   "dependencies": {
-    "tsx": "^4.16.2"
+    "tsx": "^4.19.0"
   }
 }

package/src/build/cache/createJobCache.ts

@@ -30,7 +30,7 @@ export const createJobCacheFromCacheConfigs = (
                 const baseDir =
                   c.pathMode === "absolute"
                     ? ""
-                    : c.baseDir ?? context.build.dir;
+                    : (c.baseDir ?? context.build.dir);
                 return join(baseDir, p);
               }),
             ),
@@ -41,7 +41,7 @@ export const createJobCacheFromCacheConfigs = (
   const advancedCaches = advancedCacheDefs.map(
     ({ key, paths, policy, scope, pathMode, buildDir, ...rest }) => {
       const baseDir =
-        pathMode === "absolute" ? "" : buildDir ?? context.build.dir;
+        pathMode === "absolute" ? "" : (buildDir ?? context.build.dir);
       const transformedKey =
         scope === "global"
           ? key

package/src/build/sbom.ts

@@ -22,14 +22,14 @@ export const createSbomBuildJob = (context: ComponentContext): CatladderJob => {
     isStandaloneBuildConfig(buildConfig) &&
     buildConfig.type === "custom" &&
     buildConfig.sbom !== false
-      ? buildConfig.sbom?.jobImage ?? defaultImage
+      ? (buildConfig.sbom?.jobImage ?? defaultImage)
       : defaultImage;
 
   const script =
     isStandaloneBuildConfig(buildConfig) &&
     buildConfig.type === "custom" &&
     buildConfig.sbom !== false
-      ? ensureArrayOrNull(buildConfig.sbom?.command) ?? defaultScript
+      ? (ensureArrayOrNull(buildConfig.sbom?.command) ?? defaultScript)
       : defaultScript;
 
   return {

package/src/catladder-gitlab.ts

@@ -1,17 +1,10 @@
 import { readConfig } from "./config";
 import { generatePipelineFiles } from "./pipeline/generatePipelineFiles";
-import type { PipelineMode } from "./types";
 
-const mode = process.argv[2] || "local";
-
-const config = readConfig().then(async (result) => {
+readConfig().then(async (result) => {
   if (!result?.config) {
     throw new Error("no catladder config found");
   }
 
-  await generatePipelineFiles(
-    result.config,
-    "gitlab",
-    mode as PipelineMode<"gitlab">,
-  );
+  await generatePipelineFiles(result.config, "gitlab");
 });

package/src/config/readConfig.ts

@@ -1,6 +1,5 @@
 import { existsSync, readFileSync } from "fs";
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
 const tsx = require("tsx/cjs/api");
 
 import { parse } from "yaml";

package/src/context/createComponentContext.ts

@@ -76,7 +76,7 @@ export const createComponentContext = async (
     dir,
     // also copy workspace dependencies in monorepo if packages are shared and they create build artifacts
     ...(mode === "all"
-      ? packageManagerInfo.currentWorkspaceDependencies ?? []
+      ? (packageManagerInfo.currentWorkspaceDependencies ?? [])
       : []),
   ];
   const _getBuildContext = (): BuildContextComponent => {

package/src/context/getEnvironmentVariables.ts

@@ -134,7 +134,7 @@ export const getEnvironmentVariables = async (
   );
 
   const publicEnvVars =
-    options.shouldResolveReferences ?? true
+    (options.shouldResolveReferences ?? true)
       ? await resolveAllReferences(
           publicEnvVarsUnresolved,
           async (otherComponentName) => {

package/src/deploy/base/deploy.ts

@@ -62,11 +62,11 @@ export const createDeployJob = (
         ? []
         : [{ job: SBOM_BUILD_JOB_NAME, artifacts: true }]),
       ...(deployConfig
-        ? deployConfig.waitFor?.map((c) => ({
+        ? (deployConfig.waitFor?.map((c) => ({
             componentName: c,
             job: DEPLOY_JOB_NAME,
             artifacts: false,
-          })) ?? []
+          })) ?? [])
         : []),
     ],
     // we don't want to deploy when there is a broken test
@@ -117,7 +117,7 @@ export const createDeployJob = (
     runnerVariables: {
       ...DEPLOY_RUNNER_VARIABLES,
       ...(jobDefinition.runnerVariables ?? {}),
-      ...(deployConfig ? deployConfig.runnerVariables ?? {} : {}),
+      ...(deployConfig ? (deployConfig.runnerVariables ?? {}) : {}),
     },
     environment: isStoppable
       ? {

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

@@ -108,29 +108,23 @@ export const getJobCreateScripts = (context: ComponentContext): string[] =>
         region,
         ...deployArgs
       } = getCommonDeployArgs(context);
-      const commonDeployArgsString = createArgsString({
-        command: `"${commandArray.join(",")}"`,
-        labels: `"${makeLabelString(getLabels(context))},cloud-run-job-name=$current_job_name"`,
-        image: `"${image ?? commonImage}"`,
-        project,
-        region,
-        cpu,
-        memory,
-        parallelism,
-        "task-timeout": timeout,
-        "env-vars-file": ENV_VARS_FILENAME,
-        "max-retries": 0,
-        ...deployArgs,
-      });
-
-      // due to some oversight from google, jobs create does not yet accept `--add-volume` 🤦
-      // lucky, update on the other hand accepts it... so let's just imediatly update it
-      // we cannot upsert a job, so we have to create it and catch the error and then update
-      const hasVolumes = Object.keys(volumes || {}).length > 0;
-      const needsBeta = hasVolumes ? "beta" : undefined;
-      const volumeArgs = hasVolumes
-        ? createArgsString(...createVolumeConfig(volumes, "job"))
-        : "";
+      const commonDeployArgsString = createArgsString(
+        {
+          command: `"${commandArray.join(",")}"`,
+          labels: `"${makeLabelString(getLabels(context))},cloud-run-job-name=$current_job_name"`,
+          image: `"${image ?? commonImage}"`,
+          project,
+          region,
+          cpu,
+          memory,
+          parallelism,
+          "task-timeout": timeout,
+          "env-vars-file": ENV_VARS_FILENAME,
+          "max-retries": 0,
+          ...deployArgs,
+        },
+        ...createVolumeConfig(volumes, "job"),
+      );
 
       return [
         jobIndex === 0
@@ -138,7 +132,7 @@ export const getJobCreateScripts = (context: ComponentContext): string[] =>
           : null,
         `current_job_name="${jobName}"`,
         'if grep "$current_job_name" <<<"$exist_job_names" >/dev/null; then',
-        `  ${gcloudRunCmd(needsBeta)} jobs update "$current_job_name" ${commonDeployArgsString} ${volumeArgs}`,
+        `  ${gcloudRunCmd()} jobs update "$current_job_name" ${commonDeployArgsString}`,
         "else",
         `  ${gcloudRunCmd()} jobs create "$current_job_name" ${commonDeployArgsString}`,
         "fi",

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

@@ -25,7 +25,7 @@ export const getServiceDeployScript = (
   const customConfig = service !== true ? service : undefined;
   const command =
     service !== true
-      ? service?.command ?? context.build.config.startCommand
+      ? (service?.command ?? context.build.config.startCommand)
       : undefined;
 
   const commandArray = command
@@ -62,13 +62,8 @@ export const getServiceDeployScript = (
     },
     ...createVolumeConfig(customConfig?.volumes, "service"),
   );
-  // volumes require beta
-  const requiresBeta =
-    customConfig?.volumes && Object.keys(customConfig?.volumes).length > 0;
 
-  return `${gcloudRunCmd(
-    requiresBeta ? "beta" : undefined,
-  )} deploy ${fullServiceName} ${argsString}`;
+  return `${gcloudRunCmd()} deploy ${fullServiceName} ${argsString}`;
 };
 
 export const getServiceDeleteScript = (

package/src/pipeline/generatePipelineFiles.ts

@@ -1,36 +1,8 @@
-import type { Config, PipelineMode, PipelineType } from "../types";
+import type { Config, PipelineType } from "../types";
 import { writeYamlfile } from "../utils/writeFiles";
-import { createChildPipeline } from "./createChildPipeline";
 import { createMainPipeline } from "./createMainPipeline";
-import { getPipelineTriggerForGitlabChildPipeline } from "./gitlab/getPipelineTriggerForGitlabChildPipeline";
 import { sortGitLabJobDefProps } from "./gitlab/sortGitLabJobDefProps";
 
-export async function generateChildPipelineContent<T extends PipelineType>(
-  config: Config,
-  pipelineType: T,
-) {
-  const trigger = getPipelineTriggerForGitlabChildPipeline();
-  const { jobs, image, stages, variables, workflow, ...pipelineRest } =
-    await createChildPipeline(pipelineType, trigger, config);
-
-  const jobsWithSortedProps = Object.fromEntries(
-    Object.entries(jobs).map(([jobName, job]) => [
-      jobName,
-      sortGitLabJobDefProps(job),
-    ]),
-  );
-
-  return {
-    image,
-    stages,
-    variables,
-    workflow,
-    ...pipelineRest,
-    // jobs need to be spread into main YAML, because GitLab pipeline YAML has no jobs key - jobs are top level with their key as their name
-    ...jobsWithSortedProps,
-  };
-}
-
 export async function generateLocalPipelineContent<T extends PipelineType>(
   config: Config,
   pipelineType: T,
@@ -59,15 +31,7 @@ export async function generateLocalPipelineContent<T extends PipelineType>(
 export async function generatePipelineFiles<T extends PipelineType>(
   config: Config,
   pipelineType: T,
-  mode: PipelineMode<T>,
 ) {
-  if (mode === "childpipeline") {
-    const pipelineContent = await generateChildPipelineContent(
-      config,
-      pipelineType,
-    );
-    return writeYamlfile(`__pipeline.yml`, pipelineContent);
-  }
   const pipelineContent = await generateLocalPipelineContent(
     config,
     pipelineType,

package/src/pipeline/gitlab/gitlabReleaseJobs.ts

@@ -9,15 +9,13 @@ export const getGitlabReleaseJobs = () => {
     ["create release"]: {
       stage: "release",
       image: getRunnerImage("semantic-release"),
-      script: ["semanticRelease"],
-      after_script: [EXPIRED_TOKEN_HELP],
+      script: ["semanticRelease", EXPIRED_TOKEN_HELP],
       rules: RULES_RELEASE,
     },
     ["⚠️ force create release"]: {
       stage: "release",
       image: getRunnerImage("semantic-release"),
-      script: ["semanticRelease"],
-      after_script: [EXPIRED_TOKEN_HELP],
+      script: ["semanticRelease", EXPIRED_TOKEN_HELP],
       needs: [],
       rules: RULES_MANUAL_RELEASE,
     },

package/src/pipeline/index.ts

@@ -1,4 +1,3 @@
-export * from "./createChildPipeline";
 export * from "./createJobsForComponent";
 export * from "./generatePipelineFiles";
 export * from "./gitlab/gitlabReleaseJobs";

package/src/types/pipeline.ts

@@ -2,10 +2,6 @@ import type { GitlabJobDef, GitlabPipeline } from "./gitlab-types";
 
 export type PipelineType = "gitlab";
 
-export type PipelineMode<T extends PipelineType> = T extends "gitlab"
-  ? "childpipeline" | "local"
-  : "local";
-
 export type PipelineJob<T extends PipelineType> = T extends "gitlab"
   ? GitlabJobDef
   : never;

package/dist/pipeline/createChildPipeline.d.ts

@@ -1,3 +0,0 @@
-import type { Pipeline } from "../types";
-import type { Config, PipelineTrigger } from "../types/config";
-export declare const createChildPipeline: <T extends "gitlab">(pipelineType: T, trigger: PipelineTrigger, config: Config) => Promise<Pipeline<T>>;