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

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @backstage/plugin-scaffolder-backend
 
+## 1.10.0-next.1
+
+### Minor Changes
+
+- 04a2048fb8: Allow custom repository roles to be configured on github repos
+- a69664faee: Add Github repository support for squash merge commit title and message options
+
+### Patch Changes
+
+- Updated dependencies
+  - @backstage/backend-plugin-api@0.2.1-next.0
+  - @backstage/backend-common@0.18.0-next.0
+  - @backstage/config@1.0.6-next.0
+  - @backstage/plugin-catalog-backend@1.7.0-next.1
+  - @backstage/plugin-catalog-node@1.3.1-next.1
+  - @backstage/backend-tasks@0.4.1-next.0
+  - @backstage/catalog-client@1.3.0-next.1
+  - @backstage/catalog-model@1.1.5-next.1
+  - @backstage/errors@1.1.4
+  - @backstage/integration@1.4.2-next.0
+  - @backstage/types@1.0.2
+  - @backstage/plugin-auth-node@0.2.9-next.0
+  - @backstage/plugin-scaffolder-common@1.2.4-next.1
+
 ## 1.9.1-next.0
 
 ### Patch Changes

package/alpha/package.json

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

package/dist/index.alpha.d.ts

@@ -289,6 +289,8 @@ gitAuthorName?: string | undefined;
 gitAuthorEmail?: string | undefined;
 allowRebaseMerge?: boolean | undefined;
 allowSquashMerge?: boolean | undefined;
+squashMergeCommitTitle?: "PR_TITLE" | "COMMIT_OR_PR_TITLE" | undefined;
+squashMergeCommitMessage?: "PR_BODY" | "COMMIT_MESSAGES" | "BLANK" | undefined;
 allowMergeCommit?: boolean | undefined;
 allowAutoMerge?: boolean | undefined;
 requireCodeOwnerReviews?: boolean | undefined;
@@ -303,10 +305,10 @@ requiredConversationResolution?: boolean | undefined;
 repoVisibility?: "internal" | "private" | "public" | undefined;
 collaborators?: ({
 user: string;
-access: 'pull' | 'push' | 'admin' | 'maintain' | 'triage';
+access: string;
 } | {
 team: string;
-access: 'pull' | 'push' | 'admin' | 'maintain' | 'triage';
+access: string;
 } | {
 /** @deprecated This field is deprecated in favor of team */
 username: string;
@@ -505,6 +507,8 @@ gitAuthorName?: string | undefined;
 gitAuthorEmail?: string | undefined;
 allowRebaseMerge?: boolean | undefined;
 allowSquashMerge?: boolean | undefined;
+squashMergeCommitTitle?: "PR_TITLE" | "COMMIT_OR_PR_TITLE" | undefined;
+squashMergeCommitMessage?: "PR_BODY" | "COMMIT_MESSAGES" | "BLANK" | undefined;
 allowMergeCommit?: boolean | undefined;
 allowAutoMerge?: boolean | undefined;
 sourcePath?: string | undefined;
@@ -521,10 +525,10 @@ requiredConversationResolution?: boolean | undefined;
 repoVisibility?: "internal" | "private" | "public" | undefined;
 collaborators?: ({
 user: string;
-access: 'pull' | 'push' | 'admin' | 'maintain' | 'triage';
+access: string;
 } | {
 team: string;
-access: 'pull' | 'push' | 'admin' | 'maintain' | 'triage';
+access: string;
 } | {
 /** @deprecated This field is deprecated in favor of team */
 username: string;

package/dist/index.beta.d.ts

@@ -289,6 +289,8 @@ gitAuthorName?: string | undefined;
 gitAuthorEmail?: string | undefined;
 allowRebaseMerge?: boolean | undefined;
 allowSquashMerge?: boolean | undefined;
+squashMergeCommitTitle?: "PR_TITLE" | "COMMIT_OR_PR_TITLE" | undefined;
+squashMergeCommitMessage?: "PR_BODY" | "COMMIT_MESSAGES" | "BLANK" | undefined;
 allowMergeCommit?: boolean | undefined;
 allowAutoMerge?: boolean | undefined;
 requireCodeOwnerReviews?: boolean | undefined;
@@ -303,10 +305,10 @@ requiredConversationResolution?: boolean | undefined;
 repoVisibility?: "internal" | "private" | "public" | undefined;
 collaborators?: ({
 user: string;
-access: 'pull' | 'push' | 'admin' | 'maintain' | 'triage';
+access: string;
 } | {
 team: string;
-access: 'pull' | 'push' | 'admin' | 'maintain' | 'triage';
+access: string;
 } | {
 /** @deprecated This field is deprecated in favor of team */
 username: string;
@@ -505,6 +507,8 @@ gitAuthorName?: string | undefined;
 gitAuthorEmail?: string | undefined;
 allowRebaseMerge?: boolean | undefined;
 allowSquashMerge?: boolean | undefined;
+squashMergeCommitTitle?: "PR_TITLE" | "COMMIT_OR_PR_TITLE" | undefined;
+squashMergeCommitMessage?: "PR_BODY" | "COMMIT_MESSAGES" | "BLANK" | undefined;
 allowMergeCommit?: boolean | undefined;
 allowAutoMerge?: boolean | undefined;
 sourcePath?: string | undefined;
@@ -521,10 +525,10 @@ requiredConversationResolution?: boolean | undefined;
 repoVisibility?: "internal" | "private" | "public" | undefined;
 collaborators?: ({
 user: string;
-access: 'pull' | 'push' | 'admin' | 'maintain' | 'triage';
+access: string;
 } | {
 team: string;
-access: 'pull' | 'push' | 'admin' | 'maintain' | 'triage';
+access: string;
 } | {
 /** @deprecated This field is deprecated in favor of team */
 username: string;

package/dist/index.cjs.js

@@ -1090,7 +1090,7 @@ async function getOctokitOptions(options) {
     previews: ["nebula-preview"]
   };
 }
-async function createGithubRepoWithCollaboratorsAndTopics(client, repo, owner, repoVisibility, description, homepage, deleteBranchOnMerge, allowMergeCommit, allowSquashMerge, allowRebaseMerge, allowAutoMerge, access, collaborators, hasProjects, hasWiki, hasIssues, topics, logger) {
+async function createGithubRepoWithCollaboratorsAndTopics(client, repo, owner, repoVisibility, description, homepage, deleteBranchOnMerge, allowMergeCommit, allowSquashMerge, squashMergeCommitTitle, squashMergeCommitMessage, allowRebaseMerge, allowAutoMerge, access, collaborators, hasProjects, hasWiki, hasIssues, topics, logger) {
   const user = await client.rest.users.getByUsername({
     username: owner
   });
@@ -1103,6 +1103,8 @@ async function createGithubRepoWithCollaboratorsAndTopics(client, repo, owner, r
     delete_branch_on_merge: deleteBranchOnMerge,
     allow_merge_commit: allowMergeCommit,
     allow_squash_merge: allowSquashMerge,
+    squash_merge_commit_title: squashMergeCommitTitle,
+    squash_merge_commit_message: squashMergeCommitMessage,
     allow_rebase_merge: allowRebaseMerge,
     allow_auto_merge: allowAutoMerge,
     homepage,
@@ -1116,6 +1118,8 @@ async function createGithubRepoWithCollaboratorsAndTopics(client, repo, owner, r
     delete_branch_on_merge: deleteBranchOnMerge,
     allow_merge_commit: allowMergeCommit,
     allow_squash_merge: allowSquashMerge,
+    squash_merge_commit_title: squashMergeCommitTitle,
+    squash_merge_commit_message: squashMergeCommitMessage,
     allow_rebase_merge: allowRebaseMerge,
     allow_auto_merge: allowAutoMerge,
     homepage,
@@ -1463,6 +1467,16 @@ const allowSquashMerge = {
   type: "boolean",
   description: `Allow squash merges. The default value is 'true'`
 };
+const squashMergeCommitTitle = {
+  title: "Default squash merge commit title",
+  enum: ["PR_TITLE", "COMMIT_OR_PR_TITLE"],
+  description: `Sets the default value for a squash merge commit title. The default value is 'COMMIT_OR_PR_TITLE'`
+};
+const squashMergeCommitMessage = {
+  title: "Default squash merge commit message",
+  enum: ["PR_BODY", "COMMIT_MESSAGES", "BLANK"],
+  description: `Sets the default value for a squash merge commit message. The default value is 'COMMIT_MESSAGES'`
+};
 const allowRebaseMerge = {
   title: "Allow Rebase Merges",
   type: "boolean",
@@ -1484,8 +1498,7 @@ const collaborators = {
     properties: {
       access: {
         type: "string",
-        description: "The type of access for the user",
-        enum: ["push", "pull", "admin", "maintain", "triage"]
+        description: "The type of access for the user"
       },
       user: {
         type: "string",
@@ -1610,6 +1623,8 @@ function createGithubRepoCreateAction(options) {
           deleteBranchOnMerge: deleteBranchOnMerge,
           allowMergeCommit: allowMergeCommit,
           allowSquashMerge: allowSquashMerge,
+          squashMergeCommitTitle: squashMergeCommitTitle,
+          squashMergeCommitMessage: squashMergeCommitMessage,
           allowRebaseMerge: allowRebaseMerge,
           allowAutoMerge: allowAutoMerge,
           collaborators: collaborators,
@@ -1638,6 +1653,8 @@ function createGithubRepoCreateAction(options) {
         deleteBranchOnMerge = false,
         allowMergeCommit = true,
         allowSquashMerge = true,
+        squashMergeCommitTitle = "COMMIT_OR_PR_TITLE",
+        squashMergeCommitMessage = "COMMIT_MESSAGES",
         allowRebaseMerge = true,
         allowAutoMerge = false,
         collaborators,
@@ -1668,6 +1685,8 @@ function createGithubRepoCreateAction(options) {
         deleteBranchOnMerge,
         allowMergeCommit,
         allowSquashMerge,
+        squashMergeCommitTitle,
+        squashMergeCommitMessage,
         allowRebaseMerge,
         allowAutoMerge,
         access,
@@ -2998,6 +3017,8 @@ function createPublishGithubAction(options) {
           gitAuthorEmail: gitAuthorEmail,
           allowMergeCommit: allowMergeCommit,
           allowSquashMerge: allowSquashMerge,
+          squashMergeCommitTitle: squashMergeCommitTitle,
+          squashMergeCommitMessage: squashMergeCommitMessage,
           allowRebaseMerge: allowRebaseMerge,
           allowAutoMerge: allowAutoMerge,
           sourcePath: sourcePath,
@@ -3039,6 +3060,8 @@ function createPublishGithubAction(options) {
         gitAuthorEmail,
         allowMergeCommit = true,
         allowSquashMerge = true,
+        squashMergeCommitTitle = "COMMIT_OR_PR_TITLE",
+        squashMergeCommitMessage = "COMMIT_MESSAGES",
         allowRebaseMerge = true,
         allowAutoMerge = false,
         collaborators,
@@ -3069,6 +3092,8 @@ function createPublishGithubAction(options) {
         deleteBranchOnMerge,
         allowMergeCommit,
         allowSquashMerge,
+        squashMergeCommitTitle,
+        squashMergeCommitMessage,
         allowRebaseMerge,
         allowAutoMerge,
         access,