From 8e7ac513b60f767b371788e09124429dc48a6e33 Mon Sep 17 00:00:00 2001
From: Fernandez Ludovic <ludovic@containo.us>
Date: Tue, 2 Jan 2018 18:21:38 +0100
Subject: [PATCH] refactor: add backend name functions.

---
 provider/consul/consul_catalog_config.go | 10 ++++++++--
 templates/consul_catalog.tmpl            | 17 ++++++++---------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/provider/consul/consul_catalog_config.go b/provider/consul/consul_catalog_config.go
index 11042fbf4..998595b7f 100644
--- a/provider/consul/consul_catalog_config.go
+++ b/provider/consul/consul_catalog_config.go
@@ -24,7 +24,9 @@ func (p *CatalogProvider) buildConfiguration(catalog []catalogUpdate) *types.Con
 		"hasTag":       hasTag,
 
 		// Backend functions
-		"getBackend":              getBackend,
+		"getBackend":              getNodeBackendName, // Deprecated [breaking] getBackend -> getNodeBackendName
+		"getNodeBackendName":      getNodeBackendName,
+		"getServiceBackendName":   getServiceBackendName,
 		"getBackendAddress":       getBackendAddress,
 		"getBackendName":          getServerName, // Deprecated [breaking] getBackendName -> getServerName
 		"getServerName":           getServerName,
@@ -139,10 +141,14 @@ func getEntryPoints(list string) []string {
 	return strings.Split(list, ",")
 }
 
-func getBackend(node *api.ServiceEntry) string {
+func getNodeBackendName(node *api.ServiceEntry) string {
 	return strings.ToLower(node.Service.Service)
 }
 
+func getServiceBackendName(service *serviceUpdate) string {
+	return strings.ToLower(service.ServiceName)
+}
+
 func getBackendAddress(node *api.ServiceEntry) string {
 	if node.Service.Address != "" {
 		return node.Service.Address
diff --git a/templates/consul_catalog.tmpl b/templates/consul_catalog.tmpl
index 441165018..88847356b 100644
--- a/templates/consul_catalog.tmpl
+++ b/templates/consul_catalog.tmpl
@@ -1,34 +1,33 @@
 [backends]
 {{range $service := .Services}}
-  {{$sname := $service.ServiceName}}
 
   {{ $circuitBreaker := getCircuitBreaker $service.Attributes }}
   {{if $circuitBreaker }}
-  [backends."backend-{{ $sname }}".circuitBreaker]
+  [backends."backend-{{ getServiceBackendName $service }}".circuitBreaker]
     expression = "{{ $circuitBreaker.Expression }}"
   {{end}}
 
   {{ $loadBalancer := getLoadBalancer $service.Attributes }}
   {{if $loadBalancer }}
-  [backends."backend-{{ $sname }}".loadBalancer]
+  [backends."backend-{{ getServiceBackendName $service }}".loadBalancer]
     method = "{{ $loadBalancer.Method }}"
     sticky = {{ $loadBalancer.Sticky }}
     {{if $loadBalancer.Stickiness }}
-    [backends."backend-{{ $sname }}".loadBalancer.stickiness]
+    [backends."backend-{{ getServiceBackendName $service }}".loadBalancer.stickiness]
       cookieName = "{{ $loadBalancer.Stickiness.CookieName }}"
     {{end}}
   {{end}}
 
   {{ $maxConn := getMaxConn $service.Attributes }}
   {{if $maxConn }}
-  [backends."backend-{{ $sname }}".maxConn]
+  [backends."backend-{{ getServiceBackendName $service }}".maxConn]
     extractorFunc = "{{ $maxConn.ExtractorFunc }}"
     amount = {{ $maxConn.Amount }}
   {{end}}
 
   {{ $healthCheck := getHealthCheck $service.Attributes }}
   {{if $healthCheck }}
-  [backends.backend-{{ $sname }}.healthCheck]
+  [backends.backend-{{ getServiceBackendName $service }}.healthCheck]
     path = "{{ $healthCheck.Path }}"
     port = {{ $healthCheck.Port }}
     interval = "{{ $healthCheck.Interval }}"
@@ -37,7 +36,7 @@
 {{end}}
 {{range $index, $node := .Nodes}}
 
-  [backends."backend-{{ getBackend $node }}".servers."{{ getServerName $node $index }}"]
+  [backends."backend-{{ getNodeBackendName $node }}".servers."{{ getServerName $node $index }}"]
     url = "{{ getProtocol $node.Service.Tags }}://{{ getBackendAddress $node }}:{{ $node.Service.Port }}"
     weight = {{ getWeight $node.Service.Tags }}
 
@@ -47,7 +46,7 @@
 {{range $service := .Services}}
 
   [frontends."frontend-{{ $service.ServiceName }}"]
-    backend = "backend-{{ $service.ServiceName }}"
+    backend = "backend-{{ getServiceBackendName $service }}"
     priority = {{ getPriority $service.Attributes }}
     passHostHeader = {{ getPassHostHeader $service.Attributes }}
     passTLSCert = {{ getPassTLSCert $service.Attributes }}
@@ -102,7 +101,7 @@
 
     {{end}}
 
-    [frontends."frontend-{{$service.ServiceName}}".routes."route-host-{{$service.ServiceName}}"]
+    [frontends."frontend-{{ $service.ServiceName }}".routes."route-host-{{ $service.ServiceName }}"]
       rule = "{{ getFrontendRule $service }}"
 
 {{end}}