Refactoring

docker-flow · Oct 22, 2017 · da27f4b · da27f4b
1 parent ec51f28
commit da27f4b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 /.idea
 /*.iml
 /*.out
+/certs
 /docker-flow-proxy
 *.bak
 /tmp

diff --git a/proxy/template.go b/proxy/template.go
@@ -10,7 +10,6 @@ import (
 )
 
 func getFrontTemplate(s Service) string {
-	// TODO: Change domain_{{$.AclName}} to a unique value
 	tmplString := `
 {{- range $sd := .ServiceDest}}
     {{- if eq .ReqMode "http"}}

diff --git a/proxy/types_test.go b/proxy/types_test.go
@@ -297,10 +297,10 @@ func (s *TypesTestSuite) Test_GetServiceFromProvider_MovesHttpsOnlyToIndexedEntr
 		ServiceName: "serviceName",
 	}
 	serviceMap := map[string]string{
-		"httpsOnly":         strconv.FormatBool(expected.ServiceDest[0].HttpsOnly),
-		"serviceName":       expected.ServiceName,
-		"port.1":            expected.ServiceDest[0].Port,
-		"servicePath.1":     strings.Join(expected.ServiceDest[0].ServicePath, ","),
+		"httpsOnly":     strconv.FormatBool(expected.ServiceDest[0].HttpsOnly),
+		"serviceName":   expected.ServiceName,
+		"port.1":        expected.ServiceDest[0].Port,
+		"servicePath.1": strings.Join(expected.ServiceDest[0].ServicePath, ","),
 	}
 	provider := mapParameterProvider{&serviceMap}
 	actual := GetServiceFromProvider(&provider)
@@ -326,9 +326,9 @@ func (s *TypesTestSuite) Test_GetServiceFromProvider_UsesHttpsOnlyFromEnvVar() {
 		ServiceName: "serviceName",
 	}
 	serviceMap := map[string]string{
-		"serviceName":       expected.ServiceName,
-		"port.1":            expected.ServiceDest[0].Port,
-		"servicePath.1":     strings.Join(expected.ServiceDest[0].ServicePath, ","),
+		"serviceName":   expected.ServiceName,
+		"port.1":        expected.ServiceDest[0].Port,
+		"servicePath.1": strings.Join(expected.ServiceDest[0].ServicePath, ","),
 	}
 	provider := mapParameterProvider{&serviceMap}
-Original file line number
+Diff line change
@@ -1,6 +1,7 @@
     /.idea
     /*.iml
     /*.out
+    /certs
     /docker-flow-proxy
     *.bak
     /tmp
@@ Expand Down @@