Move the sanitize fn too

Author: matt-aitken

apps/webapp/app/services/upsertBranch.server.ts

@@ -2,10 +2,10 @@ import { type PrismaClient, type PrismaClientOrTransaction } from "@trigger.dev/
 import slug from "slug";
 import { prisma } from "~/db.server";
 import { createApiKeyForEnv, createPkApiKeyForEnv } from "~/models/api-key.server";
+import { type CreateBranchOptions } from "~/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route";
+import { isValidGitBranchName, sanitizeBranchName } from "~/v3/gitBranch";
 import { logger } from "./logger.server";
 import { getLimit } from "./platform.v3.server";
-import { type CreateBranchOptions } from "~/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route";
-import { isValidGitBranchName } from "~/v3/validGitBranch";
 
 export class UpsertBranchService {
   #prismaClient: PrismaClient;
@@ -167,17 +167,3 @@ export async function checkBranchLimit(
     isAtLimit: used >= limit,
   };
 }
-
-export function sanitizeBranchName(ref: string): string | null {
-  if (!ref) return null;
-  if (ref.startsWith("refs/heads/")) return ref.substring("refs/heads/".length);
-  if (ref.startsWith("refs/remotes/")) return ref.substring("refs/remotes/".length);
-  if (ref.startsWith("refs/tags/")) return ref.substring("refs/tags/".length);
-  if (ref.startsWith("refs/pull/")) return ref.substring("refs/pull/".length);
-  if (ref.startsWith("refs/merge/")) return ref.substring("refs/merge/".length);
-  if (ref.startsWith("refs/release/")) return ref.substring("refs/release/".length);
-  //unknown ref format, so reject
-  if (ref.startsWith("refs/")) return null;
-
-  return ref;
-}

apps/webapp/app/v3/validGitBranch.ts renamed to apps/webapp/app/v3/gitBranch.ts

@@ -28,3 +28,17 @@ export function isValidGitBranchName(branch: string): boolean {
 
   return true;
 }
+
+export function sanitizeBranchName(ref: string): string | null {
+  if (!ref) return null;
+  if (ref.startsWith("refs/heads/")) return ref.substring("refs/heads/".length);
+  if (ref.startsWith("refs/remotes/")) return ref.substring("refs/remotes/".length);
+  if (ref.startsWith("refs/tags/")) return ref.substring("refs/tags/".length);
+  if (ref.startsWith("refs/pull/")) return ref.substring("refs/pull/".length);
+  if (ref.startsWith("refs/merge/")) return ref.substring("refs/merge/".length);
+  if (ref.startsWith("refs/release/")) return ref.substring("refs/release/".length);
+  //unknown ref format, so reject
+  if (ref.startsWith("refs/")) return null;
+
+  return ref;
+}

apps/webapp/test/validateGitBranchName.test.ts

@@ -1,6 +1,5 @@
 import { describe, expect, it } from "vitest";
-import { sanitizeBranchName } from "../app/services/upsertBranch.server";
-import { isValidGitBranchName } from "~/v3/validGitBranch";
+import { isValidGitBranchName, sanitizeBranchName } from "~/v3/gitBranch";
 
 describe("isValidGitBranchName", () => {
   it("returns true for a valid branch name", async () => {