From b0fffa4f375139a25b9eadd11fc7af8d64344dc4 Mon Sep 17 00:00:00 2001 From: Jennifer Power Date: Mon, 25 Nov 2024 18:10:19 -0500 Subject: [PATCH] fix: corrects the use of errJoin Signed-off-by: Jennifer Power --- rules/memory.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/rules/memory.go b/rules/memory.go index d5ad6e8..224e987 100644 --- a/rules/memory.go +++ b/rules/memory.go @@ -165,10 +165,12 @@ func (m *MemoryStore) FindByComponent(ctx context.Context, componentId string) ( } var ruleSets []extensions.RuleSet - var errs error + var errs []error for ruleId := range ruleIds { ruleSet, err := m.GetByRuleID(ctx, ruleId) - errs = errors.Join(err) + if err != nil { + errs = append(errs, err) + } // Make sure we are only returning the relevant checks for this // component. @@ -185,8 +187,9 @@ func (m *MemoryStore) FindByComponent(ctx context.Context, componentId string) ( ruleSets = append(ruleSets, ruleSet) } - if errs != nil { - return ruleSets, fmt.Errorf("failed to find rules for component %q: %w", componentId, errs) + if len(errs) > 0 { + joinedErr := errors.Join(errs...) + return ruleSets, fmt.Errorf("failed to find rules for component %q: %w", componentId, joinedErr) } return ruleSets, nil