fix: configuration for integration tests.

2019-04-09 17:24:05 +02:00
parent ee0e014617
commit 0750235712
65 changed files with 297 additions and 124 deletions
--- a/integration/fixtures/access_log_config.toml
+++ b/integration/fixtures/access_log_config.toml
@@ -1,11 +1,11 @@
-[log]
-logLevel = "ERROR"
-filePath = "traefik.log"
-
 [global]
 checkNewVersion = false
 sendAnonymousUsage = false

+[log]
+logLevel = "ERROR"
+filePath = "traefik.log"
+
 [accessLog]
  filePath = "access.log"

--- a/integration/fixtures/acme/acme_base.toml
+++ b/integration/fixtures/acme/acme_base.toml
@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-  logLevel = "DEBUG"
+logLevel = "DEBUG"

 [entrypoints]
  [entrypoints.web]
--- a/integration/fixtures/acme/acme_tls.toml
+++ b/integration/fixtures/acme/acme_tls.toml
@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-  logLevel = "DEBUG"
+logLevel = "DEBUG"

 [entrypoints]
  [entrypoints.web]
--- a/integration/fixtures/acme/acme_tls_dynamic.toml
+++ b/integration/fixtures/acme/acme_tls_dynamic.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/acme/acme_tls_multiple_entrypoints.toml
+++ b/integration/fixtures/acme/acme_tls_multiple_entrypoints.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/docker/minimal.toml
+++ b/integration/fixtures/docker/minimal.toml
@@ -1,3 +1,6 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false

 [log]
 logLevel = "DEBUG"
--- a/integration/fixtures/docker/simple.toml
+++ b/integration/fixtures/docker/simple.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/error_pages/error.toml
+++ b/integration/fixtures/error_pages/error.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/error_pages/simple.toml
+++ b/integration/fixtures/error_pages/simple.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/file/56-simple-panic.toml
+++ b/integration/fixtures/file/56-simple-panic.toml
@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-  logLevel = "DEBUG"
+logLevel = "DEBUG"

 [entrypoints]
  [entrypoints.web]
--- a/integration/fixtures/file/directory.toml
+++ b/integration/fixtures/file/directory.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/file/simple.toml
+++ b/integration/fixtures/file/simple.toml
@@ -1,11 +1,14 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"

 [entrypoints]
  [entrypoints.web]
    address = ":8000"

-[log]
-logLevel = "DEBUG"
-
 [providers]
   [providers.file]

--- a/integration/fixtures/grpc/config.toml
+++ b/integration/fixtures/grpc/config.toml
@@ -1,9 +1,13 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
+
 [serversTransport]
 rootCAs = [ """{{ .CertContent }}""" ]

-[global]
-debug = true
-
 [entrypoints]
  [entrypoints.web-secure]
    address = ":4443"
--- a/integration/fixtures/grpc/config_h2c.toml
+++ b/integration/fixtures/grpc/config_h2c.toml
@@ -1,5 +1,9 @@
 [global]
-debug = true
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"

 [entrypoints]
  [entrypoints.web]
--- a/integration/fixtures/grpc/config_h2c_termination.toml
+++ b/integration/fixtures/grpc/config_h2c_termination.toml
@@ -1,5 +1,9 @@
 [global]
-debug = true
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"

 [entrypoints]
  [entrypoints.web-secure]
--- a/integration/fixtures/grpc/config_insecure.toml
+++ b/integration/fixtures/grpc/config_insecure.toml
@@ -1,10 +1,13 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"

 [serversTransport]
 insecureSkipVerify = true

-[global]
-debug = true
-
 [entrypoints]
  [entrypoints.web-secure]
    address = ":4443"
--- a/integration/fixtures/grpc/config_retry.toml
+++ b/integration/fixtures/grpc/config_retry.toml
@@ -1,3 +1,10 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
+
 [serversTransport]
 rootCAs = [ """{{ .CertContent }}""" ]

--- a/integration/fixtures/grpc/config_with_flush.toml
+++ b/integration/fixtures/grpc/config_with_flush.toml
@@ -1,3 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"

 [serversTransport]
 rootCAs = [ """{{ .CertContent }}""" ]
--- a/integration/fixtures/headers/basic.toml
+++ b/integration/fixtures/headers/basic.toml
@@ -1,11 +1,14 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"

 [entrypoints]
  [entrypoints.web]
    address = ":8000"

-[log]
-logLevel = "DEBUG"
-
 [providers]
   [providers.file]

--- a/integration/fixtures/headers/cors.toml
+++ b/integration/fixtures/headers/cors.toml
@@ -1,11 +1,14 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"

 [entrypoints]
  [entrypoints.web]
    address = ":8000"

-[log]
-logLevel = "DEBUG"
-
 [providers]
   [providers.file]

--- a/integration/fixtures/healthcheck/multiple-entrypoints-drr.toml
+++ b/integration/fixtures/healthcheck/multiple-entrypoints-drr.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/healthcheck/multiple-entrypoints-wrr.toml
+++ b/integration/fixtures/healthcheck/multiple-entrypoints-wrr.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/healthcheck/port_overload.toml
+++ b/integration/fixtures/healthcheck/port_overload.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/healthcheck/simple.toml
+++ b/integration/fixtures/healthcheck/simple.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/https/clientca/https_1ca1config.toml
+++ b/integration/fixtures/https/clientca/https_1ca1config.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/https/clientca/https_2ca1config.toml
+++ b/integration/fixtures/https/clientca/https_2ca1config.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/https/clientca/https_2ca2config.toml
+++ b/integration/fixtures/https/clientca/https_2ca2config.toml
@@ -1,7 +1,10 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

-
 [entrypoints]
  [entrypoints.web-secure]
  address = ":4443"
--- a/integration/fixtures/https/dynamic_https_sni.toml
+++ b/integration/fixtures/https/dynamic_https_sni.toml
@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-  logLevel = "DEBUG"
+logLevel = "DEBUG"

 [entrypoints]
  [entrypoints.web-secure]
--- a/integration/fixtures/https/dynamic_https_sni_default_cert.toml
+++ b/integration/fixtures/https/dynamic_https_sni_default_cert.toml
@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-   logLevel = "DEBUG"
+logLevel = "DEBUG"

 [entrypoints]
  [entrypoints.web-secure]
--- a/integration/fixtures/https/https_redirect.toml
+++ b/integration/fixtures/https/https_redirect.toml
@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-  logLevel = "DEBUG"
+logLevel = "DEBUG"

 [entrypoints]
  [entrypoints.web]
--- a/integration/fixtures/https/https_sni.toml
+++ b/integration/fixtures/https/https_sni.toml
@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-  logLevel = "DEBUG"
+logLevel = "DEBUG"

 [entrypoints]
  [entrypoints.web-secure]
--- a/integration/fixtures/https/https_sni_case_insensitive_dynamic.toml
+++ b/integration/fixtures/https/https_sni_case_insensitive_dynamic.toml
@@ -1,3 +1,8 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
 logLevel = "DEBUG"

 [entrypoints]
--- a/integration/fixtures/https/https_sni_default_cert.toml
+++ b/integration/fixtures/https/https_sni_default_cert.toml
@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-   logLevel = "DEBUG"
+logLevel = "DEBUG"

 [entrypoints]
  [entrypoints.web-secure]
--- a/integration/fixtures/https/https_sni_strict.toml
+++ b/integration/fixtures/https/https_sni_strict.toml
@@ -1,5 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
-  logLevel = "DEBUG"
+logLevel = "DEBUG"

 [entrypoints]
  [entrypoints.web-secure]
--- a/integration/fixtures/https/rootcas/https.toml
+++ b/integration/fixtures/https/rootcas/https.toml
@@ -1,7 +1,10 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

-
 [serversTransport]
 # Use certificate in net/internal/testcert.go
 rootCAs =  [ """
--- a/integration/fixtures/https/rootcas/https_with_file.toml
+++ b/integration/fixtures/https/rootcas/https_with_file.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/k8s_crd.toml
+++ b/integration/fixtures/k8s_crd.toml
@@ -1,5 +1,9 @@
 [global]
-debug=true
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"

 [entryPoints]
  [entryPoints.web]
--- a/integration/fixtures/k8s_default.toml
+++ b/integration/fixtures/k8s_default.toml
@@ -1,5 +1,9 @@
 [global]
-debug=true
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"

 [entryPoints]
  [entryPoints.web]
--- a/integration/fixtures/keep_trailing_slash.toml
+++ b/integration/fixtures/keep_trailing_slash.toml
@@ -1,25 +0,0 @@
-keepTrailingSlash = {{ .KeepTrailingSlash }}
-
-[log]
-logLevel = "DEBUG"
-
-
-[entrypoints]
-  [entrypoints.web]
-  address = ":8000"
-
-[providers]
-   [providers.file]
-
-# rules
-[backends]
-  [backends.backend1]
-    [backends.backend1.servers.server1]
-       url = "http://172.17.0.2:80"
-       weight = 1
-
-[frontends]
-  [frontends.frontend1]
-     backend = "backend1"
-     [frontends.frontend1.routes.test_1]
-        rule = "Path(`/test/foo`)"
--- a/integration/fixtures/log_rotation_config.toml
+++ b/integration/fixtures/log_rotation_config.toml
@@ -1,30 +1,23 @@
-################################################################
-# Global configuration
-################################################################
-[accessLog]
-filePath = "access.log"
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false

 [log]
 filePath = "traefik.log"
 logLevel = "ERROR"

+[accessLog]
+filePath = "access.log"
+
 [entrypoints]
  [entrypoints.web]
  address = ":8000"
  [entrypoints.api]
  address = ":7888"

-checkNewVersion = false
-
-################################################################
-# Api configuration backend
-################################################################
 [api]
 entryPoint = "api"

-################################################################
-# File configuration backend
-################################################################
 [providers]
   [providers.file]

--- a/integration/fixtures/marathon/simple.toml
+++ b/integration/fixtures/marathon/simple.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/multiple_provider.toml
+++ b/integration/fixtures/multiple_provider.toml
@@ -1,5 +1,9 @@
 [global]
-debug=true
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"

 [entrypoints]
  [entrypoints.web]
--- a/integration/fixtures/multiprovider.toml
+++ b/integration/fixtures/multiprovider.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/proxy-protocol/with.toml
+++ b/integration/fixtures/proxy-protocol/with.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/proxy-protocol/without.toml
+++ b/integration/fixtures/proxy-protocol/without.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/ratelimit/simple.toml
+++ b/integration/fixtures/ratelimit/simple.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/reqacceptgrace.toml
+++ b/integration/fixtures/reqacceptgrace.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

@@ -12,6 +16,8 @@ logLevel = "DEBUG"
 [entrypoints.traefik.transport.lifeCycle]
    RequestAcceptGraceTimeout = "10s"

+[ping]
+
 [providers]
   [providers.file]

@@ -28,4 +34,3 @@ logLevel = "DEBUG"
        URL = "{{.Server}}"
        Weight = 1

-[ping]
--- a/integration/fixtures/rest/simple.toml
+++ b/integration/fixtures/rest/simple.toml
@@ -1,3 +1,9 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"

 [entrypoints]
  [entrypoints.web]
@@ -5,8 +11,5 @@

 [api]

-[log]
-logLevel = "DEBUG"
-
 [providers]
   [providers.rest]
--- a/integration/fixtures/retry/simple.toml
+++ b/integration/fixtures/retry/simple.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/simple_auth.toml
+++ b/integration/fixtures/simple_auth.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/simple_default.toml
+++ b/integration/fixtures/simple_default.toml
@@ -1,3 +1,6 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false

 [entrypoints]
  [entrypoints.web]
--- a/integration/fixtures/simple_hostresolver.toml
+++ b/integration/fixtures/simple_hostresolver.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/simple_stats.toml
+++ b/integration/fixtures/simple_stats.toml
@@ -1,5 +1,9 @@
 [global]
-debug=true
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"

 [entrypoints]
  [entrypoints.web]
--- a/integration/fixtures/simple_web.toml
+++ b/integration/fixtures/simple_web.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/simple_whitelist.toml
+++ b/integration/fixtures/simple_whitelist.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/tcp/mixed.toml
+++ b/integration/fixtures/tcp/mixed.toml
@@ -1,3 +1,10 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
+
 [entrypoints]
  [entrypoints.tcp]
    address = ":8093"
--- a/integration/fixtures/tcp/non-tls-fallback.toml
+++ b/integration/fixtures/tcp/non-tls-fallback.toml
@@ -1,12 +1,16 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
+
 [entrypoints]
  [entrypoints.tcp]
    address = ":8093"

 [api]

-[global]
-   debug = true
-
 [providers.file]

 [tcp]
--- a/integration/fixtures/tcp/non-tls.toml
+++ b/integration/fixtures/tcp/non-tls.toml
@@ -1,12 +1,16 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
+[log]
+logLevel = "DEBUG"
+
 [entrypoints]
  [entrypoints.tcp]
    address = ":8093"

 [api]

-[global]
-   debug = true
-
 [providers.file]

 [tcp]
--- a/integration/fixtures/timeout/forwarding_timeouts.toml
+++ b/integration/fixtures/timeout/forwarding_timeouts.toml
@@ -1,12 +1,14 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

-
 [serversTransport.forwardingTimeouts]
  dialTimeout = "300ms"
  responseHeaderTimeout = "300ms"

-
 [entrypoints]
  [entrypoints.web]
    address = ":8000"
@@ -16,7 +18,6 @@ logLevel = "DEBUG"

 [api]

-
 [providers]
   [providers.file]

--- a/integration/fixtures/tlsclientheaders/simple.toml
+++ b/integration/fixtures/tlsclientheaders/simple.toml
@@ -1,9 +1,10 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

-[global]
-debug = true
-
 [serversTransport]
 rootCAs = [ """{{ .RootCertContent }}""" ]

--- a/integration/fixtures/tracing/simple.toml
+++ b/integration/fixtures/tracing/simple.toml
@@ -1,9 +1,10 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

-[global]
-debug = true
-
 [api]

 [entrypoints]
--- a/integration/fixtures/traefik_log_config.toml
+++ b/integration/fixtures/traefik_log_config.toml
@@ -1,13 +1,11 @@
-################################################################
-# Global configuration
-################################################################
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"
 filePath = "traefik.log"

-[global]
-checkNewVersion = false
-
 [accessLog]
  filePath = "access.log"

--- a/integration/fixtures/websocket/config.toml
+++ b/integration/fixtures/websocket/config.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

--- a/integration/fixtures/websocket/config_https.toml
+++ b/integration/fixtures/websocket/config_https.toml
@@ -1,3 +1,7 @@
+[global]
+checkNewVersion = false
+sendAnonymousUsage = false
+
 [log]
 logLevel = "DEBUG"

@@ -10,7 +14,6 @@ insecureSkipVerify=true

 [api]

-
 [providers]
   [providers.file]