From 3f4c4a00ddbc7e8be831fb9d0825622879c36b5e Mon Sep 17 00:00:00 2001 From: Erik Larsson Date: Sat, 17 Apr 2021 19:31:22 +0200 Subject: [PATCH] avoid overusing fancy constructs Signed-off-by: Erik Larsson --- .../actions/builtin/catalog/register.test.ts | 11 +++++++---- .../scaffolder/actions/builtin/catalog/register.ts | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/register.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/register.test.ts index 070ad15ab7..16a918e207 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/register.test.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/register.test.ts @@ -84,10 +84,13 @@ describe('catalog:register', () => { catalogInfoUrl: 'http://foo/var', }, }); - expect(addLocation).toBeCalledWith({ - type: 'url', - target: 'http://foo/var', - }); + expect(addLocation).toBeCalledWith( + { + type: 'url', + target: 'http://foo/var', + }, + {}, + ); expect(mockContext.output).toBeCalledWith( 'entityRef', diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/register.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/register.ts index 5d169a73fd..e9710f7da4 100644 --- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/register.ts +++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/catalog/register.ts @@ -100,7 +100,7 @@ export function createCatalogRegisterAction(options: { type: 'url', target: catalogInfoUrl, }, - ...(ctx.token ? [{ token: ctx.token }] : []), + ctx.token ? { token: ctx.token } : {}, ); if (result.entities.length >= 1) { const { kind, name, namespace } = getEntityName(result.entities[0]);