ENH: Only include backend when port is defined

Author: thomasjpfan

actions/reconfigure_test.go

@@ -669,6 +669,7 @@ backend %s-be%s_9
 func (s ReconfigureTestSuite) Test_Execute_WritesBeTemplateWithRedirectToHttps_WhenHttpsOnlyIsTrue() {
 	s.reconfigure.ServiceDest[0].HttpsOnly = true
 	s.reconfigure.ServiceDest[0].Index = 0
+	s.reconfigure.ServiceDest[0].Port = "8080"
 	var actualFilename, actualData string
 	expectedFilename := fmt.Sprintf("%s/%s-be.cfg", s.TemplatesPath, s.ServiceName)
 	expectedData := fmt.Sprintf(
@@ -702,6 +703,7 @@ func (s ReconfigureTestSuite) Test_Execute_WritesBeTemplateWithHttpsRedirectCode
 	s.reconfigure.ServiceDest[0].HttpsOnly = true
 	s.reconfigure.ServiceDest[0].HttpsRedirectCode = "301"
 	s.reconfigure.ServiceDest[0].Index = 0
+	s.reconfigure.ServiceDest[0].Port = "8080"
 	var actualFilename, actualData string
 	expectedFilename := fmt.Sprintf("%s/%s-be.cfg", s.TemplatesPath, s.ServiceName)
 	expectedData := fmt.Sprintf(
@@ -769,6 +771,7 @@ backend https-my-service-be1111_0
 
 func (s ReconfigureTestSuite) Test_Execute_AddsReqHeader_WhenAddReqHeaderIsSet() {
 	s.reconfigure.AddReqHeader = []string{"header-1", "header-2"}
+	s.reconfigure.ServiceDest[0].Port = "8080"
 	var actualFilename, actualData string
 	expectedFilename := fmt.Sprintf("%s/%s-be.cfg", s.TemplatesPath, s.ServiceName)
 	expectedData := fmt.Sprintf(
@@ -801,6 +804,7 @@ backend %s-be%s_0
 
 func (s ReconfigureTestSuite) Test_Execute_AddsResHeader_WhenAddResHeaderIsSet() {
 	s.reconfigure.AddResHeader = []string{"header-1", "header-2"}
+	s.reconfigure.ServiceDest[0].Port = "8080"
 	var actualFilename, actualData string
 	expectedFilename := fmt.Sprintf("%s/%s-be.cfg", s.TemplatesPath, s.ServiceName)
 	expectedData := fmt.Sprintf(
@@ -833,6 +837,7 @@ backend %s-be%s_0
 
 func (s ReconfigureTestSuite) Test_Execute_AddsCheckResolvers_WhenSet() {
 	s.reconfigure.CheckResolvers = true
+	s.reconfigure.ServiceDest[0].Port = "8080"
 	var actualFilename, actualData string
 	expectedFilename := fmt.Sprintf("%s/%s-be.cfg", s.TemplatesPath, s.ServiceName)
 	expectedData := fmt.Sprintf(
@@ -863,6 +868,7 @@ backend %s-be%s_0
 
 func (s ReconfigureTestSuite) Test_Execute_AddsReqHeader_WhenSetReqHeaderIsSet() {
 	s.reconfigure.SetReqHeader = []string{"header-1", "Strict-Transport-Security \"max-age=16000000; includeSubDomains; preload;\""}
+	s.reconfigure.ServiceDest[0].Port = "8080"
 	var actualFilename, actualData string
 	expectedFilename := fmt.Sprintf("%s/%s-be.cfg", s.TemplatesPath, s.ServiceName)
 	expectedData := fmt.Sprintf(
@@ -895,6 +901,7 @@ backend %s-be%s_0
 
 func (s ReconfigureTestSuite) Test_Execute_AddsResHeader_WhenSetResHeaderIsSet() {
 	s.reconfigure.SetResHeader = []string{"header-1", "header-2"}
+	s.reconfigure.ServiceDest[0].Port = "8080"
 	var actualFilename, actualData string
 	expectedFilename := fmt.Sprintf("%s/%s-be.cfg", s.TemplatesPath, s.ServiceName)
 	expectedData := fmt.Sprintf(
@@ -927,6 +934,7 @@ backend %s-be%s_0
 
 func (s ReconfigureTestSuite) Test_Execute_DelReqHeader_WhenDelReqHeaderIsSet() {
 	s.reconfigure.DelReqHeader = []string{"header-1", "header-2"}
+	s.reconfigure.ServiceDest[0].Port = "8080"
 	var actualFilename, actualData string
 	expectedFilename := fmt.Sprintf("%s/%s-be.cfg", s.TemplatesPath, s.ServiceName)
 	expectedData := fmt.Sprintf(
@@ -959,6 +967,7 @@ backend %s-be%s_0
 
 func (s ReconfigureTestSuite) Test_Execute_DelResHeader_WhenDelResHeaderIsSet() {
 	s.reconfigure.DelResHeader = []string{"header-1", "header-2"}
+	s.reconfigure.ServiceDest[0].Port = "8080"
 	var actualFilename, actualData string
 	expectedFilename := fmt.Sprintf("%s/%s-be.cfg", s.TemplatesPath, s.ServiceName)
 	expectedData := fmt.Sprintf(

proxy/template.go

@@ -209,8 +209,9 @@ func GetBackTemplate(sr *Service) string {
 
 	// HTTP
 	tmpl := `{{- range $sd := .ServiceDest}}
-{{- if eq .ReqModeFormatted "http" }}
-backend {{$.AclName}}-be{{.Port}}_{{.Index}}
+{{- if ne $sd.Port ""}}
+{{- if eq $sd.ReqModeFormatted "http" }}
+backend {{$.AclName}}-be{{$sd.Port}}_{{.Index}}
     mode {{.ReqModeFormatted}}
     {{- if .HttpsOnly}}
     http-request redirect scheme https{{if .HttpsRedirectCode}} code {{.HttpsRedirectCode}}{{end}} if !{ ssl_fc }
@@ -235,8 +236,8 @@ backend {{$.AclName}}-be{{.Port}}_{{.Index}}
     http-request set-path %[path,regsub({{.}})]
         {{- end}}
         {{- if eq .VerifyClientSsl true}}
-    acl valid_client_cert_{{$.ServiceName}}{{.Port}} ssl_c_used ssl_c_verify 0
-    http-request deny unless valid_client_cert_{{$.ServiceName}}{{.Port}}
+    acl valid_client_cert_{{$.ServiceName}}{{$sd.Port}} ssl_c_used ssl_c_verify 0
+    http-request deny unless valid_client_cert_{{$.ServiceName}}{{$sd.Port}}
         {{- end}}
         {{- if .AllowedMethods}}
     acl valid_allowed_method method{{range .AllowedMethods}} {{.}}{{end}}
@@ -278,7 +279,7 @@ backend {{$.AclName}}-be{{.Port}}_{{.Index}}
         {{- end}}
 {{- else if eq .ReqModeFormatted "tcp"}}
     {{- if eq $sd.ServiceGroup "" }}
-backend {{$.AclName}}-be{{.Port}}_{{.Index}}
+backend {{$.AclName}}-be{{$sd.Port}}_{{.Index}}
     mode tcp
         {{- if .CheckTCP}}
     option tcp-check
@@ -292,9 +293,10 @@ backend {{$.AclName}}-be{{.Port}}_{{.Index}}
     server {{$.ServiceName}} {{if eq $sd.OutboundHostname ""}}{{$.ServiceName}}{{end}}{{if ne $sd.OutboundHostname ""}}{{$sd.OutboundHostname}}{{end}}:{{$sd.Port}}{{if .CheckTCP}} check{{end}}
     {{- end}}
 {{- end}}
-{{- end}}
-{{- if ne $.BackendExtra ""}}
+        {{- if ne $.BackendExtra ""}}
     {{ $.BackendExtra }}
+        {{- end}}
+{{- end}}
 {{- end}}
 {{- range $sd := .ServiceDest}}
     {{- if gt $sd.HttpsPort 0}}