chore: remove golang.org/x/slices

DataDog · Dec 23, 2024 · 7cf596d · 7cf596d
1 parent e6c945e
commit 7cf596d
Show file tree

Hide file tree

Showing 18 changed files with 17 additions and 25 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -605,6 +605,8 @@ linters-settings:
             desc: "Not really forbidden to use, but it is usually imported by mistake instead of github.com/stretchr/testify/assert, and confusing since it actually has the behavior of github.com/stretchr/testify/require"
           - pkg: "debug/elf"
             desc: "prefer pkg/util/safeelf to prevent panics during parsing"
+          - pkg: "golang.org/x/exp/slices"
+            desc: "use the std slices package instead"
       logger:
         files:
           - "!**/pkg/util/log/**"

diff --git a/comp/core/log/mock/go.mod b/comp/core/log/mock/go.mod
@@ -54,7 +54,6 @@ require (
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
-	golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect

diff --git a/pkg/config/env/go.mod b/pkg/config/env/go.mod
@@ -45,7 +45,6 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
-	golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect

diff --git a/pkg/config/env/go.sum b/pkg/config/env/go.sum
diff --git a/pkg/config/model/go.mod b/pkg/config/model/go.mod
@@ -14,7 +14,6 @@ require (
 	github.com/DataDog/viper v1.14.0
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
 	github.com/stretchr/testify v1.10.0
-	golang.org/x/exp v0.0.0-20241210194714-1829a127f884
 )
 
 require (
@@ -23,6 +22,7 @@ require (
 	github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/fsnotify/fsnotify v1.8.0 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c // indirect

diff --git a/pkg/config/model/go.sum b/pkg/config/model/go.sum
diff --git a/pkg/config/model/viper.go b/pkg/config/model/viper.go
@@ -12,17 +12,16 @@ import (
 	"io"
 	"os"
 	"path"
+	"path/filepath"
 	"reflect"
+	"slices"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
 
-	"path/filepath"
-
 	"github.com/DataDog/viper"
 	"github.com/mohae/deepcopy"
-	"golang.org/x/exp/slices"
 
 	"github.com/DataDog/datadog-agent/pkg/util/log"
 )

diff --git a/pkg/config/nodetreemodel/config.go b/pkg/config/nodetreemodel/config.go
@@ -11,15 +11,14 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"path/filepath"
 	"reflect"
+	"slices"
 	"strings"
 	"sync"
 
-	"path/filepath"
-
 	"github.com/DataDog/viper"
 	"go.uber.org/atomic"
-	"golang.org/x/exp/slices"
 
 	"github.com/DataDog/datadog-agent/pkg/config/model"
 	"github.com/DataDog/datadog-agent/pkg/util/log"

diff --git a/pkg/config/nodetreemodel/getter.go b/pkg/config/nodetreemodel/getter.go
@@ -7,13 +7,13 @@ package nodetreemodel
 
 import (
 	"maps"
+	"slices"
 	"time"
 
 	"github.com/DataDog/datadog-agent/pkg/config/model"
 	"github.com/DataDog/datadog-agent/pkg/util/log"
 	"github.com/mohae/deepcopy"
 	"github.com/spf13/cast"
-	"golang.org/x/exp/slices"
 )
 
 func (c *ntmConfig) leafAtPath(key string) LeafNode {

diff --git a/pkg/config/teeconfig/go.mod b/pkg/config/teeconfig/go.mod
@@ -29,7 +29,6 @@ require (
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
-	golang.org/x/exp v0.0.0-20241210194714-1829a127f884 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect

diff --git a/pkg/config/teeconfig/go.sum b/pkg/config/teeconfig/go.sum
diff --git a/pkg/security/process_list/activity_tree/activity_tree.go b/pkg/security/process_list/activity_tree/activity_tree.go
@@ -9,8 +9,9 @@
 package activitytree
 
 import (
+	"slices"
+
 	"github.com/DataDog/datadog-go/v5/statsd"
-	"golang.org/x/exp/slices"
 
 	processlist "github.com/DataDog/datadog-agent/pkg/security/process_list"
 	processresolver "github.com/DataDog/datadog-agent/pkg/security/process_list/process_resolver"

diff --git a/pkg/security/process_list/process_list.go b/pkg/security/process_list/process_list.go
@@ -12,13 +12,13 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"slices"
 	"sync"
 
 	"github.com/DataDog/datadog-agent/pkg/process/procutil"
 	cgroupModel "github.com/DataDog/datadog-agent/pkg/security/resolvers/cgroup/model"
 	"github.com/DataDog/datadog-agent/pkg/security/secl/model"
 	"github.com/DataDog/datadog-go/v5/statsd"
-	"golang.org/x/exp/slices"
 	"golang.org/x/sys/unix"
 )
 

diff --git a/pkg/security/process_list/process_node.go b/pkg/security/process_list/process_node.go
@@ -12,10 +12,10 @@ import (
 	"fmt"
 	"io"
 	"math/rand"
+	"slices"
 	"sync"
 
 	"github.com/DataDog/datadog-agent/pkg/security/secl/model"
-	"golang.org/x/exp/slices"
 )
 
 // ProcessNode holds the activity of a process

diff --git a/pkg/security/process_list/process_resolver/process_resolver_test.go b/pkg/security/process_list/process_resolver/process_resolver_test.go
@@ -9,14 +9,14 @@
 package processresolver
 
 import (
+	"slices"
 	"testing"
 	"time"
 
 	processlist "github.com/DataDog/datadog-agent/pkg/security/process_list"
 	cgroupModel "github.com/DataDog/datadog-agent/pkg/security/resolvers/cgroup/model"
 	"github.com/DataDog/datadog-agent/pkg/security/secl/model"
 	"github.com/stretchr/testify/assert"
-	"golang.org/x/exp/slices"
 )
 
 func newFakeExecEvent(ppid, pid int, pathname string) *model.Event {

diff --git a/pkg/security/security_profile/activity_tree/process_node.go b/pkg/security/security_profile/activity_tree/process_node.go
@@ -11,14 +11,14 @@ package activitytree
 import (
 	"fmt"
 	"io"
+	"slices"
 	"sort"
 	"strings"
 
 	"github.com/DataDog/datadog-agent/pkg/security/resolvers"
 	sprocess "github.com/DataDog/datadog-agent/pkg/security/resolvers/process"
 	"github.com/DataDog/datadog-agent/pkg/security/secl/model"
 	"github.com/DataDog/datadog-agent/pkg/security/utils"
-	"golang.org/x/exp/slices"
 )
 
 // ProcessNodeParent is an interface used to identify the parent of a process node

diff --git a/pkg/security/security_profile/activity_tree/socket_node.go b/pkg/security/security_profile/activity_tree/socket_node.go
@@ -9,8 +9,9 @@
 package activitytree
 
 import (
+	"slices"
+
 	"github.com/DataDog/datadog-agent/pkg/security/secl/model"
-	"golang.org/x/exp/slices"
 )
 
 // BindNode is used to store a bind node

diff --git a/pkg/util/port/portlist/poller.go b/pkg/util/port/portlist/poller.go
@@ -10,10 +10,9 @@ package portlist
 
 import (
 	"fmt"
+	"slices"
 	"sort"
 	"sync"
-
-	"golang.org/x/exp/slices"
 )
 
 // Poller scans the systems for listening ports periodically and sends