Merge pull request #38 from gerald1248/path_based_routing

fixed false positives for path-based routing
gerald1248 · Feb 21, 2017 · c1605c0 · c1605c0
2 parents 7fce1ca + c976b64
commit c1605c0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/bindata.go b/bindata.go
diff --git a/item-route-conflict.go → item-route.go b/item-route-conflict.go → item-route.go
@@ -39,11 +39,11 @@ func (irc *ItemRouteConflict) Lint(config *Config, params LinterParams) (ResultM
 
 			namespace := item.Metadata.Namespace
 
-			key = item.Spec.Host
+			key = item.Spec.Host + item.Spec.Path
 			value = item.Metadata.Name
 
 			if len(routeMap[key]) > 0 && routeMap[key] != value {
-				problem := fmt.Sprintf("Route to host '%s' defined twice: '%s' and '%s'", routeMap[key], value, key)
+				problem := fmt.Sprintf("Route to '%s' defined twice: '%s' and '%s'", key, routeMap[key], value)
 				if len(namespace) > 0 {
 					problem += fmt.Sprintf(" (namespace '%s')", namespace)
 				}

diff --git a/postprocess.go b/postprocess.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"regexp"
 )
 
@@ -29,7 +28,6 @@ func postprocessResult(r *ResultMap, params LinterParams) error {
 
 			if re.FindStringIndex(spec.Container) != nil {
 				replace = true
-				fmt.Printf("Skipping %s\n", container)
 			} else {
 				s = append(s, spec)
 			}

diff --git a/types.go b/types.go
@@ -45,6 +45,7 @@ type Spec struct {
 
 	//Route
 	Host string `json:"host"`
+	Path string `json:"path"`
 	Port *Port  `json:"port"`
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,6 +45,7 @@ type Spec struct { @@
     	//Route
     	Host string `json:"host"`
+    	Path string `json:"path"`
     	Port *Port  `json:"port"`
     }
@@ Expand Down @@