linter issues fixed

Signed-off-by: Xavi Garcia <xavi.garcia@suse.com>

Author: 0xavi0

cmd/fleeteventmonitor/main.go

@@ -2,8 +2,6 @@
 package main
 
 import (
-	_ "net/http/pprof"
-
 	"github.com/rancher/wrangler/v3/pkg/signals"
 	"github.com/sirupsen/logrus"
 

internal/cmd/monitor/operator.go

@@ -233,19 +233,19 @@ func start(
 // Returns error if any pattern is invalid
 func compileResourceFilters(cfg *ControllerLoggingConfig) error {
 	if err := cfg.Bundle.ResourceFilter.Compile(); err != nil {
-		return fmt.Errorf("Bundle resource filter: %w", err)
+		return fmt.Errorf("bundle resource filter: %w", err)
 	}
 	if err := cfg.BundleDeployment.ResourceFilter.Compile(); err != nil {
-		return fmt.Errorf("BundleDeployment resource filter: %w", err)
+		return fmt.Errorf("bundleDeployment resource filter: %w", err)
 	}
 	if err := cfg.Cluster.ResourceFilter.Compile(); err != nil {
-		return fmt.Errorf("Cluster resource filter: %w", err)
+		return fmt.Errorf("cluster resource filter: %w", err)
 	}
 	if err := cfg.GitRepo.ResourceFilter.Compile(); err != nil {
-		return fmt.Errorf("GitRepo resource filter: %w", err)
+		return fmt.Errorf("gitRepo resource filter: %w", err)
 	}
 	if err := cfg.HelmOp.ResourceFilter.Compile(); err != nil {
-		return fmt.Errorf("HelmOp resource filter: %w", err)
+		return fmt.Errorf("helmOp resource filter: %w", err)
 	}
 	return nil
 }

internal/cmd/monitor/reconciler/bundle_monitor.go

@@ -200,7 +200,7 @@ func (r *BundleMonitorReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 
 	logger := log.FromContext(ctx).WithName("bundle-monitor")
 	logger = logger.WithValues(
-		"bundle", req.NamespacedName.String(),
+		"bundle", req.String(),
 		"mode", LogMode(r.DetailedLogs),
 	)
 	ctx = log.IntoContext(ctx, logger)

internal/cmd/monitor/reconciler/bundle_query.go

@@ -5,8 +5,8 @@ package reconciler
 import (
 	"context"
 
-	fleet "github.com/rancher/fleet/pkg/apis/fleet.cattle.io/v1alpha1"
 	"github.com/rancher/fleet/internal/cmd/controller/target/matcher"
+	fleet "github.com/rancher/fleet/pkg/apis/fleet.cattle.io/v1alpha1"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -80,7 +80,6 @@ func (q *bundleQueryImpl) getBundlesInScopeForCluster(ctx context.Context, clust
 		return nil, err
 	}
 	for _, b := range bundles.Items {
-		b := b
 		if b.Annotations["objectset.rio.cattle.io/id"] == "fleet-manage-agent" {
 			if b.Name == "fleet-agent-"+cluster.Name {
 				bundleSet.insertSingle(&b)
@@ -99,7 +98,6 @@ func (q *bundleQueryImpl) getBundlesInScopeForCluster(ctx context.Context, clust
 
 	logger := log.FromContext(ctx).WithName("bundle-query")
 	for _, mapping := range mappings.Items {
-		mapping := mapping
 		matcher, err := newBundleMapping(&mapping)
 		if err != nil {
 			logger.Error(err, "invalid BundleNamespaceMapping, skipping", "namespace", mapping.Namespace, "name", mapping.Name)
@@ -127,7 +125,6 @@ func (q *bundleQueryImpl) clusterGroupsForCluster(ctx context.Context, cluster *
 
 	logger := log.FromContext(ctx).WithName("bundle-query")
 	for _, cg := range cgs.Items {
-		cg := cg
 		if cg.Spec.Selector == nil {
 			continue
 		}

internal/cmd/monitor/reconciler/bundledeployment_monitor.go

@@ -54,7 +54,7 @@ func (r *BundleDeploymentMonitorReconciler) Reconcile(ctx context.Context, req c
 
 	logger := log.FromContext(ctx).WithName("bundledeployment-monitor")
 	logger = logger.WithValues(
-		"bundledeployment", req.NamespacedName.String(),
+		"bundledeployment", req.String(),
 	)
 	ctx = log.IntoContext(ctx, logger)
 

internal/cmd/monitor/reconciler/cluster_monitor.go

@@ -99,7 +99,7 @@ func (r *ClusterMonitorReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 
 	logger := log.FromContext(ctx).WithName("cluster-monitor")
 	logger = logger.WithValues(
-		"cluster", req.NamespacedName.String(),
+		"cluster", req.String(),
 	)
 	ctx = log.IntoContext(ctx, logger)
 

internal/cmd/monitor/reconciler/gitrepo_monitor.go

@@ -5,8 +5,8 @@ package reconciler
 import (
 	"context"
 
-	fleet "github.com/rancher/fleet/pkg/apis/fleet.cattle.io/v1alpha1"
 	"github.com/rancher/fleet/internal/config"
+	fleet "github.com/rancher/fleet/pkg/apis/fleet.cattle.io/v1alpha1"
 	"github.com/rancher/fleet/pkg/sharding"
 
 	batchv1 "k8s.io/api/batch/v1"
@@ -172,8 +172,6 @@ func (r *GitRepoMonitorReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 	if gitrepo.Labels[fleet.RepoLabel] != "" {
 		logger = logger.WithValues("repo", gitrepo.Labels[fleet.RepoLabel])
 	}
-	ctx = log.IntoContext(ctx, logger)
-
 	// Check for deletion
 	if !gitrepo.DeletionTimestamp.IsZero() {
 		logDeletion(logger, r.DetailedLogs, r.EventFilters, "GitRepo", gitrepo.Namespace, gitrepo.Name, gitrepo.DeletionTimestamp.String())

internal/cmd/monitor/reconciler/predicate_test.go

@@ -218,7 +218,7 @@ func TestNonSecretAnnotationChangedPredicate(t *testing.T) {
 	t.Run("Update with secret hash and regular annotation change returns true", func(t *testing.T) {
 		old := &fleet.GitRepo{ObjectMeta: metav1.ObjectMeta{Annotations: map[string]string{
 			"fleet.cattle.io/client-secret-hash": "old-hash",
-			"app": "v1",
+			"app":                                "v1",
 		}}}
 		new := old.DeepCopy()
 		new.Annotations["fleet.cattle.io/client-secret-hash"] = "new-hash"