// Config: parse groups.yaml
-// Copyright (C) 2021 Simon Ruderich
+// Copyright (C) 2021-2022 Simon Ruderich
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
GroupRemoveSuffix = GroupSpecialSeparator + "remove"
)
-// Keep in sync with sync_info.go:infoGroupDetectedRegexp
+// Keep in sync with cmd/safcm/sync_info.go:infoGroupDetectedRegexp
var groupNameRegexp = regexp.MustCompile(`^[a-z0-9_-]+$`)
func LoadGroups(cfg *Config, hosts *Hosts) (map[string][]string, error) {
if x == GroupAll {
continue
}
+ // Don't validate against groupNameRegexp because
+ // hosts have less strict restrictions.
if strings.Contains(x, GroupSpecialSeparator) {
return nil, fmt.Errorf(
"%s member %q must not contain %q",
}
// Sanity check for global configuration
- for _, x := range cfg.GroupOrder {
- const errPrefix = "config.yaml: group_order:"
+ for _, x := range cfg.GroupPriority {
+ const errPrefix = "config.yaml: group_priority:"
if x == GroupAll {
continue
return groups, nil
}
-func ResolveHostGroups(host string,
- groups map[string][]string,
+func ResolveHostGroups(host string, groups map[string][]string,
detectedGroups []string) ([]string, error) {
- const maxDepth = 100
+ const maxRecursionDepth = 100
detectedGroupsMap := make(map[string]bool)
for _, x := range detectedGroups {
// groups).
var lookup func(string, int) bool
lookup = func(group string, depth int) bool {
- if depth > maxDepth {
+ if depth > maxRecursionDepth {
cycle = &group
return false
}
// TransitivelyDetectedGroups returns all groups which depend on "detected"
// groups, either directly or by depending on groups which transitively depend
// on "detected" groups.
-func TransitivelyDetectedGroups(groups map[string][]string) []string {
+func TransitivelyDetectedGroups(groups map[string][]string) map[string]bool {
work := make(map[string][]string)
for k, v := range groups {
work[k] = v
break
}
}
-
- var res []string
- for x := range detected {
- res = append(res, x)
- }
- sort.Strings(res)
- return res
+ return detected
}