added better resiliency/null checks in combined logic; added

team_reviewers to action.yml
gr2m · Dec 22, 2021 · 57e75b2 · 57e75b2
1 parent d376ab1
commit 57e75b2
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 13 deletions.
diff --git a/action.yml b/action.yml
@@ -39,6 +39,9 @@ inputs:
   reviewers:
     description: Comma separated list of reviewers to apply to the pull request
     required: false
+  team_reviewers:
+    description: Comma separated list of team reviewers to apply to the pull request
+    required: false
   auto-merge:
     description: "Enable auto merge for pull request. Requires auto merging to be enabled in repository settings"
     required: false

diff --git a/index.js b/index.js
@@ -225,22 +225,47 @@ async function main() {
     }
 
     if (inputs.reviewers || inputs.team_reviewers) {
-      core.debug(`Adding reviewers: ${inputs.reviewers}`);
-      core.debug(`Adding team reviewers: ${inputs.team_reviewers}`);
-      const reviewers = inputs.reviewers.trim().split(/\s*,\s*/);
-      const team_reviewers = inputs.team_reviewers.trim().split(/\s*,\s*/);
-      const { data } = await octokit.request(
-        `POST /repos/{owner}/{repo}/pulls/{pull_number}/requested_reviewers`,
-        {
-          owner,
-          repo,
-          pull_number: number,
-          reviewers,
+      let params = {
+        owner,
+        repo,
+        pull_number: number
+      }
+      let reviewers = null;
+      let team_reviewers = null;
+
+      if(inputs.reviewers) { 
+        core.debug(`Adding reviewers: ${inputs.reviewers}`) 
+        reviewers = (inputs.reviewers ?? "").trim().split(/\s*,\s*/);
+
+        params = {
+          ...params,
+          reviewers
+        }
+      };
+
+      if(inputs.team_reviewers) {
+        core.debug(`Adding team reviewers: ${inputs.team_reviewers}`) 
+        team_reviewers = (inputs.team_reviewers ?? "").trim().split(/\s*,\s*/);
+
+        params = {
+          ...params,
           team_reviewers
         }
+      } ;
+
+      const { data } = await octokit.request(
+        `POST /repos/{owner}/{repo}/pulls/{pull_number}/requested_reviewers`,
+        params
       );
-      core.info(`Reviewers added: ${reviewers.join(", ")}`);
-      core.info(`Team reviewers added: ${team_reviewers.join(", ")}`);
+
+      if(reviewers) {
+        core.info(`Reviewers added: ${reviewers.join(", ")}`);
+      }
+
+      if(team_reviewers) {
+        core.info(`Team reviewers added: ${team_reviewers.join(", ")}`);
+      }
+
       core.debug(inspect(data));
     }