Remove old global config and use new static config

provider/acme/provider.go

@@ -124,7 +124,7 @@ func (p *Provider) ListenRequest(domain string) (*tls.Certificate, error) {
 }
 
 // Init for compatibility reason the BaseProvider implements an empty Init
-func (p *Provider) Init(_ types.Constraints) error {
+func (p *Provider) Init() error {
 	ctx := log.With(context.Background(), log.Str(log.ProviderName, "acme"))
 	logger := log.FromContext(ctx)
 

provider/acme/provider_test.go

@@ -25,10 +25,10 @@ func TestGetUncheckedCertificates(t *testing.T) {
 	domainSafe := &safe.Safe{}
 	domainSafe.Set(domainMap)
 
+	// FIXME Add a test for DefaultCertificate
 	testCases := []struct {
 		desc             string
 		dynamicCerts     *safe.Safe
-		staticCerts      *safe.Safe
 		resolvingDomains map[string]struct{}
 		acmeCertificates []*Certificate
 		domains          []string
@@ -45,12 +45,6 @@ func TestGetUncheckedCertificates(t *testing.T) {
 			dynamicCerts:    wildcardSafe,
 			expectedDomains: nil,
 		},
-		{
-			desc:            "wildcard already exists in static certificates",
-			domains:         []string{"*.traefik.wtf"},
-			staticCerts:     wildcardSafe,
-			expectedDomains: nil,
-		},
 		{
 			desc:    "wildcard already exists in ACME certificates",
 			domains: []string{"*.traefik.wtf"},
@@ -72,12 +66,6 @@ func TestGetUncheckedCertificates(t *testing.T) {
 			dynamicCerts:    domainSafe,
 			expectedDomains: []string{"foo.traefik.wtf"},
 		},
-		{
-			desc:            "domain CN already exists in static certificates and SANs to generate",
-			domains:         []string{"traefik.wtf", "foo.traefik.wtf"},
-			staticCerts:     domainSafe,
-			expectedDomains: []string{"foo.traefik.wtf"},
-		},
 		{
 			desc:    "domain CN already exists in ACME certificates and SANs to generate",
 			domains: []string{"traefik.wtf", "foo.traefik.wtf"},
@@ -94,12 +82,6 @@ func TestGetUncheckedCertificates(t *testing.T) {
 			dynamicCerts:    domainSafe,
 			expectedDomains: nil,
 		},
-		{
-			desc:            "domain already exists in static certificates",
-			domains:         []string{"traefik.wtf"},
-			staticCerts:     domainSafe,
-			expectedDomains: nil,
-		},
 		{
 			desc:    "domain already exists in ACME certificates",
 			domains: []string{"traefik.wtf"},
@@ -116,12 +98,6 @@ func TestGetUncheckedCertificates(t *testing.T) {
 			dynamicCerts:    wildcardSafe,
 			expectedDomains: nil,
 		},
-		{
-			desc:            "domain matched by wildcard in static certificates",
-			domains:         []string{"who.traefik.wtf", "foo.traefik.wtf"},
-			staticCerts:     wildcardSafe,
-			expectedDomains: nil,
-		},
 		{
 			desc:    "domain matched by wildcard in ACME certificates",
 			domains: []string{"who.traefik.wtf", "foo.traefik.wtf"},
@@ -190,7 +166,6 @@ func TestGetUncheckedCertificates(t *testing.T) {
 			acmeProvider := Provider{
 				certificateStore: &traefiktls.CertificateStore{
 					DynamicCerts: test.dynamicCerts,
-					StaticCerts:  test.staticCerts,
 				},
 				certificates:     test.acmeCertificates,
 				resolvingDomains: test.resolvingDomains,

provider/aggregator/aggregator.go

@@ -8,20 +8,16 @@ import (
 	"github.com/containous/traefik/log"
 	"github.com/containous/traefik/provider"
 	"github.com/containous/traefik/safe"
-	"github.com/containous/traefik/types"
 )
 
 // ProviderAggregator aggregates providers.
 type ProviderAggregator struct {
-	providers   []provider.Provider
-	constraints types.Constraints
+	providers []provider.Provider
 }
 
 // NewProviderAggregator returns an aggregate of all the providers configured in the static configuration.
-func NewProviderAggregator(conf static.Configuration) ProviderAggregator {
-	p := ProviderAggregator{
-		constraints: conf.Constraints,
-	}
+func NewProviderAggregator(conf static.Providers) ProviderAggregator {
+	p := ProviderAggregator{}
 
 	if conf.File != nil {
 		p.quietAddProvider(conf.File)
@@ -39,7 +35,7 @@ func (p *ProviderAggregator) quietAddProvider(provider provider.Provider) {
 
 // AddProvider adds a provider in the providers map.
 func (p *ProviderAggregator) AddProvider(provider provider.Provider) error {
-	err := provider.Init(p.constraints)
+	err := provider.Init()
 	if err != nil {
 		return err
 	}
@@ -48,7 +44,7 @@ func (p *ProviderAggregator) AddProvider(provider provider.Provider) error {
 }
 
 // Init the provider
-func (p ProviderAggregator) Init(_ types.Constraints) error {
+func (p ProviderAggregator) Init() error {
 	return nil
 }
 

provider/base_provider.go

@@ -25,8 +25,7 @@ type BaseProvider struct {
 }
 
 // Init for compatibility reason the BaseProvider implements an empty Init.
-func (p *BaseProvider) Init(constraints types.Constraints) error {
-	p.Constraints = append(p.Constraints, constraints...)
+func (p *BaseProvider) Init() error {
 	return nil
 }
 

provider/file/file.go

@@ -15,7 +15,6 @@ import (
 	"github.com/containous/traefik/provider"
 	"github.com/containous/traefik/safe"
 	"github.com/containous/traefik/tls"
-	"github.com/containous/traefik/types"
 	"github.com/pkg/errors"
 	"gopkg.in/fsnotify.v1"
 )
@@ -32,8 +31,8 @@ type Provider struct {
 }
 
 // Init the provider
-func (p *Provider) Init(constraints types.Constraints) error {
-	return p.BaseProvider.Init(constraints)
+func (p *Provider) Init() error {
+	return p.BaseProvider.Init()
 }
 
 // Provide allows the file provider to provide configurations to traefik

provider/provider.go

@@ -3,7 +3,6 @@ package provider
 import (
 	"github.com/containous/traefik/config"
 	"github.com/containous/traefik/safe"
-	"github.com/containous/traefik/types"
 )
 
 // Provider defines methods of a provider.
@@ -11,5 +10,5 @@ type Provider interface {
 	// Provide allows the provider to provide configurations to traefik
 	// using the given configuration channel.
 	Provide(configurationChan chan<- config.Message, pool *safe.Pool) error
-	Init(constraints types.Constraints) error
+	Init() error
 }