Skip to content

Commit

Permalink
Merge pull request #42 from rusenask/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
rusenask authored Jul 22, 2017
2 parents 28553b3 + df28e2e commit eeb3b8d
Show file tree
Hide file tree
Showing 3 changed files with 130 additions and 0 deletions.
1 change: 1 addition & 0 deletions trigger/http/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ func (s *TriggerServer) registerRoutes(mux *mux.Router) {

// dockerhub webhooks handler
mux.HandleFunc("/v1/webhooks/dockerhub", s.dockerHubHandler).Methods("POST", "OPTIONS")
mux.HandleFunc("/v1/webhooks/quay", s.quayHandler).Methods("POST", "OPTIONS")
}

func (s *TriggerServer) healthHandler(resp http.ResponseWriter, req *http.Request) {
Expand Down
71 changes: 71 additions & 0 deletions trigger/http/quay_webhook_trigger.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
package http

import (
"encoding/json"
"fmt"
"net/http"
"time"

"github.com/rusenask/keel/types"

log "github.com/Sirupsen/logrus"
)

// Example of quay trigger
// {
// "name": "repository",
// "repository": "mynamespace/repository",
// "namespace": "mynamespace",
// "docker_url": "quay.io/mynamespace/repository",
// "homepage": "https://quay.io/repository/mynamespace/repository",
// "updated_tags": [
// "latest"
// ]
// }

type quayWebhook struct {
Name string `json:"name"`
Repository string `json:"repository"`
Namespace string `json:"namespace"`
DockerURL string `json:"docker_url"`
Homepage string `json:"homepage"`
UpdatedTags []string `json:"updated_tags"`
}

func (s *TriggerServer) quayHandler(resp http.ResponseWriter, req *http.Request) {
qw := quayWebhook{}
if err := json.NewDecoder(req.Body).Decode(&qw); err != nil {
log.WithFields(log.Fields{
"error": err,
}).Error("trigger.quayHandler: failed to decode request")
resp.WriteHeader(http.StatusBadRequest)
return
}

if qw.DockerURL == "" {
resp.WriteHeader(http.StatusBadRequest)
fmt.Fprintf(resp, "docker_url cannot be empty")
return
}

if len(qw.UpdatedTags) == 0 {
resp.WriteHeader(http.StatusBadRequest)
fmt.Fprintf(resp, "updated_tags cannot be empty")
return
}

// for every updated tag generating event
for _, tag := range qw.UpdatedTags {
event := types.Event{}
event.CreatedAt = time.Now()
event.TriggerName = "quay"
event.Repository.Name = qw.DockerURL
event.Repository.Tag = tag

s.trigger(event)

resp.WriteHeader(http.StatusOK)
}

return
}
58 changes: 58 additions & 0 deletions trigger/http/quay_webhook_trigger_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
package http

import (
"bytes"
"net/http"

"github.com/rusenask/keel/provider"

"net/http/httptest"
"testing"
)

var fakeQuayWebhook = `{
"name": "repository",
"repository": "mynamespace/repository",
"namespace": "mynamespace",
"docker_url": "quay.io/mynamespace/repository",
"homepage": "https://quay.io/repository/mynamespace/repository",
"updated_tags": [
"1.2.3"
]
}
`

func TestQuayWebhookHandler(t *testing.T) {

fp := &fakeProvider{}
providers := provider.New([]provider.Provider{fp})
srv := NewTriggerServer(&Opts{Providers: providers})
srv.registerRoutes(srv.router)

req, err := http.NewRequest("POST", "/v1/webhooks/quay", bytes.NewBuffer([]byte(fakeQuayWebhook)))
if err != nil {
t.Fatalf("failed to create req: %s", err)
}

//The response recorder used to record HTTP responses
rec := httptest.NewRecorder()

srv.router.ServeHTTP(rec, req)
if rec.Code != 200 {
t.Errorf("unexpected status code: %d", rec.Code)

t.Log(rec.Body.String())
}

if len(fp.submitted) != 1 {
t.Fatalf("unexpected number of events submitted: %d", len(fp.submitted))
}

if fp.submitted[0].Repository.Name != "quay.io/mynamespace/repository" {
t.Errorf("expected quay.io/mynamespace/repository but got %s", fp.submitted[0].Repository.Name)
}

if fp.submitted[0].Repository.Tag != "1.2.3" {
t.Errorf("expected 1.2.3 but got %s", fp.submitted[0].Repository.Tag)
}
}

0 comments on commit eeb3b8d

Please sign in to comment.