homelab/traefik
1
0
Fork 0
Code Activity

Filter env vars configuration

Browse source
This commit is contained in:
Ludovic Fernandez 2019-06-21 10:08:04 +02:00 • committed by Traefiker Bot
parent adc9a65ae3
commit a918dcd5a4
19 changed files with 284 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pkg/config/file/file_node.go
View file

@ -36,13 +36,13 @@ func decodeFileToNode(filePath string, filters ...string) (*parser.Node, error)
return nil, err
}
return decodeRawToNode(data, filters...)
return decodeRawToNode(data, parser.DefaultRootName, filters...)
default:
return nil, fmt.Errorf("unsupported file extension: %s", filePath)
}
return decodeRawToNode(data, filters...)
return decodeRawToNode(data, parser.DefaultRootName, filters...)
}
func getRootFieldNames(element interface{}) []string {

4
pkg/config/file/raw_node.go
View file

@ -9,9 +9,9 @@ import (
"github.com/containous/traefik/pkg/config/parser"
)
func decodeRawToNode(data map[string]interface{}, filters ...string) (*parser.Node, error) {
func decodeRawToNode(data map[string]interface{}, rootName string, filters ...string) (*parser.Node, error) {
root := &parser.Node{
Name: "traefik",
Name: rootName,
}
vData := reflect.ValueOf(data)

2
pkg/config/file/raw_node_test.go
View file

@ -531,7 +531,7 @@ func Test_decodeRawToNode(t *testing.T) {
t.Run(test.desc, func(t *testing.T) {
t.Parallel()
node, err := decodeRawToNode(test.data)
node, err := decodeRawToNode(test.data, parser.DefaultRootName)
require.NoError(t, err)
assert.Equal(t, test.expected, node)