trigger-jenkins-build: DRY up event handlers

maclover7 · web-flow · commit 8fa4cff2202d · 2018-07-27T23:34:11.000-04:00
PR-URL: nodejs#191 Reviewed-By: Phillip Johnsen <johphi@gmail.com>
diff --git a/scripts/trigger-jenkins-build.js b/scripts/trigger-jenkins-build.js
@@ -98,33 +98,36 @@ function createPrComment ({ owner, repo, number, logger }, body) {
   })
 }
 
-module.exports = (app) => {
-  app.on('issue_comment.created', function handleCommentCreated (event, owner, repo) {
-    const { number, logger, comment } = event
-    const commentAuthor = comment.user.login
-    const options = {
-      owner,
-      repo,
-      number,
-      logger
+function triggerBuildIfValid (options) {
+  const { owner, repo, author, logger } = options
+
+  githubClient.repos.checkCollaborator({ owner, repo, username: author }, function onResponse (err) {
+    if (err) {
+      return logger.debug(`Ignoring comment to me by @${options.author} because they are not a repo collaborator`)
     }
 
-    function replyToCollabWithBuildStarted (err, buildUrl) {
+    triggerBuild(options, function onBuildTriggered (err, buildUrl) {
       if (err) {
         logger.error(err, 'Error while triggering Jenkins build')
-        return createPrComment(options, `@${commentAuthor} sadly an error occured when I tried to trigger a build :(`)
+        return createPrComment(options, `@${options.author} sadly an error occured when I tried to trigger a build :(`)
       }
 
-      createPrComment(options, `@${commentAuthor} build started: ${buildUrl}`)
+      createPrComment(options, `@${options.author} build started: ${buildUrl}`)
       logger.info({ buildUrl }, 'Jenkins build started')
-    }
-
-    function triggerBuildWhenCollaborator (err) {
-      if (err) {
-        return logger.debug(`Ignoring comment to me by @${commentAuthor} because they are not a repo collaborator`)
-      }
+    })
+  })
+}
 
-      triggerBuild(options, replyToCollabWithBuildStarted)
+module.exports = (app) => {
+  app.on('issue_comment.created', function handleCommentCreated (event, owner, repo) {
+    const { number, logger, comment } = event
+    const commentAuthor = comment.user.login
+    const options = {
+      owner,
+      repo,
+      number,
+      logger,
+      author: commentAuthor
     }
 
     ifBotWasMentionedInCiComment(comment.body, (err, wasMentioned) => {
@@ -134,7 +137,7 @@ module.exports = (app) => {
 
       if (!wasMentioned) return
 
-      githubClient.repos.checkCollaborator({ owner, repo, username: commentAuthor }, triggerBuildWhenCollaborator)
+      triggerBuildIfValid(options)
     })
   })
 
@@ -145,29 +148,12 @@ module.exports = (app) => {
       owner,
       repo,
       number,
-      logger
-    }
-
-    function replyToCollabWithBuildStarted (err, buildUrl) {
-      if (err) {
-        logger.error(err, 'Error while triggering Jenkins build')
-        return createPrComment(options, `@${pullRequestAuthor} sadly an error occured when I tried to trigger a build :(`)
-      }
-
-      createPrComment(options, `@${pullRequestAuthor} build started: ${buildUrl}`)
-      logger.info({ buildUrl }, 'Jenkins build started')
-    }
-
-    function triggerBuildWhenCollaborator (err) {
-      if (err) {
-        return logger.debug(`Ignoring comment to me by @${pullRequestAuthor} because they are not a repo collaborator`)
-      }
-
-      triggerBuild(options, replyToCollabWithBuildStarted)
+      logger,
+      author: pullRequestAuthor
     }
 
     if (repo === 'node') {
-      githubClient.repos.checkCollaborator({ owner, repo, username: pullRequestAuthor }, triggerBuildWhenCollaborator)
+      triggerBuildIfValid(options)
     }
   })
 }
