Merge pull request #127 from adobe/remove-magento-team-check

DEVX-311: Update Adobe CLA bot

Author: macdonst

checker/checker.js

@@ -17,13 +17,12 @@ const utils = require('../utils.js');
 const config = utils.get_config();
 /*
 gets fired from github pr creation/update webhook.
-* Check if they are adobe/magento employee, if yes, give checkmark
+* Check if they are adobe employee, if yes, give checkmark
 * If not an employee, report back if the CLA is already signed
 * if signed, give checkmark
 * if not signed, give an 'x' and tell them to go sign at https://opensource.adobe.com/cla.html
 */
 const valid_pr_events = ['opened', 'reopened', 'synchronize'];
-const MAGENTO_EMPLOYEES_TEAM = 2032477;
 
 async function main (params) {
   if (!params.pull_request || !valid_pr_events.includes(params.action)) {
@@ -66,27 +65,11 @@ async function main (params) {
     return utils.action_error(e, 'Error retrieving GitHub API instance on behalf of app installation.');
   }
 
-  // Check if author is employee; this has separate logic for Adobe vs. Magento
-  // employees.
+  // Check if author is employee.
   let is_employee;
   if (org === 'magento') {
-    // For the magento org, we need to see if the user is a member of the
-    // magento-employees team to determine whether they are an employee
-    // m.then(gh => gh.teams.getMembership({ team_id: teamId, username: user }).then(result => console.log(`${user} is a ${result.data.state} ${result.data.role} of the magento-employees team`)).catch(err => { console.error(`${user} got membership in magento-employees team result of "${err.message}"!`); }));
-    try {
-      is_employee = await github.teams.getMembership({
-        team_id: MAGENTO_EMPLOYEES_TEAM,
-        username: user
-      });
-    } catch (e) {
-      if (e.message.includes('Not Found')) {
-        const res = await check_cla(ow, args);
-        return res;
-      } else {
-        return utils.action_error(e, 'Error during checking of Magento employees membership in the Magento org.');
-      }
-    }
-    const res = await set_green_is_adobe_employee(ow, args, org);
+    // For the magento org, we want everyone to sign the CLA
+    const res = await check_cla(ow, args);
     return res;
   } else {
     // For non-Magento orgs, as long as user is a member of the org, they are
@@ -130,7 +113,7 @@ async function main (params) {
           // the promise.
           // more details here: https://developer.github.com/v3/orgs/members/#check-public-membership
           if (public_member.status === 204) {
-            const res = await set_green_is_adobe_employee(ow, args);
+            const res = await set_green_is_adobe_employee(ow, args, 'adobe');
             return res;
           }
         } else {
@@ -285,12 +268,8 @@ async function set_green_is_bot (ow, args) {
 }
 
 async function set_green_is_adobe_employee (ow, args, membership_org) {
-  let company = 'Adobe';
-  let reason = `membership in github.com/${membership_org}`;
-  if (membership_org === 'magento') {
-    company += ' (Magento)';
-    reason = `membership in github.com/magento's employees team`;
-  }
+  const company = 'Adobe';
+  const reason = `membership in github.com/${membership_org}`;
   let result;
   try {
     result = await ow.actions.invoke({

test/integration/github.test.js

@@ -134,61 +134,6 @@ describe('github integration tests', () => {
       await teardown();
     });
   });
-  describe('pull requests from user who is a member of the adobe or magento orgs (and magento-employees team) (account adobeiotest4)', () => {
-    const user = 'adobeiotest4';
-    const newBranch = '' + new Date().valueOf();
-    const github = new Octokit({
-      auth: process.env.TEST_FOUR_PAC
-    });
-    it('should approve a pull request to an adobe repo', async () => {
-      const setup = createBranch(github, user, ADOBE_REPO, newBranch);
-      await setup();
-      console.log(`Creating pull request to adobe/${ADOBE_REPO}...`);
-      const pr = await github.pulls.create({
-        owner: 'adobe',
-        repo: ADOBE_REPO,
-        title: `testing build ${newBranch}`,
-        head: `${user}:${newBranch}`,
-        base: 'master'
-      });
-      const suite = await waitForCheck(github, 'adobe', ADOBE_REPO, pr.data.head.sha);
-      expect(suite.conclusion).toEqual('success');
-      const teardown = deleteBranch(github, user, ADOBE_REPO, newBranch);
-      await teardown();
-    });
-    it('should approve a pull request to a private magento repo', async () => {
-      const setup = createBranch(github, user, PRIVATE_MAGENTO_REPO, newBranch);
-      await setup();
-      console.log(`Creating pull request to magento/${PRIVATE_MAGENTO_REPO}...`);
-      const pr = await github.pulls.create({
-        owner: 'magento',
-        repo: PRIVATE_MAGENTO_REPO,
-        title: `testing build ${newBranch}`,
-        head: `${user}:${newBranch}`,
-        base: 'master'
-      });
-      const suite = await waitForCheck(github, 'magento', PRIVATE_MAGENTO_REPO, pr.data.head.sha);
-      expect(suite.conclusion).toEqual('success');
-      const teardown = deleteBranch(github, user, PRIVATE_MAGENTO_REPO, newBranch);
-      await teardown();
-    });
-    it('should approve a pull request to a public magento repo', async () => {
-      const setup = createBranch(github, user, PUBLIC_MAGENTO_REPO, newBranch);
-      await setup();
-      console.log(`Creating pull request to magento/${PUBLIC_MAGENTO_REPO}...`);
-      const pr = await github.pulls.create({
-        owner: 'magento',
-        repo: PUBLIC_MAGENTO_REPO,
-        title: `testing build ${newBranch}`,
-        head: `${user}:${newBranch}`,
-        base: 'master'
-      });
-      const suite = await waitForCheck(github, 'magento', PUBLIC_MAGENTO_REPO, pr.data.head.sha);
-      expect(suite.conclusion).toEqual('success');
-      const teardown = deleteBranch(github, user, PUBLIC_MAGENTO_REPO, newBranch);
-      await teardown();
-    });
-  });
   describe('pull requests from user with a signed Adobe ICLA (account adobeiotest1)', () => {
     const user = 'adobeiotest1';
     const newBranch = '' + new Date().valueOf();

test/unit/checker.test.js

@@ -44,9 +44,6 @@ describe('checker action', function () {
         orgs: {
           checkMembership: jasmine.createSpy('orgs.checkMembership spy'),
           checkPublicMembership: jasmine.createSpy('orgs.checkPublicMembership spy')
-        },
-        teams: {
-          getMembership: jasmine.createSpy('team.getMembership spy')
         }
       };
       app_spy = jasmine.createSpy('github app spy').and.returnValue({
@@ -119,7 +116,7 @@ describe('checker action', function () {
       expect(response.statusCode).toBe(200);
     });
     describe('for PRs issued to the magento github organization', () => {
-      it('should invoke the setgithubcheck action with a status of completed if user is a member of the magento employees team', async function () {
+      it('should invoke the setgithubcheck action with a status of completed if user has signed a cla', async function () {
         const params = {
           pull_request: {
             user: { login: 'hiren' },
@@ -134,35 +131,6 @@ describe('checker action', function () {
           action: 'opened',
           installation: { id: '5431' }
         };
-        github_api_stub.teams.getMembership.and.returnValue(Promise.resolve({
-          status: 204
-        }));
-        openwhisk_stub.actions.invoke.and.returnValue(Promise.resolve({}));
-        const response = await checker.main(params);
-        const action_invoke_args = openwhisk_stub.actions.invoke.calls.mostRecent().args[0];
-        expect(action_invoke_args.name).toBe('cla-setgithubcheck');
-        expect(action_invoke_args.params.status).toBe('completed');
-        expect(action_invoke_args.params.title).toContain('Adobe (Magento) Employee');
-        expect(response.statusCode).toBe(200);
-      });
-      it('should invoke the setgithubcheck action with a status of completed if user is not a member of the magento org but has signed a cla', async function () {
-        const params = {
-          pull_request: {
-            user: { login: 'hiren' },
-            base: {
-              repo: {
-                owner: { login: 'magento' },
-                name: 'magento2'
-              }
-            },
-            head: { sha: '12345' }
-          },
-          action: 'opened',
-          installation: { id: '5431' }
-        };
-        github_api_stub.teams.getMembership.and.returnValue(Promise.reject({
-          message: 'Not Found'
-        }));
         request_spy.and.callFake(function (options) {
           if (options.url.includes('agreements')) {
             return Promise.resolve({
@@ -195,7 +163,7 @@ describe('checker action', function () {
         expect(action_invoke_args.params.title).toContain('CLA Signed');
         expect(response.statusCode).toBe(200);
       });
-      it(`should invoke the setgithubcheck action with a conclusion of action_required if user is not a member of the magento org and no agreements are found containing the user's github username`, async function () {
+      it(`should invoke the setgithubcheck action with a conclusion of action_required if user no agreements are found containing the user's github username`, async function () {
         const params = {
           pull_request: {
             user: { login: 'hiren' },
@@ -210,9 +178,6 @@ describe('checker action', function () {
           action: 'opened',
           installation: { id: '5431' }
         };
-        github_api_stub.teams.getMembership.and.returnValue(Promise.reject({
-          message: 'Not Found'
-        }));
         request_spy.and.callFake(function (options) {
           if (options.url.includes('agreements')) {
             return Promise.resolve({
@@ -245,7 +210,7 @@ describe('checker action', function () {
         expect(action_invoke_args.params.title).toContain('Sign the Adobe CLA');
         expect(response.statusCode).toBe(200);
       });
-      it('should invoke the setgithubcheck action with a conclusion of action_required if user is not a member of the magento org and zero signed CLAs exist', async function () {
+      it('should invoke the setgithubcheck action with a conclusion of action_required if zero signed CLAs exist', async function () {
         const params = {
           pull_request: {
             user: { login: 'hiren' },
@@ -260,9 +225,6 @@ describe('checker action', function () {
           action: 'opened',
           installation: { id: '5431' }
         };
-        github_api_stub.teams.getMembership.and.returnValue(Promise.reject({
-          message: 'Not Found'
-        }));
         request_spy.and.callFake(function (options) {
           if (options.url.includes('agreements')) {
             return Promise.resolve({ userAgreementList: [] });