Merge current v2.8 into master

pkg/api/debug.go

@@ -11,7 +11,7 @@ import (
 )
 
 func init() {
-	// FIXME Goroutines2 -> Goroutines
+	// TODO Goroutines2 -> Goroutines
 	expvar.Publish("Goroutines2", expvar.Func(goroutines))
 }
 

pkg/config/dynamic/http_config.go

@@ -216,9 +216,9 @@ type ServerHealthCheck struct {
 	Path   string `json:"path,omitempty" toml:"path,omitempty" yaml:"path,omitempty" export:"true"`
 	Method string `json:"method,omitempty" toml:"method,omitempty" yaml:"method,omitempty" export:"true"`
 	Port   int    `json:"port,omitempty" toml:"port,omitempty,omitzero" yaml:"port,omitempty" export:"true"`
-	// FIXME change string to ptypes.Duration
+	// TODO change string to ptypes.Duration
 	Interval string `json:"interval,omitempty" toml:"interval,omitempty" yaml:"interval,omitempty" export:"true"`
-	// FIXME change string to ptypes.Duration
+	// TODO change string to ptypes.Duration
 	Timeout         string            `json:"timeout,omitempty" toml:"timeout,omitempty" yaml:"timeout,omitempty" export:"true"`
 	Hostname        string            `json:"hostname,omitempty" toml:"hostname,omitempty" yaml:"hostname,omitempty"`
 	FollowRedirects *bool             `json:"followRedirects" toml:"followRedirects" yaml:"followRedirects" export:"true"`

pkg/metrics/metrics.go

@@ -20,27 +20,32 @@ type Registry interface {
 	IsSvcEnabled() bool
 
 	// server metrics
+
 	ConfigReloadsCounter() metrics.Counter
 	ConfigReloadsFailureCounter() metrics.Counter
 	LastConfigReloadSuccessGauge() metrics.Gauge
 	LastConfigReloadFailureGauge() metrics.Gauge
 
 	// TLS
+
 	TLSCertsNotAfterTimestampGauge() metrics.Gauge
 
 	// entry point metrics
+
 	EntryPointReqsCounter() metrics.Counter
 	EntryPointReqsTLSCounter() metrics.Counter
 	EntryPointReqDurationHistogram() ScalableHistogram
 	EntryPointOpenConnsGauge() metrics.Gauge
 
 	// router metrics
+
 	RouterReqsCounter() metrics.Counter
 	RouterReqsTLSCounter() metrics.Counter
 	RouterReqDurationHistogram() ScalableHistogram
 	RouterOpenConnsGauge() metrics.Gauge
 
 	// service metrics
+
 	ServiceReqsCounter() metrics.Counter
 	ServiceReqsTLSCounter() metrics.Counter
 	ServiceReqDurationHistogram() ScalableHistogram

pkg/middlewares/metrics/metrics.go

@@ -166,6 +166,8 @@ func containsHeader(req *http.Request, name, value string) bool {
 // values that are not part of the set of HTTP verbs are replaced with EXTENSION_METHOD.
 // See https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods
 // https://datatracker.ietf.org/doc/html/rfc2616/#section-5.1.1.
+//
+//nolint:usestdlibvars
 func getMethod(r *http.Request) string {
 	if !utf8.ValidString(r.Method) {
 		log.WithoutContext().Warnf("Invalid HTTP method encoding: %s", r.Method)

pkg/middlewares/ratelimiter/rate_limiter.go

@@ -166,7 +166,7 @@ func (rl *rateLimiter) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	delay := res.Delay()
 	if delay > rl.maxDelay {
 		res.Cancel()
-		rl.serveDelayError(ctx, w, r, delay)
+		rl.serveDelayError(ctx, w, delay)
 		return
 	}
 
@@ -174,7 +174,7 @@ func (rl *rateLimiter) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	rl.next.ServeHTTP(w, r)
 }
 
-func (rl *rateLimiter) serveDelayError(ctx context.Context, w http.ResponseWriter, r *http.Request, delay time.Duration) {
+func (rl *rateLimiter) serveDelayError(ctx context.Context, w http.ResponseWriter, delay time.Duration) {
 	w.Header().Set("Retry-After", fmt.Sprintf("%.0f", math.Ceil(delay.Seconds())))
 	w.Header().Set("X-Retry-In", delay.String())
 	w.WriteHeader(http.StatusTooManyRequests)

pkg/middlewares/retry/retry.go

@@ -16,7 +16,6 @@ import (
 	"github.com/traefik/traefik/v2/pkg/config/dynamic"
 	"github.com/traefik/traefik/v2/pkg/log"
 	"github.com/traefik/traefik/v2/pkg/middlewares"
-	"github.com/traefik/traefik/v2/pkg/safe"
 	"github.com/traefik/traefik/v2/pkg/tracing"
 )
 
@@ -118,7 +117,7 @@ func (r *retry) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
 		r.listener.Retried(req, attempts)
 	}
 
-	err := backoff.RetryNotify(safe.OperationWithRecover(operation), backOff, notify)
+	err := backoff.RetryNotify(operation, backOff, notify)
 	if err != nil {
 		log.FromContext(middlewares.GetLoggerCtx(req.Context(), r.name, typeName)).
 			Debugf("Final retry attempt failed: %v", err.Error())

pkg/provider/acme/provider_test.go

@@ -26,7 +26,7 @@ func TestGetUncheckedCertificates(t *testing.T) {
 	domainSafe := &safe.Safe{}
 	domainSafe.Set(domainMap)
 
-	// FIXME Add a test for DefaultCertificate
+	// TODO Add a test for DefaultCertificate
 	testCases := []struct {
 		desc             string
 		dynamicCerts     *safe.Safe

pkg/provider/consulcatalog/config.go

@@ -140,9 +140,9 @@ func (p *Provider) buildTCPServiceConfiguration(item itemData, configuration *dy
 		}
 	}
 
-	for _, service := range configuration.Services {
+	for name, service := range configuration.Services {
 		if err := p.addServerTCP(item, service.LoadBalancer); err != nil {
-			return err
+			return fmt.Errorf("%s: %w", name, err)
 		}
 	}
 
@@ -160,9 +160,9 @@ func (p *Provider) buildUDPServiceConfiguration(item itemData, configuration *dy
 		}
 	}
 
-	for _, service := range configuration.Services {
+	for name, service := range configuration.Services {
 		if err := p.addServerUDP(item, service.LoadBalancer); err != nil {
-			return err
+			return fmt.Errorf("%s: %w", name, err)
 		}
 	}
 
@@ -181,9 +181,9 @@ func (p *Provider) buildServiceConfiguration(item itemData, configuration *dynam
 		}
 	}
 
-	for _, service := range configuration.Services {
+	for name, service := range configuration.Services {
 		if err := p.addServer(item, service.LoadBalancer); err != nil {
-			return err
+			return fmt.Errorf("%s: %w", name, err)
 		}
 	}
 

pkg/provider/docker/docker.go

@@ -206,6 +206,7 @@ func (p *Provider) Provide(configurationChan chan<- dynamic.Message, pool *safe.
 				logger.Errorf("Failed to create a client for docker, error: %s", err)
 				return err
 			}
+			defer dockerClient.Close()
 
 			serverVersion, err := dockerClient.ServerVersion(ctx)
 			if err != nil {
@@ -250,7 +251,7 @@ func (p *Provider) Provide(configurationChan chan<- dynamic.Message, pool *safe.
 							case <-ticker.C:
 								services, err := p.listServices(ctx, dockerClient)
 								if err != nil {
-									logger.Errorf("Failed to list services for docker, error %s", err)
+									logger.Errorf("Failed to list services for docker swarm mode, error %s", err)
 									errChan <- err
 									return
 								}

pkg/provider/kubernetes/crd/fixtures/with_servers_transport.yml

@@ -46,7 +46,7 @@ metadata:
 
 data:
   ca.crt: VEVTVFJPT1RDQVM0
-  tls.ca: VEVTVFJPT1RDQVM1 # <-- This should be the prefered one.
+  tls.ca: VEVTVFJPT1RDQVM1 # <-- This should be the preferred one.
 
 ---
 apiVersion: v1

pkg/provider/kv/kv_mock_test.go

@@ -97,7 +97,7 @@ func (s *Mock) List(ctx context.Context, prefix string, options *store.ReadOptio
 	}
 	var kv []*store.KVPair
 	for _, kvPair := range s.KVPairs {
-		if strings.HasPrefix(kvPair.Key, prefix) { // FIXME && !strings.ContainsAny(strings.TrimPrefix(kvPair.Key, prefix), "/") {
+		if strings.HasPrefix(kvPair.Key, prefix) {
 			kv = append(kv, kvPair)
 		}
 	}

pkg/server/middleware/middlewares.go

@@ -314,7 +314,7 @@ func (b *Builder) buildConstructor(ctx context.Context, middlewareName string) (
 			return nil, badConf
 		}
 		middleware = func(next http.Handler) (http.Handler, error) {
-			// FIXME missing metrics / accessLog
+			// TODO missing metrics / accessLog
 			return retry.New(ctx, next, *config.Retry, retry.Listeners{}, middlewareName)
 		}
 	}

pkg/server/router/tcp/router.go

@@ -106,7 +106,7 @@ func (r *Router) ServeTCP(conn tcp.WriteCloser) {
 		// we still need to reply with a 404.
 	}
 
-	// FIXME -- Check if ProxyProtocol changes the first bytes of the request
+	// TODO -- Check if ProxyProtocol changes the first bytes of the request
 	br := bufio.NewReader(conn)
 	hello, err := clientHelloInfo(br)
 	if err != nil {
@@ -218,7 +218,7 @@ func (r *Router) AddHTTPTLSConfig(sniHost string, config *tls.Config) {
 
 // GetConn creates a connection proxy with a peeked string.
 func (r *Router) GetConn(conn tcp.WriteCloser, peeked string) tcp.WriteCloser {
-	// FIXME should it really be on Router ?
+	// TODO should it really be on Router ?
 	conn = &Conn{
 		Peeked:      []byte(peeked),
 		WriteCloser: conn,

pkg/server/router/udp/router.go

@@ -52,11 +52,7 @@ func (m *Manager) BuildHandlers(rootCtx context.Context, entryPoints []string) m
 			log.FromContext(ctx).Warn("Config has more than one udp router for a given entrypoint.")
 		}
 
-		handlers, err := m.buildEntryPointHandlers(ctx, routers)
-		if err != nil {
-			log.FromContext(ctx).Error(err)
-			continue
-		}
+		handlers := m.buildEntryPointHandlers(ctx, routers)
 
 		if len(handlers) > 0 {
 			// As UDP support only one router per entrypoint, we only take the first one.
@@ -66,7 +62,7 @@ func (m *Manager) BuildHandlers(rootCtx context.Context, entryPoints []string) m
 	return entryPointHandlers
 }
 
-func (m *Manager) buildEntryPointHandlers(ctx context.Context, configs map[string]*runtime.UDPRouterInfo) ([]udp.Handler, error) {
+func (m *Manager) buildEntryPointHandlers(ctx context.Context, configs map[string]*runtime.UDPRouterInfo) []udp.Handler {
 	var rtNames []string
 	for routerName := range configs {
 		rtNames = append(rtNames, routerName)
@@ -101,5 +97,5 @@ func (m *Manager) buildEntryPointHandlers(ctx context.Context, configs map[strin
 		handlers = append(handlers, handler)
 	}
 
-	return handlers, nil
+	return handlers
 }

pkg/server/service/service.go

@@ -426,7 +426,7 @@ func (m *Manager) upsertServers(ctx context.Context, lb healthcheck.BalancerHand
 			return fmt.Errorf("error adding server %s to load balancer: %w", srv.URL, err)
 		}
 
-		// FIXME Handle Metrics
+		// TODO Handle Metrics
 	}
 	return nil
 }

pkg/tls/certificate_store_test.go

@@ -14,7 +14,7 @@ import (
 )
 
 func TestGetBestCertificate(t *testing.T) {
-	// FIXME Add tests for defaultCert
+	// TODO Add tests for defaultCert
 	testCases := []struct {
 		desc          string
 		domainToCheck string