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

Use name@provider instead of provider@name.

Browse source
This commit is contained in:
Ludovic Fernandez 2019-06-21 09:54:04 +02:00 • committed by Traefiker Bot
parent 1e779f7135
commit adc9a65ae3
35 changed files with 472 additions and 472 deletions
Download patch file Download diff file Expand all files Collapse all files

4
integration/access_log_test.go
View file

@ -581,7 +581,7 @@ func CheckAccessLogFormat(c *check.C, line string, i int) {
c.Assert(results, checker.HasLen, 14)
c.Assert(results[accesslog.OriginStatus], checker.Matches, `^(-|\d{3})$`)
c.Assert(results[accesslog.RequestCount], checker.Equals, fmt.Sprintf("%d", i+1))
c.Assert(results[accesslog.RouterName], checker.HasPrefix, "\"docker@rt-")
c.Assert(results[accesslog.RouterName], checker.Matches, `"rt-.+@docker"`)
c.Assert(results[accesslog.ServiceURL], checker.HasPrefix, "\"http://")
c.Assert(results[accesslog.Duration], checker.Matches, `^\d+ms$`)
}
@ -596,7 +596,7 @@ func checkAccessLogExactValues(c *check.C, line string, i int, v accessLogValue)
}
c.Assert(results[accesslog.OriginStatus], checker.Equals, v.code)
c.Assert(results[accesslog.RequestCount], checker.Equals, fmt.Sprintf("%d", i+1))
c.Assert(results[accesslog.RouterName], checker.Matches, `^"?(docker@)?`+v.routerName+`.*$`)
c.Assert(results[accesslog.RouterName], checker.Matches, `^"?`+v.routerName+`.*(@docker)?$`)
c.Assert(results[accesslog.ServiceURL], checker.Matches, `^"?`+v.serviceURL+`.*$`)
c.Assert(results[accesslog.Duration], checker.Matches, `^\d+ms$`)
}

2
integration/docker_compose_test.go
View file

@ -77,7 +77,7 @@ func (s *DockerComposeSuite) TestComposeScale(c *check.C) {
services := rtconf.Services
c.Assert(services, checker.HasLen, 1)
for k, v := range services {
c.Assert(k, checker.Equals, "docker@"+composeService+"_integrationtest"+composeProject)
c.Assert(k, checker.Equals, composeService+"_integrationtest"+composeProject+"@docker")
c.Assert(v.LoadBalancer.Servers, checker.HasLen, serviceCount)
// We could break here, but we don't just to keep us honest.
}

2
integration/fixtures/simple_auth.toml
View file

@ -13,7 +13,7 @@ level = "DEBUG"
address = ":8001"
[api]
middlewares = ["file@authentication"]
middlewares = ["authentication@file"]
[ping]

4
integration/simple_test.go
View file

@ -444,8 +444,8 @@ func (s *SimpleSuite) TestMultiprovider(c *check.C) {
Routers: map[string]*config.Router{
"router1": {
EntryPoints: []string{"web"},
Middlewares: []string{"file@customheader"},
Service: "file@service",
Middlewares: []string{"customheader@file"},
Service: "service@file",
Rule: "PathPrefix(`/`)",
},
},

22
integration/testdata/rawdata-crd.json vendored
View file

@ -1,6 +1,6 @@
{
"routers": {
"kubernetescrd@default/test-crd-6b204d94623b3df4370c": {
"default/test-crd-6b204d94623b3df4370c@kubernetescrd": {
"entryPoints": [
"web"
],
@ -8,7 +8,7 @@
"rule": "Host(`foo.com`) \u0026\u0026 PathPrefix(`/bar`)",
"priority": 12
},
"kubernetescrd@default/test2-crd-23c7f4c450289ee29016": {
"default/test2-crd-23c7f4c450289ee29016@kubernetescrd": {
"entryPoints": [
"web"
],
@ -20,19 +20,19 @@
}
},
"middlewares": {
"kubernetescrd@default/stripprefix": {
"default/stripprefix@kubernetescrd": {
"stripPrefix": {
"prefixes": [
"/tobestripped"
]
},
"usedBy": [
"kubernetescrd@default/test2-crd-23c7f4c450289ee29016"
"default/test2-crd-23c7f4c450289ee29016@kubernetescrd"
]
}
},
"services": {
"kubernetescrd@default/test-crd-6b204d94623b3df4370c": {
"default/test-crd-6b204d94623b3df4370c@kubernetescrd": {
"loadbalancer": {
"servers": [
{
@ -45,14 +45,14 @@
"passHostHeader": true
},
"usedBy": [
"kubernetescrd@default/test-crd-6b204d94623b3df4370c"
"default/test-crd-6b204d94623b3df4370c@kubernetescrd"
],
"serverStatus": {
"http://10.42.0.4:80": "UP",
"http://10.42.0.5:80": "UP"
}
},
"kubernetescrd@default/test2-crd-23c7f4c450289ee29016": {
"default/test2-crd-23c7f4c450289ee29016@kubernetescrd": {
"loadbalancer": {
"servers": [
{
@ -65,7 +65,7 @@
"passHostHeader": true
},
"usedBy": [
"kubernetescrd@default/test2-crd-23c7f4c450289ee29016"
"default/test2-crd-23c7f4c450289ee29016@kubernetescrd"
],
"serverStatus": {
"http://10.42.0.4:80": "UP",
@ -74,7 +74,7 @@
}
},
"tcpRouters": {
"kubernetescrd@default/test3-crd-673acf455cb2dab0b43a": {
"default/test3-crd-673acf455cb2dab0b43a@kubernetescrd": {
"entryPoints": [
"footcp"
],
@ -83,7 +83,7 @@
}
},
"tcpServices": {
"kubernetescrd@default/test3-crd-673acf455cb2dab0b43a": {
"default/test3-crd-673acf455cb2dab0b43a@kubernetescrd": {
"loadbalancer": {
"servers": [
{
@ -95,7 +95,7 @@
]
},
"usedBy": [
"kubernetescrd@default/test3-crd-673acf455cb2dab0b43a"
"default/test3-crd-673acf455cb2dab0b43a@kubernetescrd"
]
}
}

6
integration/testdata/rawdata-ingress.json vendored
View file

@ -1,13 +1,13 @@
{
"routers": {
"kubernetes@whoami-test/whoami": {
"whoami-test/whoami@kubernetes": {
"entryPoints": null,
"service": "default/whoami/http",
"rule": "Host(`whoami.test`) \u0026\u0026 PathPrefix(`/whoami`)"
}
},
"services": {
"kubernetes@default/whoami/http": {
"default/whoami/http@kubernetes": {
"loadbalancer": {
"servers": [
{
@ -20,7 +20,7 @@
"passHostHeader": true
},
"usedBy": [
"kubernetes@whoami-test/whoami"
"whoami-test/whoami@kubernetes"
],
"serverStatus": {
"http://10.42.0.2:80": "UP",

6
integration/tracing_test.go
View file

@ -89,7 +89,7 @@ func (s *TracingSuite) TestZipkinRateLimit(c *check.C) {
err = try.GetRequest("http://127.0.0.1:8000/ratelimit", 500*time.Millisecond, try.StatusCodeIs(http.StatusTooManyRequests))
c.Assert(err, checker.IsNil)
err = try.GetRequest("http://"+s.ZipkinIP+":9411/api/v2/spans?serviceName=tracing", 20*time.Second, try.BodyContains("forward service1/file@router1", "file@ratelimit"))
err = try.GetRequest("http://"+s.ZipkinIP+":9411/api/v2/spans?serviceName=tracing", 20*time.Second, try.BodyContains("forward service1/router1@file", "ratelimit@file"))
c.Assert(err, checker.IsNil)
}
@ -117,7 +117,7 @@ func (s *TracingSuite) TestZipkinRetry(c *check.C) {
err = try.GetRequest("http://127.0.0.1:8000/retry", 500*time.Millisecond, try.StatusCodeIs(http.StatusBadGateway))
c.Assert(err, checker.IsNil)
err = try.GetRequest("http://"+s.ZipkinIP+":9411/api/v2/spans?serviceName=tracing", 20*time.Second, try.BodyContains("forward service2/file@router2", "file@retry"))
err = try.GetRequest("http://"+s.ZipkinIP+":9411/api/v2/spans?serviceName=tracing", 20*time.Second, try.BodyContains("forward service2/router2@file", "retry@file"))
c.Assert(err, checker.IsNil)
}
@ -144,6 +144,6 @@ func (s *TracingSuite) TestZipkinAuth(c *check.C) {
err = try.GetRequest("http://127.0.0.1:8000/auth", 500*time.Millisecond, try.StatusCodeIs(http.StatusUnauthorized))
c.Assert(err, checker.IsNil)
err = try.GetRequest("http://"+s.ZipkinIP+":9411/api/v2/spans?serviceName=tracing", 20*time.Second, try.BodyContains("entrypoint web", "file@basic-auth"))
err = try.GetRequest("http://"+s.ZipkinIP+":9411/api/v2/spans?serviceName=tracing", 20*time.Second, try.BodyContains("entrypoint web", "basic-auth@file"))
c.Assert(err, checker.IsNil)
}