Merge pull request #279 from DEFRA/tf-svc-workflow-improvements

fixes lookupTenantService call with wrong param
DEFRA · Aug 29, 2024 · 992c2c0 · 992c2c0
2 parents e1eb932 + b8dbbc1
commit 992c2c0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 11 deletions.
diff --git a/src/api/deploy/controllers/deploy-service.js b/src/api/deploy/controllers/deploy-service.js
@@ -68,11 +68,7 @@ const deployServiceController = {
     )
     request.logger.info('Deployment registered')
 
-    const service = await lookupTenantService(
-      imageName,
-      environment,
-      request.logger
-    )
+    const service = await lookupTenantService(imageName, environment)
 
     if (!service) {
       const message =

diff --git a/src/api/deploy/controllers/existing-service-info.js b/src/api/deploy/controllers/existing-service-info.js
@@ -10,11 +10,7 @@ const existingServiceInfoController = {
     const environment = request.params.environment
     const imageName = request.params.imageName
 
-    const service = await lookupTenantService(
-      imageName,
-      environment,
-      request.logger
-    )
+    const service = await lookupTenantService(imageName, environment)
 
     const filePath = `environments/${environment}/${service?.zone}/${imageName}.json`
 

diff --git a/src/api/deploy/helpers/lookup-tenant-service.js b/src/api/deploy/helpers/lookup-tenant-service.js
@@ -32,7 +32,7 @@ async function lookupTenantService(service, environment, ref = 'main') {
     return service
   } catch (error) {
     logger.error(
-      `Error attempting to retrieve ${filePath} from GitHub - Falling back to tenant_services.json`
+      `Error attempting to retrieve ${filePath} from GitHub - Falling back to tenant_services.json, ${error}`
     )
     return await lookupLegacyTenantService(service, environment, org, repo, ref)
   }