EVEREST-107 | API server code refactor & RBAC unit tests

api-tests/tests/backup-storages.spec.ts

@@ -212,7 +212,7 @@ test('create backup storage failures', async ({request}) => {
                 secretKey: 'ssdssdssdssd',
                 allowedNamespaces: [testsNs]
             },
-            errorText: 'Region is required',
+            errorText: 'region is required',
         },
         {
             payload: {

api-tests/tests/database-cluster-backups.spec.ts

@@ -77,7 +77,7 @@ test('dbcluster not found', async ({ request, page }) => {
   })
 
   expect(response.status()).toBe(400)
-  expect(await response.text()).toContain('{"message":"Database cluster not-existing-cluster does not exist"}')
+  expect(await response.text()).toContain('database cluster not-existing-cluster does not exist')
 
   await th.deleteBackupStorage(page, request, bsName, testsNs)
 })

api-tests/tests/database-cluster-restores.spec.ts

@@ -69,7 +69,7 @@ test('create/update/delete database cluster restore', async ({ request, page })
     data: restore,
   })
   expect(response.status()).toBe(400)
-  expect(await response.text()).toContain('{"message":"Database cluster not-existing-cluster does not exist"}')
+  expect(await response.text()).toContain('database cluster not-existing-cluster does not exist')
 
   // delete restore
   await request.delete(`/v1/namespaces/${testsNs}/database-cluster-restores/${restoreName}`)
@@ -194,7 +194,7 @@ test('create restore: validation errors', async ({ request, page }) => {
   })
 
   expect(response.status()).toBe(400)
-  expect(await response.text()).toContain('{"message":"Database cluster not-existing-cluster does not exist"}')
+  expect(await response.text()).toContain('database cluster not-existing-cluster does not exist')
 
   // empty spec
   const payloadEmptySpec = {
@@ -209,7 +209,7 @@ test('create restore: validation errors', async ({ request, page }) => {
     data: payloadEmptySpec,
   })
   expect(response.status()).toBe(400)
-  expect(await response.text()).toContain('{"message":".spec cannot be empty"}')
+  expect(await response.text()).toContain('spec.dataSource.dbClusterBackupName cannot be empty')
 
   await th.deleteBackup(page, request, backupName)
   await th.deleteDBCluster(request, page, clName)

api-tests/tests/monitoring-instances.spec.ts

@@ -135,7 +135,7 @@ test('delete monitoring instance', async ({ request, page }) => {
   await checkError(response)
 
   // list of the monitoring-instances is not updated immediately, there is some kind of cache
-  await page.waitForTimeout(500)
+  await page.waitForTimeout(1000)
 
   response = await request.get(`/v1/namespaces/${testsNs}/monitoring-instances`)
   await checkError(response)
@@ -239,7 +239,7 @@ test('patch monitoring instance type fails on missing key', async ({ request, pa
 
   const getJson = await updated.json()
 
-  expect(getJson.message).toMatch('Pmm key is required')
+  expect(getJson.message).toMatch('pmm key is required')
   await deleteInstances(request, prefix)
 })