New rule syntax

Co-authored-by: jbdoumenjou <jb.doumenjou@gmail.com>
2019-01-30 16:24:07 +01:00 · 2019-01-30 16:24:07 +01:00 · 9ebe3c38b2
commit 9ebe3c38b2
parent 7155f0d50d
89 changed files with 1111 additions and 1357 deletions
--- a/integration/fixtures/access_log_config.toml
+++ b/integration/fixtures/access_log_config.toml
@ -25,5 +25,5 @@ checkNewVersion = false
 [providers]
   [providers.docker]
     exposedByDefault = false
-     defaultRule = "{{ normalize .Name }}.docker.local"
+     defaultRule = "Host(`{{ normalize .Name }}.docker.local`)"
     watch = true
--- a/integration/fixtures/acme/acme_base.toml
+++ b/integration/fixtures/acme/acme_base.toml
@ -51,5 +51,5 @@ logLevel = "DEBUG"
 [routers]
  [routers.test]
  service = "test"
-  rule = "Host:traefik.acme.wtf"
+  rule = "Host(`traefik.acme.wtf`)"
  entryPoints = ["https"]
--- a/integration/fixtures/acme/acme_http01_web_path.toml
+++ b/integration/fixtures/acme/acme_http01_web_path.toml
@ -48,5 +48,5 @@ path="/traefik"
 [routers]
  [routers.test]
  service = "test"
-  rule = "Host:traefik.acme.wtf"
+  rule = "Host(`traefik.acme.wtf`)"
  entryPoints = ["https"]
--- a/integration/fixtures/acme/acme_tls.toml
+++ b/integration/fixtures/acme/acme_tls.toml
@ -52,5 +52,5 @@ logLevel = "DEBUG"
 [routers]
  [routers.test]
  service = "test"
-  rule = "Host:traefik.acme.wtf"
+  rule = "Host(`traefik.acme.wtf`)"
  entryPoints = ["https"]
--- a/integration/fixtures/acme/certificates.toml
+++ b/integration/fixtures/acme/certificates.toml
@ -7,7 +7,7 @@
 [routers]
  [routers.test]
  service = "test"
-  rule = "Host:traefik.acme.wtf"
+  rule = "Host(`traefik.acme.wtf`)"
  entryPoints = ["https"]


--- a/integration/fixtures/consul_catalog/simple.toml
+++ b/integration/fixtures/consul_catalog/simple.toml
@ -10,4 +10,4 @@ logLevel = "DEBUG"
 [providers]
   [providers.consulCatalog]
      domain = "consul.localhost"
-      frontEndRule = "Host:{{.ServiceName}}.{{.Domain}}"
+      frontEndRule = "Host(`{{.ServiceName}}.{{.Domain}}`)"
--- a/integration/fixtures/error_pages/error.toml
+++ b/integration/fixtures/error_pages/error.toml
@ -10,7 +10,7 @@ logLevel = "DEBUG"

 [routers]
  [routers.router1]
-    rule = "Host:test.local"
+    Rule = "Host(`test.local`)"
    service = "service1"
    middlewares = ["error"]

--- a/integration/fixtures/error_pages/simple.toml
+++ b/integration/fixtures/error_pages/simple.toml
@ -10,7 +10,7 @@ logLevel = "DEBUG"

 [routers]
  [routers.router1]
-      rule = "Host:test.local"
+      Rule = "Host(`test.local`)"
      service = "service1"
      middlewares = ["error"]

--- a/integration/fixtures/file/dir/simple1.toml
+++ b/integration/fixtures/file/dir/simple1.toml
@ -1,6 +1,6 @@
 [routers]
  [routers.router1]
-    rule = "Path:/test1"
+    rule = "Path(`/test1`)"
    service = "service1"

 [services]
--- a/integration/fixtures/file/dir/simple2.toml
+++ b/integration/fixtures/file/dir/simple2.toml
@ -1,6 +1,6 @@
 [routers]
  [routers.router2]
-    rule = "Path:/test2"
+    rule = "Path(`/test2`)"
    service = "service2"

 [services]
--- a/integration/fixtures/file/simple.toml
+++ b/integration/fixtures/file/simple.toml
@ -11,11 +11,11 @@ logLevel = "DEBUG"

 [routers]
  [routers.router1]
-    rule = "Host:test.localhost"
+    rule = "Host(`test.localhost`)"
    service = "service2"

  [routers.router2]
-    rule = "Path:/test"
+    rule = "Path(`/test`)"
    middlewares = ["circuitbreaker"]
    service = "service1"

--- a/integration/fixtures/grpc/config.toml
+++ b/integration/fixtures/grpc/config.toml
@ -19,7 +19,7 @@ debug = true

 [routers]
  [routers.router1]
-    rule = "Host:127.0.0.1"
+    rule = "Host(`127.0.0.1`)"
    service = "service1"

 [services]
--- a/integration/fixtures/grpc/config_h2c.toml
+++ b/integration/fixtures/grpc/config_h2c.toml
@ -13,7 +13,7 @@ debug = true

 [routers]
  [routers.router1]
-    rule = "Host:127.0.0.1"
+    rule = "Host(`127.0.0.1`)"
    service = "service1"

 [services]
--- a/integration/fixtures/grpc/config_h2c_termination.toml
+++ b/integration/fixtures/grpc/config_h2c_termination.toml
@ -17,7 +17,7 @@ debug = true

 [routers]
  [routers.router1]
-    rule = "Host:127.0.0.1"
+    rule = "Host(`127.0.0.1`)"
    service = "service1"

 [services]
--- a/integration/fixtures/grpc/config_insecure.toml
+++ b/integration/fixtures/grpc/config_insecure.toml
@ -21,7 +21,7 @@ debug = true

 [routers]
  [routers.router1]
-    rule = "Host:127.0.0.1"
+    rule = "Host(`127.0.0.1`)"
    service = "service1"


--- a/integration/fixtures/grpc/config_with_flush.toml
+++ b/integration/fixtures/grpc/config_with_flush.toml
@ -18,7 +18,7 @@ rootCAs = [ """{{ .CertContent }}""" ]

 [routers]
  [routers.router1]
-    rule = "Host:127.0.0.1"
+    rule = "Host(`127.0.0.1`)"
    service = "service1"

 [services]
--- a/integration/fixtures/healthcheck/multiple-entrypoints-drr.toml
+++ b/integration/fixtures/healthcheck/multiple-entrypoints-drr.toml
@ -15,7 +15,7 @@ logLevel = "DEBUG"
 [routers]
  [routers.router1]
    service = "service1"
-    rule = "Host:test.localhost"
+    Rule = "Host(`test.localhost`)"

 [services]
  [services.service1.loadbalancer]
--- a/integration/fixtures/healthcheck/multiple-entrypoints-wrr.toml
+++ b/integration/fixtures/healthcheck/multiple-entrypoints-wrr.toml
@ -15,7 +15,7 @@ logLevel = "DEBUG"
 [routers]
  [routers.router1]
    service = "service1"
-    rule = "Host:test.localhost"
+    Rule = "Host(`test.localhost`)"

 [services]
  [services.service1.loadbalancer]
--- a/integration/fixtures/healthcheck/port_overload.toml
+++ b/integration/fixtures/healthcheck/port_overload.toml
@ -13,7 +13,7 @@ logLevel = "DEBUG"
 [routers]
  [routers.router1]
    service = "service1"
-    rule = "Host:test.localhost"
+    Rule = "Host(`test.localhost`)"

 [services]
  [services.service1.loadbalancer]
--- a/integration/fixtures/healthcheck/simple.toml
+++ b/integration/fixtures/healthcheck/simple.toml
@ -13,7 +13,7 @@ logLevel = "DEBUG"
 [routers]
  [routers.router1]
    service = "service1"
-    rule = "Host:test.localhost"
+    Rule = "Host(`test.localhost`)"

 [services]
  [services.service1.loadbalancer]
--- a/integration/fixtures/https/clientca/https_1ca1config.toml
+++ b/integration/fixtures/https/clientca/https_1ca1config.toml
@ -17,10 +17,10 @@ logLevel = "DEBUG"
 [Routers]
  [Routers.router1]
    Service = "service1"
-    Rule = "Host:snitest.com"
+    Rule = "Host(`snitest.com`)"
  [Routers.router2]
    Service = "service2"
-    Rule = "Host:snitest.org"
+    Rule = "Host(`snitest.org`)"

 [Services]
  [Services.service1]
--- a/integration/fixtures/https/clientca/https_2ca1config.toml
+++ b/integration/fixtures/https/clientca/https_2ca1config.toml
@ -16,10 +16,10 @@ logLevel = "DEBUG"
 [Routers]
  [Routers.router1]
    Service = "service1"
-    Rule = "Host:snitest.com"
+    Rule = "Host(`snitest.com`)"
  [Routers.router2]
    Service = "service2"
-    Rule = "Host:snitest.org"
+    Rule = "Host(`snitest.org`)"

 [Services]
  [Services.service1]
--- a/integration/fixtures/https/clientca/https_2ca2config.toml
+++ b/integration/fixtures/https/clientca/https_2ca2config.toml
@ -18,10 +18,10 @@ logLevel = "DEBUG"
 [Routers]
  [Routers.router1]
    Service = "service1"
-    Rule = "Host:snitest.com"
+    Rule = "Host(`snitest.com`)"
  [Routers.router2]
    Service = "service2"
-    Rule = "Host:snitest.org"
+    Rule = "Host(`snitest.org`)"

 [Services]
  [Services.service1]
--- a/integration/fixtures/https/dynamic_https.toml
+++ b/integration/fixtures/https/dynamic_https.toml
@ -1,10 +1,10 @@
 [Routers]
  [Routers.router1]
    Service = "service1"
-    Rule = "Host:snitest.com"
+    Rule = "Host(`snitest.com`)"
  [Routers.router2]
    Service = "service2"
-    Rule = "Host:snitest.org"
+    Rule = "Host(`snitest.org`)"

 [Services]
  [Services.service1]
--- a/integration/fixtures/https/dynamic_https_sni_default_cert.toml
+++ b/integration/fixtures/https/dynamic_https_sni_default_cert.toml
@ -17,10 +17,10 @@ logLevel = "DEBUG"
 [Routers]
  [Routers.router1]
    Service = "service1"
-    Rule = "Host:snitest.com"
+    Rule = "Host(`snitest.com`)"
  [Routers.router2]
    Service = "service1"
-    Rule = "Host:www.snitest.com"
+    Rule = "Host(`www.snitest.com`)"

 [Services]
  [Services.service1]
--- a/integration/fixtures/https/https_redirect.toml
+++ b/integration/fixtures/https/https_redirect.toml
@ -19,52 +19,52 @@ logLevel = "DEBUG"
  [Routers.router1]
    Service = "service1"
    Middlewares = ["redirect-https"]
-    Rule = "Host: example.com"
+    Rule = "Host(`example.com`)"

  [Routers.router2]
    Service = "service1"
    Middlewares = ["redirect-https", "api-slash-strip"]
-    Rule = "Host: example2.com"
+    Rule = "Host(`example2.com`)"

  [Routers.router3]
    Service = "service1"
    Middlewares = ["redirect-https", "foo-add-prefix"]
-    Rule = "Host: test.com"
+    Rule = "Host(`test.com`)"

  [Routers.router4]
    Service = "service1"
    Middlewares = ["redirect-https", "foo-slash-add-prefix"]
-    Rule = "Host: test2.com"
+    Rule = "Host(`test2.com`)"

  [Routers.router5]
    Service = "service1"
    Middlewares = ["redirect-https", "id-strip-regex-prefix"]
-    Rule = "Host: foo.com"
+    Rule = "Host(`foo.com`)"

  [Routers.router6]
    Service = "service1"
    Middlewares = ["redirect-https", "id-slash-strip-regex-prefix"]
-    Rule = "Host: foo2.com"
+    Rule = "Host(`foo2.com`)"

  [Routers.router7]
    Service = "service1"
    Middlewares = ["redirect-https", "api-regex-replace"]
-    Rule = "Host: bar.com"
+    Rule = "Host(`bar.com`)"

  [Routers.router8]
    Service = "service1"
    Middlewares = ["redirect-https", "api-slash-regex-replace"]
-    Rule = "Host: bar2.com"
+    Rule = "Host(`bar2.com`)"

  [Routers.router9]
    Service = "service1"
    Middlewares = ["redirect-https", "api-replace-path"]
-    Rule = "Host: pow.com"
+    Rule = "Host(`pow.com`)"

  [Routers.router10]
    Service = "service1"
    Middlewares = ["redirect-https", "api-slash-replace-path"]
-    Rule = "Host: pow2.com"
+    Rule = "Host(`pow2.com`)"

 [Middlewares]
  [Middlewares.api-strip.StripPrefix]
--- a/integration/fixtures/https/https_sni.toml
+++ b/integration/fixtures/https/https_sni.toml
@ -15,10 +15,10 @@ logLevel = "DEBUG"
 [Routers]
  [Routers.router1]
    Service = "service1"
-    Rule = "Host:snitest.com"
+    Rule = "Host(`snitest.com`)"
  [Routers.router2]
    Service = "service2"
-    Rule = "Host:snitest.org"
+    Rule = "Host(`snitest.org`)"

 [Services]
  [Services.service1]
--- a/integration/fixtures/https/https_sni_case_insensitive_dynamic.toml
+++ b/integration/fixtures/https/https_sni_case_insensitive_dynamic.toml
@ -16,10 +16,10 @@ logLevel = "DEBUG"
 [Routers]
  [Routers.router1]
    Service = "service1"
-    rule = "HostRegexp: {subdomain:[a-z1-9-]+}.snitest.com"
+    rule = "HostRegexp(`{subdomain:[a-z1-9-]+}.snitest.com`)"
  [Routers.router2]
    Service = "service1"
-    rule = "HostRegexp: {subdomain:[a-z1-9-]+}.www.snitest.com"
+    rule = "HostRegexp(`{subdomain:[a-z1-9-]+}.www.snitest.com`)"

 [Services]
  [Services.service1]
--- a/integration/fixtures/https/https_sni_default_cert.toml
+++ b/integration/fixtures/https/https_sni_default_cert.toml
@ -18,10 +18,10 @@ logLevel = "DEBUG"
 [Routers]
  [Routers.router1]
    Service = "service1"
-    Rule = "Host:snitest.com"
+    Rule = "Host(`snitest.com`)"
  [Routers.router2]
    Service = "service1"
-    Rule = "Host:www.snitest.com"
+    Rule = "Host(`www.snitest.com`)"

 [Services]
  [Services.service1]
--- a/integration/fixtures/https/https_sni_strict.toml
+++ b/integration/fixtures/https/https_sni_strict.toml
@ -19,7 +19,7 @@ logLevel = "DEBUG"
 [Routers]
  [Routers.router1]
    Service = "service1"
-    Rule = "Host:snitest.com"
+    Rule = "Host(`snitest.com`)"

 [Services]
  [Services.service1]
--- a/integration/fixtures/https/rootcas/https.toml
+++ b/integration/fixtures/https/rootcas/https.toml
@ -33,7 +33,7 @@ fblo6RBxUQ==
 [Routers]
  [Routers.router1]
    Service = "service1"
-    Rule = "Path: /ping"
+    Rule = "Path(`/ping`)"

 [Services]
  [Services.service1]
--- a/integration/fixtures/https/rootcas/https_with_file.toml
+++ b/integration/fixtures/https/rootcas/https_with_file.toml
@ -17,7 +17,7 @@ rootCAs =  [ "fixtures/https/rootcas/local.crt"]
 [Routers]
  [Routers.router1]
    Service = "service1"
-    Rule = "Path: /ping"
+    Rule = "Path(`/ping`)"

 [Services]
  [Services.service1]
--- a/integration/fixtures/keep_trailing_slash.toml
+++ b/integration/fixtures/keep_trailing_slash.toml
@ -22,4 +22,4 @@ logLevel = "DEBUG"
  [frontends.frontend1]
     backend = "backend1"
     [frontends.frontend1.routes.test_1]
-        rule = "Path:/test/foo"
+        rule = "Path(`/test/foo`)"
--- a/integration/fixtures/log_rotation_config.toml
+++ b/integration/fixtures/log_rotation_config.toml
@ -34,7 +34,7 @@ entryPoint = "api"
 [Routers]
  [Routers.router1]
    Service = "service1"
-    Rule = "Path: /test1"
+    Rule = "Path(`/test1`)"

 [Services]
  [Services.service1]
--- a/integration/fixtures/multiple_provider.toml
+++ b/integration/fixtures/multiple_provider.toml
@ -18,7 +18,7 @@ debug=true
 [Routers]
  [Routers.router-1]
    Service = "service-test"
-    Rule = "PathPrefix:/file"
+    Rule = "PathPrefix(`/file`)"

 [Services]
  [Services.service-test]
--- a/integration/fixtures/proxy-protocol/with.toml
+++ b/integration/fixtures/proxy-protocol/with.toml
@ -15,7 +15,7 @@ logLevel = "DEBUG"
 [Routers]
  [Routers.router1]
    Service = "service1"
-    Rule = "Path:/whoami"
+    Rule = "Path(`/whoami`)"

 [Services]
  [Services.service1]
--- a/integration/fixtures/proxy-protocol/without.toml
+++ b/integration/fixtures/proxy-protocol/without.toml
@ -15,7 +15,7 @@ logLevel = "DEBUG"
 [Routers]
  [Routers.router1]
    Service = "service1"
-    Rule = "Path:/whoami"
+    Rule = "Path(`/whoami`)"

 [Services]
  [Services.service1]
--- a/integration/fixtures/ratelimit/simple.toml
+++ b/integration/fixtures/ratelimit/simple.toml
@ -12,7 +12,7 @@ logLevel = "DEBUG"
  [Routers.router1]
    Service = "service1"
    Middlewares = [ "ratelimit" ]
-    Rule = "Path:/"
+    Rule = "Path(`/`)"

 [Middlewares]
  [Middlewares.ratelimit.RateLimit]
--- a/integration/fixtures/reqacceptgrace.toml
+++ b/integration/fixtures/reqacceptgrace.toml
@ -20,7 +20,7 @@ logLevel = "DEBUG"
 [Routers]
  [Routers.router]
    Service = "service"
-    Rule = "Path:/service"
+    Rule = "Path(`/service`)"

 [Services]
  [Services.service]
--- a/integration/fixtures/retry/simple.toml
+++ b/integration/fixtures/retry/simple.toml
@ -14,7 +14,7 @@ logLevel = "DEBUG"
  [Routers.router1]
    Service = "service1"
    Middlewares = [ "retry" ]
-    Rule = "PathPrefix:/"
+    Rule = "PathPrefix(`/`)"

 [Middlewares.retry.Retry]
   Attempts = 3
--- a/integration/fixtures/simple_hostresolver.toml
+++ b/integration/fixtures/simple_hostresolver.toml
@ -10,7 +10,7 @@ logLevel = "DEBUG"
 [providers]
   [providers.docker]
      exposedByDefault = false
-      defaultRule = "{{ normalize .Name }}.docker.local"
+      defaultRule = "Host(`{{ normalize .Name }}.docker.local`)"
      watch = true

 [hostResolver]
--- a/integration/fixtures/simple_stats.toml
+++ b/integration/fixtures/simple_stats.toml
@ -14,12 +14,12 @@ debug=true
  [Routers.router1]
    EntryPoints = ["http"]
    Service = "service1"
-    Rule = "PathPrefix:/whoami"
+    Rule = "PathPrefix(`/whoami`)"

  [Routers.router2]
    EntryPoints = ["traefik"]
    Service = "service2"
-    Rule = "PathPrefix:/whoami"
+    Rule = "PathPrefix(`/whoami`)"

 [Services]
  [Services.service1]
--- a/integration/fixtures/timeout/forwarding_timeouts.toml
+++ b/integration/fixtures/timeout/forwarding_timeouts.toml
@ -23,11 +23,11 @@ logLevel = "DEBUG"
 [Routers]
  [Routers.router1]
    Service = "service1"
-    Rule = "Path:/dialTimeout"
+    Rule = "Path(`/dialTimeout`)"

  [Routers.router2]
    Service = "service2"
-    Rule = "Path:/responseHeaderTimeout"
+    Rule = "Path(`/responseHeaderTimeout`)"

 [Services]
  [Services.service1]
--- a/integration/fixtures/tracing/simple.toml
+++ b/integration/fixtures/tracing/simple.toml
@ -27,15 +27,15 @@ debug = true
  [Routers.router1]
    Service = "service1"
    Middlewares = ["retry", "ratelimit"]
-    Rule = "Path:/ratelimit"
+    Rule = "Path(`/ratelimit`)"
  [Routers.router2]
    Service = "service2"
    Middlewares = ["retry"]
-    Rule = "Path:/retry"
+    Rule = "Path(`/retry`)"
  [Routers.router3]
    Service = "service3"
    Middlewares = ["retry", "basic-auth"]
-    Rule = "Path:/auth"
+    Rule = "Path(`/auth`)"

 [Middlewares]
  [Middlewares.retry.retry]
--- a/integration/fixtures/traefik_log_config.toml
+++ b/integration/fixtures/traefik_log_config.toml
@ -21,5 +21,5 @@ checkNewVersion = false
 [providers]
   [providers.docker]
     exposedByDefault = false
-     defaultRule = "{{ normalize .Name }}.docker.local"
+     defaultRule = "Host(`{{ normalize .Name }}.docker.local`)"
     watch = true
--- a/integration/fixtures/websocket/config.toml
+++ b/integration/fixtures/websocket/config.toml
@ -13,7 +13,7 @@ logLevel = "DEBUG"
 [Routers]
  [Routers.router1]
    Service = "service1"
-    Rule = "PathPrefix:/ws"
+    Rule = "PathPrefix(`/ws`)"

 [Services]
  [Services.service1]
--- a/integration/fixtures/websocket/config_https.toml
+++ b/integration/fixtures/websocket/config_https.toml
@ -21,7 +21,7 @@ insecureSkipVerify=true
 [Routers]
  [Routers.router1]
    Service = "service1"
-    Rule = "Path:/echo,/ws"
+    Rule = "Path(`/echo`,`/ws`)"

 [Services]
  [Services.service1]