Warnf(string, ...interface{})
}
-type deprRequestLimits struct {
- MaxItemsPerResponse *int
- MultiClusterRequestConcurrency *int
-}
-
-type deprCluster struct {
- RequestLimits deprRequestLimits
- NodeProfiles map[string]arvados.NodeProfile
-}
-
-type deprecatedConfig struct {
- Clusters map[string]deprCluster
-}
-
func LoadFile(path string, log logger) (*arvados.Config, error) {
f, err := os.Open(path)
if err != nil {
}
func Load(rdr io.Reader, log logger) (*arvados.Config, error) {
- var cfg arvados.Config
+ return load(rdr, log, true)
+}
+
+func load(rdr io.Reader, log logger, useDeprecated bool) (*arvados.Config, error) {
buf, err := ioutil.ReadAll(rdr)
if err != nil {
return nil, err
if err != nil {
return nil, fmt.Errorf("loading defaults for %s: %s", id, err)
}
- mergo.Merge(&merged, src, mergo.WithOverride)
+ err = mergo.Merge(&merged, src, mergo.WithOverride)
+ if err != nil {
+ return nil, fmt.Errorf("merging defaults for %s: %s", id, err)
+ }
}
var src map[string]interface{}
err = yaml.Unmarshal(buf, &src)
if err != nil {
return nil, fmt.Errorf("loading config data: %s", err)
}
- mergo.Merge(&merged, src, mergo.WithOverride)
+ logExtraKeys(log, merged, src, "")
+ err = mergo.Merge(&merged, src, mergo.WithOverride)
+ if err != nil {
+ return nil, fmt.Errorf("merging config data: %s", err)
+ }
+ // map[string]interface{} => json => arvados.Config
+ var cfg arvados.Config
var errEnc error
pr, pw := io.Pipe()
go func() {
return nil, fmt.Errorf("transcoding config data: %s", err)
}
- var dc deprecatedConfig
- err = yaml.Unmarshal(buf, &dc)
- if err != nil {
- return nil, err
+ if useDeprecated {
+ err = applyDeprecatedConfig(&cfg, buf, log)
+ if err != nil {
+ return nil, err
+ }
}
- err = applyDeprecatedConfig(&cfg, &dc, log)
- if err != nil {
- return nil, err
+
+ // Check for known mistakes
+ for id, cc := range cfg.Clusters {
+ err = checkKeyConflict(fmt.Sprintf("Clusters.%s.PostgreSQL.Connection", id), cc.PostgreSQL.Connection)
+ if err != nil {
+ return nil, err
+ }
}
return &cfg, nil
}
-func applyDeprecatedConfig(cfg *arvados.Config, dc *deprecatedConfig, log logger) error {
- hostname, err := os.Hostname()
- if err != nil {
- return err
- }
- for id, dcluster := range dc.Clusters {
- cluster, ok := cfg.Clusters[id]
- if !ok {
- return fmt.Errorf("can't load legacy config %q that is not present in current config", id)
- }
- for name, np := range dcluster.NodeProfiles {
- if name == "*" || name == os.Getenv("ARVADOS_NODE_PROFILE") || name == hostname {
- applyDeprecatedNodeProfile(hostname, np.RailsAPI, &cluster.Services.RailsAPI)
- applyDeprecatedNodeProfile(hostname, np.Controller, &cluster.Services.Controller)
- applyDeprecatedNodeProfile(hostname, np.DispatchCloud, &cluster.Services.DispatchCloud)
- }
- }
- if dst, n := &cluster.API.MaxItemsPerResponse, dcluster.RequestLimits.MaxItemsPerResponse; n != nil && *n != *dst {
- log.Warnf("overriding Clusters.%s.API.MaxItemsPerResponse with deprecated config RequestLimits.MultiClusterRequestConcurrency = %d", id, *n)
- *dst = *n
- }
- if dst, n := &cluster.API.MaxRequestAmplification, dcluster.RequestLimits.MultiClusterRequestConcurrency; n != nil && *n != *dst {
- log.Warnf("overriding Clusters.%s.API.MaxRequestAmplification with deprecated config RequestLimits.MultiClusterRequestConcurrency = %d", id, *n)
- *dst = *n
+func checkKeyConflict(label string, m map[string]string) error {
+ saw := map[string]bool{}
+ for k := range m {
+ k = strings.ToLower(k)
+ if saw[k] {
+ return fmt.Errorf("%s: multiple entries for %q (fix by using same capitalization as default/example file)", label, k)
}
- cfg.Clusters[id] = cluster
+ saw[k] = true
}
return nil
}
-func applyDeprecatedNodeProfile(hostname string, ssi arvados.SystemServiceInstance, svc *arvados.Service) {
- scheme := "https"
- if !ssi.TLS {
- scheme = "http"
- }
- if svc.InternalURLs == nil {
- svc.InternalURLs = map[arvados.URL]arvados.ServiceInstance{}
- }
- host := ssi.Listen
- if host == "" {
+func logExtraKeys(log logger, expected, supplied map[string]interface{}, prefix string) {
+ if log == nil {
return
}
- if strings.HasPrefix(host, ":") {
- host = hostname + host
+ for k, vsupp := range supplied {
+ if vexp, ok := expected[k]; !ok {
+ log.Warnf("deprecated or unknown config entry: %s%s", prefix, k)
+ } else if vsupp, ok := vsupp.(map[string]interface{}); !ok {
+ // if vsupp is a map but vexp isn't map, this
+ // will be caught elsewhere; see TestBadType.
+ continue
+ } else if vexp, ok := vexp.(map[string]interface{}); !ok {
+ log.Warnf("unexpected object in config entry: %s%s", prefix, k)
+ } else {
+ logExtraKeys(log, vexp, vsupp, prefix+k+".")
+ }
}
- svc.InternalURLs[arvados.URL{Scheme: scheme, Host: host}] = arvados.ServiceInstance{}
}
projects / arvados.git / blobdiff