test: resolve golangci-list SA1019 deprication warning

utilwait.PollImmediate is deprecated Signed-off-by: Nitin Goyal <nigoyal@redhat.com>
red-hat-storage · Jul 17, 2024 · 9a9debe · 9a9debe
1 parent 6d551b1
commit 9a9debe
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/pkg/deploymanager/namespace.go b/pkg/deploymanager/namespace.go
@@ -1,6 +1,7 @@
 package deploymanager
 
 import (
+	"context"
 	"time"
 
 	corev1 "k8s.io/api/core/v1"
@@ -46,7 +47,7 @@ func (d *DeployManager) DeleteNamespaceAndWait(name string) error {
 	timeout := 600 * time.Second
 	interval := 10 * time.Second
 
-	err = utilwait.PollImmediate(interval, timeout, func() (done bool, err error) {
+	err = utilwait.PollUntilContextTimeout(d.Ctx, interval, timeout, true, func(context.Context) (done bool, err error) {
 
 		existingNamespace := &corev1.Namespace{}
 		err = d.Client.Get(d.Ctx, client.ObjectKeyFromObject(namespace), existingNamespace)

diff --git a/pkg/deploymanager/olm.go b/pkg/deploymanager/olm.go
@@ -1,6 +1,7 @@
 package deploymanager
 
 import (
+	"context"
 	"fmt"
 	"time"
 
@@ -185,7 +186,7 @@ func (d *DeployManager) WaitForCatalogSource(catalogsource *operatorsv1alpha1.Ca
 
 	lastReason := ""
 
-	err := utilwait.PollImmediate(interval, timeout, func() (done bool, err error) {
+	err := utilwait.PollUntilContextTimeout(d.Ctx, interval, timeout, true, func(context.Context) (done bool, err error) {
 		existingCatalogSource := &operatorsv1alpha1.CatalogSource{}
 		err = d.Client.Get(d.Ctx, client.ObjectKeyFromObject(catalogsource), existingCatalogSource)
 		if err != nil {
@@ -220,7 +221,7 @@ func (d *DeployManager) WaitForCsv(csv *operatorsv1alpha1.ClusterServiceVersion)
 
 	lastReason := ""
 
-	err := utilwait.PollImmediate(interval, timeout, func() (done bool, err error) {
+	err := utilwait.PollUntilContextTimeout(d.Ctx, interval, timeout, true, func(context.Context) (done bool, err error) {
 		existingcsv := &operatorsv1alpha1.ClusterServiceVersion{}
 		err = d.Client.Get(d.Ctx, client.ObjectKeyFromObject(csv), existingcsv)
 		if err != nil {

diff --git a/pkg/deploymanager/storage_system.go b/pkg/deploymanager/storage_system.go
@@ -1,6 +1,7 @@
 package deploymanager
 
 import (
+	"context"
 	"fmt"
 	"time"
 
@@ -75,7 +76,7 @@ func (d *DeployManager) CheckStorageSystemCondition() error {
 
 	lastReason := ""
 
-	err := utilwait.PollImmediate(interval, timeout, func() (done bool, err error) {
+	err := utilwait.PollUntilContextTimeout(d.Ctx, interval, timeout, true, func(context.Context) (done bool, err error) {
 		storageSystem := &odfv1alpha1.StorageSystem{}
 		err = d.Client.Get(d.Ctx, types.NamespacedName{
 			Name:      stoargeSystemName,
@@ -156,7 +157,7 @@ func (d *DeployManager) DeleteStorageSystemAndWait() error {
 	interval := 10 * time.Second
 	lastReason := ""
 
-	err = utilwait.PollImmediate(interval, timeout, func() (done bool, err error) {
+	err = utilwait.PollUntilContextTimeout(d.Ctx, interval, timeout, true, func(context.Context) (done bool, err error) {
 		existingStorageSystem := &odfv1alpha1.StorageSystem{}
 		err = d.Client.Get(d.Ctx, types.NamespacedName{
 			Name:      stoargeSystemName,