1
0
Fork 0

Merge current v2.4 into v2.5

This commit is contained in:
romain 2021-07-19 15:18:38 +02:00
commit bd3271aff0
6 changed files with 41 additions and 4 deletions

View file

@ -191,6 +191,10 @@ func (p *Provider) loadFileConfig(ctx context.Context, filename string, parseTem
// TLS stores
if len(configuration.TLS.Stores) > 0 {
for name, store := range configuration.TLS.Stores {
if store.DefaultCertificate == nil {
continue
}
content, err := store.DefaultCertificate.CertFile.Read()
if err != nil {
log.FromContext(ctx).Error(err)

View file

@ -262,6 +262,13 @@ func getTestCases() []ProvideTestCase {
expectedNumRouter: 20,
expectedNumService: 20,
},
{
desc: "simple file with empty store yaml",
filePath: "./fixtures/yaml/simple_empty_store.yml",
expectedNumRouter: 0,
expectedNumService: 0,
expectedNumTLSConf: 0,
},
}
}

View file

@ -0,0 +1,3 @@
tls:
stores:
default: {}