From 2005010568a2c7cdd028a08e14993efd512041c9 Mon Sep 17 00:00:00 2001 From: Eng Zer Jun Date: Sat, 18 Jan 2025 02:51:08 +0800 Subject: [PATCH] Replace `golang.org/x/exp/slices` with `slices` from stdlib (#1783) --- cmd/download/download.go | 2 +- cmd/list/list.go | 2 +- cmd/scan/framework.go | 2 +- core/cautils/fileutils.go | 2 +- core/core/scan.go | 2 +- core/pkg/opaprocessor/processorhandler.go | 2 +- core/pkg/opaprocessor/utils.go | 2 +- go.mod | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/download/download.go b/cmd/download/download.go index 41aa9214..7f5cac20 100644 --- a/cmd/download/download.go +++ b/cmd/download/download.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "path/filepath" + "slices" "strings" "github.com/kubescape/go-logger" @@ -12,7 +13,6 @@ import ( "github.com/kubescape/kubescape/v3/core/meta" v1 "github.com/kubescape/kubescape/v3/core/meta/datastructures/v1" "github.com/spf13/cobra" - "golang.org/x/exp/slices" ) var ( diff --git a/cmd/list/list.go b/cmd/list/list.go index d2dc31b8..0165abfe 100644 --- a/cmd/list/list.go +++ b/cmd/list/list.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "slices" "strings" "github.com/kubescape/go-logger" @@ -12,7 +13,6 @@ import ( "github.com/kubescape/kubescape/v3/core/meta" v1 "github.com/kubescape/kubescape/v3/core/meta/datastructures/v1" "github.com/spf13/cobra" - "golang.org/x/exp/slices" ) var ( diff --git a/cmd/scan/framework.go b/cmd/scan/framework.go index 85575aaf..7545ef64 100644 --- a/cmd/scan/framework.go +++ b/cmd/scan/framework.go @@ -6,6 +6,7 @@ import ( "fmt" "io" "os" + "slices" "strings" "github.com/kubescape/go-logger" @@ -18,7 +19,6 @@ import ( reporthandlingapis "github.com/kubescape/opa-utils/reporthandling/apis" "github.com/kubescape/opa-utils/reporthandling/results/v1/reportsummary" "github.com/spf13/cobra" - "golang.org/x/exp/slices" ) var ( diff --git a/core/cautils/fileutils.go b/core/cautils/fileutils.go index 0b675eca..94d05d2d 100644 --- a/core/cautils/fileutils.go +++ b/core/cautils/fileutils.go @@ -7,6 +7,7 @@ import ( "fmt" "os" "path/filepath" + "slices" "strings" "github.com/kubescape/go-logger" @@ -14,7 +15,6 @@ import ( "github.com/kubescape/k8s-interface/workloadinterface" "github.com/kubescape/opa-utils/objectsenvelopes" "github.com/kubescape/opa-utils/objectsenvelopes/localworkload" - "golang.org/x/exp/slices" "gopkg.in/yaml.v3" ) diff --git a/core/core/scan.go b/core/core/scan.go index 2a1dad72..248d32b6 100644 --- a/core/core/scan.go +++ b/core/core/scan.go @@ -3,6 +3,7 @@ package core import ( "context" "fmt" + "slices" "github.com/kubescape/backend/pkg/versioncheck" "github.com/kubescape/go-logger" @@ -23,7 +24,6 @@ import ( apisv1 "github.com/kubescape/opa-utils/httpserver/apis/v1" "github.com/kubescape/opa-utils/resources" "go.opentelemetry.io/otel" - "golang.org/x/exp/slices" "k8s.io/client-go/kubernetes" ) diff --git a/core/pkg/opaprocessor/processorhandler.go b/core/pkg/opaprocessor/processorhandler.go index 498708a8..624ba069 100644 --- a/core/pkg/opaprocessor/processorhandler.go +++ b/core/pkg/opaprocessor/processorhandler.go @@ -3,6 +3,7 @@ package opaprocessor import ( "context" "fmt" + "slices" "strings" "sync" @@ -23,7 +24,6 @@ import ( "github.com/open-policy-agent/opa/storage" opaprint "github.com/open-policy-agent/opa/topdown/print" "go.opentelemetry.io/otel" - "golang.org/x/exp/slices" ) const ScoreConfigPath = "/resources/config" diff --git a/core/pkg/opaprocessor/utils.go b/core/pkg/opaprocessor/utils.go index 6a0adf1a..2aa86157 100644 --- a/core/pkg/opaprocessor/utils.go +++ b/core/pkg/opaprocessor/utils.go @@ -2,6 +2,7 @@ package opaprocessor import ( "fmt" + "slices" "strings" "github.com/kubescape/go-logger" @@ -14,7 +15,6 @@ import ( "github.com/open-policy-agent/opa/rego" "github.com/open-policy-agent/opa/topdown/builtins" "github.com/open-policy-agent/opa/types" - "golang.org/x/exp/slices" ) // convertFrameworksToPolicies convert list of frameworks to list of policies diff --git a/go.mod b/go.mod index d9352da6..71223320 100644 --- a/go.mod +++ b/go.mod @@ -50,7 +50,6 @@ require ( github.com/stretchr/testify v1.10.0 go.opentelemetry.io/otel v1.30.0 go.opentelemetry.io/otel/metric v1.30.0 - golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 golang.org/x/mod v0.20.0 golang.org/x/term v0.27.0 gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 @@ -471,6 +470,7 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/crypto v0.31.0 // indirect + golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect golang.org/x/net v0.33.0 // indirect golang.org/x/oauth2 v0.23.0 // indirect golang.org/x/sync v0.10.0 // indirect