It works with gitlab MRs

core/propaganda.go

@@ -2,9 +2,7 @@ package core
 
 // Announcement represents a message to be shouted out
 type Announcement interface {
-	Title() string
 	Text() string
-	URL() string
 	ShouldAnnounce() bool
 	ProjectName() string
 }

gitlab/fixtures/gitlab-mr-close-no-merge.json

@@ -49,7 +49,7 @@
         "target_branch": "master",
         "target_project_id": 13,
         "time_estimate": 0,
-        "title": "Update README.md",
+        "title": "[announce] Update README.md",
         "updated_at": "2018-09-19 20:48:28 UTC",
         "updated_by_id": null,
         "url": "https://git.yakshaving.art/pablo/testing-webhooks/merge_requests/2",

gitlab/gitlab.go

@@ -11,33 +11,43 @@ package gitlab
 // "Content-Type":[]string{"application/json"},
 
 import (
-	"encoding/json"
 	"fmt"
+	"strings"
+
+	"encoding/json"
 
 	"gitlab.com/yakshaving.art/propaganda/core"
 )
 
 // Parser implements the core.Parser type for GitLab merge webhooks
 type Parser struct {
+	MatchString string
 }
 
 // Match indicates that the headers match with the kind of request
 func (Parser) Match(headers map[string][]string) bool {
-	if _, ok := headers["X-Gitlab-Event"]; ok {
-		return true
+	if event, ok := headers["X-Gitlab-Event"]; ok {
+		if len(event) != 1 {
+			return false
+		}
+		return event[0] == "Merge Request Hook"
 	}
 	return false
 }
 
 // Parse creates a new merge request object from the passed payload
-func (Parser) Parse(payload []byte) (core.Announcement, error) {
+func (p Parser) Parse(payload []byte) (core.Announcement, error) {
 	var mr MergeRequest
 	if err := json.Unmarshal(payload, &mr); err != nil {
 		return mr, fmt.Errorf("could not parse json payload: %s", err)
 	}
 	if mr.Kind != "merge_request" {
 		return MergeRequest{}, fmt.Errorf("json payload is not a merge request but a %s", mr.Kind)
 	}
+	if !strings.HasPrefix(mr.Attributes.Title, p.MatchString) {
+		return MergeRequest{}, fmt.Errorf("MR title '%s' is not annouceable", mr.Attributes.Title)
+	}
+	mr.Attributes.Title = strings.TrimSpace(mr.Attributes.Title[len(p.MatchString):])
 	return mr, nil
 }
 
@@ -48,19 +58,12 @@ type MergeRequest struct {
 	Attributes Attributes `json:"object_attributes"`
 }
 
-// Title implements Annoucement
-func (m MergeRequest) Title() string {
-	return m.Attributes.Title
-}
-
 // Text implements Annoucement
 func (m MergeRequest) Text() string {
-	return ""
-}
-
-// URL implements Annoucement
-func (m MergeRequest) URL() string {
-	return m.Attributes.URL
+	return fmt.Sprintf("*%s*\n\n%s\n\n*URL:* %s",
+		m.Attributes.Title,
+		m.Attributes.Description,
+		m.Attributes.URL)
 }
 
 // ShouldAnnounce implements Announcement

gitlab/gitlab_test.go

@@ -9,7 +9,9 @@ import (
 )
 
 func TestParsingPayloads(t *testing.T) {
-	parser := gitlab.Parser{}
+	parser := gitlab.Parser{
+		MatchString: "[announce]",
+	}
 	tt := []struct {
 		name           string
 		jsonFilename   string
@@ -26,7 +28,7 @@ func TestParsingPayloads(t *testing.T) {
 				},
 				Attributes: gitlab.Attributes{
 					State:       "opened",
-					Title:       "[announce] Update README.md",
+					Title:       "Update README.md",
 					Description: "Something in the description",
 					URL:         "https://git.yakshaving.art/pablo/testing-webhooks/merge_requests/1",
 					Action:      "open",
@@ -44,7 +46,7 @@ func TestParsingPayloads(t *testing.T) {
 				},
 				Attributes: gitlab.Attributes{
 					State:       "merged",
-					Title:       "[announce] Update README.md",
+					Title:       "Update README.md",
 					Description: "Something in the description",
 					URL:         "https://git.yakshaving.art/pablo/testing-webhooks/merge_requests/1",
 					Action:      "merge",
@@ -84,9 +86,7 @@ func TestParsingPayloads(t *testing.T) {
 
 			a.EqualValuesf(tc.expected, mr, "parsed merge request is not as expected")
 
-			a.Equal(tc.expected.Title(), mr.Title())
 			a.Equal(tc.expected.Text(), mr.Text())
-			a.Equal(tc.expected.URL(), mr.URL())
 			a.Equal(tc.expected.ProjectName(), mr.ProjectName())
 			a.Equal(tc.shouldAnnounce, mr.ShouldAnnounce())
 		})

main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"flag"
+	"os"
 
 	"gitlab.com/yakshaving.art/propaganda/core"
 	"gitlab.com/yakshaving.art/propaganda/gitlab"
@@ -21,9 +22,13 @@ func main() {
 	metrics.Register(args.MetricsPath)
 
 	s := server.New(
-		slack.Announcer{},
+		slack.Announcer{
+			WebhookURL: args.WebhookURL,
+		},
 		[]core.Parser{
-			gitlab.Parser{},
+			gitlab.Parser{
+				MatchString: "[announce]",
+			},
 		})
 
 	logrus.Fatal(s.ListenAndServe(args.Address))
@@ -41,14 +46,21 @@ func setupLogger() {
 type Args struct {
 	Address     string
 	MetricsPath string
+
+	WebhookURL string
 }
 
 func parseArgs() Args {
 	var args Args
 
 	flag.StringVar(&args.Address, "address", ":9092", "listening address")
 	flag.StringVar(&args.MetricsPath, "metrics", "/metrics", "metrics path")
+	flag.StringVar(&args.WebhookURL, "webhook-url", os.Getenv("SLACK_WEBHOOK_URL"), "slack webhook url")
 	flag.Parse()
 
+	if args.WebhookURL == "" {
+		logrus.Fatalf("No slack webhook url, define it through -webhook-url argument or SLACK_WEBHOOK_URL env var")
+	}
+
 	return args
 }

metrics/metrics.go

@@ -51,18 +51,18 @@ var (
 		Name:      "valid_total",
 		Help:      "total number of valid webhooks",
 	}, []string{"project"})
-	AnnouncementSuccesses = prometheus.NewCounter(prometheus.CounterOpts{
+	AnnouncementSuccesses = prometheus.NewCounterVec(prometheus.CounterOpts{
 		Namespace: namespace,
 		Subsystem: "announcer",
 		Name:      "success_total",
 		Help:      "total number of announcement successes",
-	})
-	AnnouncementErrors = prometheus.NewCounter(prometheus.CounterOpts{
+	}, []string{"project"})
+	AnnouncementErrors = prometheus.NewCounterVec(prometheus.CounterOpts{
 		Namespace: namespace,
 		Subsystem: "announcer",
 		Name:      "errors_total",
 		Help:      "total number of announcement errors",
-	})
+	}, []string{"status"})
 )
 
 // Register registers all the metrics and sets the http handler
@@ -71,6 +71,14 @@ func Register(metricsPath string) {
 	Up.Set(0)
 
 	prometheus.MustRegister(bootTime)
+	prometheus.MustRegister(Up)
+	prometheus.MustRegister(WebhooksReceived)
+	prometheus.MustRegister(WebhooksBytesRead)
+	prometheus.MustRegister(WebhooksErrors)
+	prometheus.MustRegister(WebhooksInvalid)
+	prometheus.MustRegister(WebhooksValid)
+	prometheus.MustRegister(AnnouncementSuccesses)
+	prometheus.MustRegister(AnnouncementErrors)
 
 	http.Handle(metricsPath, prometheus.Handler())
 }

server/server.go

@@ -68,18 +68,15 @@ func (s Server) handle(w http.ResponseWriter, r *http.Request) {
 
 			metrics.WebhooksValid.WithLabelValues(a.ProjectName()).Inc()
 
+			logrus.Debugf("announcing webhook %#v", a)
 			s.announcer.Announce(a)
 
 			w.WriteHeader(http.StatusAccepted)
-			logrus.Debugf("received Webhook\nHeaders: %#v\nPayload: %s", r.Header, string(body))
+			// logrus.Debugf("received Webhook\nHeaders: %#v\nPayload: %s", r.Header, string(body))
 			return
 		}
 	}
 
 	metrics.WebhooksInvalid.WithLabelValues("no_parser").Inc()
 	http.Error(w, fmt.Sprintf("No parser defined for this hook"), http.StatusUnprocessableEntity)
 }
-
-func (s Server) process(a core.Announcement) {
-
-}