keel-hq
/
keel
mirror of https://github.com/keel-hq/keel/tree/master/chart/keel
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

simplified native trigger

pull/8/head
Karolis Rusenas 2017-06-15 09:05:34 +01:00
parent 680e3afdab
commit bb30b9bfca
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
trigger/http/native_webhook_trigger.go
View File

@ -13,8 +13,8 @@ import (
// nativeHandler - used to trigger event directly
func (s *TriggerServer) nativeHandler(resp http.ResponseWriter, req *http.Request) {
event := types.Event{}
if err := json.NewDecoder(req.Body).Decode(&event); err != nil {
repo := types.Repository{}
if err := json.NewDecoder(req.Body).Decode(&repo); err != nil {
log.WithFields(log.Fields{
"error": err,
}).Error("failed to decode request")
@ -22,18 +22,21 @@ func (s *TriggerServer) nativeHandler(resp http.ResponseWriter, req *http.Reques
return
}
if event.Repository.Name == "" {
event := types.Event{}
if repo.Name == "" {
resp.WriteHeader(http.StatusBadRequest)
fmt.Fprintf(resp, "repository name cannot be empty")
return
}
if event.Repository.Tag == "" {
if repo.Tag == "" {
resp.WriteHeader(http.StatusBadRequest)
fmt.Fprintf(resp, "repository tag cannot be empty")
return
}
event.Repository = repo
event.CreatedAt = time.Now()
event.TriggerName = "native"
s.trigger(event)

4
trigger/http/native_webhook_trigger_test.go
View File

@ -33,7 +33,7 @@ func TestNativeWebhookHandler(t *testing.T) {
srv := NewTriggerServer(&Opts{Providers: providers})
srv.registerRoutes(srv.router)
req, err := http.NewRequest("POST", "/v1/webhooks/native", bytes.NewBuffer([]byte(`{"repository": {"name": "gcr.io/v2-namespace/hello-world", "tag": "1.1.1"}}`)))
req, err := http.NewRequest("POST", "/v1/webhooks/native", bytes.NewBuffer([]byte(`{"name": "gcr.io/v2-namespace/hello-world", "tag": "1.1.1"}`)))
if err != nil {
t.Fatalf("failed to create req: %s", err)
}
@ -61,7 +61,7 @@ func TestNativeWebhookHandlerNoRepoName(t *testing.T) {
srv := NewTriggerServer(&Opts{Providers: providers})
srv.registerRoutes(srv.router)
req, err := http.NewRequest("POST", "/v1/webhooks/native", bytes.NewBuffer([]byte(`{"repository": { "tag": "1.1.1"}}`)))
req, err := http.NewRequest("POST", "/v1/webhooks/native", bytes.NewBuffer([]byte(`{ "tag": "1.1.1"}`)))
if err != nil {
t.Fatalf("failed to create req: %s", err)
}