Merge branch 'reprovide-sweep' into reprovide-sweep-enabled

guillaumemichel · web-flow · commit 1719d7758f07 · 2025-09-08T13:58:40.000+02:00
diff --git a/.github/workflows/gotest.yml b/.github/workflows/gotest.yml
@@ -45,7 +45,7 @@ jobs:
           make -j "$PARALLEL" test/unit/gotest.junit.xml &&
             [[ ! $(jq -s -c 'map(select(.Action == "fail")) | .[]' test/unit/gotest.json) ]]
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
+        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
         if: failure() || success()
         with:
           name: unittests
diff --git a/.github/workflows/sharness.yml b/.github/workflows/sharness.yml
@@ -55,7 +55,7 @@ jobs:
           # increasing parallelism beyond 10 doesn't speed up the tests much
           PARALLEL: ${{ github.repository == 'ipfs/kubo' && 10 || 3 }}
       - name: Upload coverage report
-        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5.4.3
+        uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
         if: failure() || success()
         with:
           name: sharness
diff --git a/cmd/ipfs/kubo/daemon.go b/cmd/ipfs/kubo/daemon.go
@@ -284,6 +284,15 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment
 	default:
 		return err
 	case fsrepo.ErrNeedMigration:
+		migrationDone := make(chan struct{})
+		go func() {
+			select {
+			case <-req.Context.Done():
+				os.Exit(1)
+			case <-migrationDone:
+			}
+		}()
+
 		domigrate, found := req.Options[migrateKwd].(bool)
 
 		// Get current repo version for more informative message
@@ -299,6 +308,7 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment
 		if !found {
 			domigrate = YesNoPrompt("Run migrations now? [y/N]")
 		}
+		close(migrationDone)
 
 		if !domigrate {
 			fmt.Printf("Not running migrations on repository at %s. Re-run daemon with --migrate or see 'ipfs repo migrate --help'\n", cctx.ConfigRoot)
diff --git a/cmd/ipfs/util/signal.go b/cmd/ipfs/util/signal.go
@@ -64,13 +64,7 @@ func SetupInterruptHandler(ctx context.Context) (io.Closer, context.Context) {
 		switch count {
 		case 1:
 			fmt.Println() // Prevent un-terminated ^C character in terminal
-
-			ih.wg.Add(1)
-			go func() {
-				defer ih.wg.Done()
-				cancelFunc()
-			}()
-
+			cancelFunc()
 		default:
 			fmt.Println("Received another interrupt before graceful shutdown, terminating...")
 			os.Exit(-1)
diff --git a/cmd/ipfswatch/main.go b/cmd/ipfswatch/main.go
@@ -13,6 +13,7 @@ import (
 	"syscall"
 
 	commands "github.com/ipfs/kubo/commands"
+	"github.com/ipfs/kubo/config"
 	core "github.com/ipfs/kubo/core"
 	coreapi "github.com/ipfs/kubo/core/coreapi"
 	corehttp "github.com/ipfs/kubo/core/corehttp"
@@ -25,10 +26,18 @@ import (
 
 var (
 	http      = flag.Bool("http", false, "expose IPFS HTTP API")
-	repoPath  = flag.String("repo", os.Getenv("IPFS_PATH"), "IPFS_PATH to use")
+	repoPath  *string
 	watchPath = flag.String("path", ".", "the path to watch")
 )
 
+func init() {
+	ipfsPath, err := config.PathRoot()
+	if err != nil {
+		ipfsPath = os.Getenv(config.EnvDir)
+	}
+	repoPath = flag.String("repo", ipfsPath, "repo path to use")
+}
+
 func main() {
 	flag.Parse()
 
diff --git a/core/commands/sysdiag.go b/core/commands/sysdiag.go
@@ -2,14 +2,13 @@ package commands
 
 import (
 	"os"
-	"path"
 	"runtime"
 
+	"github.com/ipfs/go-ipfs-cmds"
 	version "github.com/ipfs/kubo"
+	"github.com/ipfs/kubo/config"
 	"github.com/ipfs/kubo/core"
 	cmdenv "github.com/ipfs/kubo/core/commands/cmdenv"
-
-	cmds "github.com/ipfs/go-ipfs-cmds"
 	manet "github.com/multiformats/go-multiaddr/net"
 	sysi "github.com/whyrusleeping/go-sysinfo"
 )
@@ -84,32 +83,28 @@ func runtimeInfo(out map[string]interface{}) error {
 func envVarInfo(out map[string]interface{}) error {
 	ev := make(map[string]interface{})
 	ev["GOPATH"] = os.Getenv("GOPATH")
-	ev["IPFS_PATH"] = os.Getenv("IPFS_PATH")
+	ev[config.EnvDir] = os.Getenv(config.EnvDir)
 
 	out["environment"] = ev
 	return nil
 }
 
-func ipfsPath() string {
-	p := os.Getenv("IPFS_PATH")
-	if p == "" {
-		p = path.Join(os.Getenv("HOME"), ".ipfs")
-	}
-	return p
-}
-
 func diskSpaceInfo(out map[string]interface{}) error {
-	di := make(map[string]interface{})
-	dinfo, err := sysi.DiskUsage(ipfsPath())
+	pathRoot, err := config.PathRoot()
+	if err != nil {
+		return err
+	}
+	dinfo, err := sysi.DiskUsage(pathRoot)
 	if err != nil {
 		return err
 	}
 
-	di["fstype"] = dinfo.FsType
-	di["total_space"] = dinfo.Total
-	di["free_space"] = dinfo.Free
+	out["diskinfo"] = map[string]interface{}{
+		"fstype":      dinfo.FsType,
+		"total_space": dinfo.Total,
+		"free_space":  dinfo.Free,
+	}
 
-	out["diskinfo"] = di
 	return nil
 }
 
diff --git a/docs/examples/kubo-as-a-library/go.mod b/docs/examples/kubo-as-a-library/go.mod
@@ -7,7 +7,7 @@ go 1.25
 replace github.com/ipfs/kubo => ./../../..
 
 require (
-	github.com/ipfs/boxo v0.34.1-0.20250827083005-8b6d074957d4
+	github.com/ipfs/boxo v0.34.1-0.20250908112856-e66b18d8aa7f
 	github.com/ipfs/kubo v0.0.0-00010101000000-000000000000
 	github.com/libp2p/go-libp2p v0.43.0
 	github.com/multiformats/go-multiaddr v0.16.1
@@ -83,7 +83,6 @@ require (
 	github.com/ipfs/go-ds-measure v0.2.2 // indirect
 	github.com/ipfs/go-ds-pebble v0.5.1 // indirect
 	github.com/ipfs/go-fs-lock v0.1.1 // indirect
-	github.com/ipfs/go-ipfs-delay v0.0.1 // indirect
 	github.com/ipfs/go-ipfs-ds-help v1.1.1 // indirect
 	github.com/ipfs/go-ipfs-pq v0.0.3 // indirect
 	github.com/ipfs/go-ipfs-redirects-file v0.1.2 // indirect
diff --git a/docs/examples/kubo-as-a-library/go.sum b/docs/examples/kubo-as-a-library/go.sum
@@ -289,8 +289,8 @@ github.com/ipfs-shipyard/nopfs/ipfs v0.25.0 h1:OqNqsGZPX8zh3eFMO8Lf8EHRRnSGBMqcd
 github.com/ipfs-shipyard/nopfs/ipfs v0.25.0/go.mod h1:BxhUdtBgOXg1B+gAPEplkg/GpyTZY+kCMSfsJvvydqU=
 github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
 github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
-github.com/ipfs/boxo v0.34.1-0.20250827083005-8b6d074957d4 h1:q6q06Ye71ZZjM/JZyK0Q8t0UVSwzch/VwMS9yTtxBfw=
-github.com/ipfs/boxo v0.34.1-0.20250827083005-8b6d074957d4/go.mod h1:rXql6ncaLZZfLqDG3Cuw9ZYQKd3rMU5bk1TGXF0+ZL0=
+github.com/ipfs/boxo v0.34.1-0.20250908112856-e66b18d8aa7f h1:KBd0A0ScHnjVpg50cfmigbkKxUMDAC69CaY2qlTUgY8=
+github.com/ipfs/boxo v0.34.1-0.20250908112856-e66b18d8aa7f/go.mod h1:rXql6ncaLZZfLqDG3Cuw9ZYQKd3rMU5bk1TGXF0+ZL0=
 github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
 github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
 github.com/ipfs/go-block-format v0.0.3/go.mod h1:4LmD4ZUw0mhO+JSKdpWwrzATiEfM7WWgQ8H5l6P8MVk=
diff --git a/go.mod b/go.mod
@@ -22,7 +22,7 @@ require (
 	github.com/hashicorp/go-version v1.7.0
 	github.com/ipfs-shipyard/nopfs v0.0.14
 	github.com/ipfs-shipyard/nopfs/ipfs v0.25.0
-	github.com/ipfs/boxo v0.34.1-0.20250827083005-8b6d074957d4
+	github.com/ipfs/boxo v0.34.1-0.20250908112856-e66b18d8aa7f
 	github.com/ipfs/go-block-format v0.2.2
 	github.com/ipfs/go-cid v0.5.0
 	github.com/ipfs/go-cidutil v0.1.0
@@ -147,7 +147,6 @@ require (
 	github.com/huin/goupnp v1.3.0 // indirect
 	github.com/ipfs/bbloom v0.0.4 // indirect
 	github.com/ipfs/go-bitfield v1.1.0 // indirect
-	github.com/ipfs/go-ipfs-delay v0.0.1 // indirect
 	github.com/ipfs/go-ipfs-ds-help v1.1.1 // indirect
 	github.com/ipfs/go-ipfs-pq v0.0.3 // indirect
 	github.com/ipfs/go-ipfs-redirects-file v0.1.2 // indirect
diff --git a/go.sum b/go.sum
@@ -356,8 +356,8 @@ github.com/ipfs-shipyard/nopfs/ipfs v0.25.0 h1:OqNqsGZPX8zh3eFMO8Lf8EHRRnSGBMqcd
 github.com/ipfs-shipyard/nopfs/ipfs v0.25.0/go.mod h1:BxhUdtBgOXg1B+gAPEplkg/GpyTZY+kCMSfsJvvydqU=
 github.com/ipfs/bbloom v0.0.4 h1:Gi+8EGJ2y5qiD5FbsbpX/TMNcJw8gSqr7eyjHa4Fhvs=
 github.com/ipfs/bbloom v0.0.4/go.mod h1:cS9YprKXpoZ9lT0n/Mw/a6/aFV6DTjTLYHeA+gyqMG0=
-github.com/ipfs/boxo v0.34.1-0.20250827083005-8b6d074957d4 h1:q6q06Ye71ZZjM/JZyK0Q8t0UVSwzch/VwMS9yTtxBfw=
-github.com/ipfs/boxo v0.34.1-0.20250827083005-8b6d074957d4/go.mod h1:rXql6ncaLZZfLqDG3Cuw9ZYQKd3rMU5bk1TGXF0+ZL0=
+github.com/ipfs/boxo v0.34.1-0.20250908112856-e66b18d8aa7f h1:KBd0A0ScHnjVpg50cfmigbkKxUMDAC69CaY2qlTUgY8=
+github.com/ipfs/boxo v0.34.1-0.20250908112856-e66b18d8aa7f/go.mod h1:rXql6ncaLZZfLqDG3Cuw9ZYQKd3rMU5bk1TGXF0+ZL0=
 github.com/ipfs/go-bitfield v1.1.0 h1:fh7FIo8bSwaJEh6DdTWbCeZ1eqOaOkKFI74SCnsWbGA=
 github.com/ipfs/go-bitfield v1.1.0/go.mod h1:paqf1wjq/D2BBmzfTVFlJQ9IlFOZpg422HL0HqsGWHU=
 github.com/ipfs/go-block-format v0.0.3/go.mod h1:4LmD4ZUw0mhO+JSKdpWwrzATiEfM7WWgQ8H5l6P8MVk=
diff --git a/repo/fsrepo/migrations/fetch_test.go b/repo/fsrepo/migrations/fetch_test.go
@@ -20,10 +20,7 @@ func TestGetDistPath(t *testing.T) {
 	}
 
 	testDist := "/unit/test/dist"
-	err := os.Setenv(envIpfsDistPath, testDist)
-	if err != nil {
-		panic(err)
-	}
+	t.Setenv(envIpfsDistPath, testDist)
 	defer func() {
 		os.Unsetenv(envIpfsDistPath)
 	}()
@@ -139,18 +136,12 @@ func TestFetchBinary(t *testing.T) {
 		if err != nil {
 			panic(err)
 		}
-		err = os.Setenv("TMPDIR", tmpDir)
-		if err != nil {
-			panic(err)
-		}
+		t.Setenv("TMPDIR", tmpDir)
 		_, err = FetchBinary(ctx, fetcher, "go-ipfs", "v1.0.0", "ipfs", tmpDir)
 		if !os.IsPermission(err) {
 			t.Error("expected 'permission' error, got:", err)
 		}
-		err = os.Setenv("TMPDIR", "/tmp")
-		if err != nil {
-			panic(err)
-		}
+		t.Setenv("TMPDIR", "/tmp")
 		err = os.Chmod(tmpDir, 0o755)
 		if err != nil {
 			panic(err)
diff --git a/repo/fsrepo/migrations/ipfsdir.go b/repo/fsrepo/migrations/ipfsdir.go
@@ -8,12 +8,11 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/ipfs/kubo/config"
 	"github.com/ipfs/kubo/misc/fsutil"
 )
 
 const (
-	envIpfsPath = "IPFS_PATH"
-	defIpfsDir  = ".ipfs"
 	versionFile = "version"
 )
 
@@ -24,25 +23,16 @@ const (
 func IpfsDir(dir string) (string, error) {
 	var err error
 	if dir == "" {
-		dir = os.Getenv(envIpfsPath)
-	}
-	if dir != "" {
-		dir, err = fsutil.ExpandHome(dir)
+		dir, err = config.PathRoot()
 		if err != nil {
 			return "", err
 		}
-		return dir, nil
 	}
-
-	home, err := os.UserHomeDir()
+	dir, err = fsutil.ExpandHome(dir)
 	if err != nil {
 		return "", err
 	}
-	if home == "" {
-		return "", errors.New("could not determine IPFS_PATH, home dir not set")
-	}
-
-	return filepath.Join(home, defIpfsDir), nil
+	return dir, nil
 }
 
 // CheckIpfsDir gets the ipfs directory and checks that the directory exists.
diff --git a/repo/fsrepo/migrations/ipfsdir_test.go b/repo/fsrepo/migrations/ipfsdir_test.go
@@ -4,24 +4,28 @@ import (
 	"os"
 	"path/filepath"
 	"testing"
-)
 
-var (
-	fakeHome string
-	fakeIpfs string
+	"github.com/ipfs/kubo/config"
 )
 
 func TestRepoDir(t *testing.T) {
-	fakeHome = t.TempDir()
-	os.Setenv("HOME", fakeHome)
-	fakeIpfs = filepath.Join(fakeHome, ".ipfs")
-
-	t.Run("testIpfsDir", testIpfsDir)
-	t.Run("testCheckIpfsDir", testCheckIpfsDir)
-	t.Run("testRepoVersion", testRepoVersion)
+	fakeHome := t.TempDir()
+	t.Setenv("HOME", fakeHome)
+	fakeIpfs := filepath.Join(fakeHome, ".ipfs")
+	t.Setenv(config.EnvDir, fakeIpfs)
+
+	t.Run("testIpfsDir", func(t *testing.T) {
+		testIpfsDir(t, fakeIpfs)
+	})
+	t.Run("testCheckIpfsDir", func(t *testing.T) {
+		testCheckIpfsDir(t, fakeIpfs)
+	})
+	t.Run("testRepoVersion", func(t *testing.T) {
+		testRepoVersion(t, fakeIpfs)
+	})
 }
 
-func testIpfsDir(t *testing.T) {
+func testIpfsDir(t *testing.T, fakeIpfs string) {
 	_, err := CheckIpfsDir("")
 	if err == nil {
 		t.Fatal("expected error when no .ipfs directory to find")
@@ -37,32 +41,29 @@ func testIpfsDir(t *testing.T) {
 		t.Fatal(err)
 	}
 	if dir != fakeIpfs {
-		t.Fatal("wrong ipfs directory:", dir)
+		t.Fatalf("wrong ipfs directory: got %s, expected %s", dir, fakeIpfs)
 	}
 
-	os.Setenv(envIpfsPath, "~/.ipfs")
+	t.Setenv(config.EnvDir, "~/.ipfs")
 	dir, err = IpfsDir("")
 	if err != nil {
 		t.Fatal(err)
 	}
 	if dir != fakeIpfs {
-		t.Fatal("wrong ipfs directory:", dir)
+		t.Fatalf("wrong ipfs directory: got %s, expected %s", dir, fakeIpfs)
 	}
 
 	_, err = IpfsDir("~somesuer/foo")
 	if err == nil {
 		t.Fatal("expected error with user-specific home dir")
 	}
 
-	err = os.Setenv(envIpfsPath, "~somesuer/foo")
-	if err != nil {
-		panic(err)
-	}
+	t.Setenv(config.EnvDir, "~somesuer/foo")
 	_, err = IpfsDir("~somesuer/foo")
 	if err == nil {
 		t.Fatal("expected error with user-specific home dir")
 	}
-	err = os.Unsetenv(envIpfsPath)
+	err = os.Unsetenv(config.EnvDir)
 	if err != nil {
 		panic(err)
 	}
@@ -72,7 +73,7 @@ func testIpfsDir(t *testing.T) {
 		t.Fatal(err)
 	}
 	if dir != fakeIpfs {
-		t.Fatal("wrong ipfs directory:", dir)
+		t.Fatalf("wrong ipfs directory: got %s, expected %s", dir, fakeIpfs)
 	}
 
 	_, err = IpfsDir("")
@@ -81,7 +82,7 @@ func testIpfsDir(t *testing.T) {
 	}
 }
 
-func testCheckIpfsDir(t *testing.T) {
+func testCheckIpfsDir(t *testing.T, fakeIpfs string) {
 	_, err := CheckIpfsDir("~somesuer/foo")
 	if err == nil {
 		t.Fatal("expected error with user-specific home dir")
@@ -101,7 +102,7 @@ func testCheckIpfsDir(t *testing.T) {
 	}
 }
 
-func testRepoVersion(t *testing.T) {
+func testRepoVersion(t *testing.T, fakeIpfs string) {
 	badDir := "~somesuer/foo"
 	_, err := RepoVersion(badDir)
 	if err == nil {
diff --git a/repo/fsrepo/migrations/migrations_test.go b/repo/fsrepo/migrations/migrations_test.go
diff --git a/test/dependencies/go.mod b/test/dependencies/go.mod
diff --git a/test/dependencies/go.sum b/test/dependencies/go.sum
