@catladder/pipeline 3.18.0 → 3.20.0

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

@@ -1523,8 +1523,6 @@ create release:
     - &a5
       if: $CI_PIPELINE_SOURCE  == "schedule"
       when: never
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $AUTO_RELEASE == "true"
-      when: on_success
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       when: manual
     - if: $CI_COMMIT_BRANCH =~ /^[0-9]+.([0-9]+|x).x$/

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

@@ -1503,8 +1503,6 @@ create release:
     - &a5
       if: $CI_PIPELINE_SOURCE  == "schedule"
       when: never
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $AUTO_RELEASE == "true"
-      when: on_success
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       when: manual
     - if: $CI_COMMIT_BRANCH =~ /^[0-9]+.([0-9]+|x).x$/

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

@@ -4832,8 +4832,6 @@ create release:
     - &a4
       if: $CI_PIPELINE_SOURCE  == "schedule"
       when: never
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $AUTO_RELEASE == "true"
-      when: on_success
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       when: manual
     - if: $CI_COMMIT_BRANCH =~ /^[0-9]+.([0-9]+|x).x$/

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

@@ -1503,8 +1503,6 @@ create release:
     - &a4
       if: $CI_PIPELINE_SOURCE  == "schedule"
       when: never
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $AUTO_RELEASE == "true"
-      when: on_success
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       when: manual
     - if: $CI_COMMIT_BRANCH =~ /^[0-9]+.([0-9]+|x).x$/

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

@@ -2405,8 +2405,6 @@ create release:
     - &a4
       if: $CI_PIPELINE_SOURCE  == "schedule"
       when: never
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $AUTO_RELEASE == "true"
-      when: on_success
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       when: manual
     - if: $CI_COMMIT_BRANCH =~ /^[0-9]+.([0-9]+|x).x$/

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

@@ -2397,8 +2397,6 @@ create release:
     - &a4
       if: $CI_PIPELINE_SOURCE  == "schedule"
       when: never
-    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $AUTO_RELEASE == "true"
-      when: on_success
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
       when: manual
     - if: $CI_COMMIT_BRANCH =~ /^[0-9]+.([0-9]+|x).x$/

package/examples/automatic-releases.test.ts

@@ -0,0 +1,11 @@
+import { createYamlLocalPipeline } from "./__utils__/helpers";
+import config from "./automatic-releases";
+
+/**
+ * This test is auto-generated.
+ * Modifications will be overwritten on every `yarn test` run!
+ */
+
+it("matches snapshot for automatic-releases local pipeline YAML", async () => {
+  expect(await createYamlLocalPipeline(config)).toMatchSnapshot();
+});

package/examples/automatic-releases.ts

@@ -0,0 +1,28 @@
+import type { Config } from "../src";
+
+const config = {
+  appName: "test-app",
+  customerName: "pan",
+  releases: {
+    when: "auto",
+  },
+  components: {
+    www: {
+      dir: "www",
+      build: {
+        type: "node",
+      },
+      deploy: {
+        type: "google-cloudrun",
+        projectId: "google-project-id",
+        region: "europe-west6",
+      },
+    },
+  },
+} satisfies Config;
+
+export default config;
+
+export const information = {
+  title: "Automatic Releases on main branch",
+};

package/examples/modify-generated-files.test.ts

@@ -0,0 +1,11 @@
+import { createYamlLocalPipeline } from "./__utils__/helpers";
+import config from "./modify-generated-files";
+
+/**
+ * This test is auto-generated.
+ * Modifications will be overwritten on every `yarn test` run!
+ */
+
+it("matches snapshot for modify-generated-files local pipeline YAML", async () => {
+  expect(await createYamlLocalPipeline(config)).toMatchSnapshot();
+});

package/examples/modify-generated-files.ts

@@ -0,0 +1,29 @@
+import type { Config } from "../src";
+
+const config = {
+  appName: "test-app",
+  customerName: "pan",
+  components: {
+    api: {
+      dir: "api",
+      build: {
+        type: "node",
+      },
+      deploy: false,
+    },
+  },
+  hooks: {
+    transformFileBeforeWrite({ filename, content }) {
+      if (filename === ".gitlab-ci.yml") {
+        // FIXME: currently not covered by the snapshot test
+        return "# modified!\n\n" + content;
+      }
+    },
+  },
+} satisfies Config;
+
+export default config;
+
+export const information = {
+  title: "Custom: Modify Generated Files",
+};

package/package.json

@@ -53,7 +53,7 @@
     }
   ],
   "license": "MIT",
-  "version": "3.18.0",
+  "version": "3.20.0",
   "scripts": {
     "build:tsc": "yarn tsc",
     "build": "yarn build:compile && yarn build:inline-variables",

package/src/catenv/index.ts

@@ -0,0 +1,14 @@
+import type { Config } from "../types";
+import { FileWriter } from "../utils/writeFiles";
+
+export type CatenvContext = {
+  config: Config;
+  fileWriter: FileWriter;
+};
+
+export const createCatenvContext = (config: Config): CatenvContext => {
+  return {
+    config,
+    fileWriter: FileWriter.create(config),
+  };
+};

package/src/catladder-gitlab.ts

@@ -1,10 +1,13 @@
 import { readConfig } from "./config";
 import { generatePipelineFiles } from "./pipeline/generatePipelineFiles";
+import { createCatenvContext } from "./catenv";
 
 readConfig().then(async (result) => {
   if (!result?.config) {
     throw new Error("no catladder config found");
   }
 
-  await generatePipelineFiles(result.config, "gitlab");
+  const context = createCatenvContext(result.config);
+
+  await generatePipelineFiles(context, "gitlab");
 });

package/src/index.ts

@@ -9,3 +9,4 @@ export * from "./deploy";
 export * from "./utils/writeFiles";
 export * from "./variables/VariableValue";
 export * from "./bash";
+export * from "./catenv";

package/src/pipeline/createMainPipeline.ts

@@ -99,13 +99,15 @@ export const createMainPipeline = async <T extends PipelineType>(
       jobs: {
         ...allJobs,
         ...Object.fromEntries(
-          Object.entries(getGitlabReleaseJobs()).map(([name, gitlabJob]) => [
-            name,
-            {
-              gitlabJob,
-              context: null,
-            },
-          ]),
+          Object.entries(getGitlabReleaseJobs(config)).map(
+            ([name, gitlabJob]) => [
+              name,
+              {
+                gitlabJob,
+                context: null,
+              },
+            ],
+          ),
         ),
       },
       variables: config.runnerVariables,

package/src/pipeline/generatePipelineFiles.ts

@@ -1,9 +1,10 @@
 import { mkdir, rm } from "fs/promises";
 import { dirname } from "path";
 import type { Config, GitlabJobDef, PipelineType } from "../types";
-import { writeYamlfile } from "../utils/writeFiles";
+
 import { createMainPipeline } from "./createMainPipeline";
 import { sortGitLabJobDefProps } from "./gitlab/sortGitLabJobDefProps";
+import type { CatenvContext } from "../catenv";
 
 const CATLADDER_GENERATED_FOLDER = ".catladder-generated";
 
@@ -14,13 +15,13 @@ type YamlFile = {
   content: Record<string, unknown>;
 };
 export async function generatePipelineFiles<T extends PipelineType>(
-  config: Config,
+  context: CatenvContext,
   pipelineType: T,
 ) {
   if (pipelineType !== "gitlab") {
     throw new Error("Pipeline type not supported");
   }
-  const includes = await getGitlabPipelineIncludes(config);
+  const includes = await getGitlabPipelineIncludes(context.config);
 
   const mainFile: YamlFile = {
     path: ".gitlab-ci.yml",
@@ -37,7 +38,7 @@ export async function generatePipelineFiles<T extends PipelineType>(
   await Promise.all(
     files.map(async ({ path, content }) => {
       await mkdir(dirname(path), { recursive: true });
-      await writeYamlfile(path, content);
+      await context.fileWriter.writeYamlfile(path, content);
     }),
   );
 }

package/src/pipeline/gitlab/gitlabReleaseJobs.ts

@@ -1,23 +1,56 @@
-import { RULES_MANUAL_RELEASE, RULES_RELEASE } from "../../rules";
+import {
+  RULE_CONDITION_HOTFIX_BRANCH,
+  RULE_CONDITION_MAIN_BRANCH,
+  RULE_NEVER_ON_AGENT_TRIGGER,
+  RULE_NEVER_ON_RELEASE_COMMIT,
+  RULE_NEVER_ON_SCHEDULE,
+} from "../../rules";
 import { getRunnerImage } from "../../runner";
+import type { Config } from "../../types/config";
+import type { GitlabRule } from "../../types";
 
 const EXPIRED_TOKEN_HELP =
   "echo '👉 The project access token might be invald - run `project-renew-token` in catladder CLI to fix.'";
 
-export const getGitlabReleaseJobs = () => {
+const baseReleaseRules = [
+  RULE_NEVER_ON_RELEASE_COMMIT,
+  RULE_NEVER_ON_AGENT_TRIGGER,
+  RULE_NEVER_ON_SCHEDULE,
+];
+export const getGitlabReleaseJobs = (config: Config) => {
   return {
     ["create release"]: {
       stage: "release",
       image: getRunnerImage("semantic-release"),
       script: ["semanticRelease", EXPIRED_TOKEN_HELP],
-      rules: RULES_RELEASE,
+      rules: [
+        ...baseReleaseRules,
+        {
+          if: RULE_CONDITION_MAIN_BRANCH,
+          when: config.releases?.when === "auto" ? "on_success" : "manual",
+        },
+        {
+          if: RULE_CONDITION_HOTFIX_BRANCH,
+          when: "manual",
+        },
+      ] satisfies GitlabRule[],
     },
     ["⚠️ force create release"]: {
       stage: "release",
       image: getRunnerImage("semantic-release"),
       script: ["semanticRelease", EXPIRED_TOKEN_HELP],
       needs: [],
-      rules: RULES_MANUAL_RELEASE,
+      rules: [
+        ...baseReleaseRules,
+        {
+          if: RULE_CONDITION_MAIN_BRANCH,
+          when: "manual",
+        },
+        {
+          if: RULE_CONDITION_HOTFIX_BRANCH,
+          when: "manual",
+        },
+      ] satisfies GitlabRule[],
     },
   };
 };

package/src/rules/index.ts

@@ -39,35 +39,3 @@ export const RULE_IS_TAGGED_RELEASE: GitlabRule = {
 
 export const RULE_CONDITION_HOTFIX_BRANCH =
   "$CI_COMMIT_BRANCH =~ /^[0-9]+.([0-9]+|x).x$/";
-
-export const RULES_RELEASE: GitlabRule[] = [
-  RULE_NEVER_ON_RELEASE_COMMIT,
-  RULE_NEVER_ON_AGENT_TRIGGER,
-  RULE_NEVER_ON_SCHEDULE,
-  {
-    if: RULE_CONDITION_MAIN_BRANCH + ' && $AUTO_RELEASE == "true"',
-    when: "on_success",
-  },
-  {
-    if: RULE_CONDITION_MAIN_BRANCH,
-    when: "manual",
-  },
-  {
-    if: RULE_CONDITION_HOTFIX_BRANCH,
-    when: "manual",
-  },
-];
-
-export const RULES_MANUAL_RELEASE: GitlabRule[] = [
-  RULE_NEVER_ON_RELEASE_COMMIT,
-  RULE_NEVER_ON_AGENT_TRIGGER,
-  RULE_NEVER_ON_SCHEDULE,
-  {
-    if: RULE_CONDITION_MAIN_BRANCH,
-    when: "manual",
-  },
-  {
-    if: RULE_CONDITION_HOTFIX_BRANCH,
-    when: "manual",
-  },
-];

package/src/types/config.ts

@@ -6,6 +6,8 @@ import type { ComponentContext } from "./context";
 import type { PartialDeep } from "./utils";
 import type { PipelineType, WorkspaceBuildConfig } from "..";
 import type { AgentConfig } from "./agent";
+import type { Hooks } from "./hooks";
+import type { ReleaseConfig } from "./release";
 
 export const ALL_PIPELINE_TRIGGERS = [
   "mainBranch",
@@ -231,4 +233,14 @@ export type Config<C extends ConfigProps = never> = {
    * additional vars only for the runner in all jobs.
    */
   runnerVariables?: Record<string, string>;
+
+  /**
+   * hook into catladder generation
+   */
+  hooks?: Hooks;
+
+  /**
+   * configure tagged releases
+   */
+  releases?: ReleaseConfig;
 };

package/src/types/hooks.ts

@@ -0,0 +1,29 @@
+export type FileHookContext = {
+  /**
+   * the filename of the file
+   */
+  filename: string;
+  /**
+   * the extension of the file
+   */
+  extension: string;
+  /**
+   * the path of the file
+   */
+  path: string;
+
+  /**
+   * the content of the file
+   */
+  content: string;
+};
+
+type MaybePromise<T> = T | Promise<T>;
+export type Hooks = {
+  /**
+   * transform the file before it is written. If undefined is returned, the file is not modified
+   */
+  transformFileBeforeWrite: (
+    fileHookContext: FileHookContext,
+  ) => MaybePromise<string | undefined>;
+};

package/src/types/release.ts

@@ -0,0 +1,7 @@
+export type ReleaseConfig = {
+  /**
+   * Whether to release automatically or manually on main branch.
+   * Defaults to "manuel"
+   */
+  when?: "manual" | "auto";
+};

package/src/utils/writeFiles.ts

@@ -1,35 +1,9 @@
 import { writeFile } from "fs/promises";
 import { stringify } from "yaml";
+import type { Config } from "../types";
 
-export const getAutoGeneratedHeader = (commentChar: string) => {
-  return [
-    "-------------------------------------------------",
-    `🐱 🔨 This file is generated by catladder`,
-    `🚨 Do not edit this file manually 🚨`,
-    "-------------------------------------------------",
-  ]
-    .map((line) => `${commentChar} ${line}`)
-    .join("\n")
-    .concat("\n");
-};
-
-export const writeGeneratedFile = async (
-  path: string,
-  content: string,
-  {
-    commentChar,
-  }: {
-    commentChar: string;
-  },
-) => {
-  await writeFile(
-    path,
-    // need to spread out the jobs, forgot why
-    [getAutoGeneratedHeader(commentChar), content].join("\n"),
-    {
-      encoding: "utf-8",
-    },
-  );
+type WriteFileOptions = {
+  commentChar: string;
 };
 
 type StringifyOptions = Exclude<
@@ -45,8 +19,58 @@ export const yamlStringifyOptions: StringifyOptions = {
   singleQuote: true,
 };
 
-export const writeYamlfile = async (path: string, data: any) => {
-  await writeGeneratedFile(path, stringify(data, yamlStringifyOptions), {
-    commentChar: "#",
-  });
-};
+export class FileWriter {
+  public static create(config: Config) {
+    return new FileWriter(config);
+  }
+
+  constructor(private readonly config: Config) {
+    this.config = config;
+  }
+
+  protected async writeTheFile(path: string, content: string) {
+    const transformedContent =
+      await this.config.hooks?.transformFileBeforeWrite({
+        filename: path,
+        content,
+        extension: path.split(".").pop() ?? "",
+        path,
+      });
+    await writeFile(path, transformedContent ?? content, {
+      encoding: "utf-8",
+    });
+  }
+
+  public async writeGeneratedFile(
+    path: string,
+    content: string,
+    options: WriteFileOptions,
+  ) {
+    await this.writeTheFile(
+      path,
+      [this.getAutoGeneratedHeader(options.commentChar), content].join("\n"),
+    );
+  }
+
+  public writeYamlfile(path: string, data: any) {
+    return this.writeGeneratedFile(
+      path,
+      stringify(data, yamlStringifyOptions),
+      {
+        commentChar: "#",
+      },
+    );
+  }
+
+  protected getAutoGeneratedHeader(commentChar: string) {
+    return [
+      "-------------------------------------------------",
+      `🐱 🔨 This file is generated by catladder`,
+      `🚨 Do not edit this file manually 🚨`,
+      "-------------------------------------------------",
+    ]
+      .map((line) => `${commentChar} ${line}`)
+      .join("\n")
+      .concat("\n");
+  }
+}