fix: get agents and knowledgeBases correctly

Author: CasLubbers

src/ai/k8s.ts

@@ -14,6 +14,12 @@ const debug = Debug('otomi:ai:k8s')
 let appsApiClient: AppsV1Api | undefined
 let customObjectsApiClient: CustomObjectsApi | undefined
 
+export interface KubernetesObjectWithStatus extends KubernetesObject {
+  status: {
+    [key: string]: any
+  }
+}
+
 // Export function to reset api clients for testing
 export function resetApiClients(): void {
   appsApiClient = undefined
@@ -141,7 +147,7 @@ export async function getAkamaiKnowledgeBaseCR(namespace: string, name: string):
   }
 }
 
-export async function listAkamaiAgentCRs(namespace: string): Promise<KubernetesObject[]> {
+export async function listAkamaiAgentCRs(namespace: string): Promise<KubernetesObjectWithStatus[]> {
   const customObjectsApi = getCustomObjectsApiClient()
 
   try {
@@ -150,7 +156,7 @@ export async function listAkamaiAgentCRs(namespace: string): Promise<KubernetesO
       version: 'v1alpha1',
       namespace,
       plural: 'akamaiagents',
-    })) as KubernetesListObject<KubernetesObject>
+    })) as KubernetesListObject<KubernetesObjectWithStatus>
 
     debug(`Found ${result.items.length} AkamaiAgent CRs in namespace ${namespace}`)
     return result.items
@@ -160,7 +166,7 @@ export async function listAkamaiAgentCRs(namespace: string): Promise<KubernetesO
   }
 }
 
-export async function listAkamaiKnowledgeBaseCRs(namespace: string): Promise<KubernetesObject[]> {
+export async function listAkamaiKnowledgeBaseCRs(namespace: string): Promise<KubernetesObjectWithStatus[]> {
   const customObjectsApi = getCustomObjectsApiClient()
 
   try {
@@ -169,7 +175,7 @@ export async function listAkamaiKnowledgeBaseCRs(namespace: string): Promise<Kub
       version: 'v1alpha1',
       namespace,
       plural: 'akamaiknowledgebases',
-    })) as KubernetesListObject<KubernetesObject>
+    })) as KubernetesListObject<KubernetesObjectWithStatus>
 
     debug(`Found ${result.items.length} AkamaiKnowledgeBase CRs in namespace ${namespace}`)
     return result.items

src/api.authz.test.ts

@@ -856,7 +856,7 @@ describe('API authz tests', () => {
     })
 
     test('platform admin can get knowledge bases', async () => {
-      jest.spyOn(otomiStack, 'getAplKnowledgeBases').mockReturnValue([])
+      jest.spyOn(otomiStack, 'getAplKnowledgeBases').mockResolvedValue([])
       await agent
         .get('/alpha/teams/team1/kb')
         .set('Authorization', `Bearer ${platformAdminToken}`)
@@ -865,7 +865,7 @@ describe('API authz tests', () => {
     })
 
     test('team admin can get knowledge bases', async () => {
-      jest.spyOn(otomiStack, 'getAplKnowledgeBases').mockReturnValue([])
+      jest.spyOn(otomiStack, 'getAplKnowledgeBases').mockResolvedValue([])
       await agent
         .get('/alpha/teams/team1/kb')
         .set('Authorization', `Bearer ${teamAdminToken}`)
@@ -874,7 +874,7 @@ describe('API authz tests', () => {
     })
 
     test('team member can get knowledge bases', async () => {
-      jest.spyOn(otomiStack, 'getAplKnowledgeBases').mockReturnValue([])
+      jest.spyOn(otomiStack, 'getAplKnowledgeBases').mockResolvedValue([])
       await agent
         .get('/alpha/teams/team1/kb')
         .set('Authorization', `Bearer ${teamMemberToken}`)
@@ -1017,7 +1017,7 @@ describe('API authz tests', () => {
     })
 
     test('platform admin can get agents', async () => {
-      jest.spyOn(otomiStack, 'getAplAgents').mockReturnValue([])
+      jest.spyOn(otomiStack, 'getAplAgents').mockResolvedValue([])
       await agent
         .get('/alpha/teams/team1/agents')
         .set('Authorization', `Bearer ${platformAdminToken}`)
@@ -1026,7 +1026,7 @@ describe('API authz tests', () => {
     })
 
     test('team admin can get agents', async () => {
-      jest.spyOn(otomiStack, 'getAplAgents').mockReturnValue([])
+      jest.spyOn(otomiStack, 'getAplAgents').mockResolvedValue([])
       await agent
         .get('/alpha/teams/team1/agents')
         .set('Authorization', `Bearer ${teamAdminToken}`)
@@ -1035,7 +1035,7 @@ describe('API authz tests', () => {
     })
 
     test('team member can get agents', async () => {
-      jest.spyOn(otomiStack, 'getAplAgents').mockReturnValue([])
+      jest.spyOn(otomiStack, 'getAplAgents').mockResolvedValue([])
       await agent
         .get('/alpha/teams/team1/agents')
         .set('Authorization', `Bearer ${teamMemberToken}`)

src/api/alpha/teams/{teamId}/agents.ts

@@ -8,10 +8,10 @@ const debug = Debug('otomi:api:alpha:teams:agents')
  * GET /alpha/teams/{teamId}/agents
  * Get all agents for a team
  */
-export const getAplAgents = (req: OpenApiRequestExt, res: Response): void => {
+export const getAplAgents = async (req: OpenApiRequestExt, res: Response): Promise<void> => {
   const { teamId } = req.params
   debug(`getAplAgents(${teamId})`)
-  const v = req.otomi.getAplAgents(decodeURIComponent(teamId))
+  const v = await req.otomi.getAplAgents(decodeURIComponent(teamId))
   res.json(v)
 }
 

src/api/alpha/teams/{teamId}/kb.ts

@@ -8,10 +8,10 @@ const debug = Debug('otomi:api:alpha:teams:kb')
  * GET /alpha/teams/{teamId}/kb
  * Get all knowledge bases for a team
  */
-export const getAplKnowledgeBases = (req: OpenApiRequestExt, res: Response): void => {
+export const getAplKnowledgeBases = async (req: OpenApiRequestExt, res: Response): Promise<void> => {
   const { teamId } = req.params
   debug(`getAplKnowledgeBases(${teamId})`)
-  const v = req.otomi.getAplKnowledgeBases(decodeURIComponent(teamId))
+  const v = await req.otomi.getAplKnowledgeBases(decodeURIComponent(teamId))
   res.json(v)
 }
 

src/otomi-stack.ts

@@ -133,6 +133,9 @@ import { getSealedSecretsPEM, sealedSecretManifest } from './utils/sealedSecretU
 import { getKeycloakUsers, isValidUsername } from './utils/userUtils'
 import { defineClusterId, ObjectStorageClient } from './utils/wizardUtils'
 import { fetchChartYaml, fetchWorkloadCatalog, NewHelmChartValues, sparseCloneChart } from './utils/workloadUtils'
+import { listAkamaiAgentCRs, listAkamaiKnowledgeBaseCRs } from './ai/k8s'
+import { AkamaiAgentCR } from './ai/AkamaiAgentCR'
+import { AkamaiKnowledgeBaseCR } from './ai/AkamaiKnowledgeBaseCR'
 
 interface ExcludedApp extends App {
   managed: boolean
@@ -2230,12 +2233,12 @@ export default class OtomiStack {
     if (!knowledgeBase) {
       throw new NotExistError(`Knowledge base ${name} not found in team ${teamId}`)
     }
-    return knowledgeBase as AplKnowledgeBaseResponse
+    return AkamaiKnowledgeBaseCR.fromCR(knowledgeBase).toApiResponse(teamId)
   }
 
-  getAplKnowledgeBases(teamId: string): AplKnowledgeBaseResponse[] {
-    const files = this.fileStore.getTeamResourcesByKindAndTeamId('AkamaiKnowledgeBase', teamId)
-    return Array.from(files.values()) as AplKnowledgeBaseResponse[]
+  async getAplKnowledgeBases(teamId: string): Promise<AplKnowledgeBaseResponse[]> {
+    const knowledgeBases = await listAkamaiKnowledgeBaseCRs(`team-${teamId}`)
+    return knowledgeBases.map((kb) => AkamaiKnowledgeBaseCR.fromCR(kb).toApiResponse(teamId, kb.status))
   }
 
   private async saveTeamKnowledgeBase(aplTeamObject: AplTeamObject): Promise<AplRecord> {
@@ -2300,12 +2303,12 @@ export default class OtomiStack {
     if (!agent) {
       throw new NotExistError(`Agent ${name} not found in team ${teamId}`)
     }
-    return agent as AplAgentResponse
+    return AkamaiAgentCR.fromCR(agent).toApiResponse(teamId)
   }
 
-  getAplAgents(teamId: string): AplAgentResponse[] {
-    const files = this.fileStore.getTeamResourcesByKindAndTeamId('AkamaiAgent', teamId)
-    return Array.from(files.values()) as AplAgentResponse[]
+  async getAplAgents(teamId: string): Promise<AplAgentResponse[]> {
+    const agents = await listAkamaiAgentCRs(`team-${teamId}`)
+    return agents.map((agent) => AkamaiAgentCR.fromCR(agent).toApiResponse(teamId, agent.status))
   }
 
   getAllAplAgents(): AplAgentResponse[] {