@backstage/plugin-scaffolder-backend 1.11.1-next.0 → 1.12.0-next.2

package/dist/index.cjs.js

@@ -8,6 +8,7 @@ var pluginScaffolderNode = require('@backstage/plugin-scaffolder-node');
 var yaml = require('yaml');
 var fs = require('fs-extra');
 var backendCommon = require('@backstage/backend-common');
+var zod = require('zod');
 var integration = require('@backstage/integration');
 var path = require('path');
 var globby = require('globby');
@@ -36,7 +37,6 @@ var promClient = require('prom-client');
 var pluginScaffolderCommon = require('@backstage/plugin-scaffolder-common');
 var express = require('express');
 var Router = require('express-promise-router');
-var zod = require('zod');
 var url = require('url');
 var os = require('os');
 var pluginCatalogBackend = require('@backstage/plugin-catalog-backend');
@@ -252,24 +252,16 @@ function createCatalogWriteAction() {
   return pluginScaffolderNode.createTemplateAction({
     id: id$2,
     description: "Writes the catalog-info.yaml for your template",
-    examples: examples$2,
     schema: {
-      input: {
-        type: "object",
-        properties: {
-          filePath: {
-            title: "Catalog file path",
-            description: "Defaults to catalog-info.yaml",
-            type: "string"
-          },
-          entity: {
-            title: "Entity info to write catalog-info.yaml",
-            description: "You can provide the same values used in the Entity schema.",
-            type: "object"
-          }
-        }
-      }
+      input: zod.z.object({
+        filePath: zod.z.string().optional().describe("Defaults to catalog-info.yaml"),
+        // TODO: this should reference an zod entity validator if it existed.
+        entity: zod.z.object({}).passthrough().describe(
+          "You can provide the same values used in the Entity schema."
+        )
+      })
     },
+    examples: examples$2,
     supportsDryRun: true,
     async handler(ctx) {
       ctx.logStream.write(`Writing catalog-info.yaml`);
@@ -3494,11 +3486,12 @@ const defaultClientFactory = async ({
     ...{ throttle: { enabled: false } }
   });
 };
-const createPublishGithubPullRequestAction = ({
-  integrations,
-  githubCredentialsProvider,
-  clientFactory = defaultClientFactory
-}) => {
+const createPublishGithubPullRequestAction = (options) => {
+  const {
+    integrations,
+    githubCredentialsProvider,
+    clientFactory = defaultClientFactory
+  } = options;
   return pluginScaffolderNode.createTemplateAction({
     id: "publish:github:pull-request",
     schema: {
@@ -4394,7 +4387,8 @@ class DatabaseTaskStore {
     });
     return { events };
   }
-  async shutdownTask({ taskId }) {
+  async shutdownTask(options) {
+    const { taskId } = options;
     const message = `This task was marked as stale as it exceeded its timeout`;
     const statusStepEvents = (await this.listEvents({ taskId })).events.filter(
       ({ body }) => body == null ? void 0 : body.stepId
@@ -5199,13 +5193,12 @@ async function findTemplate(options) {
 function isSupportedTemplate(entity) {
   return entity.apiVersion === "scaffolder.backstage.io/v1beta3";
 }
-function buildDefaultIdentityClient({
-  logger
-}) {
+function buildDefaultIdentityClient(options) {
   return {
     getIdentity: async ({ request }) => {
       var _a;
       const header = request.headers.authorization;
+      const { logger } = options;
       if (!header) {
         return void 0;
       }
@@ -5225,6 +5218,9 @@ function buildDefaultIdentityClient({
         if (typeof sub !== "string") {
           throw new TypeError("Expected string sub claim");
         }
+        if (sub === "backstage-server") {
+          return void 0;
+        }
         catalogModel.parseEntityRef(sub);
         return {
           identity: {
@@ -5258,7 +5254,7 @@ async function createRouter(options) {
     additionalTemplateGlobals
   } = options;
   const logger = parentLogger.child({ plugin: "scaffolder" });
-  const identity = options.identity || buildDefaultIdentityClient({ logger });
+  const identity = options.identity || buildDefaultIdentityClient(options);
   const workingDirectory = await getWorkingDirectory(config, logger);
   const integrations = integration.ScmIntegrations.fromConfig(config);
   let taskBroker;