Merge pull request #14 from rusenask/develop

Develop

glide.yaml

@@ -11,16 +11,12 @@ import:
   subpackages:
   - iterator
   - option
-  - support  
+  - support
   - transport
 - package: google.golang.org/grpc
   version: a94a7ac054dc76e5ab6cf170a9d82faba8aaf33f
   subpackages:
-  - status  
-- package: github.com/Sirupsen/logrus  
-  subpackages:
-  - formatters
-  - formatters/logstash
+  - status
 - package: github.com/coreos/go-semver
   subpackages:
   - semver
@@ -37,7 +33,7 @@ import:
   - protoc-gen-gogo/descriptor
   - gogoproto
   - plugin/testgen
-  - protoc-gen-gogo/generator  
+  - protoc-gen-gogo/generator
 - package: k8s.io/apimachinery
   version: 75b8dd260ef0469d96d578705a87cffd0e09dab8
   subpackages:
@@ -50,3 +46,7 @@ import:
   - pkg/apis/extensions/v1beta1
   - rest
   - tools/clientcmd
+- package: github.com/Masterminds/semver
+  version: ^1.3.0
+- package: github.com/sirupsen/logrus
+  version: ^1.0.0

main.go

@@ -101,7 +101,7 @@ func main() {
 
 // setupProviders - setting up available providers. New providers should be initialised here and added to
 // provider map
-func setupProviders(k8sImplementer kubernetes.Implementer) (providers map[string]provider.Provider, teardown func()) {
+func setupProviders(k8sImplementer kubernetes.Implementer) (providers provider.Providers, teardown func()) {
 	k8sProvider, err := kubernetes.NewProvider(k8sImplementer)
 	if err != nil {
 		log.WithFields(log.Fields{
@@ -110,8 +110,7 @@ func setupProviders(k8sImplementer kubernetes.Implementer) (providers map[string
 	}
 	go k8sProvider.Start()
 
-	providers = make(map[string]provider.Provider)
-	providers[k8sProvider.GetName()] = k8sProvider
+	providers = provider.New([]provider.Provider{k8sProvider})
 
 	teardown = func() {
 		k8sProvider.Stop()
@@ -122,7 +121,7 @@ func setupProviders(k8sImplementer kubernetes.Implementer) (providers map[string
 
 // setupTriggers - setting up triggers. New triggers should be added to this function. Each trigger
 // should go through all providers (or not if there is a reason) and submit events)
-func setupTriggers(ctx context.Context, k8sImplementer kubernetes.Implementer, providers map[string]provider.Provider) (teardown func()) {
+func setupTriggers(ctx context.Context, k8sImplementer kubernetes.Implementer, providers provider.Providers) (teardown func()) {
 
 	// setting up generic http webhook server
 	whs := http.NewTriggerServer(&http.Opts{

provider/provider.go

@@ -2,10 +2,59 @@ package provider
 
 import (
 	"github.com/rusenask/keel/types"
+
+	log "github.com/Sirupsen/logrus"
 )
 
 // Provider - generic provider interface
 type Provider interface {
 	Submit(event types.Event) error
 	GetName() string
 }
+
+// Providers - available providers
+type Providers interface {
+	Submit(event types.Event) error
+	List() []string // list all providers
+}
+
+// New - new providers registry
+func New(providers []Provider) *DefaultProviders {
+	pvs := make(map[string]Provider)
+
+	for _, p := range providers {
+		pvs[p.GetName()] = p
+	}
+
+	return &DefaultProviders{
+		providers: pvs,
+	}
+}
+
+type DefaultProviders struct {
+	providers map[string]Provider
+}
+
+func (p *DefaultProviders) Submit(event types.Event) error {
+	for _, provider := range p.providers {
+		err := provider.Submit(event)
+		if err != nil {
+			log.WithFields(log.Fields{
+				"error":    err,
+				"provider": provider.GetName(),
+				"event":    event.Repository,
+				"trigger":  event.TriggerName,
+			}).Error("provider.DefaultProviders: submit event failed")
+		}
+	}
+
+	return nil
+}
+
+func (p *DefaultProviders) List() []string {
+	list := []string{}
+	for name := range p.providers {
+		list = append(list, name)
+	}
+	return list
+}

trigger/http/dockerhub_webhook_trigger_test.go

@@ -41,9 +41,7 @@ var fakeRequest = `{
 func TestDockerhubWebhookHandler(t *testing.T) {
 
 	fp := &fakeProvider{}
-	providers := map[string]provider.Provider{
-		fp.GetName(): fp,
-	}
+	providers := provider.New([]provider.Provider{fp})
 	srv := NewTriggerServer(&Opts{Providers: providers})
 	srv.registerRoutes(srv.router)