From b070ce47157f1a2f88e244267fbef127b5b790ee Mon Sep 17 00:00:00 2001 From: Sam Catlow Date: Sat, 10 Oct 2026 11:05:58 +1100 Subject: [PATCH] refactor(eda): use slices.Sorted over maps.Keys for ordered keys --- internal/domain/eda/expr/expr.go | 8 +++----- internal/domain/eda/module/module.go | 9 +++------ internal/domain/eda/playbook/playbook.go | 23 ++++++----------------- 3 files changed, 12 insertions(+), 28 deletions(-) diff --git a/internal/domain/eda/expr/expr.go b/internal/domain/eda/expr/expr.go index 2c2366742..9a69edff7 100644 --- a/internal/domain/eda/expr/expr.go +++ b/internal/domain/eda/expr/expr.go @@ -3,7 +3,9 @@ package expr import ( + "maps" "reflect" + "slices" "sort" "strings" @@ -252,11 +254,7 @@ func actionReferences(ast *cel.Ast) ([]string, bool) { } }) celast.PreOrderVisit(checked.Expr(), visitor) - ids := make([]string, 0, len(seen)) - for id := range seen { - ids = append(ids, id) - } - sort.Strings(ids) + ids := slices.Sorted(maps.Keys(seen)) return ids, identCount == staticCount } diff --git a/internal/domain/eda/module/module.go b/internal/domain/eda/module/module.go index 6844e78b8..d6b6c2218 100644 --- a/internal/domain/eda/module/module.go +++ b/internal/domain/eda/module/module.go @@ -8,8 +8,9 @@ import ( "context" "fmt" "log/slog" + "maps" "reflect" - "sort" + "slices" "strings" "github.com/samcharles93/archie-core/internal/domain/eda/module/log" @@ -164,11 +165,7 @@ func decodeResultStruct(kind string, t reflect.Type, raw map[string]any) (any, e byName[name] = out.Field(i) } - keys := make([]string, 0, len(raw)) - for key := range raw { - keys = append(keys, key) - } - sort.Strings(keys) + keys := slices.Sorted(maps.Keys(raw)) for _, key := range keys { if _, ok := byName[key]; !ok { return nil, fmt.Errorf("module %s: unknown result field %q", kind, key) diff --git a/internal/domain/eda/playbook/playbook.go b/internal/domain/eda/playbook/playbook.go index bd4710094..40d874767 100644 --- a/internal/domain/eda/playbook/playbook.go +++ b/internal/domain/eda/playbook/playbook.go @@ -6,10 +6,11 @@ import ( "context" "crypto/sha256" "fmt" + "maps" "os" "path/filepath" "reflect" - "sort" + "slices" "strings" "gopkg.in/yaml.v3" @@ -235,7 +236,7 @@ func Load(dir string, modules Modules) (*Store, error) { // Compile validates and compiles playbook documents in id order. Any invalid // playbook fails the whole set: a partially valid set never runs. func Compile(docs []Document, modules Modules) (*Store, error) { - sort.Slice(docs, func(i, j int) bool { return docs[i].ID < docs[j].ID }) + slices.SortFunc(docs, func(a, b Document) int { return strings.Compare(a.ID, b.ID) }) store := &Store{modules: modules} for _, doc := range docs { pb, err := compileOne(doc, modules) @@ -481,11 +482,7 @@ func compileArgs(path string, lines map[string]int, label, kind string, raw map[ return nil, err } } - keys := make([]string, 0, len(raw)) - for key := range raw { - keys = append(keys, key) - } - sort.Strings(keys) + keys := slices.Sorted(maps.Keys(raw)) args := make(map[string]*expr.Program, len(raw)) for _, key := range keys { prg, err := compileExpr(at(path, lines[key]), argsLabel(label, key), raw[key], env) @@ -512,11 +509,7 @@ func validateArgsKeys(path string, lines map[string]int, label, kind string, arg for field := range t.Fields() { fields[strings.ToLower(field.Name)] = struct{}{} } - keys := make([]string, 0, len(raw)) - for key := range raw { - keys = append(keys, key) - } - sort.Strings(keys) + keys := slices.Sorted(maps.Keys(raw)) loc := kind + " kind" if label != "" { loc = label + " " + loc @@ -671,11 +664,7 @@ func (a Action) whenHolds(ctx expr.Context) bool { // the first evaluation error. func (a Action) evalArgs(ctx expr.Context) (map[string]any, error) { out := make(map[string]any, len(a.Args)) - keys := make([]string, 0, len(a.Args)) - for key := range a.Args { - keys = append(keys, key) - } - sort.Strings(keys) + keys := slices.Sorted(maps.Keys(a.Args)) for _, key := range keys { if a.Args[key] == nil { continue