From d57967cbd38c68d335099b1e288e2825a5dee4fd Mon Sep 17 00:00:00 2001
From: Brian Fletcher <brian@roadie.io>
Date: Thu, 8 Aug 2024 14:08:23 +0100
Subject: [PATCH] adds ability to configure the commit message when
 initializating a repo

Signed-off-by: Brian Fletcher <brian@roadie.io>
---
 .changeset/five-mangos-agree.md                     |  5 +++++
 .../src/actions/bitbucketCloud.ts                   | 13 ++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 .changeset/five-mangos-agree.md

diff --git a/.changeset/five-mangos-agree.md b/.changeset/five-mangos-agree.md
new file mode 100644
index 0000000000..1ad9b6b04c
--- /dev/null
+++ b/.changeset/five-mangos-agree.md
@@ -0,0 +1,5 @@
+---
+'@backstage/plugin-scaffolder-backend-module-bitbucket-cloud': patch
+---
+
+Add abilty to set the initial commit message when initializing a repository using the scaffolder action.
diff --git a/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloud.ts b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloud.ts
index 99e8e52a43..71eacea955 100644
--- a/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloud.ts
+++ b/plugins/scaffolder-backend-module-bitbucket-cloud/src/actions/bitbucketCloud.ts
@@ -111,6 +111,7 @@ export function createPublishBitbucketCloudAction(options: {
     description?: string;
     defaultBranch?: string;
     repoVisibility?: 'private' | 'public';
+    gitCommitMessage?: string;
     sourcePath?: string;
     token?: string;
   }>({
@@ -141,6 +142,11 @@ export function createPublishBitbucketCloudAction(options: {
             type: 'string',
             description: `Sets the default branch on the repository. The default value is 'master'`,
           },
+          gitCommitMessage: {
+            title: 'Git Commit Message',
+            type: 'string',
+            description: `Sets the commit message on the repository. The default value is 'initial commit'`,
+          },
           sourcePath: {
             title: 'Source Path',
             description:
@@ -178,6 +184,7 @@ export function createPublishBitbucketCloudAction(options: {
         repoUrl,
         description,
         defaultBranch = 'master',
+        gitCommitMessage,
         repoVisibility = 'private',
       } = ctx.input;
 
@@ -256,9 +263,9 @@ export function createPublishBitbucketCloudAction(options: {
         auth,
         defaultBranch,
         logger: ctx.logger,
-        commitMessage: config.getOptionalString(
-          'scaffolder.defaultCommitMessage',
-        ),
+        commitMessage:
+          gitCommitMessage ||
+          config.getOptionalString('scaffolder.defaultCommitMessage'),
         gitAuthorInfo,
       });