Merge pull request #129 from ipfs/chore/latest-migration-lib

Update to latest migration lib and ipfs-update. Also, fix fs-repo-migrations to pull from dist.ipfs.io by default
ipfs · Apr 1, 2021 · 6c9f7fc · 6c9f7fc
2 parents a4a9851 + 51e34b1
commit 6c9f7fc
Show file tree

Hide file tree

Showing 9 changed files with 467 additions and 81 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 *~
-cmd/fs-repo-migrations/fs-repo-migrations
+fs-repo-migrations/fs-repo-migrations
 sharness/bin/fs-repo-migrations
 sharness/bin/fs-repo-*-to-*
 sharness/bin/go-sleep

diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ os:
 language: go
 
 go:
-  - 1.14.x
+  - "1.16.x"
 
 env:
   - TEST_VERBOSE=1

diff --git a/fs-repo-migrations/go.mod b/fs-repo-migrations/go.mod
@@ -3,6 +3,6 @@ module github.com/ipfs/fs-repo-migrations/fs-repo-migrations
 go 1.15
 
 require (
-	github.com/ipfs/go-ipfs v0.7.1-0.20210325200014-5ee8710c5806
+	github.com/ipfs/go-ipfs v0.8.1-0.20210331232424-4cdb67f37daa
 	github.com/ipfs/go-ipfs-api v0.2.0
 )
diff --git a/fs-repo-migrations/go.sum b/fs-repo-migrations/go.sum
diff --git a/fs-repo-migrations/main.go b/fs-repo-migrations/main.go
@@ -30,7 +30,7 @@ func createFetcher(distPath string) migrations.Fetcher {
 	const userAgent = "fs-repo-migrations"
 
 	if distPath == "" {
-		distPath = migrations.GetDistPathEnv(migrations.CurrentIpfsDist)
+		distPath = migrations.GetDistPathEnv(migrations.LatestIpfsDist)
 	}
 
 	return migrations.NewMultiFetcher(

diff --git a/sharness/dependencies/go.mod b/sharness/dependencies/go.mod
@@ -4,7 +4,7 @@ go 1.15
 
 require (
 	github.com/chriscool/go-sleep v0.0.0-20150606204034-743ab5f1bb48
-	github.com/ipfs/ipfs-update v1.6.1-0.20210323142304-8a5f9eabe3fa
+	github.com/ipfs/ipfs-update v1.7.1
 	github.com/ipfs/iptb v1.4.0
 	github.com/ipfs/iptb-plugins v0.2.1
 	github.com/jbenet/go-random-files v0.0.0-20190219210431-31b3f20ebded

diff --git a/sharness/dependencies/go.sum b/sharness/dependencies/go.sum
diff --git a/sharness/lib/test-lib.sh b/sharness/lib/test-lib.sh
@@ -35,12 +35,9 @@ GUEST_TEST_DIR="sharness/$TEST_DIR_BASENAME"
 
 CERTIFS='/etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt'
 
-# TODO: remove this when migrations are availabe one the distributions site                                                                                  
-IPFS_DIST_PATH="/ipfs/QmWLyhqWDsWbcWE8vjmHkzGKLGgvHh84cLxM3ceLsojwrx"
-
 # This writes a docker ID on stdout
 start_docker() {
-	docker run --rm -it -d -v "$CERTIFS" -v "$APP_ROOT_DIR:/mnt" -w "/mnt" -e "IPFS_DIST_PATH=$IPFS_DIST_PATH" "$DOCKER_IMG" /bin/bash
+	docker run --rm -it -d -v "$CERTIFS" -v "$APP_ROOT_DIR:/mnt" -w "/mnt" "$DOCKER_IMG" /bin/bash
 }
 
 # This takes a docker ID and a command as arguments

diff --git a/sharness/t0030-simple-migration.sh b/sharness/t0030-simple-migration.sh
@@ -8,9 +8,6 @@ test_expect_success "fs-repo-migrations binary is here" '
 	test -f "$LOCAL_FS_REPO_MIG"
 '
 
-# TODO: remove this when migrations are availabe at the distributions site
-export IPFS_DIST_PATH="/ipfs/QmWLyhqWDsWbcWE8vjmHkzGKLGgvHh84cLxM3ceLsojwrx"
-
 test_expect_success "'fs-repo-migrations -v' works" '
 	"$LOCAL_FS_REPO_MIG" -v >actual
 '
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ os: @@
     language: go
     go:
-      - 1.14.x
+      - "1.16.x"
     env:
       - TEST_VERBOSE=1
@@ Expand Down @@