From 77b68121ae3242193288164b138b2687752ea3d3 Mon Sep 17 00:00:00 2001 From: Xun Jiang Date: Wed, 24 Dec 2025 14:42:18 +0800 Subject: [PATCH] Replace golang.org/x/net/context with context package to fix linter issues. Signed-off-by: Xun Jiang --- go.mod | 2 +- hack/build-image/Dockerfile | 2 +- pkg/plugin/framework/backup_item_action.go | 3 ++- pkg/plugin/framework/backup_item_action_client.go | 2 +- pkg/plugin/framework/backup_item_action_server.go | 2 +- pkg/plugin/framework/backupitemaction/v2/backup_item_action.go | 3 ++- .../framework/backupitemaction/v2/backup_item_action_client.go | 2 +- .../framework/backupitemaction/v2/backup_item_action_server.go | 2 +- pkg/plugin/framework/delete_item_action.go | 3 ++- pkg/plugin/framework/delete_item_action_client.go | 2 +- pkg/plugin/framework/delete_item_action_server.go | 2 +- pkg/plugin/framework/itemblockaction/v1/item_block_action.go | 3 ++- .../framework/itemblockaction/v1/item_block_action_client.go | 2 +- .../framework/itemblockaction/v1/item_block_action_server.go | 2 +- pkg/plugin/framework/object_store.go | 3 ++- pkg/plugin/framework/object_store_client.go | 2 +- pkg/plugin/framework/object_store_server.go | 2 +- pkg/plugin/framework/plugin_lister.go | 3 ++- pkg/plugin/framework/restore_item_action.go | 3 ++- pkg/plugin/framework/restore_item_action_client.go | 2 +- pkg/plugin/framework/restore_item_action_server.go | 2 +- .../framework/restoreitemaction/v2/restore_item_action.go | 3 ++- .../restoreitemaction/v2/restore_item_action_client.go | 2 +- .../restoreitemaction/v2/restore_item_action_server.go | 2 +- pkg/plugin/framework/volume_snapshotter.go | 3 ++- pkg/plugin/framework/volume_snapshotter_client.go | 2 +- pkg/plugin/framework/volume_snapshotter_server.go | 2 +- pkg/util/kube/periodical_enqueue_source_test.go | 2 +- test/util/eks/eks.go | 2 +- test/util/k8s/clusterrolebinding.go | 3 +-- test/util/k8s/common.go | 2 +- test/util/k8s/configmap.go | 2 +- test/util/k8s/crd.go | 2 +- test/util/k8s/deployment.go | 2 +- test/util/k8s/secret.go | 2 +- test/util/k8s/statefulset.go | 2 +- test/util/kibishii/kibishii_utils.go | 2 +- test/util/providers/aws_utils.go | 2 +- test/util/providers/azure_utils.go | 2 +- test/util/providers/gcloud_utils.go | 2 +- 40 files changed, 49 insertions(+), 41 deletions(-) diff --git a/go.mod b/go.mod index 23096fdc0..a20871fcc 100644 --- a/go.mod +++ b/go.mod @@ -44,7 +44,6 @@ require ( github.com/vmware-tanzu/crash-diagnostics v0.3.7 go.uber.org/zap v1.27.0 golang.org/x/mod v0.29.0 - golang.org/x/net v0.47.0 golang.org/x/oauth2 v0.30.0 golang.org/x/text v0.31.0 google.golang.org/api v0.241.0 @@ -184,6 +183,7 @@ require ( go.uber.org/multierr v1.11.0 // indirect golang.org/x/crypto v0.45.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect + golang.org/x/net v0.47.0 // indirect golang.org/x/sync v0.18.0 // indirect golang.org/x/sys v0.38.0 // indirect golang.org/x/term v0.37.0 // indirect diff --git a/hack/build-image/Dockerfile b/hack/build-image/Dockerfile index bbb21b2c0..7d63af496 100644 --- a/hack/build-image/Dockerfile +++ b/hack/build-image/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM --platform=$TARGETPLATFORM golang:1.24.9-bookworm +FROM --platform=$TARGETPLATFORM golang:1.24.11-bookworm ARG GOPROXY diff --git a/pkg/plugin/framework/backup_item_action.go b/pkg/plugin/framework/backup_item_action.go index 00f3cc0ea..9c1a5665d 100644 --- a/pkg/plugin/framework/backup_item_action.go +++ b/pkg/plugin/framework/backup_item_action.go @@ -17,8 +17,9 @@ limitations under the License. package framework import ( + "context" + plugin "github.com/hashicorp/go-plugin" - "golang.org/x/net/context" "google.golang.org/grpc" "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" diff --git a/pkg/plugin/framework/backup_item_action_client.go b/pkg/plugin/framework/backup_item_action_client.go index 948cb3492..05375b391 100644 --- a/pkg/plugin/framework/backup_item_action_client.go +++ b/pkg/plugin/framework/backup_item_action_client.go @@ -17,10 +17,10 @@ limitations under the License. package framework import ( + "context" "encoding/json" "github.com/pkg/errors" - "golang.org/x/net/context" "google.golang.org/grpc" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/plugin/framework/backup_item_action_server.go b/pkg/plugin/framework/backup_item_action_server.go index 6511591a9..e3490faf7 100644 --- a/pkg/plugin/framework/backup_item_action_server.go +++ b/pkg/plugin/framework/backup_item_action_server.go @@ -17,10 +17,10 @@ limitations under the License. package framework import ( + "context" "encoding/json" "github.com/pkg/errors" - "golang.org/x/net/context" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" diff --git a/pkg/plugin/framework/backupitemaction/v2/backup_item_action.go b/pkg/plugin/framework/backupitemaction/v2/backup_item_action.go index c1e2e5401..903ec378c 100644 --- a/pkg/plugin/framework/backupitemaction/v2/backup_item_action.go +++ b/pkg/plugin/framework/backupitemaction/v2/backup_item_action.go @@ -17,8 +17,9 @@ limitations under the License. package v2 import ( + "context" + plugin "github.com/hashicorp/go-plugin" - "golang.org/x/net/context" "google.golang.org/grpc" "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" diff --git a/pkg/plugin/framework/backupitemaction/v2/backup_item_action_client.go b/pkg/plugin/framework/backupitemaction/v2/backup_item_action_client.go index 52733de2d..46d313439 100644 --- a/pkg/plugin/framework/backupitemaction/v2/backup_item_action_client.go +++ b/pkg/plugin/framework/backupitemaction/v2/backup_item_action_client.go @@ -17,10 +17,10 @@ limitations under the License. package v2 import ( + "context" "encoding/json" "github.com/pkg/errors" - "golang.org/x/net/context" "google.golang.org/grpc" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/plugin/framework/backupitemaction/v2/backup_item_action_server.go b/pkg/plugin/framework/backupitemaction/v2/backup_item_action_server.go index c622490e7..7e650efbc 100644 --- a/pkg/plugin/framework/backupitemaction/v2/backup_item_action_server.go +++ b/pkg/plugin/framework/backupitemaction/v2/backup_item_action_server.go @@ -17,10 +17,10 @@ limitations under the License. package v2 import ( + "context" "encoding/json" "github.com/pkg/errors" - "golang.org/x/net/context" "google.golang.org/protobuf/types/known/emptypb" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/pkg/plugin/framework/delete_item_action.go b/pkg/plugin/framework/delete_item_action.go index afc5d548e..db4329b7f 100644 --- a/pkg/plugin/framework/delete_item_action.go +++ b/pkg/plugin/framework/delete_item_action.go @@ -17,8 +17,9 @@ limitations under the License. package framework import ( + "context" + plugin "github.com/hashicorp/go-plugin" - "golang.org/x/net/context" "google.golang.org/grpc" "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" diff --git a/pkg/plugin/framework/delete_item_action_client.go b/pkg/plugin/framework/delete_item_action_client.go index 088c42b51..b0d0896d3 100644 --- a/pkg/plugin/framework/delete_item_action_client.go +++ b/pkg/plugin/framework/delete_item_action_client.go @@ -17,10 +17,10 @@ limitations under the License. package framework import ( + "context" "encoding/json" "github.com/pkg/errors" - "golang.org/x/net/context" "google.golang.org/grpc" "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" diff --git a/pkg/plugin/framework/delete_item_action_server.go b/pkg/plugin/framework/delete_item_action_server.go index e298969d1..7ff1e0518 100644 --- a/pkg/plugin/framework/delete_item_action_server.go +++ b/pkg/plugin/framework/delete_item_action_server.go @@ -17,10 +17,10 @@ limitations under the License. package framework import ( + "context" "encoding/json" "github.com/pkg/errors" - "golang.org/x/net/context" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" diff --git a/pkg/plugin/framework/itemblockaction/v1/item_block_action.go b/pkg/plugin/framework/itemblockaction/v1/item_block_action.go index 9fb8094ee..2115d2ecf 100644 --- a/pkg/plugin/framework/itemblockaction/v1/item_block_action.go +++ b/pkg/plugin/framework/itemblockaction/v1/item_block_action.go @@ -17,8 +17,9 @@ limitations under the License. package v1 import ( + "context" + plugin "github.com/hashicorp/go-plugin" - "golang.org/x/net/context" "google.golang.org/grpc" "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" diff --git a/pkg/plugin/framework/itemblockaction/v1/item_block_action_client.go b/pkg/plugin/framework/itemblockaction/v1/item_block_action_client.go index 612a14a6c..e60c00beb 100644 --- a/pkg/plugin/framework/itemblockaction/v1/item_block_action_client.go +++ b/pkg/plugin/framework/itemblockaction/v1/item_block_action_client.go @@ -17,10 +17,10 @@ limitations under the License. package v1 import ( + "context" "encoding/json" "github.com/pkg/errors" - "golang.org/x/net/context" "google.golang.org/grpc" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/plugin/framework/itemblockaction/v1/item_block_action_server.go b/pkg/plugin/framework/itemblockaction/v1/item_block_action_server.go index ab9ad7485..bf7828051 100644 --- a/pkg/plugin/framework/itemblockaction/v1/item_block_action_server.go +++ b/pkg/plugin/framework/itemblockaction/v1/item_block_action_server.go @@ -17,10 +17,10 @@ limitations under the License. package v1 import ( + "context" "encoding/json" "github.com/pkg/errors" - "golang.org/x/net/context" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" diff --git a/pkg/plugin/framework/object_store.go b/pkg/plugin/framework/object_store.go index d7c7b95e4..ea624da42 100644 --- a/pkg/plugin/framework/object_store.go +++ b/pkg/plugin/framework/object_store.go @@ -17,8 +17,9 @@ limitations under the License. package framework import ( + "context" + plugin "github.com/hashicorp/go-plugin" - "golang.org/x/net/context" "google.golang.org/grpc" "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" diff --git a/pkg/plugin/framework/object_store_client.go b/pkg/plugin/framework/object_store_client.go index 725f8e934..24587ba84 100644 --- a/pkg/plugin/framework/object_store_client.go +++ b/pkg/plugin/framework/object_store_client.go @@ -17,11 +17,11 @@ limitations under the License. package framework import ( + "context" "io" "time" "github.com/pkg/errors" - "golang.org/x/net/context" "google.golang.org/grpc" "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" diff --git a/pkg/plugin/framework/object_store_server.go b/pkg/plugin/framework/object_store_server.go index 2d3ef3658..61f509954 100644 --- a/pkg/plugin/framework/object_store_server.go +++ b/pkg/plugin/framework/object_store_server.go @@ -17,11 +17,11 @@ limitations under the License. package framework import ( + "context" "io" "time" "github.com/pkg/errors" - "golang.org/x/net/context" "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" proto "github.com/vmware-tanzu/velero/pkg/plugin/generated" diff --git a/pkg/plugin/framework/plugin_lister.go b/pkg/plugin/framework/plugin_lister.go index 19e349007..6db81c66d 100644 --- a/pkg/plugin/framework/plugin_lister.go +++ b/pkg/plugin/framework/plugin_lister.go @@ -17,9 +17,10 @@ limitations under the License. package framework import ( + "context" + plugin "github.com/hashicorp/go-plugin" "github.com/pkg/errors" - "golang.org/x/net/context" "google.golang.org/grpc" "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" diff --git a/pkg/plugin/framework/restore_item_action.go b/pkg/plugin/framework/restore_item_action.go index 0aaf2b47e..26cef3728 100644 --- a/pkg/plugin/framework/restore_item_action.go +++ b/pkg/plugin/framework/restore_item_action.go @@ -17,8 +17,9 @@ limitations under the License. package framework import ( + "context" + plugin "github.com/hashicorp/go-plugin" - "golang.org/x/net/context" "google.golang.org/grpc" "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" diff --git a/pkg/plugin/framework/restore_item_action_client.go b/pkg/plugin/framework/restore_item_action_client.go index 8809e31c3..bd035c34d 100644 --- a/pkg/plugin/framework/restore_item_action_client.go +++ b/pkg/plugin/framework/restore_item_action_client.go @@ -17,10 +17,10 @@ limitations under the License. package framework import ( + "context" "encoding/json" "github.com/pkg/errors" - "golang.org/x/net/context" "google.golang.org/grpc" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/plugin/framework/restore_item_action_server.go b/pkg/plugin/framework/restore_item_action_server.go index bdc149c48..c1c2a5e96 100644 --- a/pkg/plugin/framework/restore_item_action_server.go +++ b/pkg/plugin/framework/restore_item_action_server.go @@ -17,10 +17,10 @@ limitations under the License. package framework import ( + "context" "encoding/json" "github.com/pkg/errors" - "golang.org/x/net/context" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1" diff --git a/pkg/plugin/framework/restoreitemaction/v2/restore_item_action.go b/pkg/plugin/framework/restoreitemaction/v2/restore_item_action.go index 243e2fd67..00bb825b8 100644 --- a/pkg/plugin/framework/restoreitemaction/v2/restore_item_action.go +++ b/pkg/plugin/framework/restoreitemaction/v2/restore_item_action.go @@ -17,8 +17,9 @@ limitations under the License. package v2 import ( + "context" + plugin "github.com/hashicorp/go-plugin" - "golang.org/x/net/context" "google.golang.org/grpc" "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" diff --git a/pkg/plugin/framework/restoreitemaction/v2/restore_item_action_client.go b/pkg/plugin/framework/restoreitemaction/v2/restore_item_action_client.go index b1d61fb75..06bbe33d2 100644 --- a/pkg/plugin/framework/restoreitemaction/v2/restore_item_action_client.go +++ b/pkg/plugin/framework/restoreitemaction/v2/restore_item_action_client.go @@ -17,10 +17,10 @@ limitations under the License. package v2 import ( + "context" "encoding/json" "github.com/pkg/errors" - "golang.org/x/net/context" "google.golang.org/grpc" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/pkg/plugin/framework/restoreitemaction/v2/restore_item_action_server.go b/pkg/plugin/framework/restoreitemaction/v2/restore_item_action_server.go index 2795d787d..9b3a7d49b 100644 --- a/pkg/plugin/framework/restoreitemaction/v2/restore_item_action_server.go +++ b/pkg/plugin/framework/restoreitemaction/v2/restore_item_action_server.go @@ -17,10 +17,10 @@ limitations under the License. package v2 import ( + "context" "encoding/json" "github.com/pkg/errors" - "golang.org/x/net/context" "google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/emptypb" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/pkg/plugin/framework/volume_snapshotter.go b/pkg/plugin/framework/volume_snapshotter.go index 5eb6159eb..8cbb48fa4 100644 --- a/pkg/plugin/framework/volume_snapshotter.go +++ b/pkg/plugin/framework/volume_snapshotter.go @@ -17,8 +17,9 @@ limitations under the License. package framework import ( + "context" + plugin "github.com/hashicorp/go-plugin" - "golang.org/x/net/context" "google.golang.org/grpc" "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" diff --git a/pkg/plugin/framework/volume_snapshotter_client.go b/pkg/plugin/framework/volume_snapshotter_client.go index da66f2cea..0f884f9a2 100644 --- a/pkg/plugin/framework/volume_snapshotter_client.go +++ b/pkg/plugin/framework/volume_snapshotter_client.go @@ -17,10 +17,10 @@ limitations under the License. package framework import ( + "context" "encoding/json" "github.com/pkg/errors" - "golang.org/x/net/context" "google.golang.org/grpc" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/plugin/framework/volume_snapshotter_server.go b/pkg/plugin/framework/volume_snapshotter_server.go index 99bdea03a..63bea43c8 100644 --- a/pkg/plugin/framework/volume_snapshotter_server.go +++ b/pkg/plugin/framework/volume_snapshotter_server.go @@ -17,10 +17,10 @@ limitations under the License. package framework import ( + "context" "encoding/json" "github.com/pkg/errors" - "golang.org/x/net/context" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "github.com/vmware-tanzu/velero/pkg/plugin/framework/common" diff --git a/pkg/util/kube/periodical_enqueue_source_test.go b/pkg/util/kube/periodical_enqueue_source_test.go index 677ec90e1..7f3dd9096 100644 --- a/pkg/util/kube/periodical_enqueue_source_test.go +++ b/pkg/util/kube/periodical_enqueue_source_test.go @@ -17,12 +17,12 @@ limitations under the License. package kube import ( + "context" "testing" "time" "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - "golang.org/x/net/context" "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/test/util/eks/eks.go b/test/util/eks/eks.go index ff3df3c31..0cfad5b8e 100644 --- a/test/util/eks/eks.go +++ b/test/util/eks/eks.go @@ -17,12 +17,12 @@ limitations under the License. package k8s import ( + "context" "fmt" "os/exec" "strings" "time" - "golang.org/x/net/context" "k8s.io/apimachinery/pkg/util/wait" veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" diff --git a/test/util/k8s/clusterrolebinding.go b/test/util/k8s/clusterrolebinding.go index c7ce32e31..3728cd034 100644 --- a/test/util/k8s/clusterrolebinding.go +++ b/test/util/k8s/clusterrolebinding.go @@ -17,12 +17,11 @@ limitations under the License. package k8s import ( + "context" "fmt" "os/exec" "strings" - "golang.org/x/net/context" - veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" ) diff --git a/test/util/k8s/common.go b/test/util/k8s/common.go index 3e0c553ce..fdec297cb 100644 --- a/test/util/k8s/common.go +++ b/test/util/k8s/common.go @@ -17,6 +17,7 @@ limitations under the License. package k8s import ( + "context" "fmt" "os" "os/exec" @@ -24,7 +25,6 @@ import ( "time" "github.com/pkg/errors" - "golang.org/x/net/context" corev1api "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" diff --git a/test/util/k8s/configmap.go b/test/util/k8s/configmap.go index b03bcdb99..6c11df7ff 100644 --- a/test/util/k8s/configmap.go +++ b/test/util/k8s/configmap.go @@ -17,12 +17,12 @@ limitations under the License. package k8s import ( + "context" "fmt" "time" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "golang.org/x/net/context" corev1api "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/util/k8s/crd.go b/test/util/k8s/crd.go index 3b46ddbb0..fec3575eb 100644 --- a/test/util/k8s/crd.go +++ b/test/util/k8s/crd.go @@ -17,13 +17,13 @@ limitations under the License. package k8s import ( + "context" "fmt" "os/exec" "strings" "time" "github.com/pkg/errors" - "golang.org/x/net/context" veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" ) diff --git a/test/util/k8s/deployment.go b/test/util/k8s/deployment.go index 9c570aee1..7d72c9507 100644 --- a/test/util/k8s/deployment.go +++ b/test/util/k8s/deployment.go @@ -17,11 +17,11 @@ limitations under the License. package k8s import ( + "context" "fmt" "path" "time" - "golang.org/x/net/context" appsv1api "k8s.io/api/apps/v1" corev1api "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/util/k8s/secret.go b/test/util/k8s/secret.go index ed3eaf834..2652b16ac 100644 --- a/test/util/k8s/secret.go +++ b/test/util/k8s/secret.go @@ -17,12 +17,12 @@ limitations under the License. package k8s import ( + "context" "fmt" "time" "github.com/pkg/errors" "github.com/sirupsen/logrus" - "golang.org/x/net/context" corev1api "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/util/k8s/statefulset.go b/test/util/k8s/statefulset.go index e9a1e564d..ff63f2922 100644 --- a/test/util/k8s/statefulset.go +++ b/test/util/k8s/statefulset.go @@ -17,11 +17,11 @@ limitations under the License. package k8s import ( + "context" "fmt" "os/exec" "github.com/pkg/errors" - "golang.org/x/net/context" veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec" ) diff --git a/test/util/kibishii/kibishii_utils.go b/test/util/kibishii/kibishii_utils.go index 81be36cff..fcd28ff6e 100644 --- a/test/util/kibishii/kibishii_utils.go +++ b/test/util/kibishii/kibishii_utils.go @@ -17,6 +17,7 @@ limitations under the License. package kibishii import ( + "context" "fmt" "html/template" "os" @@ -28,7 +29,6 @@ import ( . "github.com/onsi/ginkgo/v2" "github.com/pkg/errors" - "golang.org/x/net/context" appsv1api "k8s.io/api/apps/v1" corev1api "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/util/wait" diff --git a/test/util/providers/aws_utils.go b/test/util/providers/aws_utils.go index d40a2bec2..ddca74d99 100644 --- a/test/util/providers/aws_utils.go +++ b/test/util/providers/aws_utils.go @@ -17,6 +17,7 @@ limitations under the License. package providers import ( + "context" "crypto/tls" "crypto/x509" "fmt" @@ -35,7 +36,6 @@ import ( "github.com/aws/aws-sdk-go-v2/service/s3" s3types "github.com/aws/aws-sdk-go-v2/service/s3/types" "github.com/pkg/errors" - "golang.org/x/net/context" "github.com/vmware-tanzu/velero/pkg/cmd/util/flag" "github.com/vmware-tanzu/velero/test" diff --git a/test/util/providers/azure_utils.go b/test/util/providers/azure_utils.go index 439c1e9e7..05888d768 100644 --- a/test/util/providers/azure_utils.go +++ b/test/util/providers/azure_utils.go @@ -17,6 +17,7 @@ limitations under the License. package providers import ( + "context" "fmt" "io" "log" @@ -36,7 +37,6 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container" "github.com/joho/godotenv" "github.com/pkg/errors" - "golang.org/x/net/context" "github.com/vmware-tanzu/velero/pkg/cmd/util/flag" . "github.com/vmware-tanzu/velero/test" diff --git a/test/util/providers/gcloud_utils.go b/test/util/providers/gcloud_utils.go index 99e60a61e..aa1dee6f7 100644 --- a/test/util/providers/gcloud_utils.go +++ b/test/util/providers/gcloud_utils.go @@ -17,6 +17,7 @@ limitations under the License. package providers import ( + "context" "encoding/json" "fmt" "io" @@ -25,7 +26,6 @@ import ( "cloud.google.com/go/storage" "github.com/pkg/errors" - "golang.org/x/net/context" "golang.org/x/oauth2/google" "google.golang.org/api/compute/v1" "google.golang.org/api/iterator"