homelab/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: TLS configuration from directory.

Browse source
This commit is contained in:
Ludovic Fernandez 2019-07-18 16:26:05 +02:00 • committed by Traefiker Bot
parent 68c349bbfa
commit 4dc448056c
4 changed files with 47 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

28
pkg/provider/file/file_test.go
View file

@ -17,12 +17,13 @@ import (
)
type ProvideTestCase struct {
desc string
directoryPaths []string
filePath string
expectedNumRouter int
expectedNumService int
expectedNumTLSConf int
desc string
directoryPaths []string
filePath string
expectedNumRouter int
expectedNumService int
expectedNumTLSConf int
expectedNumTLSOptions int
}
func TestTLSContent(t *testing.T) {
@ -94,6 +95,7 @@ func TestProvideWithoutWatch(t *testing.T) {
assert.Len(t, conf.Configuration.HTTP.Routers, test.expectedNumRouter)
require.NotNil(t, conf.Configuration.TLS)
assert.Len(t, conf.Configuration.TLS.Certificates, test.expectedNumTLSConf)
assert.Len(t, conf.Configuration.TLS.Options, test.expectedNumTLSOptions)
case <-timeout:
t.Errorf("timeout while waiting for config")
}
@ -192,9 +194,10 @@ func getTestCases() []ProvideTestCase {
"./fixtures/toml/dir01_file02.toml",
"./fixtures/toml/dir01_file03.toml",
},
expectedNumRouter: 2,
expectedNumService: 3,
expectedNumTLSConf: 4,
expectedNumRouter: 2,
expectedNumService: 3,
expectedNumTLSConf: 4,
expectedNumTLSOptions: 1,
},
{
desc: "simple directory yaml",
@ -203,9 +206,10 @@ func getTestCases() []ProvideTestCase {
"./fixtures/yaml/dir01_file02.yml",
"./fixtures/yaml/dir01_file03.yml",
},
expectedNumRouter: 2,
expectedNumService: 3,
expectedNumTLSConf: 4,
expectedNumRouter: 2,
expectedNumService: 3,
expectedNumTLSConf: 4,
expectedNumTLSOptions: 1,
},
{
desc: "template in directory",