homogenization of templates: ECS

autogen/gentemplates/gen.go

@@ -543,173 +543,157 @@ func templatesDockerTmpl() (*asset, error) {
 }
 
 var _templatesEcsTmpl = []byte(`[backends]
-{{range $serviceName, $instances := .Services}}
+{{range $serviceName, $instances := .Services }}
+  {{ $firstInstance := index $instances 0 }}
 
-  {{if hasCircuitBreakerLabel $instances}}
-  [backends.backend-{{ $serviceName }}.circuitBreaker]
-    expression = "{{getCircuitBreakerExpression $instances}}"
+  {{ $circuitBreaker := getCircuitBreaker $firstInstance }}
+  {{if $circuitBreaker }}
+  [backends."backend-{{ $serviceName }}".circuitBreaker]
+    expression = "{{ $circuitBreaker.Expression }}"
   {{end}}
 
-  {{if hasLoadBalancerLabel $instances}}
-  [backends.backend-{{ $serviceName }}.loadBalancer]
-    method = "{{ getLoadBalancerMethod $instances}}"
-    sticky = {{ getSticky $instances}}
-    {{if hasStickinessLabel $instances}}
-    [backends.backend-{{ $serviceName }}.loadBalancer.stickiness]
-      cookieName = "{{getStickinessCookieName $instances}}"
+  {{ $loadBalancer := getLoadBalancer $firstInstance }}
+  {{if $loadBalancer }}
+  [backends."backend-{{ $serviceName }}".loadBalancer]
+    method = "{{ $loadBalancer.Method }}"
+    sticky = {{ $loadBalancer.Sticky }}
+    {{if $loadBalancer.Stickiness }}
+    [backends."backend-{{ $serviceName }}".loadBalancer.stickiness]
+      cookieName = "{{ $loadBalancer.Stickiness.CookieName }}"
     {{end}}
   {{end}}
 
-  {{if hasMaxConnLabels $instances}}
-  [backends.backend-{{ $serviceName }}.maxConn]
-    amount = {{getMaxConnAmount $instances}}
-    extractorFunc = "{{getMaxConnExtractorFunc $instances}}"
+  {{ $maxConn := getMaxConn $firstInstance }}
+  {{if $maxConn }}
+  [backends."backend-{{ $serviceName }}".maxConn]
+    extractorFunc = "{{ $maxConn.ExtractorFunc }}"
+    amount = {{ $maxConn.Amount }}
   {{end}}
 
-  {{ if hasHealthCheckLabels $instances }}
+  {{ $healthCheck := getHealthCheck $firstInstance }}
+  {{if $healthCheck }}
   [backends.backend-{{ $serviceName }}.healthCheck]
-    path = "{{getHealthCheckPath $instances }}"
-    port = {{getHealthCheckPort $instances}}
-    interval = "{{getHealthCheckInterval $instances }}"
+    path = "{{ $healthCheck.Path }}"
+    port = {{ $healthCheck.Port }}
+    interval = "{{ $healthCheck.Interval }}"
   {{end}}
 
-  {{range $index, $instance := $instances}}
-  [backends.backend-{{ $instance.Name }}.servers.server-{{ $instance.Name }}{{ $instance.ID }}]
-    url = "{{ getProtocol $instance }}://{{ getHost $instance }}:{{ getPort $instance }}"
-    weight = {{ getWeight $instance}}
+  {{range $serverName, $server := getServers $instances }}
+  [backends.backend-{{ $serviceName }}.servers.{{ $serverName }}]
+    url = "{{ $server.URL }}"
+    weight = {{ $server.Weight }}
   {{end}}
 
 {{end}}
 
 [frontends]
-{{range $serviceName, $instances := .Services}}
-{{range $instance := filterFrontends $instances}}
+{{range $serviceName, $instances := .Services }}
+{{range $instance := filterFrontends $instances }}
 
   [frontends.frontend-{{ $serviceName }}]
     backend = "backend-{{ $serviceName }}"
-    priority = {{ getPriority $instance}}
-    passHostHeader = {{ getPassHostHeader $instance}}
-    passTLSCert = {{ getPassTLSCert $instance}}
+    priority = {{ getPriority $instance }}
+    passHostHeader = {{ getPassHostHeader $instance }}
+    passTLSCert = {{ getPassTLSCert $instance }}
 
-    entryPoints = [{{range  getEntryPoints $instance}}
+    entryPoints = [{{range getEntryPoints $instance }}
       "{{.}}",
       {{end}}]
 
-    {{if getWhitelistSourceRange $instance}}
-    whitelistSourceRange = [{{range getWhitelistSourceRange $instance}}
+    {{ $whitelistSourceRange := getWhitelistSourceRange $instance }}
+    {{if $whitelistSourceRange }}
+    whitelistSourceRange = [{{range $whitelistSourceRange }}
       "{{.}}",
       {{end}}]
     {{end}}
 
-    basicAuth = [{{range getBasicAuth $instance}}
+    basicAuth = [{{range getBasicAuth $instance }}
       "{{.}}",
       {{end}}]
 
-    {{if hasRedirect $instance}}
+          
+    {{ $redirect := getRedirect $instance }}
+    {{if $redirect }}
     [frontends."frontend-{{ $serviceName }}".redirect]
-      entryPoint = "{{getRedirectEntryPoint $instance}}"
-      regex = "{{getRedirectRegex $instance}}"
-      replacement = "{{getRedirectReplacement $instance}}"
+      entryPoint = "{{ $redirect.EntryPoint }}"
+      regex = "{{ $redirect.Regex }}"
+      replacement = "{{ $redirect.Replacement }}"
     {{end}}
 
-    {{ if hasErrorPages $instance }}
+    {{ $errorPages := getErrorPages $instance }}
+    {{if $errorPages }}
     [frontends."frontend-{{ $serviceName }}".errors]
-      {{ range $pageName, $page := getErrorPages $instance }}
+      {{range $pageName, $page := $errorPages }}
       [frontends."frontend-{{ $serviceName }}".errors.{{ $pageName }}]
-        status = [{{range $page.Status}}
+        status = [{{range $page.Status }}
           "{{.}}",
           {{end}}]
-        backend = "{{$page.Backend}}"
-        query = "{{$page.Query}}"
+        backend = "{{ $page.Backend }}"
+        query = "{{ $page.Query }}"
       {{end}}
     {{end}}
 
-    {{ if hasRateLimits $instance }}
+    {{ $rateLimit := getRateLimit $instance }}
+    {{if $rateLimit }}
     [frontends."frontend-{{ $serviceName }}".rateLimit]
-      extractorFunc = "{{ getRateLimitsExtractorFunc $instance }}"
+      extractorFunc = "{{ $rateLimit.ExtractorFunc }}"
       [frontends."frontend-{{ $serviceName }}".rateLimit.rateSet]
-        {{ range $limitName, $rateLimit := getRateLimits $instance }}
+        {{ range $limitName, $limit := $rateLimit.RateSet }}
         [frontends."frontend-{{ $serviceName }}".rateLimit.rateSet.{{ $limitName }}]
-          period = "{{ $rateLimit.Period }}"
-          average = {{ $rateLimit.Average }}
-          burst = {{ $rateLimit.Burst }}
+          period = "{{ $limit.Period }}"
+          average = {{ $limit.Average }}
+          burst = {{ $limit.Burst }}
         {{end}}
     {{end}}
 
-    {{if hasHeaders $instance }}
+    {{ $headers := getHeaders $instance }}
+    {{if $headers }}
     [frontends."frontend-{{ $serviceName }}".headers]
-      {{if hasSSLRedirectHeaders $instance}}
-      SSLRedirect = {{getSSLRedirectHeaders $instance}}
+      SSLRedirect = {{ $headers.SSLRedirect }}
+      SSLTemporaryRedirect = {{ $headers.SSLTemporaryRedirect }}
+      SSLHost = "{{ $headers.SSLHost }}"
+      STSSeconds = {{ $headers.STSSeconds }}
+      STSIncludeSubdomains = {{ $headers.STSIncludeSubdomains }}
+      STSPreload = {{ $headers.STSPreload }}
+      ForceSTSHeader = {{ $headers.ForceSTSHeader }}
+      FrameDeny = {{ $headers.FrameDeny }}
+      CustomFrameOptionsValue = "{{ $headers.CustomFrameOptionsValue }}"
+      ContentTypeNosniff = {{ $headers.ContentTypeNosniff }}
+      BrowserXSSFilter = {{ $headers.BrowserXSSFilter }}
+      ContentSecurityPolicy = "{{ $headers.ContentSecurityPolicy }}"
+      PublicKey = "{{ $headers.PublicKey }}"
+      ReferrerPolicy = "{{ $headers.ReferrerPolicy }}"
+      IsDevelopment = {{ $headers.IsDevelopment }}
+
+      {{if $headers.AllowedHosts }}
+      AllowedHosts = [{{range $headers.AllowedHosts }}
+        "{{.}}",
+        {{end}}]
       {{end}}
-      {{if hasSSLTemporaryRedirectHeaders $instance}}
-      SSLTemporaryRedirect = {{getSSLTemporaryRedirectHeaders $instance}}
+
+      {{if $headers.HostsProxyHeaders }}
+      HostsProxyHeaders = [{{range $headers.HostsProxyHeaders }}
+        "{{.}}",
+        {{end}}]
       {{end}}
-      {{if hasSSLHostHeaders $instance}}
-      SSLHost = "{{getSSLHostHeaders $instance}}"
-      {{end}}
-      {{if hasSTSSecondsHeaders $instance}}
-      STSSeconds = {{getSTSSecondsHeaders $instance}}
-      {{end}}
-      {{if hasSTSIncludeSubdomainsHeaders $instance}}
-      STSIncludeSubdomains = {{getSTSIncludeSubdomainsHeaders $instance}}
-      {{end}}
-      {{if hasSTSPreloadHeaders $instance}}
-      STSPreload = {{getSTSPreloadHeaders $instance}}
-      {{end}}
-      {{if hasForceSTSHeaderHeaders $instance}}
-      ForceSTSHeader = {{getForceSTSHeaderHeaders $instance}}
-      {{end}}
-      {{if hasFrameDenyHeaders $instance}}
-      FrameDeny = {{getFrameDenyHeaders $instance}}
-      {{end}}
-      {{if hasCustomFrameOptionsValueHeaders $instance}}
-      CustomFrameOptionsValue = "{{getCustomFrameOptionsValueHeaders $instance}}"
-      {{end}}
-      {{if hasContentTypeNosniffHeaders $instance}}
-      ContentTypeNosniff = {{getContentTypeNosniffHeaders $instance}}
-      {{end}}
-      {{if hasBrowserXSSFilterHeaders $instance}}
-      BrowserXSSFilter = {{getBrowserXSSFilterHeaders $instance}}
-      {{end}}
-      {{if hasContentSecurityPolicyHeaders $instance}}
-      ContentSecurityPolicy = "{{getContentSecurityPolicyHeaders $instance}}"
-      {{end}}
-      {{if hasPublicKeyHeaders $instance}}
-      PublicKey = "{{getPublicKeyHeaders $instance}}"
-      {{end}}
-      {{if hasReferrerPolicyHeaders $instance}}
-      ReferrerPolicy = "{{getReferrerPolicyHeaders $instance}}"
-      {{end}}
-      {{if hasIsDevelopmentHeaders $instance}}
-      IsDevelopment = {{getIsDevelopmentHeaders $instance}}
-      {{end}}
-      {{if hasRequestHeaders $instance}}
-        [frontends."frontend-{{ $serviceName }}".headers.customRequestHeaders]
-        {{range $k, $v := getRequestHeaders $instance}}
+
+      {{if $headers.CustomRequestHeaders }}
+      [frontends."frontend-{{ $serviceName }}".headers.customRequestHeaders]
+        {{range $k, $v := $headers.CustomRequestHeaders }}
         {{$k}} = "{{$v}}"
         {{end}}
       {{end}}
-      {{if hasResponseHeaders $instance}}
+
+      {{if $headers.CustomResponseHeaders }}
       [frontends."frontend-{{ $serviceName }}".headers.customResponseHeaders]
-        {{range $k, $v := getResponseHeaders $instance}}
+        {{range $k, $v := $headers.CustomResponseHeaders }}
         {{$k}} = "{{$v}}"
         {{end}}
       {{end}}
-      {{if hasAllowedHostsHeaders $instance}}
-      [frontends."frontend-{{ $serviceName }}".headers.AllowedHosts]
-        {{range getAllowedHostsHeaders $instance}}
-        "{{.}}"
-        {{end}}
-      {{end}}
-      {{if hasHostsProxyHeaders $instance}}
-      [frontends."frontend-{{ $serviceName }}".headers.HostsProxyHeaders]
-        {{range getHostsProxyHeaders $instance}}
-        "{{.}}"
-        {{end}}
-      {{end}}
-      {{if hasSSLProxyHeaders $instance}}
+
+      {{if $headers.SSLProxyHeaders }}
       [frontends."frontend-{{ $serviceName }}".headers.SSLProxyHeaders]
-        {{range $k, $v := getSSLProxyHeaders $instance}}
+        {{range $k, $v := $headers.SSLProxyHeaders }}
         {{$k}} = "{{$v}}"
         {{end}}
       {{end}}