baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(ecs): template readability.

Browse source
This commit is contained in:
Fernandez Ludovic 2017-12-16 19:22:16 +01:00 committed by Traefiker
parent 7e5c258266
commit f195ef27f3
2 changed files with 42 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
provider/ecs/config_test.go
View file

@ -12,7 +12,6 @@ import (
)
func TestBuildConfiguration(t *testing.T) {
provider := &Provider{}
tests := []struct {
desc string
services map[string][]ecsInstance
@ -134,6 +133,9 @@ func TestBuildConfiguration(t *testing.T) {
for _, test := range tests {
t.Run(test.desc, func(t *testing.T) {
t.Parallel()
provider := &Provider{}
got, err := provider.buildConfiguration(test.services)
assert.Equal(t, test.err, err)
assert.Equal(t, test.expected, got)
@ -317,6 +319,8 @@ func TestChunkedTaskArns(t *testing.T) {
for _, test := range tests {
test := test
t.Run(test.desc, func(t *testing.T) {
t.Parallel()
var tasks []*string
for v := 0; v < test.count; v++ {
tasks = append(tasks, &testVal)
@ -331,7 +335,6 @@ func TestChunkedTaskArns(t *testing.T) {
assert.Equal(t, test.expectedLengths, outCount, "Chunking %d elements", test.count)
})
}
}
@ -352,6 +355,7 @@ func TestGetHost(t *testing.T) {
test := test
t.Run(test.desc, func(t *testing.T) {
t.Parallel()
actual := getHost(test.instanceInfo)
assert.Equal(t, test.expected, actual)
})
@ -389,6 +393,7 @@ func TestGetPort(t *testing.T) {
test := test
t.Run(test.desc, func(t *testing.T) {
t.Parallel()
actual := getPort(test.instanceInfo)
assert.Equal(t, test.expected, actual)
})
@ -464,6 +469,7 @@ func TestGetFuncSliceString(t *testing.T) {
test := test
t.Run(test.desc, func(t *testing.T) {
t.Parallel()
actual := getFuncSliceString(label.TraefikFrontendEntryPoints)(test.instanceInfo)
assert.Equal(t, test.expected, actual)
})

58
templates/ecs.tmpl
View file

@ -1,37 +1,47 @@
[backends]{{range $serviceName, $instances := .Services}}
[backends.backend-{{ $serviceName }}.loadbalancer]
[backends]
{{range $serviceName, $instances := .Services}}
[backends.backend-{{ $serviceName }}.loadBalancer]
method = "{{ getLoadBalancerMethod $instances}}"
sticky = {{ getSticky $instances}}
{{if hasStickinessLabel $instances}}
[backends.backend-{{ $serviceName }}.loadbalancer.stickiness]
{{if hasStickinessLabel $instances}}
[backends.backend-{{ $serviceName }}.loadBalancer.stickiness]
cookieName = "{{getStickinessCookieName $instances}}"
{{end}}
{{ if hasHealthCheckLabels $instances }}
[backends.backend-{{ $serviceName }}.healthcheck]
path = "{{getHealthCheckPath $instances }}"
interval = "{{getHealthCheckInterval $instances }}"
{{end}}
{{range $index, $i := $instances}}
[backends.backend-{{ $i.Name }}.servers.server-{{ $i.Name }}{{ $i.ID }}]
url = "{{ getProtocol $i }}://{{ getHost $i }}:{{ getPort $i }}"
weight = {{ getWeight $i}}
{{ if hasHealthCheckLabels $instances }}
[backends.backend-{{ $serviceName }}.healthCheck]
path = "{{getHealthCheckPath $instances }}"
interval = "{{getHealthCheckInterval $instances }}"
{{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}}
{{end}}
{{end}}
[frontends]{{range $serviceName, $instances := .Services}}
{{range filterFrontends $instances}}
[frontends.frontend-{{ $serviceName }}]
backend = "backend-{{ $serviceName }}"
passHostHeader = {{ getPassHostHeader .}}
priority = {{ getPriority .}}
entryPoints = [{{range getEntryPoints .}}
[frontends]
{{range $serviceName, $instances := .Services}}
{{range filterFrontends $instances}}
[frontends.frontend-{{ $serviceName }}]
backend = "backend-{{ $serviceName }}"
priority = {{ getPriority .}}
passHostHeader = {{ getPassHostHeader .}}
entryPoints = [{{range getEntryPoints .}}
"{{.}}",
{{end}}]
basicAuth = [{{range getBasicAuth .}}
{{end}}]
basicAuth = [{{range getBasicAuth .}}
"{{.}}",
{{end}}]
{{end}}]
[frontends.frontend-{{ $serviceName }}.routes.route-frontend-{{ $serviceName }}]
rule = "{{getFrontendRule .}}"
{{end}}
{{end}}
{{end}}