Skip to content

Commit

Permalink
Update int ranges
Browse files Browse the repository at this point in the history
Signed-off-by: Edu Gómez Escandell <egomez@redhat.com>
  • Loading branch information
EduardGomezEscandell committed May 30, 2024
1 parent 973a49d commit d626e61
Show file tree
Hide file tree
Showing 19 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion cmd/cdi-importer/importer.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func waitForReadyFile() {
if readyFile == "" {
return
}
for i := 0; i < readyFileTimeoutSeconds; i++ {
for range readyFileTimeoutSeconds {
if _, err := os.Stat(readyFile); err == nil {
return
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/apiserver/webhooks/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
func validateNumberOfSources(source interface{}, sourceKind string, field *field.Path) []metav1.StatusCause {
numberOfSources := 0
s := reflect.ValueOf(source).Elem()
for i := 0; i < s.NumField(); i++ {
for i := range s.NumField() {
if !reflect.ValueOf(s.Field(i).Interface()).IsNil() {
numberOfSources++
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/common/common_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ var _ = Describe("TerminationMessage", func() {
termMsg := TerminationMessage{
Labels: map[string]string{},
}
for i := 0; i < length-serializationOffset; i++ {
for range length - serializationOffset {
termMsg.Labels["t"] += "c"
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/clone/planner.go
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ func (p *Planner) watchOwned(log logr.Logger, obj client.Object) error {
sv := reflect.ValueOf(objList).Elem()
iv := sv.FieldByName("Items")
var reqs []reconcile.Request
for i := 0; i < iv.Len(); i++ {
for i := range iv.Len() {
o := iv.Index(i).Addr().Interface().(client.Object)
reqs = append(reqs, reconcile.Request{
NamespacedName: types.NamespacedName{
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/common/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -1832,7 +1832,7 @@ func BulkDeleteResources(ctx context.Context, c client.Client, obj client.Object
sv := reflect.ValueOf(obj).Elem()
iv := sv.FieldByName("Items")

for i := 0; i < iv.Len(); i++ {
for i := range iv.Len() {
obj := iv.Index(i).Addr().Interface().(client.Object)
if obj.GetDeletionTimestamp().IsZero() {
klog.V(3).Infof("Deleting type %+v %+v", reflect.TypeOf(obj), obj)
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/dataimportcron-controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ var _ = Describe("All DataImportCron Tests", func() {
reconciler = createDataImportCronReconciler(cron)
verifyConditions("Before DesiredDigest is set", false, false, false, noImport, noDigest, "", &corev1.PersistentVolumeClaim{})

for i := 0; i < nPVCs; i++ {
for i := range nPVCs {
digest := strings.Repeat(strconv.Itoa(i), 12)
digests[i] = "sha256:" + digest
pvcs[i] = cc.CreatePvc(dataSourceName+"-"+digest, cron.Namespace, nil, nil)
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/storageprofile-controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ var _ = Describe("Storage profile controller reconcile loop", func() {
storageClass := CreateStorageClassWithProvisioner(storageClassName, nil, nil, cephProvisioner)
reconciler = createStorageProfileReconciler(storageClass, createVolumeSnapshotContentCrd(), createVolumeSnapshotClassCrd(), createVolumeSnapshotCrd())

for i := 0; i < 3; i++ {
for i := range 3 {
snapClass := createSnapshotClass(fmt.Sprintf("snapclass-%d", i), nil, cephProvisioner)
err := reconciler.client.Create(context.TODO(), snapClass)
Expect(err).ToNot(HaveOccurred())
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/controller/patches.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func (c *Customizer) GenericApplyPatches(objects interface{}) error {
switch reflect.TypeOf(objects).Kind() {
case reflect.Slice:
s := reflect.ValueOf(objects)
for i := 0; i < s.Len(); i++ {
for i := range s.Len() {
o := s.Index(i)
obj, ok := o.Interface().(runtime.Object)
if !ok {
Expand Down
2 changes: 1 addition & 1 deletion pkg/system/prlimit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ func doSpinner(args []string) {
func doHog(args []string) {
var arrays [][]byte

for i := 0; i < (1 << 20); i++ {
for range 1 << 20 {
bytes := make([]byte, 1024)
_, err := rand.Read(bytes)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion pkg/uploadserver/uploadserver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ var _ = Describe("Upload server tests", func() {
close(ch)
}()

for i := 0; i < 10; i++ {
for range 10 {
if server.bindPort != 0 {
break
}
Expand Down
2 changes: 1 addition & 1 deletion tests/cdiconfig_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ var _ = Describe("CDI ingress config tests, using manifests", Serial, func() {
}
return ""
}, time.Second*30, time.Second).Should(Equal(defaultURL))
for i := 0; i < 10; i++ {
for range 10 {
// Check for 20 seconds if the deployment pod crashed.
time.Sleep(2 * time.Second)
controllerPod, err = utils.FindPodByPrefix(f.K8sClient, f.CdiInstallNs, cdiDeploymentPodPrefix, common.CDILabelSelector)
Expand Down
8 changes: 4 additions & 4 deletions tests/cloner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2689,7 +2689,7 @@ var _ = Describe("all clone tests", func() {
size := "1Gi"
createSnapshot(size, &f.SnapshotSCName, volumeMode)

for i = 0; i < repeat; i++ {
for i := range repeat {
dataVolume := utils.NewDataVolumeForSnapshotCloningAndStorageSpec(fmt.Sprintf("clone-from-snap-%d", i), size, snapshot.Namespace, snapshot.Name, &f.SnapshotSCName, &volumeMode)
dataVolume.Labels = map[string]string{"test-label-1": "test-label-value-1"}
dataVolume.Annotations = map[string]string{"test-annotation-1": "test-annotation-value-1"}
Expand All @@ -2699,7 +2699,7 @@ var _ = Describe("all clone tests", func() {
f.ForceBindPvcIfDvIsWaitForFirstConsumer(dataVolume)
}

for i = 0; i < repeat; i++ {
for i := range repeat {
By("Waiting for clone to be completed")
dvName := fmt.Sprintf("clone-from-snap-%d", i)
err = utils.WaitForDataVolumePhase(f, targetNs.Name, cdiv1.Succeeded, dvName)
Expand Down Expand Up @@ -2765,15 +2765,15 @@ var _ = Describe("all clone tests", func() {
targetDvSize := "2Gi"
createSnapshot(snapSourceSize, &noExpansionStorageClass.Name, volumeMode)

for i = 0; i < repeat; i++ {
for i := range repeat {
dataVolume := utils.NewDataVolumeForSnapshotCloningAndStorageSpec(fmt.Sprintf("clone-from-snap-%d", i), targetDvSize, snapshot.Namespace, snapshot.Name, &noExpansionStorageClass.Name, &volumeMode)
By(fmt.Sprintf("Create new datavolume %s which will clone from volumesnapshot", dataVolume.Name))
dataVolume, err = utils.CreateDataVolumeFromDefinition(f.CdiClient, targetNs.Name, dataVolume)
Expect(err).ToNot(HaveOccurred())
f.ForceBindPvcIfDvIsWaitForFirstConsumer(dataVolume)
}

for i = 0; i < repeat; i++ {
for i := range repeat {
dvName := fmt.Sprintf("clone-from-snap-%d", i)
By("Waiting for clone to be completed")
err = utils.WaitForDataVolumePhase(f, targetNs.Name, cdiv1.Succeeded, dvName)
Expand Down
4 changes: 2 additions & 2 deletions tests/dataimportcron_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ var _ = Describe("DataImportCron", Serial, func() {
}, dataImportCronTimeout, pollingInterval).Should(BeTrue(), "cronjob was not created")

var lastImportDv, currentImportDv string
for i := 0; i < repeat; i++ {
for i := range repeat {
By(fmt.Sprintf("Iter #%d", i))
if i > 0 {
if createErrorDv {
Expand Down Expand Up @@ -477,7 +477,7 @@ var _ = Describe("DataImportCron", Serial, func() {
configureStorageProfileResultingFormat(format)

garbageSources := 3
for i := 0; i < garbageSources; i++ {
for i := range garbageSources {
srcName := fmt.Sprintf("src-garbage-%d", i)
By(fmt.Sprintf("Create %s", srcName))
switch format {
Expand Down
2 changes: 1 addition & 1 deletion tests/datavolume_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ var _ = Describe("[vendor:cnv-qe@redhat.com][level:component]DataVolume tests",
repeat = args.repeat
}

for i := 0; i < repeat; i++ {
for range repeat {
By(fmt.Sprintf("creating new datavolume %s", dataVolume.Name))
dataVolume, err := utils.CreateDataVolumeFromDefinition(f.CdiClient, f.Namespace.Name, dataVolume)
Expect(err).ToNot(HaveOccurred())
Expand Down
8 changes: 4 additions & 4 deletions tests/monitoring_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ var _ = Describe("[Destructive] Monitoring Tests", Serial, func() {

deleteUnknownStorageClasses := func() {
By("Delete unknown storage classes")
for i := 0; i < numAddedStorageClasses; i++ {
for i := range numAddedStorageClasses {
name := fmt.Sprintf("unknown-sc-%d", i)
_, err := f.K8sClient.StorageV1().StorageClasses().Get(context.TODO(), name, metav1.GetOptions{})
if err != nil && errors.IsNotFound(err) {
Expand Down Expand Up @@ -243,7 +243,7 @@ var _ = Describe("[Destructive] Monitoring Tests", Serial, func() {
Expect(err).ToNot(HaveOccurred())

numAddedStorageClasses = 2
for i := 0; i < numAddedStorageClasses; i++ {
for i := range numAddedStorageClasses {
_, err = f.K8sClient.StorageV1().StorageClasses().Create(context.TODO(), createUnknownStorageClass(fmt.Sprintf("unknown-sc-%d", i), "kubernetes.io/non-existent-provisioner"), metav1.CreateOptions{})
Expect(err).ToNot(HaveOccurred())
}
Expand All @@ -256,7 +256,7 @@ var _ = Describe("[Destructive] Monitoring Tests", Serial, func() {
waitForPrometheusAlert(f, "CDIStorageProfilesIncomplete")

By("Fix profiles to be complete and test metric value equals original")
for i := 0; i < numAddedStorageClasses; i++ {
for i := range numAddedStorageClasses {
profile := &cdiv1.StorageProfile{}
err = f.CrClient.Get(context.TODO(), types.NamespacedName{Name: fmt.Sprintf("unknown-sc-%d", i)}, profile)
Expect(err).ToNot(HaveOccurred())
Expand All @@ -275,7 +275,7 @@ var _ = Describe("[Destructive] Monitoring Tests", Serial, func() {
waitForNoPrometheusAlert(f, "CDIMultipleDefaultVirtStorageClasses")

numAddedStorageClasses = 2
for i := 0; i < numAddedStorageClasses; i++ {
for i := range numAddedStorageClasses {
sc := createUnknownStorageClass(fmt.Sprintf("unknown-sc-%d", i), "kubernetes.io/non-existent-provisioner")
cc.AddAnnotation(sc, cc.AnnDefaultVirtStorageClass, "true")
_, err := f.K8sClient.StorageV1().StorageClasses().Create(context.TODO(), sc, metav1.CreateOptions{})
Expand Down
2 changes: 1 addition & 1 deletion tests/operator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ var _ = Describe("ALL Operator tests", func() {
})

It("[test_id:4986]should remove/install CDI a number of times successfully", func() {
for i := 0; i < 5; i++ {
for range 5 {
err := f.CdiClient.CdiV1beta1().CDIs().Delete(context.TODO(), cr.Name, metav1.DeleteOptions{})
Expect(err).ToNot(HaveOccurred())
ensureCDI()
Expand Down
4 changes: 2 additions & 2 deletions tests/transfer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ var _ = Describe("[rfe_id:5630][crit:high]ObjectTransfer tests", Serial, func()
var wg sync.WaitGroup
n := 5

for i := 0; i < n; i++ {
for range n {
ns, err := f.CreateNamespace(f.NsPrefix, map[string]string{
framework.NsPrefixLabel: f.NsPrefix,
})
Expand All @@ -314,7 +314,7 @@ var _ = Describe("[rfe_id:5630][crit:high]ObjectTransfer tests", Serial, func()

wg.Wait()

for i := 0; i < n; i++ {
for i := range n {
var targetNamespace string

if createTargetNamespace {
Expand Down
2 changes: 1 addition & 1 deletion tools/cdi-func-test-file-host-init/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ func (ft formatTable) initializeTestFiles(inFile, outDir string) error {
klog.Infof("Generated file %q\n", p)
}(inFile, outDir, fList)
}
for i := 0; i < cap(sem); i++ {
for range cap(sem) {
sem <- true
}
close(errChan)
Expand Down
2 changes: 1 addition & 1 deletion tools/cdi-func-test-registry-init/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func (ft formatTable) initializeTestFiles(inFile, outDir string) error {
klog.Infof("Generated file %q\n", p)
}(inFile, outDir, fList)
}
for i := 0; i < cap(sem); i++ {
for range cap(sem) {
sem <- true
}
close(errChan)
Expand Down

0 comments on commit d626e61

Please sign in to comment.