From 4c689b0fae738935be3b5659e7524f244bc68dd7 Mon Sep 17 00:00:00 2001 From: blam Date: Fri, 2 Jul 2021 16:18:22 +0200 Subject: [PATCH] chore: making the failing test pass because of parameter validation Signed-off-by: blam --- .../scaffolder-backend/src/service/router.test.ts | 13 +++++++++++-- plugins/scaffolder-backend/src/service/router.ts | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/plugins/scaffolder-backend/src/service/router.test.ts b/plugins/scaffolder-backend/src/service/router.test.ts index c693573c4f..227f6d3c88 100644 --- a/plugins/scaffolder-backend/src/service/router.test.ts +++ b/plugins/scaffolder-backend/src/service/router.test.ts @@ -83,7 +83,16 @@ describe('createRouter', () => { owner: 'web@example.com', type: 'website', steps: [], - parameters: [], + parameters: { + type: 'object', + required: ['required'], + properties: { + required: { + type: 'string', + description: 'Required parameter', + }, + }, + }, }, }; @@ -117,7 +126,7 @@ describe('createRouter', () => { const response = await request(app) .post('/v2/tasks') .send({ - templateName: '', + templateName: 'create-react-app-template', values: { storePath: 'https://github.com/backstage/backstage', }, diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts index 3ad4646b01..2b5bdb3bf8 100644 --- a/plugins/scaffolder-backend/src/service/router.ts +++ b/plugins/scaffolder-backend/src/service/router.ts @@ -164,6 +164,7 @@ export async function createRouter( }); let taskSpec; + if (isBeta2Template(template)) { for (const parameters of [template.spec.parameters ?? []].flat()) { const result = validate(values, parameters);