RFC: Adds service index for http/https ACL

Author: thomasjpfan

proxy/ha_proxy_test.go

@@ -791,10 +791,10 @@ func (s HaProxyTestSuite) Test_CreateConfigFromTemplates_AddsServicePathExclude(
 		`%s
     acl url_my-service-11111_0 path_beg /path-1
     acl url_exclude_my-service-11111_0 path_beg /path-2 path_beg /path-3
-    acl http_my-service-1 dst_port 80
-    acl https_my-service-1 dst_port 443
-    use_backend my-service-1-be1111_0 if url_my-service-11111_0 !url_exclude_my-service-11111_0 http_my-service-1
-    use_backend https-my-service-1-be1111_0 if url_my-service-11111_0 !url_exclude_my-service-11111_0 https_my-service-1%s`,
+    acl http_my-service-1_0 dst_port 80
+    acl https_my-service-1_0 dst_port 443
+    use_backend my-service-1-be1111_0 if url_my-service-11111_0 !url_exclude_my-service-11111_0 http_my-service-1_0
+    use_backend https-my-service-1-be1111_0 if url_my-service-11111_0 !url_exclude_my-service-11111_0 https_my-service-1_0%s`,
 		tmpl,
 		s.ServicesContent,
 	)
@@ -1833,10 +1833,10 @@ func (s HaProxyTestSuite) Test_CreateConfigFromTemplates_AddsContentFrontEndWith
 	expectedData := fmt.Sprintf(
 		`%s
     acl url_my-service1111_0 path_beg /path
-    acl http_my-service dst_port 80
-    acl https_my-service dst_port 443
-    use_backend my-service-be1111_0 if url_my-service1111_0 http_my-service
-    use_backend https-my-service-be1111_0 if url_my-service1111_0 https_my-service%s`,
+    acl http_my-service_0 dst_port 80
+    acl https_my-service_0 dst_port 443
+    use_backend my-service-be1111_0 if url_my-service1111_0 http_my-service_0
+    use_backend https-my-service-be1111_0 if url_my-service1111_0 https_my-service_0%s`,
 		tmpl,
 		s.ServicesContent,
 	)

proxy/template.go

@@ -37,12 +37,10 @@ func getFrontTemplate(s Service) string {
     acl hdr_{{$.AclName}}{{$sd.Port}}_{{incIndex}} hdr({{$key}}) {{$value}}
         {{- end}}
     {{- end}}
-{{- end}}
-{{- if gt $.HttpsPort 0 }}
-    acl http_{{.ServiceName}} dst_port 80
-    acl https_{{.ServiceName}} dst_port 443
-{{- end}}
-{{- range $sd := .ServiceDest}}
+    {{- if gt $.HttpsPort 0 }}
+    acl http_{{$.ServiceName}}_{{.Index}} dst_port 80
+    acl https_{{$.ServiceName}}_{{.Index}} dst_port 443
+    {{- end}}
     {{- range $rd := $sd.RedirectFromDomain}}
     http-request redirect code 301 prefix http://{{index $sd.ServiceDomain 0}} if { hdr_beg(host) -i {{$rd}} }
     {{- end}}
@@ -60,8 +58,8 @@ func getFrontTemplate(s Service) string {
 {{- range $sd := .ServiceDest}}
     {{- if eq .ReqMode "http"}}{{- if ne .Port ""}}
     use_backend {{$.AclName}}-be{{.Port}}_{{.Index}} if url_{{$.AclName}}{{.Port}}_{{.Index}}{{if .ServicePathExclude}} !url_exclude_{{$.AclName}}{{.Port}}_{{.Index}}{{end}}{{if .ServiceDomain}} domain_{{$.AclName}}{{.Port}}_{{.Index}}{{end}}{{if .ServiceHeader}}{{resetIndex}}{{range $key, $value := .ServiceHeader}} hdr_{{$.AclName}}{{$sd.Port}}_{{incIndex}}{{end}}{{end}}{{.SrcPortAclName}}
-        {{- if gt $.HttpsPort 0 }} http_{{$.ServiceName}}
-    use_backend https-{{$.AclName}}-be{{.Port}}_{{.Index}} if url_{{$.AclName}}{{.Port}}_{{.Index}}{{if .ServicePathExclude}} !url_exclude_{{$.AclName}}{{.Port}}_{{.Index}}{{end}}{{if .ServiceDomain}} domain_{{$.AclName}}{{.Port}}_{{.Index}}{{end}} https_{{$.ServiceName}}
+        {{- if gt $.HttpsPort 0 }} http_{{$.ServiceName}}_{{.Index}}
+    use_backend https-{{$.AclName}}-be{{.Port}}_{{.Index}} if url_{{$.AclName}}{{.Port}}_{{.Index}}{{if .ServicePathExclude}} !url_exclude_{{$.AclName}}{{.Port}}_{{.Index}}{{end}}{{if .ServiceDomain}} domain_{{$.AclName}}{{.Port}}_{{.Index}}{{end}} https_{{$.ServiceName}}_{{.Index}}
         {{- end}}
     {{- $length := len .UserAgent.Value}}{{if gt $length 0}} user_agent_{{$.AclName}}_{{.UserAgent.AclName}}_{{.Index}}{{end}}
         {{- if $.IsDefaultBackend}}