Merge pull request #265 from DEFRA/424580-move-to-workflows

fixes microservice user param
DEFRA · Aug 13, 2024 · c2c9a8f · c2c9a8f
2 parents 300390b + 272c60c
commit c2c9a8f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/src/api/create-microservice/controller.js b/src/api/create-microservice/controller.js
@@ -26,7 +26,7 @@ const createMicroserviceController = {
     if (!zone) {
       throw Boom.badData(`Invalid service template: '${serviceTypeTemplate}'`)
     }
-    const user = request.request.auth?.credentials
+    const user = request.auth?.credentials
 
     await createMicroservice(
       request,

diff --git a/src/helpers/create/create-microservice.js b/src/helpers/create/create-microservice.js
@@ -92,8 +92,8 @@ async function createMicroservice(
     createTenantInfrastructure(request, repositoryName, {
       service: repositoryName,
       zone,
-      mongo_enabled: zone === 'protected',
-      redis_enabled: zone === 'public',
+      mongo_enabled: zone === 'protected' ? 'true' : 'false',
+      redis_enabled: zone === 'public' ? 'true' : 'false',
       service_code: team.serviceCodes
     }),
     createAppConfig(request, repositoryName),

diff --git a/src/helpers/create/create-microservice.test.js b/src/helpers/create/create-microservice.test.js
@@ -16,7 +16,7 @@ jest.mock('~/src/helpers/create/workflows/trigger-workflow', () => ({
 const logger = { info: jest.fn(), error: jest.fn(), warn: jest.fn() }
 let connection
 let db
-const service = 'test-service-12345'
+const service = `test-service-${new Date().toISOString()}`
 
 beforeEach(async () => {
   await db.collection('status').deleteMany({ repositoryName: service })
@@ -39,7 +39,6 @@ describe('#create-test-runner-suite', () => {
     fetchTeam.mockResolvedValue({
       team: { teamId: '123', name: 'test', github: 'test', serviceCodes: 'TST' }
     })
-    // createResourceFromWorkflow.mockResolvedValue()
 
     const request = {
       db,
@@ -77,8 +76,8 @@ describe('#create-test-runner-suite', () => {
       {
         service,
         zone: 'public',
-        mongo_enabled: false,
-        redis_enabled: true,
+        mongo_enabled: 'false',
+        redis_enabled: 'true',
         service_code: 'TST'
       }
     )

diff --git a/src/helpers/create/create-test-runner-suite.js b/src/helpers/create/create-test-runner-suite.js
@@ -70,8 +70,8 @@ export async function createTestRunnerSuite(
     createTenantInfrastructure(request, repositoryName, {
       service: repositoryName,
       zone,
-      mongo_enabled: false,
-      redis_enabled: false,
+      mongo_enabled: 'false',
+      redis_enabled: 'false',
       service_code: team.serviceCodes,
       test_suite: repositoryName
     })

diff --git a/src/helpers/create/create-test-runner-suite.test.js b/src/helpers/create/create-test-runner-suite.test.js
@@ -89,8 +89,8 @@ describe('#create-test-runner-suite', () => {
       {
         service,
         zone: 'public',
-        mongo_enabled: false,
-        redis_enabled: false,
+        mongo_enabled: 'false',
+        redis_enabled: 'false',
         service_code: 'TST',
         test_suite: service
       }