cleanup & lint fixes

Author: foosinn

finisher.go

@@ -15,9 +15,7 @@ type (
 func (f *Finisher) Handle() {
 	defer f.wg.Done()
 	for b := range f.input {
-		f.wg.Add(1)
 		f.handler(b)
-		defer f.wg.Done()
 	}
 }
 func (f *Finisher) Wait() {

main.go

@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"net/http"
+
 	"github.com/drone/envsubst"
 	"github.com/kelseyhightower/envconfig"
 	log "github.com/sirupsen/logrus"
@@ -106,17 +107,17 @@ func main() {
 	log.SetFormatter(&log.TextFormatter{ForceColors: true})
 	err := envconfig.Process("plugin", &c)
 	if err != nil {
-		log.Fatal(err.Error())
+		log.Fatalf("unable to parse environment: %s", err)
 	}
 	if c.BuildPoolSize < 1 || c.UploadPoolSize < 1 {
 		log.Fatalf("PoolSize may not be smaller than 1: BuildPoolSize: %d, UploadPoolSize: %d", c.BuildPoolSize, c.UploadPoolSize)
 	}
 	if c.Registry == "" {
-		log.Fatal("Please specify a registry.")
+		log.Fatalf("Please specify a registry.")
 	}
 	c.TagBuildID, err = envsubst.EvalEnv(c.TagBuildID)
 	if err != nil {
-		log.Fatal(err.Error())
+		log.Fatal(err)
 	}
 	if c.Debug {
 		log.SetLevel(log.DebugLevel)
@@ -130,7 +131,10 @@ func main() {
 		uploader,
 		finisher,
 	)
-	b.Run(c.Workdir)
+	err = b.Run(c.Workdir)
+	if err != nil {
+		log.Fatal(err)
+	}
 }
 
 // build an image
@@ -142,7 +146,6 @@ func builder(b *Build) {
 		return
 	}
 	log.Debugf("Build success  %s\n  >> Arguments: %s\n%s\n", b.prettyName(), b.args(), outStr)
-	return
 }
 
 // upload an image

main_test.go

@@ -1,7 +1,9 @@
 package main
 
 import (
+	"bytes"
 	"fmt"
+	"net/http"
 	"os"
 	"sort"
 	"strings"
@@ -22,6 +24,7 @@ func TestBuild(t *testing.T) {
 		TagBuildID:       "7",
 		Command:          "echo",
 		Workdir:          "testdata",
+		PushGateway:      "http://vm277.netzmarkt.lan:27121/metrics",
 		Time:             time.Now(),
 	}
 
@@ -37,9 +40,26 @@ func TestBuild(t *testing.T) {
 		func(b *Build) {
 			got += string(b.Output)
 			log.Infof("Done           %s", b.prettyName())
+
+			// notify pushgateway if set
+			if c.PushGateway != "" {
+				buffer := bytes.NewBuffer([]byte("# TYPE drone_docker_matrix gauge\n"))
+				for _, tag := range b.tags() {
+					fmt.Fprintf(buffer, "drone_docker_matrix{tag=%q} %d\n", tag, c.Time.Unix())
+				}
+				url := fmt.Sprintf(
+					"%s/job/drone-docker-matrix/image/%s",
+					c.PushGateway,
+					b.Name,
+				)
+				_, _ = http.Post(url, "text", bytes.NewReader(buffer.Bytes()))
+			}
 		},
 	)
-	b.Run(c.Workdir)
+	err := b.Run(c.Workdir)
+	if err != nil {
+		t.Fatalf("failed to run: %s", err)
+	}
 
 	want := `
 build alpine -f alpine/Dockerfile --build-arg MESSAGE=multiply -t localhost:5000/images/alpine:multiply -t localhost:5000/images/alpine:multiply-7