@backstage/plugin-scaffolder-backend 1.13.0-next.1 → 1.13.0-next.3

package/CHANGELOG.md

@@ -1,5 +1,56 @@
 # @backstage/plugin-scaffolder-backend
 
+## 1.13.0-next.3
+
+### Minor Changes
+
+- d7c8c222e25: Allow for a commit message to differ from the PR title when publishing a GitHub pull request.
+
+### Patch Changes
+
+- f37a95adcd8: Stripped entity types and namespace before passing to GitHub API
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.9.0-next.3
+  - @backstage/catalog-model@1.3.0-next.0
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-client@1.4.1-next.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-catalog-common@1.0.13-next.1
+  - @backstage/plugin-catalog-node@1.3.5-next.3
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/plugin-scaffolder-common@1.2.7-next.2
+  - @backstage/plugin-scaffolder-node@0.1.2-next.3
+
+## 1.13.0-next.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/plugin-catalog-backend@1.8.1-next.2
+  - @backstage/backend-common@0.18.4-next.2
+  - @backstage/catalog-client@1.4.1-next.0
+  - @backstage/plugin-permission-node@0.7.7-next.2
+  - @backstage/plugin-scaffolder-node@0.1.2-next.2
+  - @backstage/backend-plugin-api@0.5.1-next.2
+  - @backstage/backend-tasks@0.5.1-next.2
+  - @backstage/catalog-model@1.2.1
+  - @backstage/config@1.0.7
+  - @backstage/errors@1.1.5
+  - @backstage/integration@1.4.4-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.13-next.2
+  - @backstage/plugin-catalog-common@1.0.13-next.0
+  - @backstage/plugin-catalog-node@1.3.5-next.2
+  - @backstage/plugin-permission-common@0.7.5-next.0
+  - @backstage/plugin-scaffolder-common@1.2.7-next.1
+
 ## 1.13.0-next.1
 
 ### Minor Changes

package/alpha/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-backend",
-  "version": "1.13.0-next.1",
+  "version": "1.13.0-next.3",
   "main": "../dist/alpha.cjs.js",
   "types": "../dist/alpha.d.ts"
 }

package/dist/alpha.cjs.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var backendPluginApi = require('@backstage/backend-plugin-api');
 var alpha = require('@backstage/plugin-catalog-node/alpha');
-var ScaffolderEntitiesProcessor = require('./cjs/ScaffolderEntitiesProcessor-9c517d79.cjs.js');
+var ScaffolderEntitiesProcessor = require('./cjs/ScaffolderEntitiesProcessor-b5a2b352.cjs.js');
 var alpha$1 = require('@backstage/plugin-scaffolder-common/alpha');
 var pluginPermissionNode = require('@backstage/plugin-permission-node');
 var backendCommon = require('@backstage/backend-common');

package/dist/alpha.d.ts

@@ -55,14 +55,14 @@ declare const scaffolderConditions: _backstage_plugin_permission_node.Conditions
  *
  * @alpha
  */
-declare const createScaffolderConditionalDecision: (permission: _backstage_plugin_permission_common.ResourcePermission<"scaffolder-template">, conditions: _backstage_plugin_permission_common.PermissionCriteria<_backstage_plugin_permission_common.PermissionCondition<"scaffolder-template", _backstage_plugin_permission_common.PermissionRuleParams>>) => _backstage_plugin_permission_common.ConditionalPolicyDecision;
+declare const createScaffolderConditionalDecision: (permission: _backstage_plugin_permission_common.ResourcePermission<"scaffolder-template">, conditions: _backstage_plugin_permission_common.PermissionCriteria<_backstage_plugin_permission_common.PermissionCondition<"scaffolder-template">>) => _backstage_plugin_permission_common.ConditionalPolicyDecision;
 
 /**
  * Catalog plugin options
  *
  * @alpha
  */
-declare type ScaffolderPluginOptions = {
+type ScaffolderPluginOptions = {
     actions?: TemplateAction<any>[];
     taskWorkers?: number;
     taskBroker?: TaskBroker;

package/dist/cjs/{ScaffolderEntitiesProcessor-9c517d79.cjs.js → ScaffolderEntitiesProcessor-b5a2b352.cjs.js}

@@ -258,7 +258,7 @@ function createCatalogWriteAction() {
       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(
+        entity: zod.z.record(zod.z.any()).describe(
           "You can provide the same values used in the Entity schema."
         )
       })
@@ -1396,6 +1396,9 @@ const enableBranchProtectionOnDefaultRepoBranch = async ({
     await tryOnce();
   }
 };
+function entityRefToName(name) {
+  return name.replace(/^.*[:/]/g, "");
+}
 
 const DEFAULT_TIMEOUT_MS = 6e4;
 async function getOctokitOptions(options) {
@@ -1516,13 +1519,13 @@ async function createGithubRepoWithCollaboratorsAndTopics(client, repo, owner, r
           await client.rest.repos.addCollaborator({
             owner,
             repo,
-            username: collaborator.user,
+            username: entityRefToName(collaborator.user),
             permission: collaborator.access
           });
         } else if ("team" in collaborator) {
           await client.rest.teams.addOrUpdateRepoPermissionsInOrg({
             org: owner,
-            team_slug: collaborator.team,
+            team_slug: entityRefToName(collaborator.team),
             owner,
             repo,
             permission: collaborator.access
@@ -3734,6 +3737,11 @@ const createPublishGithubPullRequestAction = (options) => {
               type: "string"
             },
             description: "The teams that will be added as reviewers to the pull request"
+          },
+          commitMessage: {
+            type: "string",
+            title: "Commit Message",
+            description: "The commit message for the pull request commit"
           }
         }
       },
@@ -3765,7 +3773,8 @@ const createPublishGithubPullRequestAction = (options) => {
         sourcePath,
         token: providedToken,
         reviewers,
-        teamReviewers
+        teamReviewers,
+        commitMessage
       } = ctx.input;
       const { owner, repo, host } = parseRepoUrl(repoUrl, integrations);
       if (!owner) {
@@ -3820,7 +3829,7 @@ const createPublishGithubPullRequestAction = (options) => {
           changes: [
             {
               files,
-              commit: title
+              commit: commitMessage != null ? commitMessage : title
             }
           ],
           body: description,
@@ -6003,4 +6012,4 @@ exports.createWaitAction = createWaitAction;
 exports.executeShellCommand = executeShellCommand;
 exports.fetchContents = fetchContents;
 exports.scaffolderTemplateRules = scaffolderTemplateRules;
-//# sourceMappingURL=ScaffolderEntitiesProcessor-9c517d79.cjs.js.map
+//# sourceMappingURL=ScaffolderEntitiesProcessor-b5a2b352.cjs.js.map