golangci-lint: use exclude-rules instead of skip-files and skip-dirs

Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>

test/e2e/backup/backup.go

@@ -58,7 +58,6 @@ func BackupRestoreRetainedPVWithRestic() {
 }
 
 func BackupRestoreTest(backupRestoreTestConfig BackupRestoreTestConfig) {
-
 	var (
 		backupName, restoreName, kibishiiNamespace string
 		err                                        error

test/e2e/backups/sync_backups.go

@@ -73,7 +73,6 @@ func BackupsSyncTest() {
 				Expect(VeleroUninstall(ctx, veleroCfg.VeleroCLI, veleroCfg.VeleroNamespace)).To(Succeed())
 			}
 		}
-
 	})
 
 	It("Backups in object storage should be synced to a new Velero successfully", func() {

test/e2e/backups/ttl.go

@@ -51,7 +51,6 @@ func (b *TTL) Init() {
 	b.backupName = "backup-ttl-test-" + UUIDgen.String()
 	b.restoreName = "restore-ttl-test-" + UUIDgen.String()
 	b.ttl = 10 * time.Minute
-
 }
 
 func TTLTest() {
@@ -159,7 +158,6 @@ func TTLTest() {
 				veleroCfg.CloudCredentialsFile, veleroCfg.BSLBucket,
 				veleroCfg.BSLPrefix, veleroCfg.BSLConfig, test.restoreName,
 				RestoreObjectsPrefix)).NotTo(HaveOccurred(), "Fail to get restore object")
-
 		})
 
 		By("Check TTL was set correctly", func() {
@@ -198,7 +196,6 @@ func TTLTest() {
 				veleroCfg.CloudCredentialsFile, veleroCfg.BSLBucket,
 				veleroCfg.BSLPrefix, veleroCfg.BSLConfig, test.restoreName,
 				RestoreObjectsPrefix, 5)).NotTo(HaveOccurred(), "Fail to get restore object")
-
 		})
 	})
 }

test/e2e/basic/api-group/enable_api_group_extentions.go

@@ -91,7 +91,6 @@ func APIExtensionsVersionsTest() {
 				veleroCfg.ClientToInstallVelero = veleroCfg.DefaultClient
 			})
 		}
-
 	})
 	Context("When EnableAPIGroupVersions flag is set", func() {
 		It("Enable API Group to B/R CRD APIExtensionsVersions", func() {

test/e2e/basic/api-group/enable_api_group_versions.go

@@ -238,7 +238,6 @@ func runEnableAPIGroupVersionsTests(ctx context.Context, client TestClient, grou
 				fmt.Println(errors.Wrapf(err, "failed to delete crd %q", crdName))
 			}
 		}(fmt.Sprintf("rockband%ds.music.example.io.%d", i, i))
-
 	}
 
 	time.Sleep(6 * time.Minute)
@@ -328,7 +327,6 @@ func runEnableAPIGroupVersionsTests(ctx context.Context, client TestClient, grou
 				)
 				return errors.New(msg)
 			}
-
 		}
 	}
 
@@ -465,7 +463,6 @@ func resourceInfo(ctx context.Context, g, v, r string, index int) (map[string]ma
 // are found in the haystack argument values.
 func containsAll(haystack, needles map[string]string) bool {
 	for nkey, nval := range needles {
-
 		hval, ok := haystack[nkey]
 		if !ok {
 			return false

test/e2e/basic/storage-class-changing.go

@@ -83,7 +83,6 @@ func (s *StorageClasssChanging) CreateResources() error {
 	})
 
 	By(fmt.Sprintf("Create a deployment in namespace %s", s.VeleroCfg.VeleroNamespace), func() {
-
 		pvc, err := CreatePVC(s.Client, s.namespace, s.pvcName, s.srcStorageClass, nil)
 		Expect(err).To(Succeed())
 		vols := CreateVolumes(pvc.Name, []string{s.volume})

test/e2e/bsl-mgmt/deletion.go

@@ -321,7 +321,6 @@ func BslDeletionTest(useVolumeSnapshots bool) {
 				var snapshotCheckPoint SnapshotCheckPoint
 				snapshotCheckPoint.NamespaceBackedUp = bslDeletionTestNs
 				By(fmt.Sprintf("Snapshot should not be deleted in cloud object store after deleting bsl %s", backupLocation_1), func() {
-
 					snapshotCheckPoint, err = GetSnapshotCheckPoint(*veleroCfg.ClientToInstallVelero, veleroCfg, 1, bslDeletionTestNs, backupName_1, []string{podName_1})
 					Expect(err).NotTo(HaveOccurred(), "Fail to get Azure CSI snapshot checkpoint")
 					Expect(SnapshotsShouldBeCreatedInCloud(veleroCfg.CloudProvider,

test/e2e/e2e_suite_test.go

@@ -101,7 +101,6 @@ func init() {
 	flag.StringVar(&VeleroCfg.EKSPolicyARN, "eks-policy-arn", "", "EKS plicy ARN for creating AWS IAM service account.")
 	flag.StringVar(&VeleroCfg.DefaultCLSServiceAccountName, "default-cls-service-account-name", "", "default cluster service account name.")
 	flag.StringVar(&VeleroCfg.StandbyCLSServiceAccountName, "standby-cls-service-account-name", "", "standby cluster service account name.")
-
 }
 
 // Add label [SkipVanillaZfs]:

test/e2e/migration/migration.go

@@ -108,7 +108,6 @@ func MigrationTest(useVolumeSnapshots bool, veleroCLI2Version VeleroCLI2Version)
 				veleroCfg.ClusterToInstallVelero = veleroCfg.DefaultClusterName
 			})
 		}
-
 	})
 	When("kibishii is the sample workload", func() {
 		It("should be successfully backed up and restored to the default BackupStorageLocation", func() {

test/e2e/pv-backup/pv-backup-filter.go

@@ -55,7 +55,6 @@ func (p *PVBackupFiltering) Init() error {
 	//   annotation will be ignored, so it's only set for opt-out test
 	if p.annotation == OPT_OUT_ANN {
 		p.BackupArgs = append(p.BackupArgs, "--default-volumes-to-fs-backup")
-
 	}
 	p.RestoreArgs = []string{
 		"create", "--namespace", p.VeleroCfg.VeleroNamespace, "restore", p.RestoreName,

test/e2e/resource-filtering/exclude_namespaces.go

@@ -90,7 +90,6 @@ func (e *ExcludeNamespaces) Init() error {
 			"create", "--namespace", e.VeleroCfg.VeleroNamespace, "restore", e.RestoreName,
 			"--from-backup", e.BackupName, "--wait",
 		}
-
 	} else {
 		*e.NSIncluded = append(*e.NSIncluded, *e.nsExcluded...)
 		e.BackupArgs = []string{

test/e2e/resource-filtering/include_namespaces.go

@@ -79,7 +79,6 @@ func (i *IncludeNamespaces) Init() error {
 			"create", "--namespace", i.VeleroCfg.VeleroNamespace, "restore", i.RestoreName,
 			"--from-backup", i.BackupName, "--wait",
 		}
-
 	} else {
 		i.BackupName = "backup-" + i.UUIDgen
 		i.RestoreName = "restore-" + i.CaseBaseName

test/e2e/resourcepolicies/resource_policies.go

@@ -177,7 +177,6 @@ func (r *ResourcePoliciesCase) Verify() error {
 				}
 			}
 		})
-
 	}
 	return nil
 }

test/e2e/schedule/schedule.go

@@ -200,7 +200,6 @@ func (n *ScheduleBackup) Verify() error {
 			fmt.Printf("Restored configmap is %v\n", configmap)
 			Expect(err).ShouldNot(HaveOccurred(), fmt.Sprintf("failed to list configmap in namespace: %q\n", ns))
 		}
-
 	})
 	return nil
 }

test/e2e/upgrade/upgrade.go

@@ -123,7 +123,6 @@ func BackupUpgradeRestoreTest(useVolumeSnapshots bool, veleroCLI2Version VeleroC
 			veleroCfg.GCFrequency = ""
 			By(fmt.Sprintf("Install the expected old version Velero (%s) for upgrade",
 				veleroCLI2Version.VeleroVersion), func() {
-
 				//Set VeleroImage and RestoreHelperImage to blank
 				//VeleroImage and RestoreHelperImage should be the default value in originalCli
 				tmpCfgForOldVeleroInstall := veleroCfg
@@ -230,7 +229,6 @@ func BackupUpgradeRestoreTest(useVolumeSnapshots bool, veleroCLI2Version VeleroC
 			}
 
 			By(fmt.Sprintf("Upgrade Velero by CLI %s", tmpCfg.VeleroCLI), func() {
-
 				tmpCfg.GCFrequency = ""
 				tmpCfg.UseRestic = false
 				tmpCfg.UseNodeAgent = !useVolumeSnapshots