Merge pull request #7647 from thaJeztah/no_execabs

switch back from golang.org/x/sys/execabs to os/exec (go1.19)

archive/compression/compression.go

@@ -25,12 +25,12 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"os/exec"
 	"strconv"
 	"sync"
 
 	"github.com/containerd/log"
 	"github.com/klauspost/compress/zstd"
-	exec "golang.org/x/sys/execabs"
 )
 
 type (

archive/compression/compression_test.go

@@ -23,12 +23,11 @@ import (
 	"crypto/rand"
 	"io"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"runtime"
 	"strings"
 	"testing"
-
-	exec "golang.org/x/sys/execabs"
 )
 
 func TestMain(m *testing.M) {

archive/tar_test.go

@@ -27,6 +27,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"runtime"
 	"testing"
@@ -38,7 +39,6 @@ import (
 	"github.com/containerd/continuity/fs/fstest"
 	"github.com/opencontainers/go-digest"
 	"github.com/stretchr/testify/require"
-	exec "golang.org/x/sys/execabs"
 )
 
 const tarCmd = "tar"

cmd/containerd/command/service_windows.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"time"
 
@@ -27,7 +28,6 @@ import (
 	"github.com/containerd/containerd/v2/services/server"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
-	exec "golang.org/x/sys/execabs"
 	"golang.org/x/sys/windows"
 	"golang.org/x/sys/windows/svc"
 	"golang.org/x/sys/windows/svc/debug"

cmd/ctr/commands/content/content.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"os/exec"
 	"sort"
 	"strings"
 	"text/tabwriter"
@@ -35,7 +36,6 @@ import (
 	digest "github.com/opencontainers/go-digest"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/urfave/cli"
-	exec "golang.org/x/sys/execabs"
 )
 
 var (

contrib/apparmor/template.go

@@ -25,11 +25,10 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"os/exec"
 	"path"
 	"strings"
 	"text/template"
-
-	exec "golang.org/x/sys/execabs"
 )
 
 // NOTE: This code is copied from <github.com/docker/docker/profiles/apparmor>.

contrib/nvidia/nvidia.go

@@ -20,13 +20,13 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"os/exec"
 	"strconv"
 	"strings"
 
 	"github.com/containerd/containerd/v2/containers"
 	"github.com/containerd/containerd/v2/oci"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
-	exec "golang.org/x/sys/execabs"
 )
 
 // NvidiaCLI is the path to the Nvidia helper binary

diff/stream_unix.go

@@ -25,12 +25,12 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"os/exec"
 	"sync"
 
 	"github.com/containerd/containerd/v2/protobuf"
 	"github.com/containerd/containerd/v2/protobuf/proto"
 	"github.com/containerd/typeurl/v2"
-	exec "golang.org/x/sys/execabs"
 )
 
 // NewBinaryProcessor returns a binary processor for use with processing content streams

diff/stream_windows.go

@@ -23,11 +23,11 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"sync"
 
 	"github.com/Microsoft/go-winio"
-	exec "golang.org/x/sys/execabs"
 
 	"github.com/containerd/containerd/v2/protobuf"
 	"github.com/containerd/containerd/v2/protobuf/proto"

integration/client/client_test.go

@@ -23,6 +23,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"os/exec"
 	"testing"
 	"time"
 
@@ -30,7 +31,6 @@ import (
 	"github.com/opencontainers/image-spec/identity"
 	"github.com/stretchr/testify/require"
 	"go.opentelemetry.io/otel"
-	exec "golang.org/x/sys/execabs"
 
 	. "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/defaults"

integration/client/container_fuzzer.go

@@ -26,13 +26,13 @@ import (
 	"io"
 	"net/http"
 	"os"
+	"os/exec"
 	"strings"
 	"time"
 
 	fuzz "github.com/AdaLogics/go-fuzz-headers"
 	containerd "github.com/containerd/containerd/v2/client"
 	"github.com/containerd/containerd/v2/oci"
-	exec "golang.org/x/sys/execabs"
 )
 
 var (

integration/client/container_linux_test.go

@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"runtime"
 	"strings"
@@ -44,7 +45,6 @@ import (
 
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/stretchr/testify/require"
-	exec "golang.org/x/sys/execabs"
 	"golang.org/x/sys/unix"
 )
 

integration/client/container_test.go

@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"os/exec"
 	"path"
 	"path/filepath"
 	"runtime"
@@ -49,7 +50,6 @@ import (
 	"github.com/containerd/typeurl/v2"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/stretchr/testify/require"
-	exec "golang.org/x/sys/execabs"
 )
 
 func empty() cio.Creator {

integration/client/daemon.go

@@ -21,13 +21,13 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"os/exec"
 	"runtime"
 	"sync"
 	"syscall"
 	"time"
 
 	. "github.com/containerd/containerd/v2/client"
-	exec "golang.org/x/sys/execabs"
 )
 
 type daemon struct {

integration/client/restart_monitor_test.go

@@ -22,6 +22,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"runtime"
 	"strconv"
@@ -38,7 +39,6 @@ import (
 	srvconfig "github.com/containerd/containerd/v2/services/server/config"
 	"github.com/containerd/typeurl/v2"
 	"github.com/stretchr/testify/require"
-	exec "golang.org/x/sys/execabs"
 )
 
 func newDaemonWithConfig(t *testing.T, configTOML string) (*Client, *daemon, func()) {

integration/image_load_test.go

@@ -17,13 +17,13 @@
 package integration
 
 import (
+	"os/exec"
 	"path/filepath"
 	"testing"
 	"time"
 
 	"github.com/containerd/containerd/v2/integration/images"
 	"github.com/stretchr/testify/require"
-	exec "golang.org/x/sys/execabs"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 

integration/issue7496_linux_test.go

@@ -22,6 +22,7 @@ import (
 	"io"
 	"net"
 	"os"
+	"os/exec"
 	"strconv"
 	"strings"
 	"syscall"
@@ -35,7 +36,6 @@ import (
 	"github.com/containerd/ttrpc"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	exec "golang.org/x/sys/execabs"
 )
 
 // TestIssue7496 is used to reproduce https://github.com/containerd/containerd/issues/7496

integration/main_test.go

@@ -25,6 +25,7 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"os/exec"
 	"path/filepath"
 	goruntime "runtime"
 	"strconv"
@@ -47,7 +48,6 @@ import (
 	"github.com/opencontainers/selinux/go-selinux"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	exec "golang.org/x/sys/execabs"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"

integration/pod_userns_linux_test.go

@@ -21,6 +21,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"os/exec"
 	"os/user"
 	"path/filepath"
 	"strings"
@@ -32,7 +33,6 @@ import (
 	runc "github.com/containerd/go-runc"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	exec "golang.org/x/sys/execabs"
 	"golang.org/x/sys/unix"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
 )

integration/volume_copy_up_unix_test.go

@@ -20,8 +20,7 @@ package integration
 
 import (
 	"fmt"
-
+	"os/exec"
-	exec "golang.org/x/sys/execabs"
 )
 
 func getOwnership(path string) (string, error) {

mount/lookup_linux_test.go

@@ -19,6 +19,7 @@ package mount
 import (
 	"fmt"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strings"
 	"testing"
@@ -28,7 +29,6 @@ import (
 	"github.com/containerd/continuity/testutil"
 	"github.com/containerd/continuity/testutil/loopback"
 	"github.com/stretchr/testify/assert"
-	exec "golang.org/x/sys/execabs"
 )
 
 func checkLookup(t *testing.T, fsType, mntPoint, dir string) {

mount/mount_freebsd.go

@@ -20,9 +20,9 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"os/exec"
 	"time"
 
-	exec "golang.org/x/sys/execabs"
 	"golang.org/x/sys/unix"
 )
 

mount/mount_linux.go

@@ -20,6 +20,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"os/exec"
 	"path"
 	"path/filepath"
 	"runtime"
@@ -28,8 +29,6 @@ import (
 	"time"
 
 	"github.com/sirupsen/logrus"
-
-	exec "golang.org/x/sys/execabs"
 	"golang.org/x/sys/unix"
 )
 

mount/mount_linux_test.go

@@ -19,12 +19,12 @@ package mount
 import (
 	"fmt"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"reflect"
 	"testing"
 
 	"github.com/containerd/continuity/testutil"
-	exec "golang.org/x/sys/execabs"
 	"golang.org/x/sys/unix"
 )
 

pkg/process/io.go

@@ -25,6 +25,7 @@ import (
 	"io"
 	"net/url"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"sync"
 	"sync/atomic"
@@ -36,7 +37,6 @@ import (
 	"github.com/containerd/fifo"
 	runc "github.com/containerd/go-runc"
 	"github.com/containerd/log"
-	exec "golang.org/x/sys/execabs"
 )
 
 const binaryIOProcTermTimeout = 12 * time.Second // Give logger process solid 10 seconds for cleanup

pkg/process/io_util.go

@@ -19,8 +19,7 @@ package process
 import (
 	"net/url"
 	"os"
-
+	"os/exec"
-	exec "golang.org/x/sys/execabs"
 )
 
 // NewBinaryCmd returns a Cmd to be used to start a logging binary.

runtime/v2/runc/manager/manager_linux.go

@@ -21,6 +21,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"os/exec"
 	"path/filepath"
 	goruntime "runtime"
 	"syscall"
@@ -39,7 +40,6 @@ import (
 	"github.com/containerd/containerd/v2/runtime/v2/shim"
 	runcC "github.com/containerd/go-runc"
 	"github.com/containerd/log"
-	exec "golang.org/x/sys/execabs"
 	"golang.org/x/sys/unix"
 )
 

runtime/v2/shim/util.go

@@ -24,13 +24,13 @@ import (
 	"io"
 	"net"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strings"
 	"time"
 
 	"github.com/containerd/ttrpc"
 	"github.com/containerd/typeurl/v2"
-	exec "golang.org/x/sys/execabs"
 
 	"github.com/containerd/containerd/v2/errdefs"
 	"github.com/containerd/containerd/v2/namespaces"

snapshots/btrfs/btrfs_test.go

@@ -24,6 +24,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strings"
 	"testing"
@@ -35,7 +36,6 @@ import (
 	"github.com/containerd/containerd/v2/snapshots/testsuite"
 	"github.com/containerd/continuity/testutil/loopback"
 	"github.com/containerd/plugin"
-	exec "golang.org/x/sys/execabs"
 	"golang.org/x/sys/unix"
 )
 
@@ -51,7 +51,6 @@ func boltSnapshotter(t *testing.T) func(context.Context, string) (snapshots.Snap
 	}
 
 	return func(ctx context.Context, root string) (snapshots.Snapshotter, func() error, error) {
-
 		loopbackSize := int64(128 << 20) // 128 MB
 		// mkfs.btrfs creates a fs which has a blocksize equal to the system default pagesize. If that pagesize
 		// is > 4KB, mounting the fs will fail unless we increase the size of the file used by mkfs.btrfs
@@ -59,7 +58,6 @@ func boltSnapshotter(t *testing.T) func(context.Context, string) (snapshots.Snap
 			loopbackSize = int64(650 << 20) // 650 MB
 		}
 		loop, err := loopback.New(loopbackSize)
-
 		if err != nil {
 			return nil, nil, err
 		}
@@ -146,7 +144,7 @@ func TestBtrfsMounts(t *testing.T) {
 		}
 	}
 
-	if err := os.MkdirAll(target, 0755); err != nil {
+	if err := os.MkdirAll(target, 0o755); err != nil {
 		t.Fatal(err)
 	}
 	if err := mount.All(mounts, target); err != nil {
@@ -155,13 +153,13 @@ func TestBtrfsMounts(t *testing.T) {
 	defer testutil.Unmount(t, target)
 
 	// write in some data
-	if err := os.WriteFile(filepath.Join(target, "foo"), []byte("content"), 0777); err != nil {
+	if err := os.WriteFile(filepath.Join(target, "foo"), []byte("content"), 0o777); err != nil {
 		t.Fatal(err)
 	}
 
 	// TODO(stevvooe): We don't really make this with the driver, but that
 	// might prove annoying in practice.
-	if err := os.MkdirAll(filepath.Join(root, "snapshots"), 0755); err != nil {
+	if err := os.MkdirAll(filepath.Join(root, "snapshots"), 0o755); err != nil {
 		t.Fatal(err)
 	}
 
@@ -175,7 +173,7 @@ func TestBtrfsMounts(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if err := os.MkdirAll(target, 0755); err != nil {
+	if err := os.MkdirAll(target, 0o755); err != nil {
 		t.Fatal(err)
 	}
 
@@ -192,7 +190,7 @@ func TestBtrfsMounts(t *testing.T) {
 		t.Fatalf("wrong content in foo want: content, got: %s", bs)
 	}
 
-	if err := os.WriteFile(filepath.Join(target, "bar"), []byte("content"), 0777); err != nil {
+	if err := os.WriteFile(filepath.Join(target, "bar"), []byte("content"), 0o777); err != nil {
 		t.Fatal(err)
 	}
 

snapshots/devmapper/blkdiscard/blkdiscard.go

@@ -18,7 +18,7 @@
 
 package blkdiscard
 
-import exec "golang.org/x/sys/execabs"
+import "os/exec"
 
 // Version returns the output of "blkdiscard --version"
 func Version() (string, error) {

snapshots/devmapper/dmsetup/dmsetup.go

@@ -25,11 +25,11 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"os/exec"
 	"strconv"
 	"strings"
 
 	blkdiscard "github.com/containerd/containerd/v2/snapshots/devmapper/blkdiscard"
-	exec "golang.org/x/sys/execabs"
 	"golang.org/x/sys/unix"
 )
 

snapshots/devmapper/pool_device_test.go

@@ -22,6 +22,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"testing"
 	"time"
@@ -32,7 +33,6 @@ import (
 	"github.com/containerd/log"
 	"github.com/docker/go-units"
 	"github.com/stretchr/testify/assert"
-	exec "golang.org/x/sys/execabs"
 )
 
 const (

snapshots/devmapper/snapshotter.go

@@ -23,6 +23,7 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strings"
 	"sync"
@@ -33,7 +34,6 @@ import (
 	"github.com/containerd/containerd/v2/snapshots/devmapper/dmsetup"
 	"github.com/containerd/containerd/v2/snapshots/storage"
 	"github.com/containerd/log"
-	exec "golang.org/x/sys/execabs"
 )
 
 type fsType string

snapshots/overlay/overlayutils/check_test.go

@@ -19,11 +19,11 @@
 package overlayutils
 
 import (
+	"os/exec"
 	"testing"
 
 	"github.com/containerd/containerd/v2/pkg/testutil"
 	"github.com/containerd/continuity/testutil/loopback"
-	exec "golang.org/x/sys/execabs"
 )
 
 func testOverlaySupported(t testing.TB, expected bool, mkfs ...string) {

sys/oom_linux_test.go

@@ -20,13 +20,13 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"os/exec"
 	"testing"
 	"time"
 
 	"github.com/containerd/containerd/v2/pkg/userns"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	exec "golang.org/x/sys/execabs"
 )
 
 func TestSetPositiveOomScoreAdjustment(t *testing.T) {

sys/reaper/reaper_unix.go

@@ -21,13 +21,13 @@ package reaper
 import (
 	"errors"
 	"fmt"
+	"os/exec"
 	"runtime"
 	"sync"
 	"syscall"
 	"time"
 
 	runc "github.com/containerd/go-runc"
-	exec "golang.org/x/sys/execabs"
 	"golang.org/x/sys/unix"
 )