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

22
pkg/server/router/router_test.go
View file

@ -204,14 +204,14 @@ func TestRouterManager_Get(t *testing.T) {
{
desc: "no middleware with provider name",
routersConfig: map[string]*config.Router{
"provider-1@foo": {
"foo@provider-1": {
EntryPoints: []string{"web"},
Service: "foo-service",
Rule: "Host(`foo.bar`)",
},
},
serviceConfig: map[string]*config.Service{
"provider-1@foo-service": {
"foo-service@provider-1": {
LoadBalancer: &config.LoadBalancerService{
Servers: []config.Server{
{
@ -227,14 +227,14 @@ func TestRouterManager_Get(t *testing.T) {
{
desc: "no middleware with specified provider name",
routersConfig: map[string]*config.Router{
"provider-1@foo": {
"foo@provider-1": {
EntryPoints: []string{"web"},
Service: "provider-2@foo-service",
Service: "foo-service@provider-2",
Rule: "Host(`foo.bar`)",
},
},
serviceConfig: map[string]*config.Service{
"provider-2@foo-service": {
"foo-service@provider-2": {
LoadBalancer: &config.LoadBalancerService{
Servers: []config.Server{
{
@ -250,15 +250,15 @@ func TestRouterManager_Get(t *testing.T) {
{
desc: "middleware: chain with provider name",
routersConfig: map[string]*config.Router{
"provider-1@foo": {
"foo@provider-1": {
EntryPoints: []string{"web"},
Middlewares: []string{"provider-2@chain-middle", "headers-middle"},
Middlewares: []string{"chain-middle@provider-2", "headers-middle"},
Service: "foo-service",
Rule: "Host(`foo.bar`)",
},
},
serviceConfig: map[string]*config.Service{
"provider-1@foo-service": {
"foo-service@provider-1": {
LoadBalancer: &config.LoadBalancerService{
Servers: []config.Server{
{
@ -269,15 +269,15 @@ func TestRouterManager_Get(t *testing.T) {
},
},
middlewaresConfig: map[string]*config.Middleware{
"provider-2@chain-middle": {
"chain-middle@provider-2": {
Chain: &config.Chain{Middlewares: []string{"auth-middle"}},
},
"provider-2@auth-middle": {
"auth-middle@provider-2": {
BasicAuth: &config.BasicAuth{
Users: []string{"toto:titi"},
},
},
"provider-1@headers-middle": {
"headers-middle@provider-1": {
Headers: &config.Headers{
CustomRequestHeaders: map[string]string{"X-Apero": "beer"},
},