fixes

Author: lucasgoral

src/lib/api/validations/regex.spec.ts

@@ -0,0 +1,81 @@
+import { describe, it, expect } from 'vitest';
+import {
+  projectWorkspaceNameRegex,
+  managedControlPlaneNameRegex,
+} from './regex';
+
+describe('projectWorkspaceNameRegex', () => {
+  const valid = [
+    'Project1',
+    'my-project',
+    'A1-B2-C3',
+    'abc.DEF-123',
+    'a'.repeat(63),
+    'abc.def.ghi',
+    'A-1.b-2',
+    'abc123',
+    'abc-123.DEF',
+  ];
+  const invalid = [
+    '-project',
+    'project-',
+    '.project',
+    'project.',
+    'a'.repeat(64),
+    'abc..def',
+    'abc.-def',
+    'abc-.def',
+    'abc_def',
+    'abc@def',
+  ];
+
+  it('matches valid project or workspace names', () => {
+    for (const name of valid) {
+      expect(projectWorkspaceNameRegex.test(name)).toBe(true);
+    }
+  });
+
+  it('does not match invalid project or workspace names', () => {
+    for (const name of invalid) {
+      expect(projectWorkspaceNameRegex.test(name)).toBe(false);
+    }
+  });
+});
+
+describe('managedControlPlaneNameRegex', () => {
+  const valid = [
+    'my-mcp',
+    'abc123',
+    'abc-123',
+    'abc.def',
+    'a'.repeat(63),
+    'abc.def-ghi',
+    'abc-123.def',
+    'abc1-2.def3',
+    'abc.def.ghi',
+  ];
+  const invalid = [
+    'My-MCP',
+    'ABC',
+    '-mcp',
+    'mcp-',
+    '.mcp',
+    'mcp.',
+    'a'.repeat(64),
+    'abc..def',
+    'abc-.def',
+    'abc.-def',
+  ];
+
+  it('matches valid managed control plane names', () => {
+    for (const name of valid) {
+      expect(managedControlPlaneNameRegex.test(name)).toBe(true);
+    }
+  });
+
+  it('does not match invalid managed control plane names', () => {
+    for (const name of invalid) {
+      expect(managedControlPlaneNameRegex.test(name)).toBe(false);
+    }
+  });
+});

src/lib/api/validations/regex.ts

@@ -0,0 +1,4 @@
+export const projectWorkspaceNameRegex =
+  /^(?!-)[a-zA-Z0-9-]{1,63}(?<!-)(?:\.(?!-)[a-zA-Z0-9-]{1,63}(?<!-))*$/;
+export const managedControlPlaneNameRegex =
+  /^(?!-)[a-z0-9-]{1,63}(?<!-)(?:\.(?!-)[a-z0-9-]{1,63}(?<!-))*$/;

src/lib/api/validations/schemas.ts

@@ -1,16 +1,15 @@
 import { z } from 'zod';
 import { Member } from '../types/shared/members.ts';
 import i18n from '../../../../i18n.ts';
+import {
+  managedControlPlaneNameRegex,
+  projectWorkspaceNameRegex,
+} from './regex.ts';
 
 const { t } = i18n;
 
 const member = z.custom<Member>();
 
-export const projectWorkspaceNameRegex =
-  /^(?!-)[a-zA-Z0-9-]{1,63}(?<!-)(?:\.(?!-)[a-zA-Z0-9-]{1,63}(?<!-))*$/;
-export const managedControlPlaneNameRegex =
-  /^(?!-)[a-z0-9-]{1,63}(?<!-)(?:\.(?!-)[a-z0-9-]{1,63}(?<!-))*$/;
-
 export const validationSchemaProjectWorkspace = z.object({
   name: z
     .string()