Fix linter

grafana · Dec 13, 2022 · bb49a68 · bb49a68
1 parent c8a748a
commit bb49a68
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/component/mimir/rules/diff.go b/component/mimir/rules/diff.go
@@ -22,7 +22,7 @@ type ruleGroupDiff struct {
 	Desired mimirClient.RuleGroup
 }
 
-func diffRuleState(desired map[string][]mimirClient.RuleGroup, actual map[string][]mimirClient.RuleGroup) (map[string][]ruleGroupDiff, error) {
+func diffRuleState(desired map[string][]mimirClient.RuleGroup, actual map[string][]mimirClient.RuleGroup) map[string][]ruleGroupDiff {
 	seen := map[string]bool{}
 
 	diff := make(map[string][]ruleGroupDiff)
@@ -50,7 +50,7 @@ func diffRuleState(desired map[string][]mimirClient.RuleGroup, actual map[string
 		diff[namespace] = subDiff
 	}
 
-	return diff, nil
+	return diff
 }
 
 func diffRuleNamespaceState(desired []mimirClient.RuleGroup, actual []mimirClient.RuleGroup) []ruleGroupDiff {

diff --git a/component/mimir/rules/diff_test.go b/component/mimir/rules/diff_test.go
@@ -119,8 +119,7 @@ groups:
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			actual, err := diffRuleState(tc.desired, tc.actual)
-			require.NoError(t, err)
+			actual := diffRuleState(tc.desired, tc.actual)
 			requireEqualRuleDiffs(t, tc.expected, actual)
 		})
 	}

diff --git a/component/mimir/rules/events.go b/component/mimir/rules/events.go
@@ -143,11 +143,7 @@ func (c *Component) reconcileState(ctx context.Context) error {
 		return err
 	}
 
-	diffs, err := diffRuleState(desiredState, c.currentState)
-	if err != nil {
-		return err
-	}
-
+	diffs := diffRuleState(desiredState, c.currentState)
 	errs := multierror.New()
 	for ns, diff := range diffs {
 		err = c.applyChanges(ctx, ns, diff)