chore: fix linting issues

grafana · Feb 16, 2024 · c68a5f4 · c68a5f4
1 parent ec7136e
commit c68a5f4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/controllers/grafanaalertrulegroup_controller.go b/controllers/grafanaalertrulegroup_controller.go
@@ -105,7 +105,7 @@ func (r *GrafanaAlertRuleGroupReconciler) Reconcile(ctx context.Context, req ctr
 
 	instances, err := r.GetMatchingInstances(ctx, group.Spec.InstanceSelector, r.Client)
 	if err != nil {
-		setNoMatchingInstance(&group.Status.Conditions, group.Generation, "ErrFetchingInstances", fmt.Sprintf("error occured during fetching of instances: %s", err.Error()))
+		setNoMatchingInstance(&group.Status.Conditions, group.Generation, "ErrFetchingInstances", fmt.Sprintf("error occurred during fetching of instances: %s", err.Error()))
 		r.Log.Error(err, "could not find matching instances")
 		return ctrl.Result{RequeueAfter: RequeueDelay}, err
 	}
@@ -142,7 +142,7 @@ func (r *GrafanaAlertRuleGroupReconciler) Reconcile(ctx context.Context, req ctr
 	if len(applyErrors) == 0 {
 		condition.Status = "True"
 		condition.Reason = "ApplySuccesfull"
-		condition.Message = fmt.Sprintf("Alert Rule Group was succesfully applied to %d instances", len(instances.Items))
+		condition.Message = fmt.Sprintf("Alert Rule Group was successfully applied to %d instances", len(instances.Items))
 	} else {
 		condition.Status = "False"
 		condition.Reason = "ApplyFailed"
@@ -160,7 +160,7 @@ func (r *GrafanaAlertRuleGroupReconciler) Reconcile(ctx context.Context, req ctr
 }
 
 // SetupWithManager sets up the controller with the Manager.
-func (r *GrafanaAlertRuleGroupReconciler) SetupWithManager(mgr ctrl.Manager, ctx context.Context) error {
+func (r *GrafanaAlertRuleGroupReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		For(&grafanav1beta1.GrafanaAlertRuleGroup{}).
 		Complete(r)
@@ -187,6 +187,7 @@ func (r *GrafanaAlertRuleGroupReconciler) reconcileWithInstance(ctx context.Cont
 	}
 
 	for _, rule := range group.Spec.Rules {
+		rule := rule
 		apiRule := &models.ProvisionedAlertRule{
 			Annotations:  rule.Annotations,
 			Condition:    &rule.Condition,
@@ -292,6 +293,7 @@ func (r *GrafanaAlertRuleGroupReconciler) removeFromInstance(ctx context.Context
 		return fmt.Errorf("fetching alert rule group from instance %s: %w", instance.Status.AdminUrl, err)
 	}
 	for _, rule := range remote.Payload.Rules {
+		rule := rule
 		params := provisioning.NewDeleteAlertRuleParams().WithUID(rule.UID)
 		_, err := cl.Provisioning.DeleteAlertRule(params)
 		if err != nil {

diff --git a/main.go b/main.go
@@ -190,7 +190,7 @@ func main() {
 	if err = (&controllers.GrafanaAlertRuleGroupReconciler{
 		Client: mgr.GetClient(),
 		Scheme: mgr.GetScheme(),
-	}).SetupWithManager(mgr, ctx); err != nil {
+	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "GrafanaAlertRuleGroup")
 		os.Exit(1)
 	}