From 25e8598339245d6b2666df911963a20c37898af2 Mon Sep 17 00:00:00 2001
From: fabuloso <dalfovo.alessandro@gmail.com>
Date: Mon, 23 May 2022 15:51:02 +0200
Subject: [PATCH] Allow adding user as collaborator to publish:github action

Signed-off-by: fabuloso <dalfovo.alessandro@gmail.com>
---
 .../actions/builtin/publish/github.test.ts    |  8 ++--
 .../actions/builtin/publish/github.ts         | 37 +++++++++++--------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
index f1a6c9bfe8..2ab3cfb523 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.test.ts
@@ -399,11 +399,11 @@ describe('publish:github', () => {
         collaborators: [
           {
             access: 'pull',
-            username: 'robot-1',
+            team: 'robot-1'
           },
           {
             access: 'push',
-            username: 'robot-2',
+            team: 'robot-2',
           },
         ],
       },
@@ -465,11 +465,11 @@ describe('publish:github', () => {
         collaborators: [
           {
             access: 'pull',
-            username: 'robot-1',
+            team: 'robot-1',
           },
           {
             access: 'push',
-            username: 'robot-2',
+            team: 'robot-2',
           },
         ],
       },
diff --git a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
index 1f9125d962..3deb074a1b 100644
--- a/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/actions/builtin/publish/github.ts
@@ -58,7 +58,8 @@ export function createPublishGithubAction(options: {
     requiredStatusCheckContexts?: string[];
     repoVisibility?: 'private' | 'internal' | 'public';
     collaborators?: Array<{
-      username: string;
+      username?: string;
+      team?: string;
       access: 'pull' | 'push' | 'admin' | 'maintain' | 'triage';
     }>;
     token?: string;
@@ -158,7 +159,7 @@ export function createPublishGithubAction(options: {
             type: 'array',
             items: {
               type: 'object',
-              required: ['username', 'access'],
+              required: ['access'],
               properties: {
                 access: {
                   type: 'string',
@@ -167,8 +168,12 @@ export function createPublishGithubAction(options: {
                 },
                 username: {
                   type: 'string',
-                  description: 'The username or group',
+                  description: 'The username',
                 },
+                team: {
+                  type: 'string',
+                  description: 'The team name'
+                }
               },
             },
           },
@@ -299,22 +304,24 @@ export function createPublishGithubAction(options: {
       }
 
       if (collaborators) {
-        for (const {
-          access: permission,
-          username: team_slug,
-        } of collaborators) {
+        for (const collaborator of collaborators) {
           try {
-            await client.rest.teams.addOrUpdateRepoPermissionsInOrg({
-              org: owner,
-              team_slug,
-              owner,
-              repo,
-              permission,
-            });
+            if (collaborator.username) {
+              await client.rest.repos.addCollaborator({ owner, repo, username: collaborator.username, permissions: collaborator.access });
+            }
+            else {
+              await client.rest.teams.addOrUpdateRepoPermissionsInOrg({
+                org: owner,
+                team_slug: collaborator.team,
+                owner,
+                repo,
+                permission: collaborator.access,
+              });
+            }
           } catch (e) {
             assertError(e);
             ctx.logger.warn(
-              `Skipping ${permission} access for ${team_slug}, ${e.message}`,
+              `Skipping ${collaborator.access} access for ${collaborator.team}, ${e.message}`,
             );
           }
         }