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

Remove the trailing dot if the domain is not defined.

Browse source
This commit is contained in:
Ludovic Fernandez 2018-10-23 17:36:05 +02:00 • committed by Traefiker Bot
parent 638960284e
commit c7df82e695
8 changed files with 46 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
provider/ecs/config.go
View file

@ -141,7 +141,11 @@ func (p *Provider) getFrontendRule(i ecsInstance) string {
}
domain := label.GetStringValue(i.SegmentLabels, label.TraefikDomain, p.Domain)
defaultRule := "Host:" + strings.ToLower(strings.Replace(i.Name, "_", "-", -1)) + "." + domain
if len(domain) > 0 {
domain = "." + domain
}
defaultRule := "Host:" + strings.ToLower(strings.Replace(i.Name, "_", "-", -1)) + domain
return label.GetStringValue(i.TraefikLabels, label.TraefikFrontendRule, defaultRule)
}

12
provider/ecs/config_test.go
View file

@ -52,7 +52,7 @@ func TestBuildConfiguration(t *testing.T) {
Backend: "backend-instance",
Routes: map[string]types.Route{
"route-frontend-instance": {
Rule: "Host:instance.",
Rule: "Host:instance",
},
},
PassHostHeader: true,
@ -99,7 +99,7 @@ func TestBuildConfiguration(t *testing.T) {
Backend: "backend-instance",
Routes: map[string]types.Route{
"route-frontend-instance": {
Rule: "Host:instance.",
Rule: "Host:instance",
},
},
PassHostHeader: true,
@ -144,7 +144,7 @@ func TestBuildConfiguration(t *testing.T) {
Backend: "backend-instance",
Routes: map[string]types.Route{
"route-frontend-instance": {
Rule: "Host:instance.",
Rule: "Host:instance",
},
},
Auth: &types.Auth{
@ -195,7 +195,7 @@ func TestBuildConfiguration(t *testing.T) {
Backend: "backend-instance",
Routes: map[string]types.Route{
"route-frontend-instance": {
Rule: "Host:instance.",
Rule: "Host:instance",
},
},
Auth: &types.Auth{
@ -246,7 +246,7 @@ func TestBuildConfiguration(t *testing.T) {
Backend: "backend-instance",
Routes: map[string]types.Route{
"route-frontend-instance": {
Rule: "Host:instance.",
Rule: "Host:instance",
},
},
Auth: &types.Auth{
@ -305,7 +305,7 @@ func TestBuildConfiguration(t *testing.T) {
Backend: "backend-instance",
Routes: map[string]types.Route{
"route-frontend-instance": {
Rule: "Host:instance.",
Rule: "Host:instance",
},
},
Auth: &types.Auth{