From 083b9a89909f0d7d6985a150d3d1f2e644781355 Mon Sep 17 00:00:00 2001 From: Chris Turner <23338096+christopherjturner@users.noreply.github.com> Date: Tue, 13 Aug 2024 18:43:46 +0100 Subject: [PATCH 1/2] fixes microservice user param --- src/api/create-microservice/controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/create-microservice/controller.js b/src/api/create-microservice/controller.js index 2bbbc74..73570bc 100644 --- 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, From 272c60c08676b5b3924873796590f3727833b185 Mon Sep 17 00:00:00 2001 From: Chris Turner <23338096+christopherjturner@users.noreply.github.com> Date: Tue, 13 Aug 2024 19:03:38 +0100 Subject: [PATCH 2/2] makes redis/mongo inputs strings --- src/helpers/create/create-microservice.js | 4 ++-- src/helpers/create/create-microservice.test.js | 7 +++---- src/helpers/create/create-test-runner-suite.js | 4 ++-- src/helpers/create/create-test-runner-suite.test.js | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/helpers/create/create-microservice.js b/src/helpers/create/create-microservice.js index 3a99e1d..5dfce98 100644 --- 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 index 0db8fab..8bccba5 100644 --- 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 index f7f07cf..144333b 100644 --- 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 index 1050daa..c2581ce 100644 --- 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 }