tolerate yaml payloads for generic webhooks

Author: bparees

examples/sample-app/application-template-stibuild.json

@@ -108,7 +108,8 @@
           {
             "type": "Generic",
             "generic": {
-              "secret": "secret101"
+              "secret": "secret101",
+              "allowEnv": true
             }
           },
           {

pkg/build/webhook/generic/generic.go

@@ -10,6 +10,7 @@ import (
 	"github.com/golang/glog"
 
 	kapi "k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/util/yaml"
 
 	"github.com/openshift/origin/pkg/build/api"
 	"github.com/openshift/origin/pkg/build/webhook"
@@ -54,7 +55,7 @@ func (p *WebHookPlugin) Extract(buildCfg *api.BuildConfig, secret, path string,
 		}
 	}
 
-	if req.Body != nil && contentType == "application/json" {
+	if req.Body != nil && (contentType == "application/json" || contentType == "application/yaml") {
 		body, err := ioutil.ReadAll(req.Body)
 		if err != nil {
 			return nil, envvars, false, err
@@ -65,8 +66,15 @@ func (p *WebHookPlugin) Extract(buildCfg *api.BuildConfig, secret, path string,
 		}
 
 		var data api.GenericWebHookEvent
+		if contentType == "application/yaml" {
+			body, err = yaml.ToJSON(body)
+			if err != nil {
+				glog.V(4).Infof("Error converting payload to json %v, but continuing with build", err)
+				return nil, envvars, true, nil
+			}
+		}
 		if err = json.Unmarshal(body, &data); err != nil {
-			glog.V(4).Infof("Error unmarshaling json %v, but continuing", err)
+			glog.V(4).Infof("Error unmarshalling payload %v, but continuing with build", err)
 			return nil, envvars, true, nil
 		}
 		if len(data.Env) > 0 && trigger.AllowEnv {

pkg/build/webhook/generic/generic_test.go

@@ -482,7 +482,7 @@ func TestExtractWithUnmatchedGitRefsPayload(t *testing.T) {
 	}
 }
 
-func TestExtractWithKeyValuePairs(t *testing.T) {
+func TestExtractWithKeyValuePairsJSON(t *testing.T) {
 	req := GivenRequestWithPayload(t, "push-generic-envs.json")
 	buildConfig := &api.BuildConfig{
 		Spec: api.BuildConfigSpec{
@@ -523,6 +523,47 @@ func TestExtractWithKeyValuePairs(t *testing.T) {
 	}
 }
 
+func TestExtractWithKeyValuePairsYAML(t *testing.T) {
+	req := GivenRequestWithPayloadAndContentType(t, "push-generic-envs.yaml", "application/yaml")
+	buildConfig := &api.BuildConfig{
+		Spec: api.BuildConfigSpec{
+			Triggers: []api.BuildTriggerPolicy{
+				{
+					Type: api.GenericWebHookBuildTriggerType,
+					GenericWebHook: &api.WebHookTrigger{
+						Secret:   "secret100",
+						AllowEnv: true,
+					},
+				},
+			},
+			CommonSpec: api.CommonSpec{
+				Source: api.BuildSource{
+					Git: &api.GitBuildSource{
+						Ref: "master",
+					},
+				},
+				Strategy: mockBuildStrategy,
+			},
+		},
+	}
+	plugin := New()
+	revision, envvars, proceed, err := plugin.Extract(buildConfig, "secret100", "", req)
+
+	if err != nil {
+		t.Errorf("Expected to be able to trigger a build without a payload error: %v", err)
+	}
+	if !proceed {
+		t.Error("Expected 'proceed' return value to be 'true'")
+	}
+	if revision == nil {
+		t.Error("Expected the 'revision' return value to not be nil")
+	}
+
+	if len(envvars) == 0 {
+		t.Error("Expected env vars to be set")
+	}
+}
+
 func TestExtractWithKeyValuePairsDisabled(t *testing.T) {
 	req := GivenRequestWithPayload(t, "push-generic-envs.json")
 	buildConfig := &api.BuildConfig{

pkg/build/webhook/generic/testdata/push-generic-envs.yaml

@@ -0,0 +1,17 @@
+---
+  type: "Git"
+  git: 
+    uri: "git://mygitserver/myrepo.git"
+    ref: "refs/heads/master"
+    commit: "9bdc3a26ff933b32f3e558636b58aea86a69f051"
+    message: "Random act of kindness"
+    author: 
+      name: "Jon Doe"
+      email: "[email protected]"
+    committer: 
+      name: "Jon Doe"
+      email: "[email protected]"
+  env: 
+    - 
+      name: "EXAMPLE"
+      value: "sample-app"