@backstage/plugin-scaffolder-backend 1.2.0-next.0 → 1.2.0-next.1

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @backstage/plugin-scaffolder-backend
 
+## 1.2.0-next.1
+
+### Minor Changes
+
+- f8baf7df44: Added the ability to reference the user in the `template.yaml` manifest
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-common@0.13.3-next.2
+  - @backstage/plugin-catalog-backend@1.1.2-next.2
+  - @backstage/plugin-scaffolder-common@1.1.0-next.0
+  - @backstage/config@1.0.1-next.0
+  - @backstage/catalog-model@1.0.2-next.0
+  - @backstage/integration@1.2.0-next.1
+  - @backstage/catalog-client@1.0.2-next.0
+
 ## 1.2.0-next.0
 
 ### Minor Changes

package/dist/index.cjs.js

@@ -2653,6 +2653,7 @@ class DatabaseTaskStore {
     this.db = options.database;
   }
   async getTask(taskId) {
+    var _a;
     const [result] = await this.db("tasks").where({ id: taskId }).select();
     if (!result) {
       throw new errors.NotFoundError(`No task with id '${taskId}' found`);
@@ -2666,6 +2667,7 @@ class DatabaseTaskStore {
         status: result.status,
         lastHeartbeatAt: result.last_heartbeat_at,
         createdAt: result.created_at,
+        createdBy: (_a = result.created_by) != null ? _a : void 0,
         secrets
       };
     } catch (error) {
@@ -2673,17 +2675,20 @@ class DatabaseTaskStore {
     }
   }
   async createTask(options) {
+    var _a;
     const taskId = uuid.v4();
     await this.db("tasks").insert({
       id: taskId,
       spec: JSON.stringify(options.spec),
       secrets: options.secrets ? JSON.stringify(options.secrets) : void 0,
+      created_by: (_a = options.createdBy) != null ? _a : null,
       status: "open"
     });
     return { taskId };
   }
   async claimTask() {
     return this.db.transaction(async (tx) => {
+      var _a;
       const [task] = await tx("tasks").where({
         status: "open"
       }).limit(1).select();
@@ -2707,6 +2712,7 @@ class DatabaseTaskStore {
           status: "processing",
           lastHeartbeatAt: task.last_heartbeat_at,
           createdAt: task.created_at,
+          createdBy: (_a = task.created_by) != null ? _a : void 0,
           secrets
         };
       } catch (error) {
@@ -2825,6 +2831,9 @@ class TaskManager {
   get secrets() {
     return this.task.secrets;
   }
+  get createdBy() {
+    return this.task.createdBy;
+  }
   async getWorkspaceName() {
     return this.task.taskId;
   }
@@ -2884,7 +2893,8 @@ class StorageTaskBroker {
         return TaskManager.create({
           taskId: pendingTask.id,
           spec: pendingTask.spec,
-          secrets: pendingTask.secrets
+          secrets: pendingTask.secrets,
+          createdBy: pendingTask.createdBy
         }, this.storage, this.logger);
       }
       await this.waitForDispatch();
@@ -3035,7 +3045,8 @@ class NunjucksWorkflowRunner {
       await task.emitLog(`Starting up task with ${task.spec.steps.length} steps`);
       const context = {
         parameters: task.spec.parameters,
-        steps: {}
+        steps: {},
+        user: task.spec.user
       };
       for (const step of task.spec.steps) {
         try {
@@ -3253,10 +3264,11 @@ async function createRouter(options) {
   router.get("/v2/templates/:namespace/:kind/:name/parameter-schema", async (req, res) => {
     var _a, _b;
     const { namespace, kind, name } = req.params;
+    const { token } = parseBearerToken(req.headers.authorization);
     const template = await findTemplate({
       catalogApi: catalogClient,
       entityRef: { kind, namespace, name },
-      token: getBearerToken(req.headers.authorization)
+      token
     });
     if (isSupportedTemplate(template)) {
       const parameters = [(_a = template.spec.parameters) != null ? _a : []].flat();
@@ -3288,12 +3300,13 @@ async function createRouter(options) {
     const { kind, namespace, name } = catalogModel.parseEntityRef(templateRef, {
       defaultKind: "template"
     });
+    const { token, entityRef: userEntityRef } = parseBearerToken(req.headers.authorization);
+    const userEntity = userEntityRef ? await catalogClient.getEntityByRef(userEntityRef, { token }) : void 0;
     const values = req.body.values;
-    const token = getBearerToken(req.headers.authorization);
     const template = await findTemplate({
       catalogApi: catalogClient,
       entityRef: { kind, namespace, name },
-      token: getBearerToken(req.headers.authorization)
+      token
     });
     if (!isSupportedTemplate(template)) {
       throw new errors.InputError(`Unsupported apiVersion field in schema entity, ${template.apiVersion}`);
@@ -3318,6 +3331,10 @@ async function createRouter(options) {
       }),
       output: (_b = template.spec.output) != null ? _b : {},
       parameters: values,
+      user: {
+        entity: userEntity,
+        ref: userEntityRef
+      },
       templateInfo: {
         entityRef: catalogModel.stringifyEntityRef({
           kind,
@@ -3329,6 +3346,7 @@ async function createRouter(options) {
     };
     const result = await taskBroker.dispatch({
       spec: taskSpec,
+      createdBy: userEntityRef,
       secrets: {
         ...req.body.secrets,
         backstageToken: token
@@ -3403,9 +3421,17 @@ data: ${JSON.stringify(event)}
   app.use("/", router);
   return app;
 }
-function getBearerToken(header) {
+function parseBearerToken(header) {
   var _a;
-  return (_a = header == null ? void 0 : header.match(/Bearer\s+(\S+)/i)) == null ? void 0 : _a[1];
+  const token = (_a = header == null ? void 0 : header.match(/Bearer\s+(\S+)/i)) == null ? void 0 : _a[1];
+  if (!token)
+    return {};
+  const [_header, rawPayload, _signature] = token.split(".");
+  const payload = JSON.parse(Buffer.from(rawPayload, "base64").toString());
+  return {
+    entityRef: payload.sub,
+    token
+  };
 }
 
 class ScaffolderEntitiesProcessor {