Merge branch 'develop' into api-client/integration

Author: rajdip-b

packages/api-client/package-lock.json

@@ -9,7 +9,7 @@
     "watch": "tsc -w",
     "start": "node dist/index.js",
     "dev": "npx tsc && node dist/index.js",
-    "test": "cross-env BACKEND_URL=http://localhost:4200 jest",
+    "test": "cross-env BACKEND_URL=http://localhost:4200 jest --runInBand",
     "lint": "eslint \"{src,tests}/**/*.ts\" --fix",
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\""
   },

packages/api-client/package.json

@@ -1,6 +1,6 @@
-import { ClientResponse } from '../../types/index.types'
-import { APIClient } from '../../core/client'
-import { parseResponse } from '../../core/response-parser'
+import { ClientResponse } from '../types/index.types'
+import { APIClient } from '../core/client'
+import { parseResponse } from '../core/response-parser'
 import {
   CreateEnvironmentRequest,
   CreateEnvironmentResponse,
@@ -12,7 +12,7 @@ import {
   GetEnvironmentByIdResponse,
   UpdateEnvironmentRequest,
   UpdateEnvironmentResponse
-} from '../../types/environment.types'
+} from '../types/environment.types'
 
 export default class EnvironmentController {
   private apiClient: APIClient

packages/api-client/src/controllers/environment/environment.ts packages/api-client/src/controllers/environment.ts

@@ -1,7 +1,7 @@
-import { GetEventsRequest, GetEventsResponse } from '../../types/event.types'
-import { APIClient } from '../../core/client'
-import { ClientResponse } from '../../types/index.types'
-import { parseResponse } from '../../core/response-parser'
+import { GetEventsRequest, GetEventsResponse } from '../types/event.types'
+import { APIClient } from '../core/client'
+import { ClientResponse } from '../types/index.types'
+import { parseResponse } from '../core/response-parser'
 
 export default class EventController {
   private apiClient: APIClient
@@ -18,6 +18,7 @@ export default class EventController {
       `/api/event/${request.workspaceId}?source=${request.source}`,
       headers
     )
+
     return await parseResponse<GetEventsResponse>(response)
   }
 }

packages/api-client/src/controllers/event/event.ts packages/api-client/src/controllers/event.ts

@@ -1,6 +1,6 @@
-import { APIClient } from '../../core/client'
-import { ClientResponse } from 'src/types/index.types'
-import { parseResponse } from '../../core/response-parser'
+import { APIClient } from '../core/client'
+import { ClientResponse } from '../types/index.types'
+import { parseResponse } from '../core/response-parser'
 import {
   CreateSecretRequest,
   CreateSecretResponse,
@@ -14,7 +14,7 @@ import {
   RollBackSecretResponse,
   UpdateSecretRequest,
   UpdateSecretResponse
-} from '../../types/secret.types'
+} from '../types/secret.types'
 
 export default class SecretController {
   private apiClient: APIClient
@@ -32,8 +32,10 @@ export default class SecretController {
       request,
       headers
     )
+
     return await parseResponse<CreateSecretResponse>(response)
   }
+
   async updateSecret(
     request: UpdateSecretRequest,
     headers?: Record<string, string>
@@ -56,6 +58,7 @@ export default class SecretController {
       request,
       headers
     )
+
     return await parseResponse<RollBackSecretResponse>(response)
   }
 
@@ -67,6 +70,7 @@ export default class SecretController {
       `/api/secret/${request.secretId}`,
       headers
     )
+
     return await parseResponse<DeleteSecretResponse>(response)
   }
 

packages/api-client/src/controllers/secret/secret.ts packages/api-client/src/controllers/secret.ts

@@ -1,7 +1,7 @@
 import { APIClient } from '../src/core/client'
-import EnvironmentController from '../src/controllers/environment/environment'
+import EnvironmentController from '../src/controllers/environment'
 
-describe('Get Environments Tests', () => {
+describe('Environments Controller Tests', () => {
   const backendUrl = process.env.BACKEND_URL
 
   const client = new APIClient(backendUrl)
@@ -10,7 +10,7 @@ describe('Get Environments Tests', () => {
   const email = 'johndoe@example.com'
   let projectId: string | null
   let workspaceId: string | null
-  let environment: any
+  let environmentId: string | null
 
   beforeAll(async () => {
     //Create the user's workspace
@@ -66,12 +66,12 @@ describe('Get Environments Tests', () => {
       )
     ).json()) as any
 
-    environment = createEnvironmentResponse
+    environmentId = createEnvironmentResponse.id
   })
 
   afterEach(async () => {
     // Delete the environment
-    await client.delete(`/api/environment/${environment.id}`, {
+    await client.delete(`/api/environment/${environmentId}`, {
       'x-e2e-user-email': email
     })
   })
@@ -112,15 +112,15 @@ describe('Get Environments Tests', () => {
     const environmentResponse = (
       await environmentController.getEnvironmentById(
         {
-          id: environment.id
+          id: environmentId
         },
         {
           'x-e2e-user-email': email
         }
       )
     ).data
 
-    expect(environmentResponse.id).toBe(environment.id)
+    expect(environmentResponse.id).toBe(environmentId)
     expect(environmentResponse.name).toBe('Dev')
   })
 
@@ -157,7 +157,7 @@ describe('Get Environments Tests', () => {
     const updateEnvironmentResponse = (
       await environmentController.updateEnvironment(
         {
-          id: environment.id,
+          id: environmentId,
           name: 'Prod'
         },
         {
@@ -169,7 +169,7 @@ describe('Get Environments Tests', () => {
     expect(updateEnvironmentResponse.name).toBe('Prod')
 
     const fetchEnvironmentResponse = (await (
-      await client.get(`/api/environment/${environment.id}`, {
+      await client.get(`/api/environment/${environmentId}`, {
         'x-e2e-user-email': email
       })
     ).json()) as any

packages/api-client/tests/environment.spec.ts

@@ -1,5 +1,5 @@
 import { APIClient } from '../src/core/client'
-import EventController from '../src/controllers/event/event'
+import EventController from '../src/controllers/event'
 export enum EventSource {
   SECRET = 'SECRET',
   VARIABLE = 'VARIABLE',
@@ -10,16 +10,14 @@ export enum EventSource {
   INTEGRATION = 'INTEGRATION'
 }
 
-describe('Get Event Controller', () => {
+describe('Event Controller Tests', () => {
   const backendUrl = process.env.BACKEND_URL
 
   const client = new APIClient(backendUrl)
   const eventController = new EventController(backendUrl)
   const email = 'johndoe@example.com'
   let projectId: string | null
   let workspaceId: string | null
-  let secret: any
-  let variable: any
   let environment: any
 
   beforeAll(async () => {
@@ -35,7 +33,6 @@ describe('Get Event Controller', () => {
         }
       )
     ).json()) as any
-    console.log(workspaceResponse)
     workspaceId = workspaceResponse.id
   })
 
@@ -65,7 +62,6 @@ describe('Get Event Controller', () => {
       { workspaceId, source: 'PROJECT' },
       { 'x-e2e-user-email': email }
     )
-    console.log(events.data.items)
     expect(events.data.items[0].source).toBe(EventSource.PROJECT)
     expect(events.data.items[0].metadata.projectId).toBe(projectId)
     expect(events.data.items[0].metadata.name).toBe('Project')
@@ -122,7 +118,6 @@ describe('Get Event Controller', () => {
     expect(events.data.items[0].source).toBe('SECRET')
     expect(events.data.items[0].metadata.secretId).toBe(secretRepsonse.id)
     expect(events.data.items[0].metadata.name).toBe('My secret')
-    secret = secretRepsonse
   })
 
   it('should fetch a Variable Event', async () => {
@@ -151,6 +146,5 @@ describe('Get Event Controller', () => {
     expect(events.data.items[0].source).toBe('VARIABLE')
     expect(events.data.items[0].metadata.variableId).toBe(variableResponse.id)
     expect(events.data.items[0].metadata.name).toBe('My variable')
-    variable = variableResponse
   })
 })