fix: remove projects

Author: ferruhcihan

src/middleware/authz.ts

@@ -77,20 +77,11 @@ export function authorize(req: OpenApiRequestExt, res, next, authz: Authz, repoS
     Build: 'builds',
     Workload: 'workloads',
     Settings: 'otomi',
-    Project: 'projects',
     Netpol: 'netpols',
     Policy: 'policies',
     SealedSecret: 'sealedSecrets',
   }
-  const teamSpecificCollections = [
-    'builds',
-    'services',
-    'workloads',
-    'netpols',
-    'projects',
-    'policies',
-    'sealedSecrets',
-  ] // <-- These are fetched per team
+  const teamSpecificCollections = ['builds', 'services', 'workloads', 'netpols', 'policies', 'sealedSecrets'] // <-- These are fetched per team
 
   const selector = renameKeys(req.params)
   const collectionId = schemaToRepoMap[schemaName]
@@ -133,7 +124,6 @@ export function authorize(req: OpenApiRequestExt, res, next, authz: Authz, repoS
   return next()
 }
 export function authzMiddleware(authz: Authz): RequestHandler {
-  // eslint-disable-next-line @typescript-eslint/no-misused-promises
   return async function nextHandler(req: OpenApiRequestExt, res, next): Promise<any> {
     if (req.user) {
       req.isSecurityHandler = true

src/otomi-stack.test.ts

@@ -164,7 +164,6 @@ describe('Data validation', () => {
       services: [],
       sealedsecrets: [],
       backups: [],
-      projects: [],
       netpols: [],
       settings: teamSettings,
       apps: [],
@@ -195,7 +194,6 @@ describe('Data validation', () => {
       services: [],
       sealedsecrets: [],
       backups: [],
-      projects: [],
       netpols: [],
       settings: teamSettings,
       apps: [],
@@ -245,7 +243,6 @@ describe('Data validation', () => {
       services: [],
       sealedsecrets: [],
       backups: [],
-      projects: [],
       netpols: [],
       settings: teamSettings,
       apps: [],
@@ -288,7 +285,6 @@ describe('Data validation', () => {
       services: [],
       sealedsecrets: [],
       backups: [],
-      projects: [],
       netpols: [],
       settings: teamSettings,
       apps: [],

src/repo.ts

@@ -338,17 +338,6 @@ export function getFileMaps(envDir: string): Array<FileMap> {
       loadToSpec: true,
       v2: true,
     },
-    {
-      kind: 'AplTeamProject',
-      envDir,
-      jsonPathExpression: '$.teamConfig.*.projects[*]',
-      pathGlob: `${envDir}/env/teams/*/projects/*.yaml`,
-      processAs: 'arrayItem',
-      resourceGroup: 'team',
-      resourceDir: 'projects',
-      loadToSpec: true,
-      v2: true,
-    },
     {
       kind: 'AplTeamNetworkControl',
       envDir,

src/services/RepoService.test.ts

@@ -198,14 +198,5 @@ describe('RepoService', () => {
       })
       expect(service.getAllBuilds()).toHaveLength(1)
     })
-
-    test('should return all projects', () => {
-      service.getTeamConfigService('team1').createProject({
-        kind: 'AplTeamProject',
-        metadata: { name: 'Project1' },
-        spec: {},
-      })
-      expect(service.getAllProjects()).toHaveLength(1)
-    })
   })
 })

src/services/RepoService.ts

@@ -8,7 +8,6 @@ import {
   AplCodeRepoResponse,
   AplNetpolResponse,
   AplPolicyResponse,
-  AplProjectResponse,
   AplSecretResponse,
   AplServiceResponse,
   AplTeamSettingsRequest,
@@ -27,8 +26,8 @@ import {
   User,
   Versions,
 } from '../otomi-models'
-import { TeamConfigService } from './TeamConfigService'
 import { createAplObject } from '../utils/manifests'
+import { TeamConfigService } from './TeamConfigService'
 
 function mergeCustomizer(prev, next) {
   return next
@@ -136,7 +135,6 @@ export class RepoService {
       services: [],
       sealedsecrets: [],
       backups: [],
-      projects: [],
       netpols: [],
       settings: {} as AplTeamSettingsResponse,
       apps: [],
@@ -241,10 +239,6 @@ export class RepoService {
     return this.getTeamIds().flatMap((teamName) => this.getTeamConfigService(teamName).getNetpols())
   }
 
-  public getAllProjects(): AplProjectResponse[] {
-    return this.getTeamIds().flatMap((teamName) => this.getTeamConfigService(teamName).getProjects())
-  }
-
   public getAllBuilds(): AplBuildResponse[] {
     return this.getTeamIds().flatMap((teamName) => this.getTeamConfigService(teamName).getBuilds())
   }

src/services/TeamConfigService.test.ts

@@ -4,7 +4,6 @@ import {
   AplBackupRequest,
   AplBuildRequest,
   AplNetpolRequest,
-  AplProjectRequest,
   AplSecretRequest,
   AplServiceRequest,
   AplWorkloadRequest,
@@ -41,7 +40,6 @@ describe('TeamConfigService', () => {
       services: [],
       sealedsecrets: [],
       backups: [],
-      projects: [],
       netpols: [],
       apps: [],
       policies: [],
@@ -296,41 +294,6 @@ describe('TeamConfigService', () => {
     })
   })
 
-  describe('Projects', () => {
-    const project: AplProjectRequest = {
-      kind: 'AplTeamProject',
-      metadata: { name: 'TestProject' },
-      spec: {},
-    }
-
-    test('should create a project', () => {
-      const created = service.createProject(project)
-      expect(created).toEqual({
-        kind: 'AplTeamProject',
-        metadata: {
-          name: 'TestProject',
-          labels: {
-            'apl.io/teamId': 'team1',
-          },
-        },
-        spec: { name: 'TestProject' },
-        status: {},
-      })
-      expect(service.getProject(created.metadata.name)).toEqual(created)
-    })
-
-    test('should throw an error when creating duplicate project', () => {
-      service.createProject(project)
-      expect(() => service.createProject(project)).toThrow(AlreadyExists)
-    })
-
-    test('should delete a project', () => {
-      const created = service.createProject(project)
-      service.deleteProject(created.metadata.name)
-      expect(() => service.getProject(created.metadata.name)).toThrow(NotExistError)
-    })
-  })
-
   describe('Netpols', () => {
     const netpol: AplNetpolRequest = {
       kind: 'AplTeamNetworkControl',
@@ -468,61 +431,6 @@ describe('TeamConfigService', () => {
     })
   })
 
-  describe('doesProjectNameExist', () => {
-    test('should return false when no projects exist', () => {
-      expect(service.doesProjectNameExist('NonExistentProject')).toBe(false)
-    })
-
-    test('should return true when a build with the given name exists', () => {
-      service.createBuild({
-        kind: 'AplTeamBuild',
-        metadata: { name: 'ExistingBuild' },
-        spec: {},
-      })
-      expect(service.doesProjectNameExist('ExistingBuild')).toBe(true)
-    })
-
-    test('should return true when a workload with the given name exists', () => {
-      service.createWorkload({
-        kind: 'AplTeamWorkload',
-        metadata: { name: 'ExistingWorkload' },
-        spec: {
-          url: 'http://example.com',
-          values: '',
-        },
-      })
-      expect(service.doesProjectNameExist('ExistingWorkload')).toBe(true)
-    })
-
-    test('should return true when a service with the given name exists', () => {
-      service.createService({
-        kind: 'AplTeamService',
-        metadata: { name: 'ExistingService' },
-        spec: {},
-      })
-      expect(service.doesProjectNameExist('ExistingService')).toBe(true)
-    })
-
-    test('should return false when the name does not match any existing project', () => {
-      service.createBuild({
-        kind: 'AplTeamBuild',
-        metadata: { name: 'SomeBuild' },
-        spec: {},
-      })
-      service.createWorkload({
-        kind: 'AplTeamWorkload',
-        metadata: { name: 'SomeWorkload' },
-        spec: { url: 'http://example.com', values: '' },
-      })
-      service.createService({
-        kind: 'AplTeamService',
-        metadata: { name: 'SomeService' },
-        spec: {},
-      })
-      expect(service.doesProjectNameExist('NonExistentProject')).toBe(false)
-    })
-  })
-
   describe('getCollection', () => {
     test('should retrieve an existing collection', () => {
       service.getSettings().metadata.name = 'team1'

src/services/TeamConfigService.ts

@@ -12,8 +12,6 @@ import {
   AplNetpolResponse,
   AplPolicyRequest,
   AplPolicyResponse,
-  AplProjectRequest,
-  AplProjectResponse,
   AplRequestObject,
   AplResponseObject,
   AplSecretRequest,
@@ -42,7 +40,6 @@ export class TeamConfigService {
     this.teamConfig.services ??= []
     this.teamConfig.sealedsecrets ??= []
     this.teamConfig.backups ??= []
-    this.teamConfig.projects ??= []
     this.teamConfig.netpols ??= []
     this.teamConfig.apps ??= []
     this.teamConfig.policies ??= []
@@ -304,41 +301,6 @@ export class TeamConfigService {
     remove(this.teamConfig.backups, (item) => item.metadata.name === name)
   }
 
-  // =====================================
-  // == PROJECTS CRUD ==
-  // =====================================
-
-  public createProject(project: AplProjectRequest): AplProjectResponse {
-    const { name } = project.metadata
-    if (find(this.teamConfig.projects, (item) => item.metadata.name === name)) {
-      throw new AlreadyExists(`Project[${name}] already exists.`)
-    }
-
-    const newProject = this.createAplObject(name, {
-      kind: project.kind,
-      metadata: project.metadata,
-      spec: { name },
-    }) as AplProjectResponse
-    this.teamConfig.projects.push(newProject)
-    return newProject
-  }
-
-  public getProject(name: string): AplProjectResponse {
-    const project = find(this.teamConfig.projects, (item) => item.metadata.name === name)
-    if (!project) {
-      throw new NotExistError(`Project[${name}] does not exist.`)
-    }
-    return project
-  }
-
-  public getProjects(): AplProjectResponse[] {
-    return this.teamConfig.projects ?? []
-  }
-
-  public deleteProject(name: string): void {
-    remove(this.teamConfig.projects, (item) => item.metadata.name === name)
-  }
-
   // =====================================
   // == NETPOLS CRUD ==
   // =====================================
@@ -484,14 +446,6 @@ export class TeamConfigService {
     }
   }
 
-  public doesProjectNameExist(name: string): boolean {
-    return (
-      (this.teamConfig.builds && this.teamConfig.builds.some((build) => build.metadata.name === name)) ||
-      (this.teamConfig.workloads && this.teamConfig.workloads.some((workload) => workload.metadata.name === name)) ||
-      (this.teamConfig.services && this.teamConfig.services.some((service) => service.metadata.name === name))
-    )
-  }
-
   /** Retrieve a collection dynamically from the Teamconfig */
   public getCollection(collectionId: string): AplResponseObject[] {
     if (!has(this.teamConfig, collectionId)) {