1.0.0

AUTHORS.md

@@ -0,0 +1,3 @@
+### Authors
+
+- joe fleming ([w33ble](https://github.com/w33ble))

CHANGELOG.md

@@ -0,0 +1,11 @@
+### Changelog
+
+### [v1.0.0](https://git.w33ble.com/w33ble/gh-action-bot/compare/v0.1.0...v1.0.0) (18 October 2018)
+- feat: allow filtering by pr author [`68cccb7`](https://git.w33ble.com/w33ble/gh-action-bot/commit/68cccb72a9801c502003c7b913844fc01721a6e3)
+
+#### v0.1.0 (18 October 2018)
+- docs: update readme, add sample env [`a28d6a2`](https://git.w33ble.com/w33ble/gh-action-bot/commit/a28d6a25096efb9c8acea3e8d26e7f7f50dfd6b5)
+- feat: add retest comment, delete it [`ced41f4`](https://git.w33ble.com/w33ble/gh-action-bot/commit/ced41f4a495823205e5769e4531f923a982d29b4)
+- feat: process 2 pages of events [`c117cb8`](https://git.w33ble.com/w33ble/gh-action-bot/commit/c117cb847d5cb7a6b57b705e0c192cc725c0d646)
+- feat: fetch data for prs that need retest [`d1cfd7c`](https://git.w33ble.com/w33ble/gh-action-bot/commit/d1cfd7c20b17802f2de1b9153ae9a8392ed1bc44)
+- feat: add history tracking [`b6b5c27`](https://git.w33ble.com/w33ble/gh-action-bot/commit/b6b5c27ffc43ff2e1c1ccf041958021cf7c8c4d4)

README.md

@@ -1,10 +1,16 @@
 # gh-action-bot
 
-Action bot for Github.
+Action bot for Github. Checks a repo's event stream and leaves a ghost comment when your criteria is met.
 
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/w33ble/gh-action-bot/master/LICENSE)
-[![npm](https://img.shields.io/npm/v/gh-action-bot.svg)](https://www.npmjs.com/package/gh-action-bot)
-[![Project Status](https://img.shields.io/badge/status-experimental-orange.svg)](https://nodejs.org/api/documentation.html#documentation_stability_index)
+[![Project Status](https://img.shields.io/badge/status-stable-green.svg)](https://nodejs.org/api/documentation.html#documentation_stability_index)
+
+## Usage
+
+`node . owner/repo`
+
+You'll need to set some environment flags. Check `sample-env` for what is available, and you can copy the file to `.env` in the root and add your settings there as well.
+
 
 #### License
 

package.json

@@ -1,6 +1,7 @@
 {
   "name": "gh-action-bot",
-  "version": "0.0.0",
+  "version": "1.0.0",
+  "private": true,
   "description": "Action bot for Github",
   "main": "index",
   "module": "index.mjs",

sample-env

@@ -0,0 +1,7 @@
+GITHUB_ACCESS_TOKEN=xxx
+COMMENT_ACTOR=username
+COMMENT_BODY_REGEXP=build failed
+COMMENT_BODY_REGEXP_FLAGS=i
+PULL_LABEL_FILTER=
+PULL_AUTHOR_FILTER=
+PULL_RETEST_BODY=retest

src/index.mjs

@@ -1,79 +1,82 @@
+import dotenv from 'dotenv';
 import createRepo from './lib/create_repo.mjs';
 import getComments from './lib/get_comments.mjs';
 import getPull from './lib/get_pull.mjs';
 import getCommits from './lib/get_commits.mjs';
 import getCommitStatus from './lib/get_commit_status.mjs';
+import { createComment, deleteComment } from './lib/comments.mjs';
 import History from './lib/history.mjs';
 
+// load env vars from .env file
+dotenv.config();
+
 export default async function() {
   // parse repo name from cli and create repo instance
   const repo = createRepo(process.argv.splice(2)[0]);
+  const {
+    COMMENT_BODY_REGEXP,
+    COMMENT_BODY_REGEXP_FLAGS,
+    COMMENT_ACTOR,
+    PULL_LABEL_FILTER,
+    PULL_AUTHOR_FILTER,
+    PULL_RETEST_BODY,
+  } = process.env;
 
   // load the history module
   const history = new History();
 
   // fetch comment info from event stream, filter for only new comments
   const comments = (await getComments(repo, {
-    body: /build failed/i,
-    actor: 'elasticmachine',
-  })).filter(comment => true /*!history.get(comment.id)*/);
+    body: new RegExp(COMMENT_BODY_REGEXP, COMMENT_BODY_REGEXP_FLAGS),
+    actor: COMMENT_ACTOR,
+  })).filter(comment => !history.get(comment.id));
 
-  console.log(
-    comments
-      .map(comment => {
-        history.add(comment); // temp
-        return comment.number;
-      })
-      .join(',')
-  );
-
-  // read pull data, filter out any closed pulls
+  // read pull data
   const pulls = (await Promise.all(
     comments.map(async comment => {
       const pull = await getPull(repo, comment.number);
-      if (pull.state !== 'open') return false;
+
+      if (pull.state !== 'open') return false; // filter out any closed pulls
+      if (PULL_AUTHOR_FILTER && !pull.owner !== PULL_AUTHOR_FILTER) return false; // filter on owner
+      if (PULL_LABEL_FILTER && !pull.labels.includes(PULL_LABEL_FILTER)) return false; // filter on label
+
       return { comment, pull };
     })
   )).filter(Boolean);
 
-  const commits = await Promise.all(pulls.map(pull => getCommits(repo, pull.number, true)));
-
-  const buildStatus = await getCommitStatus(repo, commits[1].sha);
-
-  console.log(buildStatus);
-  process.exit();
-
-  Promise.resolve()
-
-    .then(commit =>
-      // get the status of the commit
-      repo.commits(commit.sha).statuses.fetch()
-    )
-    .then(statuses => {
-      if (statuses.lastPage) return statuses.lastPage.fetch();
-      return statuses;
+  const records = (await Promise.all(
+    pulls.map(async ({ pull, comment }) => {
+      const commit = await getCommits(repo, pull.number, true);
+      const buildStatus = await getCommitStatus(repo, commit.sha);
+      // do nothing if the build has not started, or is pending or successful
+      if (!buildStatus || buildStatus.state === 'pending' || buildStatus.state === 'success')
+        return false;
+      return { comment, pull, commit, buildStatus };
     })
-    .then(({ items }) => {
-      const buildStatus = items.find(item => item.context === 'kibana-ci');
-      // status will be one of: error, failure, pending, success
-      // we should skip the retest if the state is pending or success
-      console.log(`PR state: ${buildStatus.state}`);
-      return buildStatus;
+  )).filter(Boolean);
+
+  console.log(`Found ${records.length} outstanding failures`);
+
+  await Promise.all(
+    records.map(async record => {
+      console.log(`Re-testing PR #${record.pull.number}`);
+      const comment = await createComment(repo, records[0].pull.number, PULL_RETEST_BODY);
+      await deleteComment(repo, comment.id);
     })
-    .catch(err => console.error(err));
+  );
 
   /*
 
   TODO:
 
-  - [ ] keep track of seen comment ids, only process new ones
+  - [x] keep track of seen comment ids, only process new ones
   - [x] check the pr's status and only retest if no longer "Pending"
-  - [ ] add a retest comment
+  - [x] add a retest comment
     - POST /repos/:owner/:repo/issues/:number/comments
+  - [x] delete the retest comment
   - [ ] delete the build comment
-    - DELETE /repos/:owner/:repo/issues/comments/:comment_id
   - [ ] delete ALL build failure comments
-  - [ ] delete the retest comment
+    - DELETE /repos/:owner/:repo/issues/comments/:comment_id
 
   */
 }

src/lib/comments.mjs

@@ -0,0 +1,7 @@
+export async function createComment(repo, issueId, body) {
+  return repo.issues(issueId).comments.create({ body });
+}
+
+export async function deleteComment(repo, commentId) {
+  return repo.issues.comments(commentId).remove();
+}

src/lib/create_repo.mjs

@@ -8,8 +8,11 @@ function usageError() {
 
 export default function(repo) {
   if (typeof repo !== 'string' || repo.length === 0) usageError();
+  const settings = {
+    token: process.env.GITHUB_ACCESS_TOKEN,
+  };
 
-  const octo = new Octokat();
+  const octo = new Octokat(settings);
   const [owner, name] = repo.split('/');
 
   if (!owner || !name) usageError();

src/lib/get_comments.mjs

@@ -1,8 +1,17 @@
 export default async function getEvents(repo, { body, actor } = {}) {
-  return cache;
-  const { items: events } = await repo.events.fetch();
+  const events = await repo.events.fetch();
 
-  return events
+  const items = await (async () => {
+    // process 2 pages of events
+    if (events.nextPage) {
+      const moreEvents = await events.nextPage.fetch();
+      return [...events.items, ...moreEvents.items];
+    }
+
+    return events.items;
+  })();
+
+  return items
     .map(comment => {
       // only comments created by specific user
       if (comment.type !== 'IssueCommentEvent') return false;
@@ -22,67 +31,3 @@ export default async function getEvents(repo, { body, actor } = {}) {
     })
     .filter(Boolean);
 }
-
-const cache = [ { id: '8438445273',
-number: 23819,
-owner: 'mattapperson',
-labels: [ ':Beats', 'beats-cm' ],
-comment_id: 430790622,
-comment_author: 'elasticmachine',
-comment_body: '## :broken_heart: Build Failed\n* [continuous-integration/kibana-ci/pull-request](https://kibana-ci.elastic.co/job/elastic-kibana-pull-request/5174/)\n\n' },
-{ id: '8438364880',
-number: 24158,
-owner: 'joshdover',
-labels: [],
-comment_id: 430786140,
-comment_author: 'elasticmachine',
-comment_body: '## :broken_heart: Build Failed\n* [continuous-integration/kibana-ci/pull-request](https://kibana-ci.elastic.co/job/elastic-kibana-pull-request/5153/)\n\n' },
-{ id: '8438241644',
-number: 24104,
-owner: 'graphaelli',
-labels: [],
-comment_id: 430777985,
-comment_author: 'elasticmachine',
-comment_body: '## :broken_heart: Build Failed\n* [continuous-integration/kibana-ci/pull-request](https://kibana-ci.elastic.co/job/elastic-kibana-pull-request/5150/)\n\n' },
-{ id: '8438206753',
-number: 24158,
-owner: 'joshdover',
-labels: [],
-comment_id: 430775791,
-comment_author: 'elasticmachine',
-comment_body: '## :broken_heart: Build Failed\n* [continuous-integration/kibana-ci/pull-request](https://kibana-ci.elastic.co/job/elastic-kibana-pull-request/5147/)\n\n' },
-{ id: '8438199856',
-number: 23819,
-owner: 'mattapperson',
-labels: [ ':Beats', 'beats-cm' ],
-comment_id: 430775402,
-comment_author: 'elasticmachine',
-comment_body: '## :broken_heart: Build Failed\n* [continuous-integration/kibana-ci/pull-request](https://kibana-ci.elastic.co/job/elastic-kibana-pull-request/5165/)\n\n' },
-{ id: '8438188563',
-number: 23648,
-owner: 'jbudz',
-labels: [ ':Operations' ],
-comment_id: 430774756,
-comment_author: 'elasticmachine',
-comment_body: '## :broken_heart: Build Failed\n* [continuous-integration/kibana-ci/pull-request](https://kibana-ci.elastic.co/job/elastic-kibana-pull-request/5144/)\n\n' },
-{ id: '8438183173',
-number: 24038,
-owner: 'cqliu1',
-labels: [ ':Canvas', ':Home', 'review', 'v6.5.0', 'v7.0.0' ],
-comment_id: 430774424,
-comment_author: 'elasticmachine',
-comment_body: '## :broken_heart: Build Failed\n* [continuous-integration/kibana-ci/pull-request](https://kibana-ci.elastic.co/job/elastic-kibana-pull-request/5145/)\n\n' },
-{ id: '8438163617',
-number: 24100,
-owner: 'jakelandis',
-labels: [ 'v6.5.0', 'v7.0.0' ],
-comment_id: 430773251,
-comment_author: 'elasticmachine',
-comment_body: '## :broken_heart: Build Failed\n* [continuous-integration/kibana-ci/pull-request](https://kibana-ci.elastic.co/job/elastic-kibana-pull-request/5142/)\n\n' },
-{ id: '8438139342',
-number: 24153,
-owner: 'cchaos',
-labels: [ 'backport' ],
-comment_id: 430771841,
-comment_author: 'elasticmachine',
-comment_body: '## :broken_heart: Build Failed\n* [continuous-integration/kibana-ci/pull-request](https://kibana-ci.elastic.co/job/elastic-kibana-pull-request/5143/)\n\n' } ];

src/lib/get_commit_status.mjs

@@ -9,7 +9,6 @@ function getBuildStatus({ items: statuses }) {
 }
 
 export default async function getCommitStatus(repo, sha) {
-  return cache
   const statuses = await repo.commits(sha).statuses.fetch();
 
   const buildStatus = await (async stats => {
@@ -21,7 +20,3 @@ export default async function getCommitStatus(repo, sha) {
 
   return buildStatus;
 }
-
-const cache = { id: 5666338700,
-  url: 'https://api.github.com/repos/elastic/kibana/statuses/5f948924cc4fe34c7b9399e685927e93a18d7450',
-  state: 'pending' };

src/lib/get_commits.mjs

@@ -3,7 +3,7 @@ function formatCommit(commit) {
     sha: commit.sha,
     owner: commit.committer.login,
     message: commit.commit.message,
-  }
+  };
 }
 
 function formatCommits(commits, lastOnly) {
@@ -12,7 +12,6 @@ function formatCommits(commits, lastOnly) {
 }
 
 export default async function getCommits(repo, id, lastOnly = true) {
-  return cache;
   const commits = await repo.pulls(id).commits.fetch();
 
   if (commits.lastPage) {
@@ -22,7 +21,3 @@ export default async function getCommits(repo, id, lastOnly = true) {
 
   return formatCommits(commits.items, lastOnly);
 }
-
-const cache = { sha: '5f948924cc4fe34c7b9399e685927e93a18d7450',
-owner: 'mattapperson',
-message: 'Merge branch \'feature/x-pack/management/beats\' of github.com:elastic/kibana into feature/x-pack/management/beats' };

src/lib/get_pull.mjs

@@ -1,15 +1,12 @@
 export default async function getPull(repo, id) {
-  return cache;
   const pull = await repo.pulls(id).fetch();
   return {
     id: pull.id,
     url: pull.url,
     number: pull.number,
+    owner: pull.user.login,
     state: pull.state,
+    title: pull.title,
+    labels: pull.labels.map(label => label.name),
   };
 }
-
-const cache = { id: 220387229,
-  url: 'https://api.github.com/repos/elastic/kibana/pulls/23819',
-  number: 23819,
-  state: 'open' };