Github webhook now working in real-life test

Author: pvdissel

subprojects/listener/src/main/groovy/org/pipelinelabs/pipeline/listen/core/GitWorker.groovy

@@ -3,9 +3,13 @@ package org.pipelinelabs.pipeline.listen.core
 import com.google.common.eventbus.EventBus
 import com.google.common.eventbus.Subscribe
 import com.yammer.dropwizard.lifecycle.Managed
+import groovy.util.logging.Slf4j
 
 import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.Paths
 
+@Slf4j
 class GitWorker implements Managed {
 
     private final EventBus bus
@@ -26,9 +30,25 @@ class GitWorker implements Managed {
 
     @Subscribe
     void work(GitTriggerEvent event) {
-        def dir = Files.createTempDirectory("pipeline/")
+        log.info('Received event [{}]', event)
+        def dir = Files.createTempDirectory("pipeline")
+        log.debug('Created pipeline directory [{}]', dir)
+
+        def workDirName = "work"
+        def workDir = Paths.get(dir.toString(), workDirName)
         List envProps = null
-        "git clone ${event.url}".execute(envProps, dir.toFile())
-        "pipe-runner run project.pipe".execute(envProps, dir.toFile())
+
+        def gitCommand = "git clone ${event.url} ${workDirName}"
+        executeCommand(gitCommand, dir, envProps)
+
+        def runnerCommand = "pipe-runner run project.pipeline"
+        executeCommand(runnerCommand, workDir, envProps)
+    }
+
+    private void executeCommand(String command, Path workDir, List envProps) {
+        log.info('Executing command [{}] in pipeline directory [{}]', command, workDir)
+        def runnerProc = command.execute(envProps, workDir.toFile())
+        def runnerExitStatus = runnerProc.waitFor()
+        log.info('Command [{}] exitted with status [{}]', command, runnerExitStatus)
     }
 }

subprojects/listener/src/main/groovy/org/pipelinelabs/pipeline/listen/resources/GitHubWebHookResource.groovy

@@ -8,13 +8,14 @@ import org.pipelinelabs.pipeline.listen.core.GitTriggerEvent
 import javax.ws.rs.*
 import javax.ws.rs.core.Response
 
+import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON
 import static javax.ws.rs.core.Response.Status.BAD_REQUEST
 
 @Slf4j
 @Path("/providers/github")
 @Produces(APPLICATION_JSON)
-@Consumes(APPLICATION_JSON)
+@Consumes(APPLICATION_FORM_URLENCODED)
 class GitHubWebHookResource {
 
     private final EventBus bus

subprojects/listener/src/test/groovy/org/pipelinelabs/pipeline/listen/resources/GitHubWebHookResourceSpec.groovy

@@ -13,6 +13,7 @@ import spock.lang.Unroll
 import static com.sun.jersey.api.client.ClientResponse.Status.BAD_REQUEST
 import static com.sun.jersey.api.client.ClientResponse.Status.NO_CONTENT
 import static com.yammer.dropwizard.testing.JsonHelpers.jsonFixture
+import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED_TYPE
 import static javax.ws.rs.core.MediaType.APPLICATION_JSON_TYPE
 
 class GitHubWebHookResourceSpec extends Specification {
@@ -27,7 +28,7 @@ class GitHubWebHookResourceSpec extends Specification {
 
         when:
         def response = requestBuilder()
-                .type(APPLICATION_JSON_TYPE)
+                .type(APPLICATION_FORM_URLENCODED_TYPE)
                 .accept(APPLICATION_JSON_TYPE)
                 .post(ClientResponse, form)
 
@@ -46,7 +47,7 @@ class GitHubWebHookResourceSpec extends Specification {
 
         when:
         def response = requestBuilder()
-                .type(APPLICATION_JSON_TYPE)
+                .type(APPLICATION_FORM_URLENCODED_TYPE)
                 .accept(APPLICATION_JSON_TYPE)
                 .post(ClientResponse, form)
 
@@ -69,7 +70,7 @@ class GitHubWebHookResourceSpec extends Specification {
 
         when:
         def response = requestBuilder()
-                .type(APPLICATION_JSON_TYPE)
+                .type(APPLICATION_FORM_URLENCODED_TYPE)
                 .accept(APPLICATION_JSON_TYPE)
                 .post(ClientResponse, form)