containerd
diff --git a/‎.github/workflows/ci.yml
Copy file name to clipboard
+10-15Lines changed: 10 additions & 15 deletions b/‎.github/workflows/ci.yml
Copy file name to clipboard
+10-15Lines changed: 10 additions & 15 deletions
diff --git a/‎Makefile
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎Makefile
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎commands/apply.go
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎commands/apply.go
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎commands/dump.go
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎commands/dump.go
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎commands/main.go
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions b/‎commands/main.go
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions
diff --git a/‎commands/mount.go
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions b/‎commands/mount.go
Copy file name to clipboard
+1-2Lines changed: 1 addition & 2 deletions
diff --git a/‎commands/verify.go
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎commands/verify.go
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎driver/utils.go
Copy file name to clipboard
+3-4Lines changed: 3 additions & 4 deletions b/‎driver/utils.go
Copy file name to clipboard
+3-4Lines changed: 3 additions & 4 deletions
diff --git a/‎fs/copy_linux_test.go
Copy file name to clipboard
+1-6Lines changed: 1 addition & 6 deletions b/‎fs/copy_linux_test.go
Copy file name to clipboard
+1-6Lines changed: 1 addition & 6 deletions
diff --git a/‎fs/copy_test.go
Copy file name to clipboard
+6-17Lines changed: 6 additions & 17 deletions b/‎fs/copy_test.go
Copy file name to clipboard
+6-17Lines changed: 6 additions & 17 deletions
@@ -22,6 +22,11 @@ jobs:
           path: src/github.com/containerd/continuity
           fetch-depth: 100
 
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: 1.17.x
+
       - uses: containerd/project-checks@v1
         with:
           working-directory: src/github.com/containerd/continuity
@@ -38,15 +43,9 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.17
-
-    - name: Setup Go binary path
-      shell: bash
-      run: |
-        echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV
-        echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
+        go-version: 1.17.x
 
     - name: Git line endings
       shell: bash
@@ -61,10 +60,7 @@ jobs:
         fetch-depth: 25
 
     - name: Dependencies
-      env:
-        GO111MODULE: on
-      shell: bash
-      run: go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.23.8
+      run: go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.45.2
 
     - name: Lint
       shell: bash
@@ -80,7 +76,7 @@ jobs:
       if: startsWith(matrix.os, 'ubuntu')
       run: |
         make test
-        sudo GOPATH=$GOPATH make root-test
+        make root-test
       working-directory: src/github.com/containerd/continuity
 
     - name: Non-Linux Tests
@@ -101,14 +97,13 @@ jobs:
 
     steps:
     - name: Set up Go
-      uses: actions/setup-go@v1
+      uses: actions/setup-go@v3
       with:
         go-version: 1.17
 
     - name: Setup Go binary path
       shell: bash
       run: |
-        echo "GOPATH=${{ github.workspace }}" >> $GITHUB_ENV
         echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
 
     - name: Check out code
 
@@ -66,7 +66,7 @@ test:
 
 root-test:
 	@echo "+ $@"
-	@go test ${TEST_REQUIRES_ROOT_PACKAGES} -test.root
+	@go test -exec sudo ${TEST_REQUIRES_ROOT_PACKAGES} -test.root
 
 test-compile:
 	@echo "+ $@"
 
@@ -17,8 +17,8 @@
 package commands
 
 import (
-	"io/ioutil"
 	"log"
+	"os"
 
 	"github.com/containerd/continuity"
 	"github.com/spf13/cobra"
@@ -30,7 +30,7 @@ var ApplyCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		root, path := args[0], args[1]
 
-		p, err := ioutil.ReadFile(path)
+		p, err := os.ReadFile(path)
 		if err != nil {
 			log.Fatalf("error reading manifest: %v", err)
 		}
 
@@ -17,7 +17,7 @@
 package commands
 
 import (
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 
@@ -34,12 +34,12 @@ var DumpCmd = &cobra.Command{
 		var err error
 
 		if len(args) < 1 {
-			p, err = ioutil.ReadAll(os.Stdin)
+			p, err = io.ReadAll(os.Stdin)
 			if err != nil {
 				log.Fatalf("error reading manifest: %v", err)
 			}
 		} else {
-			p, err = ioutil.ReadFile(args[0])
+			p, err = os.ReadFile(args[0])
 			if err != nil {
 				log.Fatalf("error reading manifest: %v", err)
 			}
 
@@ -18,7 +18,6 @@ package commands
 
 import (
 	"io"
-	"io/ioutil"
 	"os"
 	"text/tabwriter"
 
@@ -78,7 +77,7 @@ func init() {
 // readManifestFile reads the manifest from the given path. This should
 // probably be provided by the continuity library.
 func readManifestFile(path string) (*pb.Manifest, error) {
-	p, err := ioutil.ReadFile(path)
+	p, err := os.ReadFile(path)
 	if err != nil {
 		return nil, err
 	}
 
@@ -20,7 +20,6 @@
 package commands
 
 import (
-	"io/ioutil"
 	"log"
 	"os"
 	"os/signal"
@@ -50,7 +49,7 @@ var MountCmd = &cobra.Command{
 
 		manifestName := filepath.Base(manifest)
 
-		p, err := ioutil.ReadFile(manifest)
+		p, err := os.ReadFile(manifest)
 		if err != nil {
 			log.Fatalf("error reading manifest: %v", err)
 		}
 
@@ -17,8 +17,8 @@
 package commands
 
 import (
-	"io/ioutil"
 	"log"
+	"os"
 
 	"github.com/containerd/continuity"
 	"github.com/spf13/cobra"
@@ -34,7 +34,7 @@ var VerifyCmd = &cobra.Command{
 
 		root, path := args[0], args[1]
 
-		p, err := ioutil.ReadFile(path)
+		p, err := os.ReadFile(path)
 		if err != nil {
 			log.Fatalf("error reading manifest: %v", err)
 		}
 
@@ -18,28 +18,27 @@ package driver
 
 import (
 	"io"
-	"io/ioutil"
 	"os"
 	"sort"
 )
 
-// ReadFile works the same as ioutil.ReadFile with the Driver abstraction
+// ReadFile works the same as os.ReadFile with the Driver abstraction
 func ReadFile(r Driver, filename string) ([]byte, error) {
 	f, err := r.Open(filename)
 	if err != nil {
 		return nil, err
 	}
 	defer f.Close()
 
-	data, err := ioutil.ReadAll(f)
+	data, err := io.ReadAll(f)
 	if err != nil {
 		return nil, err
 	}
 
 	return data, nil
 }
 
-// WriteFile works the same as ioutil.WriteFile with the Driver abstraction
+// WriteFile works the same as os.WriteFile with the Driver abstraction
 func WriteFile(r Driver, filename string, data []byte, perm os.FileMode) error {
 	f, err := r.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, perm)
 	if err != nil {
 
@@ -21,7 +21,6 @@ package fs
 
 import (
 	"io"
-	"io/ioutil"
 	"math/rand"
 	"os"
 	"os/exec"
@@ -34,11 +33,7 @@ import (
 
 func TestCopyReflinkWithXFS(t *testing.T) {
 	testutil.RequiresRoot(t)
-	mnt, err := ioutil.TempDir("", "containerd-test-copy-reflink-with-xfs")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(mnt)
+	mnt := t.TempDir()
 
 	loop, err := loopback.New(1 << 30) // sparse file (max=1GB)
 	if err != nil {
 
@@ -19,8 +19,6 @@ package fs
 import (
 	_ "crypto/sha256"
 	"fmt"
-	"io/ioutil"
-	"os"
 	"testing"
 	"time"
 
@@ -43,7 +41,7 @@ func TestCopyDirectory(t *testing.T) {
 		fstest.CreateDir("/home", 0755),
 	)
 
-	if err := testCopy(apply); err != nil {
+	if err := testCopy(t, apply); err != nil {
 		t.Fatalf("Copy test failed: %+v", err)
 	}
 }
@@ -57,7 +55,7 @@ func TestCopyDirectoryWithLocalSymlink(t *testing.T) {
 		fstest.Symlink("nothing.txt", "link-no-nothing.txt"),
 	)
 
-	if err := testCopy(apply); err != nil {
+	if err := testCopy(t, apply); err != nil {
 		t.Fatalf("Copy test failed: %+v", err)
 	}
 }
@@ -72,23 +70,14 @@ func TestCopyWithLargeFile(t *testing.T) {
 		fstest.CreateRandomFile("/banana/split", time.Now().UnixNano(), 3*1024*1024*1024, 0644),
 	)
 
-	if err := testCopy(apply); err != nil {
+	if err := testCopy(t, apply); err != nil {
 		t.Fatal(err)
 	}
 }
 
-func testCopy(apply fstest.Applier) error {
-	t1, err := ioutil.TempDir("", "test-copy-src-")
-	if err != nil {
-		return fmt.Errorf("failed to create temporary directory: %w", err)
-	}
-	defer os.RemoveAll(t1)
-
-	t2, err := ioutil.TempDir("", "test-copy-dst-")
-	if err != nil {
-		return fmt.Errorf("failed to create temporary directory: %w", err)
-	}
-	defer os.RemoveAll(t2)
+func testCopy(t testing.TB, apply fstest.Applier) error {
+	t1 := t.TempDir()
+	t2 := t.TempDir()
 
 	if err := apply.Apply(t1); err != nil {
 		return fmt.Errorf("failed to apply changes: %w", err)
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,6 @@ package fs`
`19`	`19`	`import (`
`20`	`20`	`_ "crypto/sha256"`
`21`	`21`	`"fmt"`
`22`		`- "io/ioutil"`
`23`		`- "os"`
`24`	`22`	`"testing"`
`25`	`23`	`"time"`
`26`	`24`
`@@ -43,7 +41,7 @@ func TestCopyDirectory(t *testing.T) {`
`43`	`41`	`fstest.CreateDir("/home", 0755),`
`44`	`42`	`)`
`45`	`43`
`46`		`- if err := testCopy(apply); err != nil {`
	`44`	`+ if err := testCopy(t, apply); err != nil {`
`47`	`45`	`t.Fatalf("Copy test failed: %+v", err)`
`48`	`46`	`}`
`49`	`47`	`}`
`@@ -57,7 +55,7 @@ func TestCopyDirectoryWithLocalSymlink(t *testing.T) {`
`57`	`55`	`fstest.Symlink("nothing.txt", "link-no-nothing.txt"),`
`58`	`56`	`)`
`59`	`57`
`60`		`- if err := testCopy(apply); err != nil {`
	`58`	`+ if err := testCopy(t, apply); err != nil {`
`61`	`59`	`t.Fatalf("Copy test failed: %+v", err)`
`62`	`60`	`}`
`63`	`61`	`}`
`@@ -72,23 +70,14 @@ func TestCopyWithLargeFile(t *testing.T) {`
`72`	`70`	`fstest.CreateRandomFile("/banana/split", time.Now().UnixNano(), 310241024*1024, 0644),`
`73`	`71`	`)`
`74`	`72`
`75`		`- if err := testCopy(apply); err != nil {`
	`73`	`+ if err := testCopy(t, apply); err != nil {`
`76`	`74`	`t.Fatal(err)`
`77`	`75`	`}`
`78`	`76`	`}`
`79`	`77`
`80`		`-func testCopy(apply fstest.Applier) error {`
`81`		`- t1, err := ioutil.TempDir("", "test-copy-src-")`
`82`		`- if err != nil {`
`83`		`- return fmt.Errorf("failed to create temporary directory: %w", err)`
`84`		`- }`
`85`		`- defer os.RemoveAll(t1)`
`86`		`-`
`87`		`- t2, err := ioutil.TempDir("", "test-copy-dst-")`
`88`		`- if err != nil {`
`89`		`- return fmt.Errorf("failed to create temporary directory: %w", err)`
`90`		`- }`
`91`		`- defer os.RemoveAll(t2)`
	`78`	`+func testCopy(t testing.TB, apply fstest.Applier) error {`
	`79`	`+ t1 := t.TempDir()`
	`80`	`+ t2 := t.TempDir()`
`92`	`81`
`93`	`82`	`if err := apply.Apply(t1); err != nil {`
`94`	`83`	`return fmt.Errorf("failed to apply changes: %w", err)`