Move dynamic config into a dedicated package.

pkg/middlewares/auth/basic_auth.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	goauth "github.com/abbot/go-http-auth"
-	"github.com/containous/traefik/pkg/config"
+	"github.com/containous/traefik/pkg/config/dynamic"
 	"github.com/containous/traefik/pkg/middlewares"
 	"github.com/containous/traefik/pkg/middlewares/accesslog"
 	"github.com/containous/traefik/pkg/tracing"
@@ -29,7 +29,7 @@ type basicAuth struct {
 }
 
 // NewBasic creates a basicAuth middleware.
-func NewBasic(ctx context.Context, next http.Handler, authConfig config.BasicAuth, name string) (http.Handler, error) {
+func NewBasic(ctx context.Context, next http.Handler, authConfig dynamic.BasicAuth, name string) (http.Handler, error) {
 	middlewares.GetLogger(ctx, name, basicTypeName).Debug("Creating middleware")
 	users, err := getUsers(authConfig.UsersFile, authConfig.Users, basicUserParser)
 	if err != nil {

pkg/middlewares/auth/basic_auth_test.go

@@ -9,7 +9,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/containous/traefik/pkg/config"
+	"github.com/containous/traefik/pkg/config/dynamic"
 	"github.com/containous/traefik/pkg/testhelpers"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -20,13 +20,13 @@ func TestBasicAuthFail(t *testing.T) {
 		fmt.Fprintln(w, "traefik")
 	})
 
-	auth := config.BasicAuth{
+	auth := dynamic.BasicAuth{
 		Users: []string{"test"},
 	}
 	_, err := NewBasic(context.Background(), next, auth, "authName")
 	require.Error(t, err)
 
-	auth2 := config.BasicAuth{
+	auth2 := dynamic.BasicAuth{
 		Users: []string{"test:test"},
 	}
 	authMiddleware, err := NewBasic(context.Background(), next, auth2, "authTest")
@@ -49,7 +49,7 @@ func TestBasicAuthSuccess(t *testing.T) {
 		fmt.Fprintln(w, "traefik")
 	})
 
-	auth := config.BasicAuth{
+	auth := dynamic.BasicAuth{
 		Users: []string{"test:$apr1$H6uskkkW$IgXLP6ewTrSuBkTrqE8wj/"},
 	}
 	authMiddleware, err := NewBasic(context.Background(), next, auth, "authName")
@@ -79,7 +79,7 @@ func TestBasicAuthUserHeader(t *testing.T) {
 		fmt.Fprintln(w, "traefik")
 	})
 
-	auth := config.BasicAuth{
+	auth := dynamic.BasicAuth{
 		Users:       []string{"test:$apr1$H6uskkkW$IgXLP6ewTrSuBkTrqE8wj/"},
 		HeaderField: "X-Webauth-User",
 	}
@@ -110,7 +110,7 @@ func TestBasicAuthHeaderRemoved(t *testing.T) {
 		fmt.Fprintln(w, "traefik")
 	})
 
-	auth := config.BasicAuth{
+	auth := dynamic.BasicAuth{
 		RemoveHeader: true,
 		Users:        []string{"test:$apr1$H6uskkkW$IgXLP6ewTrSuBkTrqE8wj/"},
 	}
@@ -142,7 +142,7 @@ func TestBasicAuthHeaderPresent(t *testing.T) {
 		fmt.Fprintln(w, "traefik")
 	})
 
-	auth := config.BasicAuth{
+	auth := dynamic.BasicAuth{
 		Users: []string{"test:$apr1$H6uskkkW$IgXLP6ewTrSuBkTrqE8wj/"},
 	}
 	middleware, err := NewBasic(context.Background(), next, auth, "authName")
@@ -226,7 +226,7 @@ func TestBasicAuthUsersFromFile(t *testing.T) {
 			require.NoError(t, err)
 
 			// Creates the configuration for our Authenticator
-			authenticatorConfiguration := config.BasicAuth{
+			authenticatorConfiguration := dynamic.BasicAuth{
 				Users:     test.givenUsers,
 				UsersFile: usersFile.Name(),
 				Realm:     test.realm,

pkg/middlewares/auth/digest_auth.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	goauth "github.com/abbot/go-http-auth"
-	"github.com/containous/traefik/pkg/config"
+	"github.com/containous/traefik/pkg/config/dynamic"
 	"github.com/containous/traefik/pkg/middlewares"
 	"github.com/containous/traefik/pkg/middlewares/accesslog"
 	"github.com/containous/traefik/pkg/tracing"
@@ -29,7 +29,7 @@ type digestAuth struct {
 }
 
 // NewDigest creates a digest auth middleware.
-func NewDigest(ctx context.Context, next http.Handler, authConfig config.DigestAuth, name string) (http.Handler, error) {
+func NewDigest(ctx context.Context, next http.Handler, authConfig dynamic.DigestAuth, name string) (http.Handler, error) {
 	middlewares.GetLogger(ctx, name, digestTypeName).Debug("Creating middleware")
 	users, err := getUsers(authConfig.UsersFile, authConfig.Users, digestUserParser)
 	if err != nil {

pkg/middlewares/auth/digest_auth_test.go

@@ -9,7 +9,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/containous/traefik/pkg/config"
+	"github.com/containous/traefik/pkg/config/dynamic"
 	"github.com/containous/traefik/pkg/testhelpers"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -20,7 +20,7 @@ func TestDigestAuthError(t *testing.T) {
 		fmt.Fprintln(w, "traefik")
 	})
 
-	auth := config.DigestAuth{
+	auth := dynamic.DigestAuth{
 		Users: []string{"test"},
 	}
 	_, err := NewDigest(context.Background(), next, auth, "authName")
@@ -32,7 +32,7 @@ func TestDigestAuthFail(t *testing.T) {
 		fmt.Fprintln(w, "traefik")
 	})
 
-	auth := config.DigestAuth{
+	auth := dynamic.DigestAuth{
 		Users: []string{"test:traefik:a2688e031edb4be6a3797f3882655c05"},
 	}
 	authMiddleware, err := NewDigest(context.Background(), next, auth, "authName")
@@ -101,7 +101,7 @@ func TestDigestAuthUsersFromFile(t *testing.T) {
 			require.NoError(t, err)
 
 			// Creates the configuration for our Authenticator
-			authenticatorConfiguration := config.DigestAuth{
+			authenticatorConfiguration := dynamic.DigestAuth{
 				Users:     test.givenUsers,
 				UsersFile: usersFile.Name(),
 				Realm:     test.realm,

pkg/middlewares/auth/forward.go

@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/containous/traefik/pkg/config"
+	"github.com/containous/traefik/pkg/config/dynamic"
 	"github.com/containous/traefik/pkg/middlewares"
 	"github.com/containous/traefik/pkg/tracing"
 	"github.com/opentracing/opentracing-go/ext"
@@ -33,7 +33,7 @@ type forwardAuth struct {
 }
 
 // NewForward creates a forward auth middleware.
-func NewForward(ctx context.Context, next http.Handler, config config.ForwardAuth, name string) (http.Handler, error) {
+func NewForward(ctx context.Context, next http.Handler, config dynamic.ForwardAuth, name string) (http.Handler, error) {
 	middlewares.GetLogger(ctx, name, forwardedTypeName).Debug("Creating middleware")
 
 	fa := &forwardAuth{

pkg/middlewares/auth/forward_test.go

@@ -8,7 +8,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/containous/traefik/pkg/config"
+	"github.com/containous/traefik/pkg/config/dynamic"
 	"github.com/containous/traefik/pkg/testhelpers"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -25,7 +25,7 @@ func TestForwardAuthFail(t *testing.T) {
 	}))
 	defer server.Close()
 
-	middleware, err := NewForward(context.Background(), next, config.ForwardAuth{
+	middleware, err := NewForward(context.Background(), next, dynamic.ForwardAuth{
 		Address: server.URL,
 	}, "authTest")
 	require.NoError(t, err)
@@ -63,7 +63,7 @@ func TestForwardAuthSuccess(t *testing.T) {
 		fmt.Fprintln(w, "traefik")
 	})
 
-	auth := config.ForwardAuth{
+	auth := dynamic.ForwardAuth{
 		Address:             server.URL,
 		AuthResponseHeaders: []string{"X-Auth-User", "X-Auth-Group"},
 	}
@@ -96,7 +96,7 @@ func TestForwardAuthRedirect(t *testing.T) {
 		fmt.Fprintln(w, "traefik")
 	})
 
-	auth := config.ForwardAuth{
+	auth := dynamic.ForwardAuth{
 		Address: authTs.URL,
 	}
 	authMiddleware, err := NewForward(context.Background(), next, auth, "authTest")
@@ -147,7 +147,7 @@ func TestForwardAuthRemoveHopByHopHeaders(t *testing.T) {
 	next := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		fmt.Fprintln(w, "traefik")
 	})
-	auth := config.ForwardAuth{
+	auth := dynamic.ForwardAuth{
 		Address: authTs.URL,
 	}
 	authMiddleware, err := NewForward(context.Background(), next, auth, "authTest")
@@ -193,7 +193,7 @@ func TestForwardAuthFailResponseHeaders(t *testing.T) {
 		fmt.Fprintln(w, "traefik")
 	})
 
-	auth := config.ForwardAuth{
+	auth := dynamic.ForwardAuth{
 		Address: authTs.URL,
 	}
 	authMiddleware, err := NewForward(context.Background(), next, auth, "authTest")