Use pkg slices from the standard library (#35905)

Prefer the stdlib version of the experimental package. Includes a depguard update to prevent future regressions, as well as an e-ref update to appease depguard. Generated with: $ gofmt -w -r '"golang.org/x/exp/slices" -> "slices"' . && \ make fix-imports
gravitational · Dec 19, 2023 · 44a6bb1 · 44a6bb1
1 parent b2fae64
commit 44a6bb1
Show file tree

Hide file tree

Showing 155 changed files with 162 additions and 156 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -56,6 +56,8 @@ linters-settings:
             desc: 'use "sync/atomic" instead'
           - pkg: golang.design
             desc: 'experimental project, not to be confused with official Go packages'
+          - pkg: golang.org/x/exp/slices
+            desc: 'use "slices" instead'
   gci:
     sections:
       - standard # Standard section: captures all standard packages.

diff --git a/api/client/proxy/client.go b/api/client/proxy/client.go
@@ -19,14 +19,14 @@ import (
 	"crypto/tls"
 	"encoding/asn1"
 	"net"
+	"slices"
 	"sync/atomic"
 	"time"
 
 	"github.com/gravitational/trace"
 	"go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/agent"
-	"golang.org/x/exp/slices"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/credentials/insecure"

diff --git a/api/client/proxy/client_test.go b/api/client/proxy/client_test.go
@@ -23,6 +23,7 @@ import (
 	"errors"
 	"fmt"
 	"net"
+	"slices"
 	"testing"
 	"time"
 
@@ -34,7 +35,6 @@ import (
 	"github.com/stretchr/testify/require"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/agent"
-	"golang.org/x/exp/slices"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/credentials/insecure"

diff --git a/api/client/webclient/webclient_test.go b/api/client/webclient/webclient_test.go
@@ -22,13 +22,13 @@ import (
 	"net"
 	"net/http"
 	"net/http/httptest"
+	"slices"
 	"strings"
 	"testing"
 	"time"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/slices"
 
 	"github.com/gravitational/teleport/api/defaults"
 	apihelpers "github.com/gravitational/teleport/api/testhelpers"

diff --git a/api/types/authority.go b/api/types/authority.go
@@ -18,10 +18,10 @@ package types
 
 import (
 	"fmt"
+	"slices"
 	"time"
 
 	"github.com/gravitational/trace"
-	"golang.org/x/exp/slices"
 
 	"github.com/gravitational/teleport/api/constants"
 	"github.com/gravitational/teleport/api/utils"

diff --git a/api/types/header/header.go b/api/types/header/header.go
@@ -17,10 +17,10 @@ limitations under the License.
 package header
 
 import (
+	"slices"
 	"time"
 
 	"github.com/gravitational/trace"
-	"golang.org/x/exp/slices"
 
 	"github.com/gravitational/teleport/api/types/common"
 	"github.com/gravitational/teleport/api/utils"

diff --git a/api/types/instance.go b/api/types/instance.go
@@ -17,12 +17,12 @@ limitations under the License.
 package types
 
 import (
+	"slices"
 	"strings"
 	"time"
 
 	"github.com/coreos/go-semver/semver"
 	"github.com/gravitational/trace"
-	"golang.org/x/exp/slices"
 
 	"github.com/gravitational/teleport/api/defaults"
 	"github.com/gravitational/teleport/api/utils"

diff --git a/api/types/jamf.go b/api/types/jamf.go
@@ -16,10 +16,10 @@ package types
 
 import (
 	"net/url"
+	"slices"
 	"strings"
 
 	"github.com/gravitational/trace"
-	"golang.org/x/exp/slices"
 )
 
 const (

diff --git a/api/types/kubernetes.go b/api/types/kubernetes.go
@@ -19,11 +19,11 @@ package types
 import (
 	"fmt"
 	"regexp"
+	"slices"
 	"sort"
 	"time"
 
 	"github.com/gravitational/trace"
-	"golang.org/x/exp/slices"
 
 	"github.com/gravitational/teleport/api/utils"
 )

diff --git a/api/types/matchers_aws.go b/api/types/matchers_aws.go
@@ -17,8 +17,9 @@ limitations under the License.
 package types
 
 import (
+	"slices"
+
 	"github.com/gravitational/trace"
-	"golang.org/x/exp/slices"
 
 	apiutils "github.com/gravitational/teleport/api/utils"
 	awsapiutils "github.com/gravitational/teleport/api/utils/aws"

diff --git a/api/types/matchers_azure.go b/api/types/matchers_azure.go
@@ -17,8 +17,9 @@ limitations under the License.
 package types
 
 import (
+	"slices"
+
 	"github.com/gravitational/trace"
-	"golang.org/x/exp/slices"
 
 	apiutils "github.com/gravitational/teleport/api/utils"
 )

diff --git a/api/types/matchers_gcp.go b/api/types/matchers_gcp.go
@@ -17,8 +17,9 @@ limitations under the License.
 package types
 
 import (
+	"slices"
+
 	"github.com/gravitational/trace"
-	"golang.org/x/exp/slices"
 
 	apiutils "github.com/gravitational/teleport/api/utils"
 )

diff --git a/api/types/matchers_kube.go b/api/types/matchers_kube.go
@@ -17,8 +17,9 @@ limitations under the License.
 package types
 
 import (
+	"slices"
+
 	"github.com/gravitational/trace"
-	"golang.org/x/exp/slices"
 
 	apiutils "github.com/gravitational/teleport/api/utils"
 )

diff --git a/api/types/oidc.go b/api/types/oidc.go
@@ -18,11 +18,11 @@ package types
 
 import (
 	"net/url"
+	"slices"
 	"time"
 
 	"github.com/gravitational/trace"
 	"golang.org/x/crypto/ssh"
-	"golang.org/x/exp/slices"
 
 	"github.com/gravitational/teleport/api/constants"
 	"github.com/gravitational/teleport/api/defaults"

diff --git a/api/types/provisioning.go b/api/types/provisioning.go
@@ -18,11 +18,11 @@ package types
 
 import (
 	"fmt"
+	"slices"
 	"strings"
 	"time"
 
 	"github.com/gravitational/trace"
-	"golang.org/x/exp/slices"
 
 	"github.com/gravitational/teleport/api/defaults"
 	apiutils "github.com/gravitational/teleport/api/utils"

diff --git a/api/types/resource.go b/api/types/resource.go
@@ -18,12 +18,12 @@ package types
 
 import (
 	"regexp"
+	"slices"
 	"sort"
 	"strings"
 	"time"
 
 	"github.com/gravitational/trace"
-	"golang.org/x/exp/slices"
 
 	"github.com/gravitational/teleport/api/defaults"
 	"github.com/gravitational/teleport/api/types/common"

diff --git a/api/types/resource_ids.go b/api/types/resource_ids.go
@@ -19,10 +19,10 @@ package types
 import (
 	"encoding/json"
 	"fmt"
+	"slices"
 	"strings"
 
 	"github.com/gravitational/trace"
-	"golang.org/x/exp/slices"
 )
 
 func (id *ResourceID) CheckAndSetDefaults() error {

diff --git a/api/types/role.go b/api/types/role.go
@@ -20,11 +20,11 @@ import (
 	"encoding/json"
 	"fmt"
 	"path"
+	"slices"
 	"time"
 
 	"github.com/gogo/protobuf/proto"
 	"github.com/gravitational/trace"
-	"golang.org/x/exp/slices"
 
 	"github.com/gravitational/teleport/api/constants"
 	"github.com/gravitational/teleport/api/defaults"

diff --git a/api/types/saml.go b/api/types/saml.go
@@ -17,12 +17,12 @@ limitations under the License.
 package types
 
 import (
+	"slices"
 	"strings"
 	"time"
 
 	"github.com/gravitational/trace"
 	"golang.org/x/crypto/ssh"
-	"golang.org/x/exp/slices"
 
 	"github.com/gravitational/teleport/api/constants"
 	"github.com/gravitational/teleport/api/defaults"

diff --git a/api/types/session_tracker.go b/api/types/session_tracker.go
@@ -17,10 +17,10 @@ limitations under the License.
 package types
 
 import (
+	"slices"
 	"time"
 
 	"github.com/gravitational/trace"
-	"golang.org/x/exp/slices"
 
 	"github.com/gravitational/teleport/api/defaults"
 )

diff --git a/api/types/sessionrecording.go b/api/types/sessionrecording.go
@@ -17,11 +17,11 @@ limitations under the License.
 package types
 
 import (
+	"slices"
 	"strings"
 	"time"
 
 	"github.com/gravitational/trace"
-	"golang.org/x/exp/slices"
 )
 
 // SessionRecordingConfig defines session recording configuration. This is

diff --git a/api/types/trustedcluster.go b/api/types/trustedcluster.go
@@ -18,11 +18,11 @@ package types
 
 import (
 	"fmt"
+	"slices"
 	"time"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/gravitational/trace"
-	"golang.org/x/exp/slices"
 )
 
 // TrustedCluster holds information needed for a cluster that can not be directly

diff --git a/api/utils/aws/identifiers.go b/api/utils/aws/identifiers.go
@@ -18,10 +18,10 @@ package aws
 
 import (
 	"regexp"
+	"slices"
 	"strings"
 
 	"github.com/gravitational/trace"
-	"golang.org/x/exp/slices"
 )
 
 // IsValidAccountID checks whether the accountID is a valid AWS Account ID

diff --git a/api/utils/route.go b/api/utils/route.go
@@ -16,10 +16,10 @@ package utils
 
 import (
 	"net"
+	"slices"
 	"unicode/utf8"
 
 	"github.com/google/uuid"
-	"golang.org/x/exp/slices"
 
 	"github.com/gravitational/teleport/api/utils/aws"
 )

diff --git a/build.assets/tooling/cmd/difftest/main.go b/build.assets/tooling/cmd/difftest/main.go
@@ -24,12 +24,12 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"slices"
 	"strings"
 	"time"
 
 	"github.com/alecthomas/kingpin/v2"
 	"github.com/gravitational/trace"
-	"golang.org/x/exp/slices"
 )
 
 var (

diff --git a/e b/e
diff --git a/e_imports.go b/e_imports.go
@@ -84,7 +84,6 @@ import (
 	_ "github.com/vulcand/predicate"
 	_ "golang.org/x/crypto/bcrypt"
 	_ "golang.org/x/exp/maps"
-	_ "golang.org/x/exp/slices"
 	_ "golang.org/x/mod/semver"
 	_ "golang.org/x/net/html"
 	_ "golang.org/x/oauth2"

diff --git a/examples/dynamoathenamigration/migration.go b/examples/dynamoathenamigration/migration.go
@@ -26,6 +26,7 @@ import (
 	"io"
 	"os"
 	"path"
+	"slices"
 	"sort"
 	"sync"
 	"time"
@@ -44,7 +45,6 @@ import (
 	"github.com/gravitational/trace"
 	log "github.com/sirupsen/logrus"
 	"golang.org/x/exp/maps"
-	"golang.org/x/exp/slices"
 	"golang.org/x/sync/errgroup"
 
 	apievents "github.com/gravitational/teleport/api/types/events"

diff --git a/integration/integration_test.go b/integration/integration_test.go
@@ -39,6 +39,7 @@ import (
 	"reflect"
 	"regexp"
 	"runtime/pprof"
+	"slices"
 	"strconv"
 	"strings"
 	"sync"
@@ -55,7 +56,6 @@ import (
 	"github.com/stretchr/testify/require"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/agent"
-	"golang.org/x/exp/slices"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/connectivity"
 	"google.golang.org/grpc/credentials"

diff --git a/integrations/access/servicenow/app.go b/integrations/access/servicenow/app.go
@@ -22,12 +22,12 @@ import (
 	"context"
 	"fmt"
 	"net/url"
+	"slices"
 	"strings"
 	"time"
 
 	"github.com/gravitational/trace"
 	"github.com/jonboulle/clockwork"
-	"golang.org/x/exp/slices"
 
 	tp "github.com/gravitational/teleport"
 	"github.com/gravitational/teleport/api/accessrequest"

diff --git a/integrations/kube-agent-updater/pkg/controller/statefulset_test.go b/integrations/kube-agent-updater/pkg/controller/statefulset_test.go
@@ -20,11 +20,11 @@ package controller
 
 import (
 	"context"
+	"slices"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/slices"
 	appsv1 "k8s.io/api/apps/v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"