github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Fix toml plugin decoding

Browse Source 
Do not rely on toml metadata when decoding plugin's configs as it's not possible to merge toml.MetaData structs during import.

Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
This commit is contained in:
Maksym Pavlenko
2019-08-22 17:22:25 -07:00
parent a1e3779cad
commit bca0857530
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/server/config/config.go
View File

@@ -64,8 +64,6 @@ type Config struct {
Imports []string `toml:"imports"`
StreamProcessors []StreamProcessor `toml:"stream_processors"`
md toml.MetaData
}
// StreamProcessor provides configuration for diff content processors
@@ -203,7 +201,7 @@ func (c *Config) Decode(p *plugin.Registration) (interface{}, error) {
if !ok {
return p.Config, nil
}
if err := c.md.PrimitiveDecode(data, p.Config); err != nil {
if err := toml.PrimitiveDecode(data, p.Config); err != nil {
return nil, err
}
return p.Config, nil
@@ -258,11 +256,10 @@ func LoadConfig(path string, out *Config) error {
// loadConfigFile decodes a TOML file at the given path
func loadConfigFile(path string) (*Config, error) {
config := &Config{}
md, err := toml.DecodeFile(path, &config)
_, err := toml.DecodeFile(path, &config)
if err != nil {
return nil, err
}
config.md = md
return config, nil
}