From 81746eb44bda866869ce721daea38c5a168d45de Mon Sep 17 00:00:00 2001 From: Marco Crivellaro Date: Tue, 28 Jun 2022 12:52:59 +0100 Subject: [PATCH] feat: log User's metadata.name on POST to /v2/tasks Signed-off-by: Marco Crivellaro --- plugins/scaffolder-backend/src/service/router.ts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts index 2abb730250..809f64c4c9 100644 --- a/plugins/scaffolder-backend/src/service/router.ts +++ b/plugins/scaffolder-backend/src/service/router.ts @@ -17,17 +17,17 @@ import { PluginDatabaseManager, UrlReader } from '@backstage/backend-common'; import { CatalogApi } from '@backstage/catalog-client'; import { + Entity, parseEntityRef, stringifyEntityRef, UserEntity, } from '@backstage/catalog-model'; -import { Entity } from '@backstage/catalog-model'; import { Config, JsonObject } from '@backstage/config'; import { InputError, NotFoundError, stringifyError } from '@backstage/errors'; import { ScmIntegrations } from '@backstage/integration'; import { - TemplateEntityV1beta3, TaskSpec, + TemplateEntityV1beta3, templateEntityV1beta3Validator, } from '@backstage/plugin-scaffolder-common'; import { JsonValue } from '@backstage/types'; @@ -35,8 +35,8 @@ import express from 'express'; import Router from 'express-promise-router'; import { validate } from 'jsonschema'; import { Logger } from 'winston'; -import { TemplateFilter } from '../lib'; import { z } from 'zod'; +import { TemplateFilter } from '../lib'; import { createBuiltinActions, DatabaseTaskStore, @@ -47,7 +47,7 @@ import { } from '../scaffolder'; import { createDryRunner } from '../scaffolder/dryrun'; import { StorageTaskBroker } from '../scaffolder/tasks/StorageTaskBroker'; -import { getEntityBaseUrl, getWorkingDirectory, findTemplate } from './helpers'; +import { findTemplate, getEntityBaseUrl, getWorkingDirectory } from './helpers'; /** * RouterOptions @@ -193,6 +193,8 @@ export async function createRouter( ? await catalogClient.getEntityByRef(userEntityRef, { token }) : undefined; + logger.info(`POST /v2/tasks from ${userEntity?.metadata.name}`); + const values = req.body.values; const template = await findTemplate({