From 10f657c0b58762ded56adc79ee806dfcbf16978b Mon Sep 17 00:00:00 2001
From: chotai <chotai@users.noreply.github.com>
Date: Fri, 13 Sep 2024 14:51:15 +0100
Subject: [PATCH] Remove tenant_service.json fallback from tenant service
 lookup

---
 .../deploy/helpers/lookup-tenant-service.js   | 33 +------
 .../helpers/lookup-tenant-service.test.js     | 99 +------------------
 2 files changed, 2 insertions(+), 130 deletions(-)

diff --git a/src/api/deploy/helpers/lookup-tenant-service.js b/src/api/deploy/helpers/lookup-tenant-service.js
index 2e39325..06a25dd 100644
--- a/src/api/deploy/helpers/lookup-tenant-service.js
+++ b/src/api/deploy/helpers/lookup-tenant-service.js
@@ -31,38 +31,7 @@ async function lookupTenantService(service, environment, ref = 'main') {
     Joi.assert(service, schema) // Check file in correct format
     return service
   } catch (error) {
-    logger.error(
-      `Error attempting to retrieve ${filePath} from GitHub - Falling back to tenant_services.json, ${error}`
-    )
-    return await lookupLegacyTenantService(service, environment, org, repo, ref)
-  }
-}
-
-/**
- * Get service from the legacy single-file version of tenants.json
- * @param {string} service
- * @param {string} environment
- * @param {string} owner
- * @param {string} repo
- * @param {string} ref
- * @returns {Promise<undefined|*>}
- */
-async function lookupLegacyTenantService(
-  service,
-  environment,
-  owner,
-  repo,
-  ref
-) {
-  const filePath = `environments/${environment}/resources/tenant_services.json`
-  logger.info(`Getting legacy tenant file ${filePath}`)
-  try {
-    const data = await getContent(owner, repo, filePath, ref)
-    const services = JSON.parse(data)
-    return services[0][service]
-  } catch (error) {
-    logger.error(error, `Error attempting to retrieve ${filePath} from GitHub`)
-    return undefined
+    logger.error(`Error attempting to retrieve ${filePath} from GitHub`)
   }
 }
 
diff --git a/src/api/deploy/helpers/lookup-tenant-service.test.js b/src/api/deploy/helpers/lookup-tenant-service.test.js
index 2bde0b0..2cb16e9 100644
--- a/src/api/deploy/helpers/lookup-tenant-service.test.js
+++ b/src/api/deploy/helpers/lookup-tenant-service.test.js
@@ -36,101 +36,12 @@ describe('lookupTenantService', () => {
     expect(result).toEqual(tenant)
   })
 
-  test('should fallback to legacy tenant json when not found', async () => {
-    const tenants = [
-      {
-        someService: {
-          zone: 'public',
-          mongo: false,
-          redis: true,
-          service_code: 'ABC'
-        }
-      }
-    ]
-
-    getContent
-      .mockReturnValueOnce(null)
-      .mockResolvedValue(JSON.stringify(tenants))
-
-    const result = await lookupTenantService('someService', 'dev')
-
-    expect(mockGetContent).toHaveBeenNthCalledWith(
-      1,
-      org,
-      repo,
-      'environments/dev/tenants/someService.json',
-      'main'
-    )
-
-    expect(mockGetContent).toHaveBeenNthCalledWith(
-      2,
-      org,
-      repo,
-      'environments/dev/resources/tenant_services.json',
-      'main'
-    )
-
-    expect(result).toEqual({
-      zone: 'public',
-      mongo: false,
-      redis: true,
-      service_code: 'ABC'
-    })
-  })
-
-  test('should fallback to legacy tenant json when service_code is missing', async () => {
-    const missingServiceCode = {
-      zone: 'public',
-      mongo: false,
-      redis: true
-    }
-    const tenants = [
-      {
-        someService: {
-          zone: 'public',
-          mongo: false,
-          redis: true,
-          service_code: 'ABC'
-        }
-      }
-    ]
-
-    getContent
-      .mockReturnValueOnce(missingServiceCode)
-      .mockResolvedValue(JSON.stringify(tenants))
-
-    const result = await lookupTenantService('someService', 'dev')
-
-    expect(mockGetContent).toHaveBeenNthCalledWith(
-      1,
-      org,
-      repo,
-      'environments/dev/tenants/someService.json',
-      'main'
-    )
-
-    expect(mockGetContent).toHaveBeenNthCalledWith(
-      2,
-      org,
-      repo,
-      'environments/dev/resources/tenant_services.json',
-      'main'
-    )
-
-    expect(result).toEqual({
-      zone: 'public',
-      mongo: false,
-      redis: true,
-      service_code: 'ABC'
-    })
-  })
-
   test('should return nothing when the service doesnt exist', async () => {
     getContent.mockResolvedValue(null)
 
     const result = await lookupTenantService('someService', 'dev')
 
-    expect(mockGetContent).toHaveBeenCalledTimes(2)
+    expect(mockGetContent).toHaveBeenCalledTimes(1)
     expect(result).toBeUndefined()
   })
 
@@ -159,14 +70,6 @@ describe('lookupTenantService', () => {
       'environments/dev/tenants/someService.json',
       '87428fc5'
     )
-
-    expect(mockGetContent).toHaveBeenNthCalledWith(
-      2,
-      org,
-      repo,
-      'environments/dev/resources/tenant_services.json',
-      '87428fc5'
-    )
   })
 
   test('should get the tenant service from the single file version when present even if it has extra fields', async () => {