Fix capitalized cluster labels

apps/client/src/components/ClusterForm.spec.ts

@@ -0,0 +1,10 @@
+import { describe, expect, it } from 'vitest'
+import { getClusterLabelValidationMessage } from '@/utils/cluster.js'
+
+describe('getClusterLabelValidationMessage', () => {
+  it('returns the length message for a label longer than 50 characters', () => {
+    expect(getClusterLabelValidationMessage('a'.repeat(51))).toBe(
+      'Le nom du cluster ne doit pas dépasser 50 caractères',
+    )
+  })
+})

apps/client/src/components/ClusterForm.vue

@@ -16,6 +16,7 @@ import { computed, onBeforeMount, ref, watch } from 'vue'
 import { JsonViewer } from 'vue3-json-viewer'
 import { parse } from 'yaml'
 import { useSnackbarStore } from '@/stores/snackbar.js'
+import { getClusterLabelValidationMessage } from '@/utils/cluster.js'
 import { localeParseFloat, ONE_TENTH_STR } from '@/utils/func.js'
 import ChoiceSelector from './ChoiceSelector.vue'
 
@@ -318,7 +319,7 @@ const isConnectionDetailsShown = ref(true)
       type="text"
       :disabled="props.associatedEnvironments.length !== 0"
       :required="true"
-      :error-message="localCluster.label && !ClusterDetailsSchema.pick({ label: true }).safeParse({ label: localCluster.label }).success ? 'Le nom du cluster ne doit contenir ni espaces ni caractères spéciaux' : undefined"
+      :error-message="getClusterLabelValidationMessage(localCluster.label)"
       label="Nom du cluster applicatif"
       label-visible
       hint="Nom du cluster applicatif utilisable lors des déploiements Argocd. Modifiable uniquement si le cluster ne comporte aucun environnement."

apps/client/src/utils/cluster.ts

@@ -0,0 +1,8 @@
+import { ClusterDetailsSchema } from '@cpn-console/shared'
+
+export function getClusterLabelValidationMessage(label: string) {
+  if (!label) return undefined
+
+  const result = ClusterDetailsSchema.pick({ label: true }).safeParse({ label })
+  return result.success ? undefined : result.error.issues[0]?.message
+}

apps/server/src/resources/cluster/router.spec.ts

@@ -61,7 +61,7 @@ describe('test clusterContract', () => {
         id: faker.string.uuid(),
         clusterResources: true,
         infos: '',
-        label: faker.string.alpha(),
+        label: faker.string.alpha({ casing: 'lower' }),
         privacy: 'public',
         stageIds: [],
         zoneId: faker.string.uuid(),
@@ -163,7 +163,7 @@ describe('test clusterContract', () => {
       id: faker.string.uuid(),
       clusterResources: true,
       infos: '',
-      label: faker.string.alpha(),
+      label: faker.string.alpha({ casing: 'lower' }),
       privacy: 'public',
       stageIds: [],
       zoneId: faker.string.uuid(),
@@ -189,6 +189,18 @@ describe('test clusterContract', () => {
       expect(response.json()).toEqual(cluster)
       expect(response.statusCode).toEqual(201)
     })
+    it('should reject an invalid label before creating a cluster', async () => {
+      const user = getUserMockInfos(ADMIN_PERMS.MANAGE_CLUSTERS)
+      authUserMock.mockResolvedValueOnce(user)
+
+      const response = await app.inject()
+        .post(clusterContract.createCluster.path)
+        .body({ ...cluster, label: 'Cluster-Tools' })
+        .end()
+
+      expect(response.statusCode).toEqual(400)
+      expect(businessCreateMock).not.toHaveBeenCalled()
+    })
     it('should pass business error', async () => {
       const user = getUserMockInfos(ADMIN_PERMS.MANAGE_CLUSTERS)
       authUserMock.mockResolvedValueOnce(user)
@@ -219,7 +231,7 @@ describe('test clusterContract', () => {
     const cluster: Omit<ClusterDetails, 'id'> = {
       clusterResources: true,
       infos: '',
-      label: faker.string.alpha(),
+      label: faker.string.alpha({ casing: 'lower' }),
       privacy: 'public',
       stageIds: [],
       zoneId: faker.string.uuid(),
@@ -245,6 +257,18 @@ describe('test clusterContract', () => {
       expect(response.json()).toEqual({ id: clusterId, ...cluster })
       expect(response.statusCode).toEqual(200)
     })
+    it('should reject an invalid label before updating a cluster', async () => {
+      const user = getUserMockInfos(ADMIN_PERMS.MANAGE_CLUSTERS)
+      authUserMock.mockResolvedValueOnce(user)
+
+      const response = await app.inject()
+        .put(clusterContract.updateCluster.path.replace(':clusterId', clusterId))
+        .body({ ...cluster, label: '-cluster' })
+        .end()
+
+      expect(response.statusCode).toEqual(400)
+      expect(businessUpdateMock).not.toHaveBeenCalled()
+    })
     it('should pass business error', async () => {
       const user = getUserMockInfos(ADMIN_PERMS.MANAGE_CLUSTERS)
       authUserMock.mockResolvedValueOnce(user)

packages/shared/src/schemas/cluster.ts

@@ -3,12 +3,16 @@ import { z } from 'zod'
 
 export const ClusterPrivacySchema = z.enum(['public', 'dedicated'])
 
+export const clusterLabelValidationMessage = 'Le nom du cluster doit contenir uniquement des lettres minuscules, des chiffres et des traits d’union, et commencer et terminer par un caractère alphanumérique.'
+
+const ClusterLabelSchema = z.string()
+  .max(50, { message: 'Le nom du cluster ne doit pas dépasser 50 caractères' })
+  .regex(/^[a-z0-9]([-a-z0-9]*[a-z0-9])?$/, { message: clusterLabelValidationMessage })
+
 export const CleanedClusterSchema = z.object({
   id: z.string()
     .uuid(),
-  label: z.string()
-    .regex(/^[a-z0-9-]+$/i)
-    .max(50),
+  label: ClusterLabelSchema,
   infos: z.string()
     .max(1000)
     .optional()

packages/shared/src/utils/schemas.spec.ts

@@ -346,4 +346,27 @@ describe('schemas utils', () => {
       projectId: true,
     })
   })
+
+  it.each(['cluster', 'cluster-1', '1-cluster', 'a', 'a--b'])(
+    'should validate RFC 1123 cluster label %s without transforming it',
+    (label) => {
+      const result = ClusterDetailsSchema.shape.label.safeParse(label)
+
+      expect(result.success).toBe(true)
+      if (result.success) expect(result.data).toBe(label)
+    },
+  )
+
+  it.each([
+    'Cluster-Tools',
+    '-cluster',
+    'cluster-',
+    'cluster.tools',
+    'cluster_1',
+    'cluster tools',
+    '',
+    'a'.repeat(51),
+  ])('should reject invalid RFC 1123 cluster label %s', (label) => {
+    expect(ClusterDetailsSchema.shape.label.safeParse(label).success).toBe(false)
+  })
 })

playwright/e2e-tests/clusters.spec.ts

@@ -25,6 +25,22 @@ test.describe('Clusters page', () => {
     )
   })
 
+  test('should not create a cluster with a non RFC 1123 label', { tag: '@e2e' }, async ({ page }) => {
+    const invalidLabels = ['Cluster-Tools', '-cluster', 'cluster-', 'cluster.tools']
+
+    await page.goto(clientURL)
+    await signInCloudPiNative({ page, credentials: adminUser })
+    await page.getByTestId('menuAdministrationBtn').click()
+    await page.getByTestId('menuAdministrationClusters').click()
+    await page.getByTestId('addClusterLink').click()
+
+    for (const label of invalidLabels) {
+      await page.getByTestId('labelInput').fill(label)
+      await expect(page.getByText('Le nom du cluster doit contenir uniquement des lettres minuscules, des chiffres et des traits d’union, et commencer et terminer par un caractère alphanumérique.')).toBeVisible()
+      await expect(page.getByTestId('addClusterBtn')).toBeDisabled()
+    }
+  })
+
   test('should update a public cluster', { tag: '@e2e' }, async ({ page }) => {
     const clusterName2 = faker.string.alpha(10).toLowerCase()
     await page.goto(clientURL)