Testing webhooks and node core labels

lib/github-events.js

@@ -1,12 +1,6 @@
-const crypto = require('crypto')
 const debug = require('debug')('github-events')
 
-const secret = process.env.GITHUB_WEBHOOK_SECRET || 'hush-hush'
-
-const sign = (secret, data) => {
- const buffer = new Buffer(data, 'utf8')
- return 'sha1=' + crypto.createHmac('sha1', secret).update(buffer).digest('hex')
-}
+const githubSecret = require('./github-secret')
 
 module.exports = (app) => {
  app.post('/hooks/github', (req, res) => {
@@ -16,16 +10,15 @@ module.exports = (app) => {
  return res.end()
  }
 
- const signature = req.headers['x-hub-signature']
- const data = req.body
- data.action = data.action ? event + '.' + data.action : event
-
- if (!signature || signature !== sign(secret, req.raw)) {
+ if (!githubSecret.isValid(req)) {
  res.writeHead(401, 'Invalid Signature')
  req.log.error('Invalid GitHub event signature, returning 401')
  return res.end()
  }
 
+ const data = req.body
+ data.action = data.action ? event + '.' + data.action : event
+
  res.end()
 
  app.emitGhEvent(data, req.log)

lib/github-secret.js

@@ -0,0 +1,13 @@
+const crypto = require('crypto')
+
+const secret = process.env.GITHUB_WEBHOOK_SECRET || 'hush-hush'
+
+function sign (data) {
+ const buffer = new Buffer(data, 'utf8')
+ return 'sha1=' + crypto.createHmac('sha1', secret).update(buffer).digest('hex')
+}
+
+exports.isValid = function isValid (req) {
+ const signature = req.headers['x-hub-signature']
+ return signature && signature === sign(req.raw)
+}

lib/node-repo.js

@@ -25,41 +25,17 @@ function updatePrWithLabels (options, labels) {
  return
  }
 
- fetchExistingLabels(options, (err, existingLabels) => {
- if (err) {
- return
- }
-
- const mergedLabels = labels.concat(existingLabels)
-
- githubClient.issues.edit({
- user: options.owner,
- repo: options.repo,
- number: options.prId,
- labels: mergedLabels
- }, (err) => {
- if (err) {
- return options.logger.error(err, 'Error while editing issue to add labels')
- }
-
- options.logger.info(`Added labels: ${labels}`)
- })
- })
-}
-
-function fetchExistingLabels (options, cb) {
- githubClient.issues.getIssueLabels({
+ githubClient.issues.addLabels({
  user: options.owner,
  repo: options.repo,
- number: options.prId
- }, (err, res) => {
+ number: options.prId,
+ body: labels
+ }, (err) => {
  if (err) {
- options.logger.error(err, 'Error while fetching existing issue labels')
- return cb(err)
+ return options.logger.error(err, 'Error while editing issue to add labels')
  }
 
- const existingLabels = res.map((labelMeta) => labelMeta.name)
- cb(null, existingLabels)
+ options.logger.info(`Added labels: ${labels}`)
  })
 }
 

lib/pollTravis.js

@@ -94,7 +94,7 @@ function pollTravisBuildBySha (options, checkNumber = 1) {
 
 function createGhStatusFn (options) {
  return (state, travisId, message) => {
- githubClient.statuses.create({
+ githubClient.repos.createStatus({
  user: options.owner,
  repo: options.repo,
  sha: options.lastCommit.sha,

lib/push-jenkins-update.js

@@ -80,7 +80,7 @@ function findLatestCommitInPr (options, cb) {
 }
 
 function createGhStatus (options, logger) {
- githubClient.statuses.create({
+ githubClient.repos.createStatus({
  user: options.owner,
  repo: options.repo,
  sha: options.sha,

package.json

@@ -4,7 +4,7 @@
  "description": "Node.js GitHub Bot",
  "scripts": {
  "start": "node server.js | bunyan -o short",
- "test": "tap test/*.test.js && standard",
+ "test": "tap test/**/*.test.js && standard",
  "test:watch": "nodemon -q -x 'npm test'"
  },
  "engines": {
@@ -20,14 +20,15 @@
  "debug": "^2.2.0",
  "dotenv": "^2.0.0",
  "express": "^4.13.4",
- "github": "^0.2.4",
+ "github": "^2.5.2",
  "glob": "^7.0.3",
  "travis-ci": "^2.1.0"
  },
  "devDependencies": {
  "eventsource": "^0.2.1",
  "nock": "^8.0.0",
  "nodemon": "^1.9.1",
+ "proxyquire": "^1.7.10",
  "request": "^2.72.0",
  "standard": "^6.0.7",
  "supertest": "^1.2.0",

test/_fixtures/pull-request-files.json

@@ -0,0 +1,14 @@
+[
+ {
+ "sha": "aae34fdac0caea4e4aa204aeade6a12befe32e73",
+ "filename": "lib/timers.js",
+ "status": "changed",
+ "additions": 103,
+ "deletions": 21,
+ "changes": 124,
+ "blob_url": "https://github.com/nodejs/node/blob/aae34fdac0caea4e4aa204aeade6a12befe32e73/lib/timers.js",
+ "raw_url": "https://github.com/nodejs/node/raw/aae34fdac0caea4e4aa204aeade6a12befe32e73/lib/timers.js",
+ "contents_url": "https://api.github.com/repos/nodejs/node/contents/lib/timers.js?ref=aae34fdac0caea4e4aa204aeade6a12befe32e73",
+ "patch": "@@ -132,7 +132,7 @@ module Test @@ -1000,7 +1000,7 @@ module Test"
+ }
+]

test/_fixtures/pull-request-labels.json

@@ -0,0 +1,7 @@
+[
+ {
+ "url": "https://github.com/nodejs/node/labels/enhancement",
+ "name": "enhancement",
+ "color": "f29513"
+ }
+]