Fix warnings about configuration values; should always use the snake case since we're using a marshaled value
This commit is contained in:
parent
276bd2be33
commit
c802a3397e
|
@ -46,9 +46,9 @@ type Configuration struct {
|
||||||
// validate against it.
|
// validate against it.
|
||||||
AuthenticationToken string `json:"token" yaml:"token"`
|
AuthenticationToken string `json:"token" yaml:"token"`
|
||||||
|
|
||||||
Api ApiConfiguration
|
Api ApiConfiguration `json:"api" yaml:"api"`
|
||||||
System SystemConfiguration
|
System SystemConfiguration `json:"system" yaml:"system"`
|
||||||
Docker DockerConfiguration
|
Docker DockerConfiguration `json:"docker" yaml:"docker"`
|
||||||
|
|
||||||
// The amount of time in seconds that should elapse between disk usage checks
|
// The amount of time in seconds that should elapse between disk usage checks
|
||||||
// run by the daemon. Setting a higher number can result in better IO performance
|
// run by the daemon. Setting a higher number can result in better IO performance
|
||||||
|
|
|
@ -15,7 +15,7 @@ type dockerNetworkInterfaces struct {
|
||||||
type DockerNetworkConfiguration struct {
|
type DockerNetworkConfiguration struct {
|
||||||
// The interface that should be used to create the network. Must not conflict
|
// The interface that should be used to create the network. Must not conflict
|
||||||
// with any other interfaces in use by Docker or on the system.
|
// with any other interfaces in use by Docker or on the system.
|
||||||
Interface string `default:"172.18.0.1"`
|
Interface string `default:"172.18.0.1" json:"interface" yaml:"interface"`
|
||||||
|
|
||||||
// The DNS settings for containers.
|
// The DNS settings for containers.
|
||||||
Dns []string `default:"[\"1.1.1.1\", \"1.0.0.1\"]"`
|
Dns []string `default:"[\"1.1.1.1\", \"1.0.0.1\"]"`
|
||||||
|
@ -45,7 +45,7 @@ type DockerConfiguration struct {
|
||||||
UpdateImages bool `default:"true" json:"update_images" yaml:"update_images"`
|
UpdateImages bool `default:"true" json:"update_images" yaml:"update_images"`
|
||||||
|
|
||||||
// The location of the Docker socket.
|
// The location of the Docker socket.
|
||||||
Socket string `default:"/var/run/docker.sock"`
|
Socket string `default:"/var/run/docker.sock" json:"socket" yaml:"socket"`
|
||||||
|
|
||||||
// Defines the location of the timezone file on the host system that should
|
// Defines the location of the timezone file on the host system that should
|
||||||
// be mounted into the created containers so that they all use the same time.
|
// be mounted into the created containers so that they all use the same time.
|
||||||
|
|
|
@ -165,11 +165,8 @@ func (f *ConfigurationFile) LookupConfigurationValue(cfr ConfigurationFileReplac
|
||||||
)
|
)
|
||||||
|
|
||||||
var path []string
|
var path []string
|
||||||
// The camel casing is important here, the configuration for the Daemon does not use
|
|
||||||
// JSON, and as such all of the keys will be generated in CamelCase format, rather than
|
|
||||||
// the expected snake_case from the old Daemon.
|
|
||||||
for _, value := range strings.Split(huntPath, ".") {
|
for _, value := range strings.Split(huntPath, ".") {
|
||||||
path = append(path, strcase.ToCamel(value))
|
path = append(path, strcase.ToSnake(value))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Look for the key in the configuration file, and if found return that value to the
|
// Look for the key in the configuration file, and if found return that value to the
|
||||||
|
|
|
@ -124,8 +124,12 @@ func (cfr *ConfigurationFileReplacement) UnmarshalJSON(data []byte) error {
|
||||||
func (f *ConfigurationFile) Parse(path string, internal bool) error {
|
func (f *ConfigurationFile) Parse(path string, internal bool) error {
|
||||||
zap.S().Debugw("parsing configuration file", zap.String("path", path), zap.String("parser", string(f.Parser)))
|
zap.S().Debugw("parsing configuration file", zap.String("path", path), zap.String("parser", string(f.Parser)))
|
||||||
|
|
||||||
mb, _ := json.Marshal(config.Get())
|
if mb, err := json.Marshal(config.Get()); err != nil {
|
||||||
|
return err
|
||||||
|
} else {
|
||||||
f.configuration = mb
|
f.configuration = mb
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user