Merge pull request #334 from DEFRA/485829

Update lookup service to call portal-backend instead of GitHub

src/api/deploy-terminal/controllers/deploy-terminal.js

@@ -38,13 +38,13 @@ const deployTerminalController = {
       )
     }
 
-    const tenant = await lookupTenantService(
+    const service = await lookupTenantService(
       payload.service,
       payload.environment,
       logger
     )
 
-    if (!tenant?.zone) {
+    if (!service?.zone) {
       logger.error(
         `failed to find zone for ${payload.service} in ${payload.environment}`
       )
@@ -61,7 +61,7 @@ const deployTerminalController = {
       user,
       token,
       environment: payload.environment,
-      zone: tenant.zone,
+      zone: service.zone,
       service: payload.service
     })
 

src/api/deploy/controllers/deploy-service.js

@@ -93,7 +93,7 @@ const deployServiceController = {
         service.zone,
         user,
         configLatestCommitSha,
-        service.service_code,
+        service.serviceCode,
         request
       )
 
@@ -109,7 +109,7 @@ const deployServiceController = {
       service.zone,
       user,
       configLatestCommitSha,
-      service.service_code,
+      service.serviceCode,
       shouldDeployByFile,
       logger
     )

src/api/deploy/helpers/lookup-tenant-service.js

@@ -1,41 +1,27 @@
-import Joi from 'joi'
-
-import { getContent } from '~/src/helpers/github/get-content.js'
 import { config } from '~/src/config/index.js'
-
-const org = config.get('github.org')
-const repo = config.get('github.repos.cdpTfSvcInfra')
-
-const schema = Joi.object({
-  zone: Joi.string().valid('public', 'protected').required(),
-  service_code: Joi.any(),
-  mongo: Joi.boolean(),
-  redis: Joi.boolean(),
-  test_suite: Joi.string()
-}).unknown(true)
+import { fetcher } from '~/src/helpers/fetcher.js'
+import Boom from '@hapi/boom'
 
 /**
- * Get service from the multi-file version of tenants.json
+ * Get service from portal-backend
  * @param {string} service
  * @param {string} environment
  * @param {Logger} logger
- * @param {string} ref
  * @returns {Promise<undefined|*>}
  */
-async function lookupTenantService(service, environment, logger, ref = 'main') {
-  const filePath = `environments/${environment}/tenants/${service}.json`
-  try {
-    const data = await getContent(org, repo, filePath, ref)
-    if (!data) {
-      logger.warn(`Tenant environment file ${filePath} from GitHub not found`)
-      return undefined
-    }
-    const service = JSON.parse(data)
-    Joi.assert(service, schema) // Check file in correct format
-    return service
-  } catch (error) {
-    logger.error(error, `Error attempting to retrieve ${filePath} from GitHub`)
+async function lookupTenantService(service, environment, logger) {
+  const url = `${config.get('portalBackendUrl')}/tenant-services/${service}/${environment}`
+  const response = await fetcher(url, {
+    method: 'get',
+    headers: { 'Content-Type': 'application/json' }
+  })
+  const json = await response.json()
+
+  if (response.ok) {
+    return json
   }
+  logger.error(`Service lookup failed: ${json.message}`)
+  throw Boom.boomify(new Error(json.message), { statusCode: response.status })
 }
 
 export { lookupTenantService }

src/listeners/github/helpers/bulk-update-tf-svc-infra.js

@@ -46,7 +46,7 @@ const bulkUpdateTfSvcInfra = async (db, trimmedWorkflow, status) => {
     const serviceName = serviceToUpdate.name
 
     let runMode = 'Service'
-    if (serviceToUpdate?.tenantConfig?.test_suite) {
+    if (serviceToUpdate?.tenantConfig?.testSuite) {
       runMode = 'Job'
     }
 

src/listeners/github/helpers/bulk-update-tf-svc-infra.test.js

@@ -93,10 +93,8 @@ describe('bulkUpdateTtfSvcInfra', () => {
       }
     ])
     lookupTenantService.mockResolvedValue({
-      test_suite: 'test1',
+      testSuite: 'test1',
       zone: 'public',
-      mongo: false,
-      redis: false,
       service_code: 'TST'
     })