Merge remote-tracking branch 'origin/main' into dependabot/npm_and_yarn/npm-dependencies-04ade640ba

Author: svcAPLBot

src/middleware/jwt.test.ts

@@ -1,10 +1,10 @@
+import { mockDeep } from 'jest-mock-extended'
 import { JWT } from 'src/otomi-models'
 import OtomiStack from 'src/otomi-stack'
-import { getUser } from './jwt'
-import * as getValuesSchemaModule from '../utils'
 import { loadSpec } from '../app'
-import { mockDeep } from 'jest-mock-extended'
 import { Git } from '../git'
+import * as getValuesSchemaModule from '../utils'
+import { getUser } from './jwt'
 
 const email = '[email protected]'
 const platformAdminGroups = ['platform-admin', 'all-teams-admin']
@@ -64,7 +64,7 @@ describe('JWT claims mapping', () => {
   })
 
   test("Non existing team groups should not be added to the user's list of teams", async () => {
-    const extraneousTeamsList = [...multiTeamUser, 'nonexisting']
+    const extraneousTeamsList = [...multiTeamUser, 'nonexist']
     await Promise.all(extraneousTeamsList.map(async (teamId) => otomiStack.createTeam({ name: teamId }, false)))
     const user = getUser(multiTeamJWT, otomiStack)
     expect(user.teams).toEqual(multiTeamUser)

src/otomi-stack.test.ts

@@ -11,7 +11,7 @@ import {
 } from 'src/otomi-models'
 import OtomiStack from 'src/otomi-stack'
 import { loadSpec } from './app'
-import { PublicUrlExists } from './error'
+import { PublicUrlExists, ValidationError } from './error'
 import { Git } from './git'
 import { RepoService } from './services/RepoService'
 import { TeamConfigService } from './services/TeamConfigService'
@@ -208,6 +208,109 @@ describe('Data validation', () => {
     expect(createItemSpy.mock.calls[0][0].spec.password).toEqual(myPassword)
     createItemSpy.mockRestore()
   })
+
+  test('should throw ValidationError when team name exceeds 9 characters', async () => {
+    const teamData: AplTeamSettingsRequest = {
+      kind: 'AplTeamSettingSet',
+      metadata: {
+        name: 'verylongteamname',
+        labels: {
+          'apl.io/teamId': 'verylongteamname',
+        },
+      },
+      spec: {},
+    }
+
+    await expect(otomiStack.createAplTeam(teamData, false)).rejects.toThrow(
+      new ValidationError('Team name must not exceed 9 characters'),
+    )
+  })
+
+  test('should not throw ValidationError when team name is exactly 9 characters', async () => {
+    const teamSettings = {
+      kind: 'AplTeamSettingSet',
+      metadata: {
+        name: 'ninechars',
+        labels: {
+          'apl.io/teamId': 'ninechars',
+        },
+      },
+      spec: {},
+      status: {},
+    }
+
+    const createItemSpy = jest.spyOn(otomiStack.repoService, 'createTeamConfig').mockReturnValue({
+      builds: [],
+      codeRepos: [],
+      workloads: [],
+      services: [],
+      sealedsecrets: [],
+      backups: [],
+      projects: [],
+      netpols: [],
+      settings: teamSettings,
+      apps: [],
+      policies: [],
+      workloadValues: [],
+    } as TeamConfig)
+
+    const teamData: AplTeamSettingsRequest = {
+      kind: 'AplTeamSettingSet',
+      metadata: {
+        name: 'ninechars',
+        labels: {
+          'apl.io/teamId': 'ninechars',
+        },
+      },
+      spec: {},
+    }
+
+    await expect(otomiStack.createAplTeam(teamData, false)).resolves.not.toThrow()
+    createItemSpy.mockRestore()
+  })
+
+  test('should not throw ValidationError when team name is less than 9 characters', async () => {
+    const teamSettings = {
+      kind: 'AplTeamSettingSet',
+      metadata: {
+        name: 'short',
+        labels: {
+          'apl.io/teamId': 'short',
+        },
+      },
+      spec: {},
+      status: {},
+    }
+
+    const createItemSpy = jest.spyOn(otomiStack.repoService, 'createTeamConfig').mockReturnValue({
+      builds: [],
+      codeRepos: [],
+      workloads: [],
+      services: [],
+      sealedsecrets: [],
+      backups: [],
+      projects: [],
+      netpols: [],
+      settings: teamSettings,
+      apps: [],
+      policies: [],
+      workloadValues: [],
+    } as TeamConfig)
+
+    const teamData: AplTeamSettingsRequest = {
+      kind: 'AplTeamSettingSet',
+      metadata: {
+        name: 'short',
+        labels: {
+          'apl.io/teamId': 'short',
+        },
+      },
+      spec: {},
+    }
+
+    await expect(otomiStack.createAplTeam(teamData, false)).resolves.not.toThrow()
+    createItemSpy.mockRestore()
+  })
 })
 
 describe('Work with values', () => {

src/otomi-stack.ts

@@ -1,4 +1,4 @@
-import { CoreV1Api, KubeConfig, User as k8sUser, V1ObjectReference } from '@kubernetes/client-node'
+import { CoreV1Api, User as k8sUser, KubeConfig, V1ObjectReference } from '@kubernetes/client-node'
 import Debug from 'debug'
 
 import { getRegions, ObjectStorageKeyRegions } from '@linode/api-v4'
@@ -689,6 +689,7 @@ export default class OtomiStack {
 
   async createAplTeam(data: AplTeamSettingsRequest, deploy = true): Promise<AplTeamSettingsResponse> {
     const teamName = data.metadata.name
+    if (teamName.length > 9) throw new ValidationError('Team name must not exceed 9 characters')
 
     if (isEmpty(data.spec.password)) {
       debug(`creating password for team '${teamName}'`)