Merge remote-tracking branch 'origin/main' into dependabot/npm_and_yarn/markdown-to-jsx-9.8.0

Author: svcAPLBot

src/pages/code-repositories/create-edit/create-edit-codeRepositories.validator.test.ts

@@ -0,0 +1,126 @@
+import { aplCodeRepoApiSchema } from './create-edit-codeRepositories.validator'
+
+const baseRepo = {
+  kind: 'AplTeamCodeRepo',
+  spec: {
+    gitService: 'github',
+    repositoryUrl: 'https://github.com/linode/apl-examples',
+    private: false,
+  },
+  metadata: {
+    name: 'repo-name',
+    labels: {
+      'apl.io/teamId': 'team1',
+    },
+  },
+  status: {},
+}
+
+describe('aplCodeRepoApiSchema', () => {
+  describe('repositoryUrl validation', () => {
+    it.each(['https://github.com/linode/apl-examples', 'git@github.com:linode/apl-examples.git'])(
+      'accepts valid github url: %s',
+      async (repositoryUrl) => {
+        await expect(
+          aplCodeRepoApiSchema.validate({
+            ...baseRepo,
+            spec: {
+              ...baseRepo.spec,
+              gitService: 'github',
+              repositoryUrl,
+            },
+          }),
+        ).resolves.toBeTruthy()
+      },
+    )
+
+    it('rejects duplicate url when only .git differs', async () => {
+      await expect(
+        aplCodeRepoApiSchema.validate(
+          {
+            ...baseRepo,
+            spec: {
+              ...baseRepo.spec,
+              repositoryUrl: 'https://github.com/linode/apl-examples.git',
+            },
+          },
+          {
+            context: {
+              validateOnSubmit: true,
+              codeRepoUrls: ['https://github.com/linode/apl-examples'],
+            },
+          },
+        ),
+      ).rejects.toThrow('Repository URL must be unique.')
+    })
+
+    it('rejects duplicate url when only trailing slash differs', async () => {
+      await expect(
+        aplCodeRepoApiSchema.validate(
+          {
+            ...baseRepo,
+            spec: {
+              ...baseRepo.spec,
+              repositoryUrl: 'https://github.com/linode/apl-examples/',
+            },
+          },
+          {
+            context: {
+              validateOnSubmit: true,
+              codeRepoUrls: ['https://github.com/linode/apl-examples'],
+            },
+          },
+        ),
+      ).rejects.toThrow('Repository URL must be unique.')
+    })
+
+    it('accepts unique repository url', async () => {
+      await expect(
+        aplCodeRepoApiSchema.validate(baseRepo, {
+          context: {
+            validateOnSubmit: true,
+            codeRepoUrls: ['https://github.com/linode/other-repo'],
+          },
+        }),
+      ).resolves.toBeTruthy()
+    })
+
+    it('skips uniqueness validation when validateOnSubmit is false', async () => {
+      await expect(
+        aplCodeRepoApiSchema.validate(baseRepo, {
+          context: {
+            validateOnSubmit: false,
+            codeRepoUrls: ['https://github.com/linode/apl-examples'],
+          },
+        }),
+      ).resolves.toBeTruthy()
+    })
+  })
+
+  describe('private repository secret', () => {
+    it('requires secret when private=true', async () => {
+      await expect(
+        aplCodeRepoApiSchema.validate({
+          ...baseRepo,
+          spec: {
+            ...baseRepo.spec,
+            private: true,
+          },
+        }),
+      ).rejects.toThrow('Secret is required when private is true.')
+    })
+
+    it('accepts secret when private=true', async () => {
+      await expect(
+        aplCodeRepoApiSchema.validate({
+          ...baseRepo,
+          spec: {
+            ...baseRepo.spec,
+            private: true,
+            secret: 'my-secret',
+          },
+        }),
+      ).resolves.toBeTruthy()
+    })
+  })
+})

src/pages/code-repositories/create-edit/create-edit-codeRepositories.validator.ts

@@ -1,5 +1,12 @@
 import * as yup from 'yup'
 
+const normalizeRepoUrl = (url: string) =>
+  url
+    .trim()
+    .replace(/\/$/, '') // remove trailing slash
+    .replace(/\.git$/, '') // remove trailing .git
+    .toLowerCase()
+
 const repoUrlValidation = yup
   .string()
   .test('is-valid-url', 'Invalid URL for the selected git service', function (value) {
@@ -8,15 +15,21 @@ const repoUrlValidation = yup
     if (!value || !gitService) return true
 
     if (gitService === 'gitea') return value.startsWith('https://gitea')
+
     if (gitService === 'github') return /^(https:\/\/github\.com\/.+|git@github\.com:.+\.git)$/.test(value)
+
     if (gitService === 'gitlab') return /^(https:\/\/gitlab\.com\/.+|git@gitlab\.com:.+\.git)$/.test(value)
+
     return true
   })
   .test('is-unique', 'Repository URL must be unique.', function (value) {
     const { codeRepoUrls, validateOnSubmit } = (this.options.context || {}) as any
-    if (!validateOnSubmit) return true
-    if (!value) return true
-    return !codeRepoUrls?.some((repoUrl: string) => repoUrl === value)
+
+    if (!validateOnSubmit || !value) return true
+
+    const normalizedValue = normalizeRepoUrl(value)
+
+    return !codeRepoUrls?.some((repoUrl: string) => normalizeRepoUrl(repoUrl) === normalizedValue)
   })
 
 export const aplCodeRepoApiSchema = yup.object({