add more tests

Author: ChristianKniep

main.go

@@ -10,22 +10,6 @@ import (
 	"strings"
 )
 
-func ReadPatterns(path string) (patterns []string, err error) {
-	file, err := os.Open(path)
-	if err != nil {
-		return
-	}
-	defer file.Close()
-
-	scanner := bufio.NewScanner(file)
-	for scanner.Scan() {
-		line := scanner.Text()
-		if ! strings.HasPrefix(line, "#") {
-			patterns = append(patterns, line)
-		}
-	}
-	return
-}
 
 func RunApp(ctx *cli.Context) {
 	log.Printf("[II] Start Version: %s", ctx.App.Version)
@@ -34,7 +18,12 @@ func RunApp(ctx *cli.Context) {
 	dockerSock, _ := cfg.String("docker-socket")
 	debug, _ := cfg.Bool("debug")
 	patternsFile, _ := cfg.String("pattern-file")
-	patterns, err  := ReadPatterns(patternsFile)
+	reader, err := os.Open(patternsFile)
+	if err != nil {
+		return
+	}
+	defer reader.Close()
+	patterns, err  := proxy.ReadPatterns(reader)
 	if err != nil {
 		log.Printf("Error reading patterns file (%s), using default patterns\n", err.Error())
 		patterns = []string{

proxy/main_test.go

@@ -0,0 +1,18 @@
+package proxy
+
+import (
+	"testing"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestProxy_AddPattern(t *testing.T) {
+	p := NewProxy("new", "old", false)
+	p.AddPattern("mypat1")
+	assert.Equal(t, []string{"mypat1"}, p.patterns)
+}
+
+func TestProxy_AddPatterns(t *testing.T) {
+	p := NewProxy("new", "old", false)
+	p.AddPatterns([]string{"mypat1","mypat2"})
+	assert.Equal(t, []string{"mypat1","mypat2"}, p.patterns)
+}

proxy/newsock.go

@@ -0,0 +1,18 @@
+package proxy
+
+import (
+	"bufio"
+	"strings"
+	"io"
+)
+
+func ReadPatterns(reader io.Reader) (patterns []string, err error) {
+	scanner := bufio.NewScanner(reader)
+	for scanner.Scan() {
+		line := scanner.Text()
+		if ! strings.HasPrefix(line, "#") {
+			patterns = append(patterns, line)
+		}
+	}
+	return
+}

proxy/patterns.go

@@ -0,0 +1,40 @@
+package proxy
+
+import (
+	"testing"
+	"strings"
+	"github.com/stretchr/testify/assert"
+)
+
+const (
+	p1 = `# List and inspect containers
+^/(v\d\.\d+/)?containers(/\w+)?/json$
+# List and inspect services
+^/(v\d\.\d+/)?services(/[0-9a-f]+)?$
+# List and inspect tasks
+^/(v\d\.\d+/)?tasks(/\w+)?$
+# List and inspect networks
+^/(v\d\.\d+/)?networks(/\w+)?$
+# List and inspect nodes
+^/(v\d\.\d+/)?nodes(/\w+)?$
+# Show engine info
+^/(v\d\.\d+/)?info$
+# Healthcheck
+^/_ping$`
+)
+
+func TestReadPatterns(t *testing.T) {
+	r := strings.NewReader(p1)
+	got,err := ReadPatterns(r)
+	assert.NoError(t, err, "Should be parsed without problems")
+	exp := []string{
+		`^/(v\d\.\d+/)?containers(/\w+)?/json$`,
+		`^/(v\d\.\d+/)?services(/[0-9a-f]+)?$`,
+		`^/(v\d\.\d+/)?tasks(/\w+)?$`,
+		`^/(v\d\.\d+/)?networks(/\w+)?$`,
+		`^/(v\d\.\d+/)?nodes(/\w+)?$`,
+		`^/(v\d\.\d+/)?info$`,
+		"^/_ping$",
+	}
+	assert.Equal(t, exp, got)
+}

proxy/patterns_test.go

@@ -1,12 +1,15 @@
 package proxy
 
 import (
+	"log"
 	"net"
 	"fmt"
 	"net/url"
 	"net/http"
 	"net/http/httputil"
 	"regexp"
+	"os"
+	"path/filepath"
 )
 
 type UpStream struct {
@@ -76,3 +79,25 @@ func (u *UpStream) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	}
 	http.Error(w, fmt.Sprintf("'%s' is not allowed.", req.URL.Path), 403)
 }
+
+func ListenToNewSock(newsock string, sigc chan os.Signal) (l net.Listener, err error) {
+	// extract directory for newsock
+	dir, _ := filepath.Split(newsock)
+	// attempt to create dir and ignore if it's already existing
+	_ = os.Mkdir(dir, 0777)
+	l, err = net.Listen("unix", newsock)
+	if err != nil {
+		panic(err)
+	}
+	os.Chmod(newsock, 0666)
+	log.Println("[gk-soxy] Listening on " + newsock)
+	go func(c chan os.Signal) {
+		sig := <-c
+		log.Printf("[gk-soxy] Caught signal %s: shutting down.\n", sig)
+		if err := l.Close(); err != nil {
+			panic(err)
+		}
+		os.Exit(0)
+	}(sigc)
+	return
+}

proxy/proxy.go

@@ -0,0 +1,12 @@
+package proxy
+
+import (
+	"testing"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNewUnixSocket(t *testing.T) {
+	us := NewUnixSocket("test")
+	exp := UnixSocket{"test"}
+	assert.Equal(t, exp, us)
+}