Merge pull request #14 from finn-no/handle-missing-path

Handle missing Path in HTTPIngressPath

Author: pleshakov

nginx-controller/Makefile

@@ -6,7 +6,10 @@ PREFIX = nginxdemos/nginx-ingress
 nginx-ingress:
 	CGO_ENABLED=0 GOOS=linux godep go build -a -installsuffix cgo -ldflags '-w' -o nginx-ingress *.go
 
-container: nginx-ingress
+test:
+	godep go test ./...
+
+container: nginx-ingress test
 	docker build -t $(PREFIX):$(TAG) .
 
 push: container

nginx-controller/controller/controller.go

@@ -317,7 +317,7 @@ func (lbc *LoadBalancerController) updateNGINX(name string, ing *extensions.Ingr
 		var locations []nginx.Location
 
 		for _, path := range rule.HTTP.Paths {
-			loc := nginx.Location{Path: path.Path}
+			loc := nginx.Location{Path: pathOrDefault(path.Path)}
 			upsName := getNameForUpstream(ing, rule.Host, path.Backend.ServiceName)
 
 			if ups, ok := upstreams[upsName]; ok {
@@ -333,6 +333,14 @@ func (lbc *LoadBalancerController) updateNGINX(name string, ing *extensions.Ingr
 	lbc.nginx.AddOrUpdateIngress(name, nginx.IngressNGINXConfig{Upstreams: upstreamMapToSlice(upstreams), Servers: servers})
 }
 
+func pathOrDefault(path string) string {
+	if path == "" {
+		return "/"
+	} else {
+		return path
+	}
+}
+
 func endpointsToUpstreamServers(endps api.Endpoints, servicePort int) []nginx.UpstreamServer {
 	var upsServers []nginx.UpstreamServer
 	for _, subset := range endps.Subsets {

nginx-controller/controller/controller_test.go

@@ -0,0 +1,20 @@
+package controller
+
+import (
+	"testing"
+)
+
+func TestPathOrDefaultReturnDefault(t *testing.T) {
+	path := ""
+	expected := "/"
+	if pathOrDefault(path) != expected {
+		t.Errorf("pathOrDefault(%q) should return %q", path, expected)
+	}
+}
+
+func TestPathOrDefaultReturnActual(t *testing.T) {
+	path := "/path/to/resource"
+	if pathOrDefault(path) != path {
+		t.Errorf("pathOrDefault(%q) should return %q", path, path)
+	}
+}

nginx-controller/nginx/nginx.go

@@ -1,6 +1,7 @@
 package nginx
 
 import (
+	"bytes"
 	"html/template"
 	"os"
 	"os/exec"
@@ -180,16 +181,24 @@ func (nginx *NGINXController) createCertsDir() {
 }
 
 func shellOut(cmd string) {
+	var stdout bytes.Buffer
+	var stderr bytes.Buffer
+
 	glog.Infof("executing %s", cmd)
 
 	command := exec.Command("sh", "-c", cmd)
+	command.Stdout = &stdout
+	command.Stderr = &stderr
+
 	err := command.Start()
 	if err != nil {
 		glog.Fatalf("Failed to execute %v, err: %v", cmd, err)
 	}
 
 	err = command.Wait()
 	if err != nil {
+		glog.Errorf("Command %v stdout: %q", cmd, stdout.String())
+		glog.Errorf("Command %v stderr: %q", cmd, stderr.String())
 		glog.Fatalf("Command %v finished with error: %v", cmd, err)
 	}
 }