golangci-lint: fixes stash

Signed-off-by: Raghavendra Talur <[email protected]>

controllers/drclusters.go

@@ -223,7 +223,7 @@ func drClusterUndeploy(
 	mcv util.ManagedClusterViewGetter,
 	log logr.Logger,
 ) error {
-	clusterNames := sets.String{}
+	clusterNames := sets.Set[string]{}
 	drpolicies := rmn.DRPolicyList{}
 
 	if err := mwu.Client.List(mwu.Ctx, &drpolicies); err != nil {

controllers/drplacementcontrol.go

@@ -538,7 +538,7 @@ func (d *DRPCInstance) checkRegionalFailoverPrerequisites() bool {
 	if required, activationsRequired := requiresRegionalFailoverPrerequisites(
 		d.ctx,
 		d.reconciler.APIReader,
-		rmnutil.DRPolicyS3Profiles(d.drPolicy, d.drClusters).List(),
+		rmnutil.DRPolicyS3Profiles(d.drPolicy, d.drClusters).UnsortedList(),
 		d.instance.GetName(), d.instance.GetNamespace(),
 		d.vrgs, d.instance.Spec.FailoverCluster,
 		d.reconciler.ObjStoreGetter, d.log); required {
@@ -1498,7 +1498,7 @@ func (d *DRPCInstance) generateVRG(repState rmn.ReplicationState) rmn.VolumeRepl
 		Spec: rmn.VolumeReplicationGroupSpec{
 			PVCSelector:          d.instance.Spec.PVCSelector,
 			ReplicationState:     repState,
-			S3Profiles:           rmnutil.DRPolicyS3Profiles(d.drPolicy, d.drClusters).List(),
+			S3Profiles:           rmnutil.DRPolicyS3Profiles(d.drPolicy, d.drClusters).UnsortedList(),
 			KubeObjectProtection: d.instance.Spec.KubeObjectProtection,
 		},
 	}

controllers/drplacementcontrol_controller.go

@@ -430,8 +430,6 @@ func DRPCsFailingOverToCluster(k8sclient client.Client, log logr.Logger, drclust
 
 // DRPCsFailingOverToClusterForPolicy filters DRPC resources that reference the DRPolicy and are failing over
 // to the target cluster passed in
-//
-//nolint:gocognit
 func DRPCsFailingOverToClusterForPolicy(
 	k8sclient client.Client,
 	log logr.Logger,
@@ -587,7 +585,7 @@ func (r *DRPlacementControlReconciler) SetupWithManager(mgr ctrl.Manager) error
 // For more details, check Reconcile and its Result here:
 // - https://pkg.go.dev/sigs.k8s.io/[email protected]/pkg/reconcile
 //
-//nolint:cyclop,funlen,gocognit
+//nolint:cyclop,funlen
 func (r *DRPlacementControlReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	logger := r.Log.WithValues("DRPC", req.NamespacedName, "rid", uuid.New())
 
@@ -655,7 +653,7 @@ func (r *DRPlacementControlReconciler) Reconcile(ctx context.Context, req ctrl.R
 	if err != nil && !errorswrapper.Is(err, InitialWaitTimeForDRPCPlacementRule) {
 		err2 := r.updateDRPCStatus(ctx, drpc, placementObj, logger)
 
-		return ctrl.Result{}, fmt.Errorf("failed to create DRPC instance (%w) and (%v)", err, err2)
+		return ctrl.Result{}, fmt.Errorf("failed to create DRPC instance (%w) and (%w)", err, err2)
 	}
 
 	if errorswrapper.Is(err, InitialWaitTimeForDRPCPlacementRule) {
@@ -927,7 +925,7 @@ func (r *DRPlacementControlReconciler) getDRPolicy(ctx context.Context,
 func (r DRPlacementControlReconciler) updateObjectMetadata(ctx context.Context,
 	drpc *rmn.DRPlacementControl, placementObj client.Object, log logr.Logger,
 ) error {
-	update := false
+	var update bool
 
 	update = rmnutil.AddLabel(drpc, rmnutil.OCMBackupLabelKey, rmnutil.OCMBackupLabelValue)
 	update = rmnutil.AddFinalizer(drpc, DRPCFinalizer) || update

controllers/drpolicy.go

@@ -59,7 +59,7 @@ func drClusterSecretsDeploy(
 		log.Info("Received partial list", "err", err)
 	}
 
-	for _, secretName := range drPolicySecrets.List() {
+	for _, secretName := range drPolicySecrets.UnsortedList() {
 		if err := secretsUtil.AddSecretToCluster(
 			secretName,
 			clusterName,
@@ -102,7 +102,7 @@ func drClustersUndeploySecrets(
 		return nil
 	}
 
-	mustHaveS3Secrets := map[string]sets.String{}
+	mustHaveS3Secrets := map[string]sets.Set[string]{}
 
 	// Determine S3 secrets that must continue to exist per cluster in the policy being deleted
 	for _, clusterName := range util.DrpolicyClusterNames(drpolicy) {
@@ -119,7 +119,7 @@ func drClustersUndeploySecrets(
 	// For each cluster in the must have S3 secrets list, check and delete
 	// S3Profiles that maybe deleted, iff absent in the must have list
 	for clusterName, mustHaveS3Secrets := range mustHaveS3Secrets {
-		for _, s3SecretToDelete := range mayDeleteS3Secrets.List() {
+		for _, s3SecretToDelete := range mayDeleteS3Secrets.UnsortedList() {
 			if mustHaveS3Secrets.Has(s3SecretToDelete) {
 				continue
 			}
@@ -144,8 +144,8 @@ func drClusterListMustHaveSecrets(
 	clusterName string,
 	ignorePolicy *rmn.DRPolicy,
 	ramenConfig *rmn.RamenConfig,
-) sets.String {
-	mustHaveS3Secrets := sets.String{}
+) sets.Set[string] {
+	mustHaveS3Secrets := sets.Set[string]{}
 
 	mustHaveS3Profiles := drClusterListMustHaveS3Profiles(drpolicies, drclusters, clusterName, ignorePolicy)
 
@@ -164,8 +164,8 @@ func drClusterListMustHaveS3Profiles(drpolicies rmn.DRPolicyList,
 	drclusters *rmn.DRClusterList,
 	clusterName string,
 	ignorePolicy *rmn.DRPolicy,
-) sets.String {
-	mustHaveS3Profiles := sets.String{}
+) sets.Set[string] {
+	mustHaveS3Profiles := sets.Set[string]{}
 
 	for idx := range drpolicies.Items {
 		// Skip the policy being ignored (used for delete)
@@ -192,8 +192,8 @@ func drClusterListMustHaveS3Profiles(drpolicies rmn.DRPolicyList,
 func drPolicySecretNames(drpolicy *rmn.DRPolicy,
 	drclusters *rmn.DRClusterList,
 	rmnCfg *rmn.RamenConfig,
-) (sets.String, error) {
-	secretNames := sets.String{}
+) (sets.Set[string], error) {
+	secretNames := sets.Set[string]{}
 
 	var err error
 

controllers/ramenconfig.go

@@ -6,7 +6,6 @@ package controllers
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"net/url"
 	"os"
 
@@ -90,7 +89,7 @@ func ReadRamenConfigFile(log logr.Logger) (ramenConfig ramendrv1alpha1.RamenConf
 
 	log.Info("loading Ramen config file ", "name", cachedRamenConfigFileName)
 
-	fileContents, err := ioutil.ReadFile(cachedRamenConfigFileName)
+	fileContents, err := os.ReadFile(cachedRamenConfigFileName)
 	if err != nil {
 		err = fmt.Errorf("unable to load the config file %s: %w",
 			cachedRamenConfigFileName, err)

controllers/util/drpolicy_util.go

@@ -40,8 +40,8 @@ func DrpolicyRegionNames(drpolicy *rmn.DRPolicy, drClusters []rmn.DRCluster) []s
 	return regionNames
 }
 
-func DrpolicyRegionNamesAsASet(drpolicy *rmn.DRPolicy, drClusters []rmn.DRCluster) sets.String {
-	return sets.NewString(DrpolicyRegionNames(drpolicy, drClusters)...)
+func DrpolicyRegionNamesAsASet(drpolicy *rmn.DRPolicy, drClusters []rmn.DRCluster) sets.Set[string] {
+	return sets.New[string](DrpolicyRegionNames(drpolicy, drClusters)...)
 }
 
 func DrpolicyValidated(drpolicy *rmn.DRPolicy) error {
@@ -68,8 +68,8 @@ func GetAllDRPolicies(ctx context.Context, client client.Reader) (rmn.DRPolicyLi
 	return drpolicies, nil
 }
 
-func DRPolicyS3Profiles(drpolicy *rmn.DRPolicy, drclusters []rmn.DRCluster) sets.String {
-	mustHaveS3Profiles := sets.String{}
+func DRPolicyS3Profiles(drpolicy *rmn.DRPolicy, drclusters []rmn.DRCluster) sets.Set[string] {
+	mustHaveS3Profiles := sets.Set[string]{}
 
 	for _, managedCluster := range DrpolicyClusterNames(drpolicy) {
 		s3ProfileName := ""

controllers/volsync/vshandler.go

@@ -735,7 +735,6 @@ func (v *VSHandler) DeleteRD(pvcName string) error {
 	return nil
 }
 
-//nolint:gocognit
 func (v *VSHandler) deleteLocalRDAndRS(rd *volsyncv1alpha1.ReplicationDestination) error {
 	latestRDImage, err := v.getRDLatestImage(rd.GetName())
 	if err != nil {

controllers/vrg_kubeobjects.go

@@ -325,7 +325,7 @@ func (v *VRGInstance) kubeObjectsGroupCapture(
 
 			result.Requeue = true
 
-			return
+			return requestsCompletedCount
 		}
 
 		captureInProgressStatusUpdate()

controllers/vrg_recipe_test.go

@@ -436,8 +436,8 @@ var _ = Describe("VolumeReplicationGroupRecipe", func() {
 						recipeHooksDefine(hook(ns0ParameterRef))
 					})
 					JustBeforeEach(func() {
-						recipeExpanded = &*r
-						Expect(controllers.RecipeParametersExpand(recipeExpanded, vrgRecipeParameters(), testLogger)).To(Succeed())
+						recipeExpanded := *r
+						Expect(controllers.RecipeParametersExpand(&recipeExpanded, vrgRecipeParameters(), testLogger)).To(Succeed())
 					})
 					It("expands a parameter list enclosed in double quotes to a single string with quotes preserved", func() {
 						Skip("feature not supported")

controllers/vrg_volrep.go

@@ -1995,10 +1995,10 @@ func restoreClusterDataObjects[
 
 	for i := range objList {
 		object := &objList[i]
-		objectCopy := &*object
-		obj := ClientObject(objectCopy)
+		objectCopy := *object
+		obj := ClientObject(&objectCopy)
 
-		cleanupForRestore(objectCopy)
+		cleanupForRestore(&objectCopy)
 		addRestoreAnnotation(obj)
 
 		if err := v.reconciler.Create(v.ctx, obj); err != nil {
@@ -2328,7 +2328,7 @@ func (v *VRGInstance) aggregateVolRepDataReadyCondition() *metav1.Condition {
 	return newVRGDataErrorCondition(v.instance.Generation, msg)
 }
 
-//nolint:funlen,gocognit,cyclop
+//nolint:funlen,cyclop
 func (v *VRGInstance) aggregateVolRepDataProtectedCondition() *metav1.Condition {
 	if len(v.volRepPVCs) == 0 {
 		return nil

controllers/vrg_volsync.go

@@ -76,7 +76,7 @@ func (v *VRGInstance) reconcileVolSyncAsPrimary(finalSyncPrepared *bool) (requeu
 	if len(v.volSyncPVCs) == 0 {
 		finalSyncComplete()
 
-		return
+		return requeue
 	}
 
 	v.log.Info(fmt.Sprintf("Reconciling VolSync as Primary. %d VolSyncPVCs", len(v.volSyncPVCs)))
@@ -89,7 +89,7 @@ func (v *VRGInstance) reconcileVolSyncAsPrimary(finalSyncPrepared *bool) (requeu
 
 		requeue = true
 
-		return
+		return requeue
 	}
 
 	for _, pvc := range v.volSyncPVCs {