Skip to content

Commit b4f52ce

Browse files
vasacvasac
committed
Use the standard library context package instead of deprecated golang.org/x/net/context
1 parent a07761f commit b4f52ce

File tree

10 files changed

+70
-67
lines changed

10 files changed

+70
-67
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ require (
2424
github.com/spf13/viper v1.21.0
2525
github.com/stretchr/testify v1.11.1
2626
golang.org/x/mod v0.31.0
27-
golang.org/x/net v0.48.0
2827
k8s.io/api v0.35.0
2928
k8s.io/apiextensions-apiserver v0.35.0
3029
k8s.io/apimachinery v0.35.0
@@ -103,6 +102,7 @@ require (
103102
go.yaml.in/yaml/v2 v2.4.3 // indirect
104103
go.yaml.in/yaml/v3 v3.0.4 // indirect
105104
golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 // indirect
105+
golang.org/x/net v0.48.0 // indirect
106106
golang.org/x/oauth2 v0.34.0 // indirect
107107
golang.org/x/sync v0.19.0 // indirect
108108
golang.org/x/sys v0.39.0 // indirect

‎test/certification/certify_persistence_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77
package certification
88

99
import (
10-
goctx "context"
10+
"context"
1111
"encoding/json"
1212
"fmt"
13-
. "github.com/onsi/gomega"
14-
v1 "github.com/oracle/coherence-operator/api/v1"
15-
"github.com/oracle/coherence-operator/test/e2e/helper"
16-
"golang.org/x/net/context"
1713
"io"
18-
corev1 "k8s.io/api/core/v1"
19-
"k8s.io/apimachinery/pkg/util/wait"
2014
"net/http"
2115
"os"
2216
"strconv"
2317
"testing"
2418
"time"
19+
20+
. "github.com/onsi/gomega"
21+
v1 "github.com/oracle/coherence-operator/api/v1"
22+
"github.com/oracle/coherence-operator/test/e2e/helper"
23+
corev1 "k8s.io/api/core/v1"
24+
"k8s.io/apimachinery/pkg/util/wait"
2525
)
2626

2727
type snapshotActionType int
@@ -228,7 +228,7 @@ func ensurePods(g *GomegaWithT, yamlFile, ns string) (v1.Coherence, []corev1.Pod
228228
d, _ := json.Marshal(deployment)
229229
fmt.Printf("Persistence Test installing deployment:\n%s\n", string(d))
230230

231-
err = testContext.Client.Create(goctx.TODO(), &deployment)
231+
err = testContext.Client.Create(context.TODO(), &deployment)
232232
g.Expect(err).NotTo(HaveOccurred())
233233

234234
_, err = helper.WaitForStatefulSetForDeployment(testContext, ns, &deployment, helper.RetryInterval, helper.Timeout)

‎test/coherence_compatibility/certify_persistence_test.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,17 @@
77
package compatibility
88

99
import (
10-
goctx "context"
10+
"context"
1111
"encoding/json"
1212
"fmt"
13+
"testing"
14+
"time"
15+
1316
. "github.com/onsi/gomega"
1417
v1 "github.com/oracle/coherence-operator/api/v1"
1518
"github.com/oracle/coherence-operator/test/e2e/helper"
1619
corev1 "k8s.io/api/core/v1"
1720
"k8s.io/utils/ptr"
18-
"testing"
19-
"time"
2021
)
2122

2223
// Deploy a Coherence resource with persistence enabled (this should enable active persistence).
@@ -149,7 +150,7 @@ func ensurePods(g *GomegaWithT, yamlFile, ns string) (v1.Coherence, []corev1.Pod
149150
d, _ := json.Marshal(deployment)
150151
fmt.Printf("Persistence Test installing deployment:\n%s\n", string(d))
151152

152-
err = testContext.Client.Create(goctx.TODO(), &deployment)
153+
err = testContext.Client.Create(context.TODO(), &deployment)
153154
g.Expect(err).NotTo(HaveOccurred())
154155

155156
_, err = helper.WaitForStatefulSetForDeployment(testContext, ns, &deployment, helper.RetryInterval, helper.Timeout)

‎test/e2e/helm/helm_test.go‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
package helm
88

99
import (
10-
goctx "context"
10+
"context"
1111
"fmt"
1212
"os"
1313
"os/exec"
@@ -766,7 +766,7 @@ func AssertThreeReplicas() error {
766766
func AssertRBAC(allowNode bool) error {
767767
rbacClient := testContext.KubeClient.RbacV1()
768768

769-
crList, err := rbacClient.ClusterRoles().List(goctx.TODO(), metav1.ListOptions{})
769+
crList, err := rbacClient.ClusterRoles().List(context.TODO(), metav1.ListOptions{})
770770
if err != nil {
771771
return err
772772
}
@@ -779,7 +779,7 @@ func AssertRBAC(allowNode bool) error {
779779
}
780780
}
781781

782-
crbList, err := rbacClient.ClusterRoleBindings().List(goctx.TODO(), metav1.ListOptions{})
782+
crbList, err := rbacClient.ClusterRoleBindings().List(context.TODO(), metav1.ListOptions{})
783783
if err != nil {
784784
return err
785785
}
@@ -793,12 +793,12 @@ func AssertRBAC(allowNode bool) error {
793793
}
794794

795795
ns := helper.GetTestNamespace()
796-
_, err = rbacClient.Roles(ns).Get(goctx.TODO(), "coherence-operator", metav1.GetOptions{})
796+
_, err = rbacClient.Roles(ns).Get(context.TODO(), "coherence-operator", metav1.GetOptions{})
797797
if err != nil {
798798
return err
799799
}
800800

801-
_, err = rbacClient.RoleBindings(ns).Get(goctx.TODO(), "coherence-operator", metav1.GetOptions{})
801+
_, err = rbacClient.RoleBindings(ns).Get(context.TODO(), "coherence-operator", metav1.GetOptions{})
802802
if err != nil {
803803
return err
804804
}
@@ -852,7 +852,7 @@ func AssertHelmInstallWithStatefulSetSubTest(t *testing.T, id string, cmd *exec.
852852

853853
defer deleteCoherence(t, &deployment)
854854

855-
err = testContext.Client.Create(goctx.TODO(), &deployment)
855+
err = testContext.Client.Create(context.TODO(), &deployment)
856856
g.Expect(err).NotTo(HaveOccurred())
857857

858858
var sts *appsv1.StatefulSet
@@ -863,7 +863,7 @@ func AssertHelmInstallWithStatefulSetSubTest(t *testing.T, id string, cmd *exec.
863863
}
864864

865865
func deleteCoherence(t *testing.T, d *coh.Coherence) {
866-
if err := testContext.Client.Delete(goctx.TODO(), d); err != nil {
866+
if err := testContext.Client.Delete(context.TODO(), d); err != nil {
867867
t.Logf("Error deleting Coherence deployment %s - %s", d.GetNamespacedName(), err.Error())
868868
}
869869
}
@@ -884,12 +884,12 @@ func RemoveWebHook() error {
884884
// DefaultValidatingWebhookName
885885
client := testContext.KubeClient.AdmissionregistrationV1()
886886

887-
err := client.MutatingWebhookConfigurations().Delete(goctx.TODO(), operator.DefaultMutatingWebhookName, metav1.DeleteOptions{})
887+
err := client.MutatingWebhookConfigurations().Delete(context.TODO(), operator.DefaultMutatingWebhookName, metav1.DeleteOptions{})
888888
if err != nil && !errors.IsNotFound(err) {
889889
return err
890890
}
891891

892-
err = client.ValidatingWebhookConfigurations().Delete(goctx.TODO(), operator.DefaultValidatingWebhookName, metav1.DeleteOptions{})
892+
err = client.ValidatingWebhookConfigurations().Delete(context.TODO(), operator.DefaultValidatingWebhookName, metav1.DeleteOptions{})
893893
if err != nil && !errors.IsNotFound(err) {
894894
return err
895895
}
@@ -901,14 +901,14 @@ func RemoveWebHook() error {
901901
func RemoveCRDs() error {
902902
cohCrd := crdv1.CustomResourceDefinition{}
903903
cohCrd.Name = "coherence.coherence.oracle.com"
904-
err := testContext.Client.Delete(goctx.TODO(), &cohCrd)
904+
err := testContext.Client.Delete(context.TODO(), &cohCrd)
905905
if err != nil && !errors.IsNotFound(err) {
906906
return err
907907
}
908908

909909
cohJobCrd := crdv1.CustomResourceDefinition{}
910910
cohJobCrd.Name = "coherencejob.coherence.oracle.com"
911-
err = testContext.Client.Delete(goctx.TODO(), &cohJobCrd)
911+
err = testContext.Client.Delete(context.TODO(), &cohJobCrd)
912912
if err != nil && !errors.IsNotFound(err) {
913913
return err
914914
}
@@ -924,27 +924,27 @@ func RemoveRBAC() error {
924924
clusterRolesClient := rbacClient.ClusterRoles()
925925
clusterRoleBindingsClient := rbacClient.ClusterRoleBindings()
926926

927-
crList, err := clusterRolesClient.List(goctx.TODO(), metav1.ListOptions{})
927+
crList, err := clusterRolesClient.List(context.TODO(), metav1.ListOptions{})
928928
if err != nil {
929929
return err
930930
}
931931

932932
for _, cr := range crList.Items {
933933
if strings.HasPrefix(strings.ToLower(cr.Name), "coherence-operator") {
934-
if err := clusterRolesClient.Delete(goctx.TODO(), cr.Name, metav1.DeleteOptions{}); err != nil {
934+
if err := clusterRolesClient.Delete(context.TODO(), cr.Name, metav1.DeleteOptions{}); err != nil {
935935
return err
936936
}
937937
}
938938
}
939939

940-
crbList, err := clusterRoleBindingsClient.List(goctx.TODO(), metav1.ListOptions{})
940+
crbList, err := clusterRoleBindingsClient.List(context.TODO(), metav1.ListOptions{})
941941
if err != nil {
942942
return err
943943
}
944944

945945
for _, crb := range crbList.Items {
946946
if strings.HasPrefix(strings.ToLower(crb.Name), "coherence-operator") {
947-
if err := clusterRoleBindingsClient.Delete(goctx.TODO(), crb.Name, metav1.DeleteOptions{}); err != nil {
947+
if err := clusterRoleBindingsClient.Delete(context.TODO(), crb.Name, metav1.DeleteOptions{}); err != nil {
948948
return err
949949
}
950950
}
@@ -954,14 +954,14 @@ func RemoveRBAC() error {
954954
rolesClient := rbacClient.Roles(ns)
955955
roleBindingsClient := rbacClient.RoleBindings(ns)
956956

957-
if role, err := rolesClient.Get(goctx.TODO(), "coherence-operator", metav1.GetOptions{}); err == nil {
958-
if err := rolesClient.Delete(goctx.TODO(), role.Name, metav1.DeleteOptions{}); err != nil {
957+
if role, err := rolesClient.Get(context.TODO(), "coherence-operator", metav1.GetOptions{}); err == nil {
958+
if err := rolesClient.Delete(context.TODO(), role.Name, metav1.DeleteOptions{}); err != nil {
959959
return err
960960
}
961961
}
962962

963-
if roleBinding, err := roleBindingsClient.Get(goctx.TODO(), "coherence-operator", metav1.GetOptions{}); err == nil {
964-
if err := roleBindingsClient.Delete(goctx.TODO(), roleBinding.Name, metav1.DeleteOptions{}); err != nil {
963+
if roleBinding, err := roleBindingsClient.Get(context.TODO(), "coherence-operator", metav1.GetOptions{}); err == nil {
964+
if err := roleBindingsClient.Delete(context.TODO(), roleBinding.Name, metav1.DeleteOptions{}); err != nil {
965965
return err
966966
}
967967
}

‎test/e2e/helper/e2e-helpers.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
package helper
99

1010
import (
11-
goctx "context"
11+
"context"
1212
"encoding/json"
1313
"fmt"
1414
"io"
@@ -19,7 +19,6 @@ import (
1919
. "github.com/onsi/gomega"
2020
coh "github.com/oracle/coherence-operator/api/v1"
2121
"github.com/oracle/coherence-operator/pkg/operator"
22-
"golang.org/x/net/context"
2322
appsv1 "k8s.io/api/apps/v1"
2423
batchv1 "k8s.io/api/batch/v1"
2524
corev1 "k8s.io/api/core/v1"
@@ -355,7 +354,8 @@ func WaitForCoherence(ctx TestContext, namespace, name string, retryInterval, ti
355354
func WaitForCoherenceCondition(testCtx TestContext, namespace, name string, condition DeploymentStateCondition, retryInterval, timeout time.Duration) (*coh.Coherence, error) {
356355
var deployment *coh.Coherence
357356

358-
ctx, _ := context.WithTimeout(testCtx.Context, timeout)
357+
ctx, cancel := context.WithTimeout(testCtx.Context, timeout)
358+
defer cancel()
359359

360360
err := wait.PollUntilContextTimeout(ctx, retryInterval, timeout, true, func(context.Context) (done bool, err error) {
361361
deployment, err = GetCoherence(testCtx, namespace, name)
@@ -699,7 +699,7 @@ func WaitForCoherenceCleanup(ctx TestContext, namespace string) error {
699699
}
700700

701701
list := &coh.CoherenceList{}
702-
err = ctx.Client.List(goctx.TODO(), list, client.InNamespace(namespace))
702+
err = ctx.Client.List(context.TODO(), list, client.InNamespace(namespace))
703703
if err != nil {
704704
return err
705705
}
@@ -708,14 +708,14 @@ func WaitForCoherenceCleanup(ctx TestContext, namespace string) error {
708708
for i := range list.Items {
709709
item := list.Items[i]
710710
ctx.Logf("Deleting Coherence resource %s in namespace %s", item.Name, item.Namespace)
711-
err = ctx.Client.Delete(goctx.TODO(), &item)
711+
err = ctx.Client.Delete(context.TODO(), &item)
712712
if err != nil {
713713
ctx.Logf("Error deleting Coherence resource %s - %s", item.Name, err.Error())
714714
}
715715
}
716716

717717
// Obtain any remaining Coherence resources
718-
err = ctx.Client.List(goctx.TODO(), list, client.InNamespace(namespace))
718+
err = ctx.Client.List(context.TODO(), list, client.InNamespace(namespace))
719719
if err != nil {
720720
return err
721721
}
@@ -729,15 +729,15 @@ func WaitForCoherenceCleanup(ctx TestContext, namespace string) error {
729729
ctx.Logf("error patching Coherence %s: %+v", item.Name, err)
730730
}
731731
ctx.Logf("Deleting Coherence resource %s in namespace %s", item.Name, item.Namespace)
732-
err = ctx.Client.Delete(goctx.TODO(), &item)
732+
err = ctx.Client.Delete(context.TODO(), &item)
733733
if err != nil {
734734
ctx.Logf("Error deleting Coherence resource %s - %s", item.Name, err.Error())
735735
}
736736
}
737737

738738
// Wait for removal of the Coherence resources
739739
err = wait.PollUntilContextTimeout(ctx.Context, RetryInterval, Timeout, true, func(context.Context) (done bool, err error) {
740-
err = ctx.Client.List(goctx.TODO(), list, client.InNamespace(namespace))
740+
err = ctx.Client.List(context.TODO(), list, client.InNamespace(namespace))
741741
if err == nil || isNoResources(err) || apierrors.IsNotFound(err) {
742742
if len(list.Items) > 0 {
743743
ctx.Logf("Waiting for deletion of %d Coherence resources", len(list.Items))
@@ -774,7 +774,7 @@ func waitForCoherenceJobCleanup(ctx TestContext, namespace string) error {
774774
ctx.Logf("Waiting for clean-up of CoherenceJob resources in namespace %s", namespace)
775775

776776
list := &coh.CoherenceJobList{}
777-
err := ctx.Client.List(goctx.TODO(), list, client.InNamespace(namespace))
777+
err := ctx.Client.List(context.TODO(), list, client.InNamespace(namespace))
778778
if err != nil {
779779
return err
780780
}
@@ -783,14 +783,14 @@ func waitForCoherenceJobCleanup(ctx TestContext, namespace string) error {
783783
for i := range list.Items {
784784
item := list.Items[i]
785785
ctx.Logf("Deleting CoherenceJob resource %s in namespace %s", item.Name, item.Namespace)
786-
err = ctx.Client.Delete(goctx.TODO(), &item)
786+
err = ctx.Client.Delete(context.TODO(), &item)
787787
if err != nil {
788788
ctx.Logf("Error deleting CoherenceJob resource %s - %s", item.Name, err.Error())
789789
}
790790
}
791791

792792
// Obtain any remaining CoherenceJob resources
793-
err = ctx.Client.List(goctx.TODO(), list, client.InNamespace(namespace))
793+
err = ctx.Client.List(context.TODO(), list, client.InNamespace(namespace))
794794
if err != nil {
795795
return err
796796
}
@@ -804,15 +804,15 @@ func waitForCoherenceJobCleanup(ctx TestContext, namespace string) error {
804804
ctx.Logf("error patching CoherenceJob %s: %+v", item.Name, err)
805805
}
806806
ctx.Logf("Deleting CoherenceJob resource %s in namespace %s", item.Name, item.Namespace)
807-
err = ctx.Client.Delete(goctx.TODO(), &item)
807+
err = ctx.Client.Delete(context.TODO(), &item)
808808
if err != nil {
809809
ctx.Logf("Error deleting CoherenceJob resource %s - %s", item.Name, err.Error())
810810
}
811811
}
812812

813813
// Wait for removal of the CoherenceJob resources
814814
err = wait.PollUntilContextTimeout(ctx.Context, RetryInterval, Timeout, true, func(context.Context) (done bool, err error) {
815-
err = ctx.Client.List(goctx.TODO(), list, client.InNamespace(namespace))
815+
err = ctx.Client.List(context.TODO(), list, client.InNamespace(namespace))
816816
if err == nil || isNoResources(err) || apierrors.IsNotFound(err) {
817817
if len(list.Items) > 0 {
818818
ctx.Logf("Waiting for deletion of %d CoherenceJob resources", len(list.Items))

‎test/e2e/helper/test_context.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"os"
1414
"testing"
1515

16+
"context"
1617
"github.com/go-logr/logr"
1718
coh "github.com/oracle/coherence-operator/api/v1"
1819
"github.com/oracle/coherence-operator/controllers"
@@ -23,7 +24,6 @@ import (
2324
"github.com/spf13/cobra"
2425
"github.com/spf13/pflag"
2526
"github.com/spf13/viper"
26-
"golang.org/x/net/context"
2727
corev1 "k8s.io/api/core/v1"
2828
"k8s.io/apimachinery/pkg/types"
2929
"k8s.io/client-go/kubernetes/scheme"
@@ -264,6 +264,7 @@ func NewContext(startController bool, watchNamespaces ...string) (TestContext, e
264264
Log: ctrl.Log.WithName("controllers").WithName("Coherence"),
265265
}).SetupWithManager(k8sManager, cs)
266266
if err != nil {
267+
cancel()
267268
return TestContext{}, err
268269
}
269270

@@ -273,6 +274,7 @@ func NewContext(startController bool, watchNamespaces ...string) (TestContext, e
273274
Log: ctrl.Log.WithName("controllers").WithName("CoherenceJob"),
274275
}).SetupWithManager(k8sManager, cs)
275276
if err != nil {
277+
cancel()
276278
return TestContext{}, err
277279
}
278280
}

0 commit comments

Comments
 (0)