Merge pull request #124 from johnsanthosh/jsanthosh-support-username-suffix

Support for username suffixes.

Author: decompil3d

.env.example

@@ -50,3 +50,6 @@ JIRA_PASSWORD=
 
 # Optional message to greet your new contributors
 #WELCOME_MESSAGE="Hey there, thanks for contributing to the project!"
+
+# Optional variable if defined, appends a suffix to the username pulled out from the email address, before checking if the user is a collaborator in the repo.
+#GITHUB_USER_SUFFIX="someusernamesuffix"

plugins/reviewers/index.js

@@ -216,7 +216,7 @@ export default class ReviewerPlugin extends BasePlugin {
       }
       const matches = REVIEWER_REGEX.exec(testSubject);
       if (!matches) return testSubject;
-      return matches[1];
+      return `${matches[1]}${process.env.GITHUB_USER_SUFFIX || ''}`;
     }).filter(r => {
       if (!r) return false;
       return r !== context.payload.pull_request.user.login;

test/unit/plugins/reviewers.test.js

@@ -20,6 +20,7 @@ const reviewersPlugin = new ReviewersPlugin();
 describe('ReviewersPlugin', function () {
   afterEach(function () {
     sandbox.restore();
+    delete process.env.GITHUB_USER_SUFFIX;
   });
 
   let mockContext;
@@ -477,5 +478,39 @@ describe('ReviewersPlugin', function () {
         'hobjectson'
       ]);
     });
+
+    it('properly gets filtered users with suffix from the reviewers list if GITHUB_USER_SUFFIX is set.', async function () {
+      process.env.GITHUB_USER_SUFFIX = '-coolsuffix';
+      userExistsStub.resolves({ status: 204 });
+      userExistsStub
+        .withArgs(
+          sinon.match({
+            username: 'Bob McNoEmail',
+          })
+        )
+        .resolves({ status: 404 });
+      // @ts-ignore
+      const users = await reviewersPlugin.getUsersFromReviewersList(
+        mockContext,
+        [
+          'Joe Schmoe <jschmoe@test.com>',
+          'John Doe <jdoe@test.com>',
+          'Bob McNoEmail',
+          {
+            name: 'Hans Objectson',
+            email: 'hobjectson@test.com',
+          },
+          {
+            name: 'Billy ObjectNoEmailHeimer',
+          },
+          12345
+        ]
+      );
+      assume(users).eqls([
+        'jschmoe-coolsuffix',
+        'jdoe-coolsuffix',
+        'hobjectson-coolsuffix'
+      ]);
+    });
   });
 });