From c5e7d97ffa108b43948a398bdb4392742a68b185 Mon Sep 17 00:00:00 2001 From: Eng Zer Jun Date: Tue, 4 Feb 2025 00:41:49 +0800 Subject: [PATCH] Replace `golang.org/x/exp/slices` with `slices` The experimental functions in `golang.org/x/exp/slices` are now available in the standard library in Go 1.21. Reference: https://go.dev/doc/go1.21#slices Signed-off-by: Eng Zer Jun --- go.mod | 2 +- integration/utilities/cluster/cluster.go | 2 +- pkg/actions/podidentityassociation/iam_role_updater.go | 5 ++--- pkg/ctl/cmdutils/access_entry.go | 2 +- pkg/ctl/cmdutils/configfile.go | 3 +-- pkg/ctl/utils/describe_stacks.go | 2 +- pkg/ctl/utils/vpc_helper.go | 3 +-- 7 files changed, 8 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 7904a247bf..b57eaeff3f 100644 --- a/go.mod +++ b/go.mod @@ -72,7 +72,6 @@ require ( github.com/weaveworks/schemer v0.0.0-20230525114451-47139fe25848 github.com/xgfone/netaddr v0.5.1 golang.org/x/crypto v0.32.0 - golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc golang.org/x/oauth2 v0.25.0 golang.org/x/sync v0.10.0 golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d @@ -393,6 +392,7 @@ require ( go.uber.org/automaxprocs v1.5.3 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.26.0 // indirect + golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect golang.org/x/mod v0.17.0 // indirect golang.org/x/net v0.33.0 // indirect diff --git a/integration/utilities/cluster/cluster.go b/integration/utilities/cluster/cluster.go index c872c034e2..6676f29484 100644 --- a/integration/utilities/cluster/cluster.go +++ b/integration/utilities/cluster/cluster.go @@ -5,10 +5,10 @@ import ( "encoding/json" "io" "os" + "slices" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "golang.org/x/exp/slices" api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" "github.com/weaveworks/eksctl/pkg/eks" diff --git a/pkg/actions/podidentityassociation/iam_role_updater.go b/pkg/actions/podidentityassociation/iam_role_updater.go index 3d9b6f4a3b..a0cce56246 100644 --- a/pkg/actions/podidentityassociation/iam_role_updater.go +++ b/pkg/actions/podidentityassociation/iam_role_updater.go @@ -3,18 +3,17 @@ package podidentityassociation import ( "context" "fmt" + "slices" + "time" "github.com/aws/aws-sdk-go-v2/aws" cfntypes "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" "github.com/kris-nova/logger" "github.com/pkg/errors" - "time" - api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5" "github.com/weaveworks/eksctl/pkg/cfn/builder" "github.com/weaveworks/eksctl/pkg/cfn/manager" - "golang.org/x/exp/slices" ) // IAMRoleUpdater updates IAM resources for pod identity associations. diff --git a/pkg/ctl/cmdutils/access_entry.go b/pkg/ctl/cmdutils/access_entry.go index 76ef808f7b..40f8b9a936 100644 --- a/pkg/ctl/cmdutils/access_entry.go +++ b/pkg/ctl/cmdutils/access_entry.go @@ -3,8 +3,8 @@ package cmdutils import ( "errors" "fmt" + "slices" - "golang.org/x/exp/slices" "k8s.io/apimachinery/pkg/util/sets" ekstypes "github.com/aws/aws-sdk-go-v2/service/eks/types" diff --git a/pkg/ctl/cmdutils/configfile.go b/pkg/ctl/cmdutils/configfile.go index d847462ab2..d0b082e8aa 100644 --- a/pkg/ctl/cmdutils/configfile.go +++ b/pkg/ctl/cmdutils/configfile.go @@ -5,11 +5,10 @@ import ( "fmt" "io" "reflect" + "slices" "strconv" "strings" - "golang.org/x/exp/slices" - "github.com/kris-nova/logger" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/pkg/ctl/utils/describe_stacks.go b/pkg/ctl/utils/describe_stacks.go index e85fae276e..20dea7c8de 100644 --- a/pkg/ctl/utils/describe_stacks.go +++ b/pkg/ctl/utils/describe_stacks.go @@ -5,13 +5,13 @@ import ( "errors" "fmt" "os" + "slices" "strings" "time" "github.com/kris-nova/logger" "github.com/spf13/cobra" "github.com/spf13/pflag" - "golang.org/x/exp/slices" "github.com/aws/aws-sdk-go-v2/service/cloudformation/types" diff --git a/pkg/ctl/utils/vpc_helper.go b/pkg/ctl/utils/vpc_helper.go index 84e0d25e5b..4f5be486f0 100644 --- a/pkg/ctl/utils/vpc_helper.go +++ b/pkg/ctl/utils/vpc_helper.go @@ -3,13 +3,12 @@ package utils import ( "context" "fmt" + "slices" "github.com/aws/aws-sdk-go-v2/aws" "github.com/kris-nova/logger" "k8s.io/apimachinery/pkg/util/sets" - "golang.org/x/exp/slices" - "github.com/aws/aws-sdk-go-v2/service/eks" ekstypes "github.com/aws/aws-sdk-go-v2/service/eks/types"