@backstage/plugin-scaffolder-backend 0.15.18 → 0.15.21

package/CHANGELOG.md

@@ -1,5 +1,71 @@
 # @backstage/plugin-scaffolder-backend
 
+## 0.15.21
+
+### Patch Changes
+
+- b05d303226: Added the ability to support supplying secrets when creating tasks in the `scaffolder-backend`.
+
+  **deprecation**: Deprecated `ctx.token` from actions in the `scaffolder-backend`. Please move to using `ctx.secrets.backstageToken` instead.
+
+  **deprecation**: Deprecated `task.token` in `TaskSpec` in the `scaffolder-backend`. Please move to using `task.secrets.backstageToken` instead.
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@0.21.0
+  - @backstage/integration@0.7.2
+  - @backstage/backend-common@0.10.4
+  - @backstage/config@0.1.13
+  - @backstage/catalog-model@0.9.10
+  - @backstage/catalog-client@0.5.5
+  - @backstage/plugin-scaffolder-backend-module-cookiecutter@0.1.9
+  - @backstage/plugin-scaffolder-common@0.1.3
+
+## 0.15.21-next.0
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@0.21.0-next.0
+  - @backstage/backend-common@0.10.4-next.0
+  - @backstage/config@0.1.13-next.0
+  - @backstage/catalog-model@0.9.10-next.0
+  - @backstage/catalog-client@0.5.5-next.0
+  - @backstage/integration@0.7.2-next.0
+  - @backstage/plugin-scaffolder-backend-module-cookiecutter@0.1.9-next.0
+  - @backstage/plugin-scaffolder-common@0.1.3-next.0
+
+## 0.15.20
+
+### Patch Changes
+
+- 9fbd3b90ae: fix: Register plugin to prioritise Component kind for entityRef
+- 451ef0aa07: Fix token pass-through for software templates using beta 3 version
+- 5333451def: Cleaned up API exports
+- 3b4d8caff6: Allow a GitHubCredentialsProvider to be passed to the GitHub scaffolder tasks actions.
+- Updated dependencies
+  - @backstage/config@0.1.12
+  - @backstage/integration@0.7.1
+  - @backstage/backend-common@0.10.3
+  - @backstage/plugin-catalog-backend@0.20.0
+  - @backstage/errors@0.2.0
+  - @backstage/catalog-client@0.5.4
+  - @backstage/catalog-model@0.9.9
+  - @backstage/plugin-scaffolder-backend-module-cookiecutter@0.1.8
+
+## 0.15.19
+
+### Patch Changes
+
+- 7d4b4e937c: Uptake changes to the GitHub Credentials Provider interface.
+- d078377f67: Support navigating back to pre-filled templates to update inputs of scaffolder tasks for resubmission
+- 5f8ceba1b1: Support custom file name for `catalog:write` action
+- Updated dependencies
+  - @backstage/backend-common@0.10.1
+  - @backstage/plugin-catalog-backend@0.19.4
+  - @backstage/plugin-scaffolder-common@0.1.2
+  - @backstage/integration@0.7.0
+  - @backstage/plugin-scaffolder-backend-module-cookiecutter@0.1.7
+
 ## 0.15.18
 
 ### Patch Changes

package/dist/index.cjs.js

@@ -7,6 +7,7 @@ var catalogModel = require('@backstage/catalog-model');
 var fs = require('fs-extra');
 var yaml = require('yaml');
 var backendCommon = require('@backstage/backend-common');
+var integration = require('@backstage/integration');
 var path = require('path');
 var globby = require('globby');
 var isbinaryfile = require('isbinaryfile');
@@ -16,7 +17,6 @@ var child_process = require('child_process');
 var stream = require('stream');
 var azureDevopsNodeApi = require('azure-devops-node-api');
 var fetch = require('node-fetch');
-var integration = require('@backstage/integration');
 var rest = require('@octokit/rest');
 var lodash = require('lodash');
 var octokitPluginCreatePullRequest = require('octokit-plugin-create-pull-request');
@@ -119,7 +119,7 @@ function createCatalogRegisterAction(options) {
       }
     },
     async handler(ctx) {
-      var _a;
+      var _a, _b;
       const { input } = ctx;
       let catalogInfoUrl;
       if ("catalogInfoUrl" in input) {
@@ -139,16 +139,23 @@ function createCatalogRegisterAction(options) {
       await catalogClient.addLocation({
         type: "url",
         target: catalogInfoUrl
-      }, ctx.token ? { token: ctx.token } : {});
+      }, ((_a = ctx.secrets) == null ? void 0 : _a.backstageToken) ? { token: ctx.secrets.backstageToken } : {});
       try {
         const result = await catalogClient.addLocation({
           dryRun: true,
           type: "url",
           target: catalogInfoUrl
-        }, ctx.token ? { token: ctx.token } : {});
+        }, ((_b = ctx.secrets) == null ? void 0 : _b.backstageToken) ? { token: ctx.secrets.backstageToken } : {});
         if (result.entities.length > 0) {
           const { entities } = result;
-          const entity = (_a = entities.find((e) => !e.metadata.name.startsWith("generated-"))) != null ? _a : entities[0];
+          let entity;
+          entity = entities.find((e) => !e.metadata.name.startsWith("generated-") && e.kind === "Component");
+          if (!entity) {
+            entity = entities.find((e) => !e.metadata.name.startsWith("generated-"));
+          }
+          if (!entity) {
+            entity = entities[0];
+          }
           ctx.output("entityRef", catalogModel.stringifyEntityRef(entity));
         }
       } catch (e) {
@@ -169,6 +176,11 @@ function createCatalogWriteAction() {
       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.",
@@ -179,8 +191,9 @@ function createCatalogWriteAction() {
     },
     async handler(ctx) {
       ctx.logStream.write(`Writing catalog-info.yaml`);
-      const { entity } = ctx.input;
-      await fs__default["default"].writeFile(backendCommon.resolveSafeChildPath(ctx.workspacePath, "catalog-info.yaml"), yaml__namespace.stringify(entity));
+      const { filePath, entity } = ctx.input;
+      const path = filePath != null ? filePath : "catalog-info.yaml";
+      await fs__default["default"].writeFile(backendCommon.resolveSafeChildPath(ctx.workspacePath, path), yaml__namespace.stringify(entity));
     }
   });
 }
@@ -1144,12 +1157,9 @@ function createPublishFileAction() {
 }
 
 class OctokitProvider {
-  constructor(integrations) {
+  constructor(integrations, githubCredentialsProvider) {
     this.integrations = integrations;
-    this.credentialsProviders = new Map(integrations.github.list().map((integration$1) => {
-      const provider = integration.GithubCredentialsProvider.create(integration$1.config);
-      return [integration$1.config.host, provider];
-    }));
+    this.githubCredentialsProvider = githubCredentialsProvider || integration.DefaultGithubCredentialsProvider.fromIntegrations(this.integrations);
   }
   async getOctokit(repoUrl) {
     var _a;
@@ -1161,11 +1171,7 @@ class OctokitProvider {
     if (!integrationConfig) {
       throw new errors.InputError(`No integration for host ${host}`);
     }
-    const credentialsProvider = this.credentialsProviders.get(host);
-    if (!credentialsProvider) {
-      throw new errors.InputError(`No matching credentials for host ${host}, please check your integrations config`);
-    }
-    const { token } = await credentialsProvider.getCredentials({
+    const { token } = await this.githubCredentialsProvider.getCredentials({
       url: `https://${host}/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}`
     });
     if (!token) {
@@ -1181,8 +1187,8 @@ class OctokitProvider {
 }
 
 function createPublishGithubAction(options) {
-  const { integrations, config } = options;
-  const octokitProvider = new OctokitProvider(integrations);
+  const { integrations, config, githubCredentialsProvider } = options;
+  const octokitProvider = new OctokitProvider(integrations, githubCredentialsProvider || integration.DefaultGithubCredentialsProvider.fromIntegrations(integrations));
   return createTemplateAction({
     id: "publish:github",
     description: "Initializes a git repository of contents in workspace and publishes it to GitHub.",
@@ -1382,6 +1388,7 @@ class GithubResponseError extends errors.CustomErrorBase {
 }
 const defaultClientFactory = async ({
   integrations,
+  githubCredentialsProvider,
   owner,
   repo,
   host = "github.com"
@@ -1391,10 +1398,7 @@ const defaultClientFactory = async ({
   if (!integrationConfig) {
     throw new errors.InputError(`No integration for host ${host}`);
   }
-  const credentialsProvider = integration.GithubCredentialsProvider.create(integrationConfig);
-  if (!credentialsProvider) {
-    throw new errors.InputError(`No matching credentials for host ${host}, please check your integrations config`);
-  }
+  const credentialsProvider = githubCredentialsProvider || integration.SingleInstanceGithubCredentialsProvider.create(integrationConfig);
   const { token } = await credentialsProvider.getCredentials({
     url: `https://${host}/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}`
   });
@@ -1409,6 +1413,7 @@ const defaultClientFactory = async ({
 };
 const createPublishGithubPullRequestAction = ({
   integrations,
+  githubCredentialsProvider,
   clientFactory = defaultClientFactory
 }) => {
   return createTemplateAction({
@@ -1475,7 +1480,13 @@ const createPublishGithubPullRequestAction = ({
       if (!owner) {
         throw new errors.InputError(`No owner provided for host: ${host}, and repo ${repo}`);
       }
-      const client = await clientFactory({ integrations, host, owner, repo });
+      const client = await clientFactory({
+        integrations,
+        githubCredentialsProvider,
+        host,
+        owner,
+        repo
+      });
       const fileRoot = sourcePath ? backendCommon.resolveSafeChildPath(ctx.workspacePath, sourcePath) : ctx.workspacePath;
       const localFilePaths = await globby__default["default"](["./**", "./**/.*", "!.git"], {
         cwd: fileRoot,
@@ -1737,8 +1748,8 @@ const createPublishGitlabMergeRequestAction = (options) => {
 };
 
 function createGithubActionsDispatchAction(options) {
-  const { integrations } = options;
-  const octokitProvider = new OctokitProvider(integrations);
+  const { integrations, githubCredentialsProvider } = options;
+  const octokitProvider = new OctokitProvider(integrations, githubCredentialsProvider || integration.DefaultGithubCredentialsProvider.fromIntegrations(integrations));
   return createTemplateAction({
     id: "github:actions:dispatch",
     description: "Dispatches a GitHub Action workflow for a given branch or tag",
@@ -1781,8 +1792,8 @@ function createGithubActionsDispatchAction(options) {
 }
 
 function createGithubWebhookAction(options) {
-  const { integrations, defaultWebhookSecret } = options;
-  const octokitProvider = new OctokitProvider(integrations);
+  const { integrations, defaultWebhookSecret, githubCredentialsProvider } = options;
+  const octokitProvider = new OctokitProvider(integrations, githubCredentialsProvider != null ? githubCredentialsProvider : integration.DefaultGithubCredentialsProvider.fromIntegrations(integrations));
   const eventNames = webhooks.emitterEventNames.filter((event) => !event.includes("."));
   return createTemplateAction({
     id: "github:webhook",
@@ -1882,6 +1893,7 @@ function createGithubWebhookAction(options) {
 
 const createBuiltinActions = (options) => {
   const { reader, integrations, containerRunner, catalogClient, config } = options;
+  const githubCredentialsProvider = integration.DefaultGithubCredentialsProvider.fromIntegrations(integrations);
   const actions = [
     createFetchPlainAction({
       reader,
@@ -1893,10 +1905,12 @@ const createBuiltinActions = (options) => {
     }),
     createPublishGithubAction({
       integrations,
-      config
+      config,
+      githubCredentialsProvider
     }),
     createPublishGithubPullRequestAction({
-      integrations
+      integrations,
+      githubCredentialsProvider
     }),
     createPublishGitlabAction({
       integrations,
@@ -1919,10 +1933,12 @@ const createBuiltinActions = (options) => {
     createFilesystemDeleteAction(),
     createFilesystemRenameAction(),
     createGithubActionsDispatchAction({
-      integrations
+      integrations,
+      githubCredentialsProvider
     }),
     createGithubWebhookAction({
-      integrations
+      integrations,
+      githubCredentialsProvider
     })
   ];
   if (containerRunner) {
@@ -2008,7 +2024,8 @@ class DatabaseTaskStore {
       }
       const updateCount = await tx("tasks").where({ id: task.id, status: "open" }).update({
         status: "processing",
-        last_heartbeat_at: this.db.fn.now()
+        last_heartbeat_at: this.db.fn.now(),
+        secrets: null
       });
       if (updateCount < 1) {
         return void 0;
@@ -2072,8 +2089,7 @@ class DatabaseTaskStore {
         id: taskId,
         status: oldStatus
       }).update({
-        status,
-        secrets: null
+        status
       });
       if (updateCount !== 1) {
         throw new errors.ConflictError(`Failed to update status to '${status}' for taskId ${taskId}`);
@@ -2286,7 +2302,7 @@ class HandlebarsWorkflowRunner {
     this.handlebars.registerHelper("eq", (a, b) => a === b);
   }
   async execute(task) {
-    var _a, _b;
+    var _a, _b, _c;
     if (!isValidTaskSpec$1(task.spec)) {
       throw new errors.InputError(`Task spec is not a valid v1beta2 task spec`);
     }
@@ -2390,6 +2406,7 @@ class HandlebarsWorkflowRunner {
             logStream: stream$1,
             input,
             token: (_b = task.secrets) == null ? void 0 : _b.token,
+            secrets: (_c = task.secrets) != null ? _c : {},
             workspacePath,
             async createTemporaryDirectory() {
               const tmpDir = await fs__default["default"].mkdtemp(`${workspacePath}_step-${step.id}-`);
@@ -2515,7 +2532,7 @@ class NunjucksWorkflowRunner {
     });
   }
   async execute(task) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     if (!isValidTaskSpec(task.spec)) {
       throw new errors.InputError("Wrong template version executed with the workflow engine");
     }
@@ -2564,6 +2581,8 @@ class NunjucksWorkflowRunner {
           await action.handler({
             baseUrl: task.spec.baseUrl,
             input,
+            token: (_c = task.secrets) == null ? void 0 : _c.token,
+            secrets: (_d = task.secrets) != null ? _d : {},
             logger: taskLogger,
             logStream: streamLogger,
             workspacePath,
@@ -2845,6 +2864,8 @@ async function createRouter(options) {
       throw new errors.InputError(`Unsupported apiVersion field in schema entity, ${template.apiVersion}`);
     }
     const result = await taskBroker.dispatch(taskSpec, {
+      ...req.body.secrets,
+      backstageToken: token,
       token
     });
     res.status(201).json({ id: result.taskId });