From 76fc5e29c9677383958d73ca10c2ae26c853ecd5 Mon Sep 17 00:00:00 2001
From: shoukoo <shoukoo.koike@gmail.com>
Date: Sun, 4 Jul 2021 08:36:16 +1000
Subject: [PATCH] feat:add default branch prop for publish:gitlab action

Signed-off-by: shoukoo <shoukoo.koike@gmail.com>
---
 .../publish/{gitab.test.ts => gitlab.test.ts} | 24 +++++++++++++++++++
 .../actions/builtin/publish/gitlab.ts         | 13 +++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 rename plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/{gitab.test.ts => gitlab.test.ts} (88%)

diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitab.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.test.ts
similarity index 88%
rename from plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitab.test.ts
rename to plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.test.ts
index 79de6fd669..67064efde7 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitab.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.test.ts
@@ -139,6 +139,30 @@ describe('publish:gitlab', () => {
 
     expect(initRepoAndPush).toHaveBeenCalledWith({
       dir: mockContext.workspacePath,
+      defaultBranch: 'master',
+      remoteUrl: 'http://mockurl.git',
+      auth: { username: 'oauth2', password: 'tokenlols' },
+      logger: mockContext.logger,
+    });
+  });
+
+  it('should call initRepoAndPush with the correct default branch', async () => {
+    mockGitlabClient.Namespaces.show.mockResolvedValue({ id: 1234 });
+    mockGitlabClient.Projects.create.mockResolvedValue({
+      http_url_to_repo: 'http://mockurl.git',
+    });
+
+    await action.handler({
+      ...mockContext,
+      input: {
+        ...mockContext.input,
+        defaultBranch: 'main',
+      },
+    });
+
+    expect(initRepoAndPush).toHaveBeenCalledWith({
+      dir: mockContext.workspacePath,
+      defaultBranch: 'main',
       remoteUrl: 'http://mockurl.git',
       auth: { username: 'oauth2', password: 'tokenlols' },
       logger: mockContext.logger,
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts
index 3f24b98e6c..57c7fdf752 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/gitlab.ts
@@ -28,6 +28,7 @@ export function createPublishGitlabAction(options: {
 
   return createTemplateAction<{
     repoUrl: string;
+    defaultBranch?: string;
     repoVisibility: 'private' | 'internal' | 'public';
     sourcePath?: string;
   }>({
@@ -48,6 +49,11 @@ export function createPublishGitlabAction(options: {
             type: 'string',
             enum: ['private', 'public', 'internal'],
           },
+          defaultBranch: {
+            title: 'Default Branch',
+            type: 'string',
+            description: `Sets the default branch on the repository. The default value is 'master'`,
+          },
           sourcePath: {
             title:
               'Path within the workspace that will be used as the repository root. If omitted, the entire workspace will be published as the repository.',
@@ -70,7 +76,11 @@ export function createPublishGitlabAction(options: {
       },
     },
     async handler(ctx) {
-      const { repoUrl, repoVisibility = 'private' } = ctx.input;
+      const {
+        repoUrl,
+        repoVisibility = 'private',
+        defaultBranch = 'master',
+      } = ctx.input;
 
       const { owner, repo, host } = parseRepoUrl(repoUrl);
 
@@ -114,6 +124,7 @@ export function createPublishGitlabAction(options: {
       await initRepoAndPush({
         dir: getRepoSourceDirectory(ctx.workspacePath, ctx.input.sourcePath),
         remoteUrl: http_url_to_repo as string,
+        defaultBranch,
         auth: {
           username: 'oauth2',
           password: integrationConfig.config.token,