Remove acme provider dependency in server

This commit is contained in:
SALLEYRON Julien 2018-04-24 22:40:04 +02:00 committed by Traefiker Bot
parent 9daae9c705
commit b4e3bca6fa
7 changed files with 124 additions and 101 deletions

View file

@ -5,6 +5,7 @@ import (
"testing"
"github.com/containous/traefik/safe"
traefiktls "github.com/containous/traefik/tls"
"github.com/containous/traefik/types"
"github.com/stretchr/testify/assert"
)
@ -25,7 +26,7 @@ func TestGetUncheckedCertificates(t *testing.T) {
testCases := []struct {
desc string
dynamicCerts *safe.Safe
staticCerts map[string]*tls.Certificate
staticCerts *safe.Safe
acmeCertificates []*Certificate
domains []string
expectedDomains []string
@ -44,7 +45,7 @@ func TestGetUncheckedCertificates(t *testing.T) {
{
desc: "wildcard already exists in static certificates",
domains: []string{"*.traefik.wtf"},
staticCerts: wildcardMap,
staticCerts: wildcardSafe,
expectedDomains: nil,
},
{
@ -71,7 +72,7 @@ func TestGetUncheckedCertificates(t *testing.T) {
{
desc: "domain CN already exists in static certificates and SANs to generate",
domains: []string{"traefik.wtf", "foo.traefik.wtf"},
staticCerts: domainMap,
staticCerts: domainSafe,
expectedDomains: []string{"foo.traefik.wtf"},
},
{
@ -93,7 +94,7 @@ func TestGetUncheckedCertificates(t *testing.T) {
{
desc: "domain already exists in static certificates",
domains: []string{"traefik.wtf"},
staticCerts: domainMap,
staticCerts: domainSafe,
expectedDomains: nil,
},
{
@ -115,7 +116,7 @@ func TestGetUncheckedCertificates(t *testing.T) {
{
desc: "domain matched by wildcard in static certificates",
domains: []string{"who.traefik.wtf", "foo.traefik.wtf"},
staticCerts: wildcardMap,
staticCerts: wildcardSafe,
expectedDomains: nil,
},
{
@ -146,8 +147,10 @@ func TestGetUncheckedCertificates(t *testing.T) {
t.Parallel()
acmeProvider := Provider{
dynamicCerts: test.dynamicCerts,
staticCerts: test.staticCerts,
certificateStore: traefiktls.CertificateStore{
DynamicCerts: test.dynamicCerts,
StaticCerts: test.staticCerts,
},
certificates: test.acmeCertificates,
}