From 72d6b9f4e2a62e29024e6cbf52b83413fe63f54b Mon Sep 17 00:00:00 2001
From: Maurice Mohlek <maurice.mohlek@valtech.de>
Date: Fri, 13 Jan 2023 13:31:18 +0100
Subject: [PATCH] default commit msgs for bitbucketServer

Signed-off-by: Maurice Mohlek <maurice.mohlek@valtech.de>
---
 .changeset/red-pens-tickle.md                 |  5 +++
 .../builtin/publish/bitbucketServer.ts        | 35 ++++++++++++++++---
 2 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 .changeset/red-pens-tickle.md

diff --git a/.changeset/red-pens-tickle.md b/.changeset/red-pens-tickle.md
new file mode 100644
index 0000000000..2a09f6c7e6
--- /dev/null
+++ b/.changeset/red-pens-tickle.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend': patch
+---
+
+Override default commit message and author details in BitbucketServer
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketServer.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketServer.ts
index d0cde4ad31..eec9587365 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketServer.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/bitbucketServer.ts
@@ -130,6 +130,9 @@ export function createPublishBitbucketServerAction(options: {
     sourcePath?: string;
     enableLFS?: boolean;
     token?: string;
+    gitCommitMessage?: string;
+    gitAuthorName?: string;
+    gitAuthorEmail?: string;
   }>({
     id: 'publish:bitbucketServer',
     description:
@@ -174,6 +177,21 @@ export function createPublishBitbucketServerAction(options: {
             description:
               'The token to use for authorization to BitBucket Server',
           },
+          gitCommitMessage: {
+            title: 'Git Commit Message',
+            type: 'string',
+            description: `Sets the commit message on the repository. The default value is 'initial commit'`,
+          },
+          gitAuthorName: {
+            title: 'Default Author Name',
+            type: 'string',
+            description: `Sets the default author name for the commit. The default value is 'Scaffolder'`,
+          },
+          gitAuthorEmail: {
+            title: 'Default Author Email',
+            type: 'string',
+            description: `Sets the default author email for the commit.`,
+          },
         },
       },
       output: {
@@ -197,6 +215,9 @@ export function createPublishBitbucketServerAction(options: {
         defaultBranch = 'master',
         repoVisibility = 'private',
         enableLFS = false,
+        gitCommitMessage = 'initial commit',
+        gitAuthorName,
+        gitAuthorEmail,
       } = ctx.input;
 
       const { project, repo, host } = parseRepoUrl(repoUrl, integrations);
@@ -241,8 +262,12 @@ export function createPublishBitbucketServerAction(options: {
       });
 
       const gitAuthorInfo = {
-        name: config.getOptionalString('scaffolder.defaultAuthor.name'),
-        email: config.getOptionalString('scaffolder.defaultAuthor.email'),
+        name: gitAuthorName
+          ? gitAuthorName
+          : config.getOptionalString('scaffolder.defaultAuthor.name'),
+        email: gitAuthorEmail
+          ? gitAuthorEmail
+          : config.getOptionalString('scaffolder.defaultAuthor.email'),
       };
 
       const auth = authConfig.token
@@ -260,9 +285,9 @@ export function createPublishBitbucketServerAction(options: {
         auth,
         defaultBranch,
         logger: ctx.logger,
-        commitMessage: config.getOptionalString(
-          'scaffolder.defaultCommitMessage',
-        ),
+        commitMessage: gitCommitMessage
+          ? gitCommitMessage
+          : config.getOptionalString('scaffolder.defaultCommitMessage'),
         gitAuthorInfo,
       });