fix(p2p): qri bootstrap addrs config migration

Author: Arqu

config/config.go

@@ -18,7 +18,7 @@ import (
 
 // CurrentConfigRevision is the latest configuration revision configurations
 // that don't match this revision number should be migrated up
-const CurrentConfigRevision = 2
+const CurrentConfigRevision = 3
 
 // Config encapsulates all configuration details for qri
 type Config struct {

config/migrate/migrate.go

@@ -51,6 +51,11 @@ func RunMigrations(streams ioes.IOStreams, cfg *config.Config, shouldRun func()
 				return err
 			}
 		}
+		if cfg.Revision == 2 {
+			if err := TwoToThree(cfg); err != nil {
+				return err
+			}
+		}
 		streams.PrintErr("done!\n")
 
 		if errorOnSuccess {
@@ -161,6 +166,48 @@ func oneToTwoConfig(cfg *config.Config) error {
 	return nil
 }
 
+// TwoToThree migrates a configuration from Revision 2 to Revision 3
+func TwoToThree(cfg *config.Config) error {
+	if cfg.P2P != nil {
+		removes := map[string]bool{
+			"/ip4/35.239.80.82/tcp/4001/ipfs/QmdpGkbqDYRPCcwLYnEm8oYGz2G9aUZn9WwPjqvqw3XUAc":   true, // red
+			"/ip4/35.225.152.38/tcp/4001/ipfs/QmTRqTLbKndFC2rp6VzpyApxHCLrFV35setF1DQZaRWPVf":  true, // orange
+			"/ip4/35.202.155.225/tcp/4001/ipfs/QmegNYmwHUQFc3v3eemsYUVf3WiSg4RcMrh3hovA5LncJ2": true, // yellow
+			"/ip4/35.238.10.180/tcp/4001/ipfs/QmessbA6uGLJ7HTwbUJ2niE49WbdPfzi27tdYXdAaGRB4G":  true, // green
+			"/ip4/35.238.105.35/tcp/4001/ipfs/Qmc353gHY5Wx5iHKHPYj3QDqHP4hVA1MpoSsT6hwSyVx3r":  true, // blue
+			"/ip4/35.239.138.186/tcp/4001/ipfs/QmT9YHJF2YkysLqWhhiVTL5526VFtavic3bVueF9rCsjVi": true, // indigo
+			"/ip4/35.226.44.58/tcp/4001/ipfs/QmQS2ryqZrjJtPKDy9VTkdPwdUSpTi1TdpGUaqAVwfxcNh":   true, // violet
+		}
+
+		adds := map[string]bool{}
+		for _, addr := range config.DefaultP2P().QriBootstrapAddrs {
+			adds[addr] = true
+		}
+
+		res := []string{}
+
+		for _, addr := range cfg.P2P.QriBootstrapAddrs {
+			if removes[addr] || adds[addr] {
+				continue
+			}
+			res = append(res, addr)
+		}
+
+		res = append(res, config.DefaultP2P().QriBootstrapAddrs...)
+
+		cfg.P2P.QriBootstrapAddrs = res
+	}
+
+	cfg.Revision = 3
+
+	if err := safeWriteConfig(cfg); err != nil {
+		rollbackConfigWrite(cfg)
+		return err
+	}
+
+	return nil
+}
+
 func rollbackConfigWrite(cfg *config.Config) {
 	cfgPath := cfg.Path()
 	if len(cfgPath) == 0 {

config/migrate/migrate_test.go

@@ -9,6 +9,7 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/google/go-cmp/cmp"
 	"github.com/qri-io/ioes"
 	"github.com/qri-io/qri/config"
 	"github.com/qri-io/qri/config/migrate"
@@ -53,6 +54,49 @@ func TestOneToTwo(t *testing.T) {
 	buildrepo.New(ctx, repoPath, cfg)
 }
 
+func TestTwoToThree(t *testing.T) {
+	// setup a repo in the v2 arrangement
+	dir, err := ioutil.TempDir("", "testTwoToThree")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(dir)
+	repoPath := filepath.Join(dir, "qri")
+	os.MkdirAll(repoPath, 0774)
+
+	input, err := ioutil.ReadFile("testdata/two_to_three/qri_config.yaml")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	ioutil.WriteFile(filepath.Join(repoPath, "config.yaml"), input, 0774)
+
+	cfg, err := config.ReadFromFile(filepath.Join(repoPath, "config.yaml"))
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// call TwoToThree
+	if err := migrate.RunMigrations(ioes.NewStdIOStreams(), cfg, func() bool { return true }, false); err != nil {
+		t.Error(err)
+	}
+
+	expect := []string{
+		"/ip4/1.2.3.4/tcp/4001/ipfs/QmTestPersistingManuallyAddedBootstrappers",            // should persist unknown
+		"/ip4/35.231.230.13/tcp/4001/ipfs/QmdpGkbqDYRPCcwLYnEm8oYGz2G9aUZn9WwPjqvqw3XUAc",  // red
+		"/ip4/34.75.40.163/tcp/4001/ipfs/QmTRqTLbKndFC2rp6VzpyApxHCLrFV35setF1DQZaRWPVf",   // orange
+		"/ip4/35.237.172.74/tcp/4001/ipfs/QmegNYmwHUQFc3v3eemsYUVf3WiSg4RcMrh3hovA5LncJ2",  // yellow
+		"/ip4/35.231.155.111/tcp/4001/ipfs/QmessbA6uGLJ7HTwbUJ2niE49WbdPfzi27tdYXdAaGRB4G", // green
+		"/ip4/35.237.232.64/tcp/4001/ipfs/Qmc353gHY5Wx5iHKHPYj3QDqHP4hVA1MpoSsT6hwSyVx3r",  // blue
+		"/ip4/35.185.20.61/tcp/4001/ipfs/QmT9YHJF2YkysLqWhhiVTL5526VFtavic3bVueF9rCsjVi",   // indigo
+		"/ip4/35.231.246.50/tcp/4001/ipfs/QmQS2ryqZrjJtPKDy9VTkdPwdUSpTi1TdpGUaqAVwfxcNh",  // violet
+	}
+
+	if diff := cmp.Diff(cfg.P2P.QriBootstrapAddrs, expect); diff != "" {
+		t.Errorf("config.p2p.QriBootstrapAddrs result mismatch. (-want +got):%s\n", diff)
+	}
+}
+
 func unzipFile(sourceZip, destDir string) {
 	r, err := zip.OpenReader(sourceZip)
 	if err != nil {

config/migrate/testdata/two_to_three/qri_config.yaml

@@ -0,0 +1,71 @@
+API:
+  address: /ip4/127.0.0.1/tcp/2503
+  allowedorigins:
+  - electron://local.qri.io
+  - http://app.qri.io
+  - https://app.qri.io
+  disablewebui: false
+  enabled: true
+  readonly: false
+  serveremotetraffic: false
+  websocketaddress: /ip4/127.0.0.1/tcp/2506
+CLI:
+  colorizeoutput: true
+Filesystems:
+- config:
+    path: /Users/test/.qri/ipfs
+  type: ipfs
+- type: local
+- type: http
+Logging:
+  levels:
+    lib: info
+    qriapi: info
+    qrip2p: error
+P2P:
+  addrs: null
+  autoNAT: false
+  bootstrapaddrs: null
+  enabled: true
+  peerid: QmTCc3annoyEniMyz6to8cZLGPbXLh64oVzVMiMBoXp2u9
+  port: 0
+  privkey: CAASpwkwggSjAgEAAoIBAQDwntvAyYXW2KjWsttn0EydRgqlIJuITqUhWV41g5+AvEUYwGpFuKYvi5bW28cWUaeFKTAx9i3lX/J+Wq4XSH+yM4Tr+QhvtR0E/hFMU++ZpyBBk/v6RnusIAFwnKYgrrGIoK2o4UPcook1pKF+ptMlnQ6+a8GbijXR4iq8BOCNY9JcaaUXjqQ3cXPTkqeG4QlsReG/ERSUJo+Rx0lOtgI5IGgEisp6XceDsWzjXwTEoGagOsBQPH1KvGivp1myf9Sf1H+7RiswXiOXOmLaLc7VOGyuHtyvXxMP62B00hzuhcZB4nxtN1W2rA+fJ1xz2tSYxUeJV4SZ28hmSgje3FFhAgMBAAECggEBALaLXh3xBMeMkPJouEkW3rjGJVdG2JfdSit1uCITHBO3QRhZCYahYfpaBPI1w+Dry5IbQEP3BrSoSLiRJNfnGXFg4mt+/2Z32W8rLIZiezhvcOovUY96n2Ji2ZTMUsAip+8GLxka5Lfi2wNGRXpnJ3K2pzPRXg0ZGmGDGnaPoKfB5YSIvJGXMr1dt5HrA1gpxXT5wSomWgV9qtaPFWf3HHY9VnzL3I23+q+E4FzkwjNtJy39ANxL9btnE80Xowkwa95em65ixpmqUNcw9skRn0uzkVGQqhjTiqqqxcz+pK0OoFYdpSQTArtMU1KUTgz4LkcvY8H/ljYcCjDK8fm70U0CgYEA+U9yS8dL0UnzCIQsy+9wT7g/9RIOKtE3UcilP6XPkEjPNWdnEYDbkZIXDfOX+XKkDSfx9jzeA785/E3WuZkNEcjaZSVK/QGVphNi8s6W0g/EBMtFCi92QXQRmr9ESGvByCTqo32FdZR1xAVh0/rj4covVyNseDzrBPi3DtM4t3MCgYEA9xO4Zb8bycPM74bEPIeaAvQLP29oJpDqCgr3uVS5AjcduFS+YnBJZoGHQjOb5posCSvkzYy1tow18KRXlA/lB/nBbeKpdOAY+IFLONFOj4EJTXtQ7eERDM9o7QB+mJq+HZxL2ywh3FpMlka0qsX4kF9z56XoSZHtSUvNMmw+ltsCgYBrC0SM6t5P10uFbZL6YS083WSAqibxFXGGKPtiz6PGVKy7RlGHv2cHIs3JTL0E+scbavpF+q5st2+DODyo5eEpsK6s3Q1MgqCpdQt4K2GwgdptIIXdMLG6usZQRi1gVvwWHluspNlnub2y04jEhqXPrYsUA/6vxaA3Oz8GG4TvpwKBgHaMgrxm/tlHVkxTOFLmqVHjcIYmWS2v+GuLKaNF8GMMuPjZyGOJBt7lJVXxV0tFC/32jpjFe+azzanB4LeNDNJP1qx3xeDrKXAK8WG4o94dBq6jjYglpj2kQu78fsGP9cpVVNw7h5+nv/mWwVbzGDmFYyJxq0upddXmRfV8lGdjAoGAGC7BoXWYGi7bAaRFZM48h8mxSEaff0SrD5ryeQ+Uzd2BR36tu3tRL7jbh7iBdb/J3K74UOIYN/XQTqq7JMQvYzVc+uVTWKmh2RNJV6iy3Nbb5T26uOtmMmWJx85tKDKXUbFZlVboKPE2Fpr+GGpPabOQRxi3XSpRCQL6LWwrn8w=
+  qribootstrapaddrs:
+  - /ip4/35.239.80.82/tcp/4001/ipfs/QmdpGkbqDYRPCcwLYnEm8oYGz2G9aUZn9WwPjqvqw3XUAc
+  - /ip4/35.225.152.38/tcp/4001/ipfs/QmTRqTLbKndFC2rp6VzpyApxHCLrFV35setF1DQZaRWPVf
+  - /ip4/35.202.155.225/tcp/4001/ipfs/QmegNYmwHUQFc3v3eemsYUVf3WiSg4RcMrh3hovA5LncJ2
+  - /ip4/35.238.10.180/tcp/4001/ipfs/QmessbA6uGLJ7HTwbUJ2niE49WbdPfzi27tdYXdAaGRB4G
+  - /ip4/35.238.105.35/tcp/4001/ipfs/Qmc353gHY5Wx5iHKHPYj3QDqHP4hVA1MpoSsT6hwSyVx3r
+  - /ip4/35.239.138.186/tcp/4001/ipfs/QmT9YHJF2YkysLqWhhiVTL5526VFtavic3bVueF9rCsjVi
+  - /ip4/35.226.44.58/tcp/4001/ipfs/QmQS2ryqZrjJtPKDy9VTkdPwdUSpTi1TdpGUaqAVwfxcNh
+  - /ip4/1.2.3.4/tcp/4001/ipfs/QmTestPersistingManuallyAddedBootstrappers
+Profile:
+  color: ""
+  created: "2020-01-15T23:03:22Z"
+  description: ""
+  email: brendan+rm_me_1@qri.io
+  homeurl: ""
+  id: QmTCc3annoyEniMyz6to8cZLGPbXLh64oVzVMiMBoXp2u9
+  name: ""
+  peername: rm_me_1
+  photo: https://qri-user-images.storage.googleapis.com/1570029806838.png
+  poster: ""
+  privkey: CAASpwkwggSjAgEAAoIBAQDwntvAyYXW2KjWsttn0EydRgqlIJuITqUhWV41g5+AvEUYwGpFuKYvi5bW28cWUaeFKTAx9i3lX/J+Wq4XSH+yM4Tr+QhvtR0E/hFMU++ZpyBBk/v6RnusIAFwnKYgrrGIoK2o4UPcook1pKF+ptMlnQ6+a8GbijXR4iq8BOCNY9JcaaUXjqQ3cXPTkqeG4QlsReG/ERSUJo+Rx0lOtgI5IGgEisp6XceDsWzjXwTEoGagOsBQPH1KvGivp1myf9Sf1H+7RiswXiOXOmLaLc7VOGyuHtyvXxMP62B00hzuhcZB4nxtN1W2rA+fJ1xz2tSYxUeJV4SZ28hmSgje3FFhAgMBAAECggEBALaLXh3xBMeMkPJouEkW3rjGJVdG2JfdSit1uCITHBO3QRhZCYahYfpaBPI1w+Dry5IbQEP3BrSoSLiRJNfnGXFg4mt+/2Z32W8rLIZiezhvcOovUY96n2Ji2ZTMUsAip+8GLxka5Lfi2wNGRXpnJ3K2pzPRXg0ZGmGDGnaPoKfB5YSIvJGXMr1dt5HrA1gpxXT5wSomWgV9qtaPFWf3HHY9VnzL3I23+q+E4FzkwjNtJy39ANxL9btnE80Xowkwa95em65ixpmqUNcw9skRn0uzkVGQqhjTiqqqxcz+pK0OoFYdpSQTArtMU1KUTgz4LkcvY8H/ljYcCjDK8fm70U0CgYEA+U9yS8dL0UnzCIQsy+9wT7g/9RIOKtE3UcilP6XPkEjPNWdnEYDbkZIXDfOX+XKkDSfx9jzeA785/E3WuZkNEcjaZSVK/QGVphNi8s6W0g/EBMtFCi92QXQRmr9ESGvByCTqo32FdZR1xAVh0/rj4covVyNseDzrBPi3DtM4t3MCgYEA9xO4Zb8bycPM74bEPIeaAvQLP29oJpDqCgr3uVS5AjcduFS+YnBJZoGHQjOb5posCSvkzYy1tow18KRXlA/lB/nBbeKpdOAY+IFLONFOj4EJTXtQ7eERDM9o7QB+mJq+HZxL2ywh3FpMlka0qsX4kF9z56XoSZHtSUvNMmw+ltsCgYBrC0SM6t5P10uFbZL6YS083WSAqibxFXGGKPtiz6PGVKy7RlGHv2cHIs3JTL0E+scbavpF+q5st2+DODyo5eEpsK6s3Q1MgqCpdQt4K2GwgdptIIXdMLG6usZQRi1gVvwWHluspNlnub2y04jEhqXPrYsUA/6vxaA3Oz8GG4TvpwKBgHaMgrxm/tlHVkxTOFLmqVHjcIYmWS2v+GuLKaNF8GMMuPjZyGOJBt7lJVXxV0tFC/32jpjFe+azzanB4LeNDNJP1qx3xeDrKXAK8WG4o94dBq6jjYglpj2kQu78fsGP9cpVVNw7h5+nv/mWwVbzGDmFYyJxq0upddXmRfV8lGdjAoGAGC7BoXWYGi7bAaRFZM48h8mxSEaff0SrD5ryeQ+Uzd2BR36tu3tRL7jbh7iBdb/J3K74UOIYN/XQTqq7JMQvYzVc+uVTWKmh2RNJV6iy3Nbb5T26uOtmMmWJx85tKDKXUbFZlVboKPE2Fpr+GGpPabOQRxi3XSpRCQL6LWwrn8w=
+  thumb: ""
+  twitter: ""
+  type: peer
+  updated: "2020-01-15T18:01:36.486248-05:00"
+RPC:
+  address: /ip4/127.0.0.1/tcp/2504
+  enabled: true
+Registry:
+  location: http://localhost:3100
+Remote: null
+Remotes: null
+Repo:
+  type: fs
+Revision: 2
+Stats:
+  cache:
+    maxsize: 25600
+    type: fs

config/p2p.go

@@ -59,13 +59,13 @@ func DefaultP2P() *P2P {
 		// One day it would be super nice to bootstrap from a stored history & only
 		// use these for first-round bootstrapping.
 		QriBootstrapAddrs: []string{
-			"/ip4/35.231.230.13/tcp/4001/ipfs/Qmf2p5hQcHn2Xmk7UaVcAS1AWfa9rBCJDjbuKsDHBHyTyq",  // red
-			"/ip4/34.75.40.163/tcp/4001/ipfs/QmRq4aByaHmL8He2Hhu4V4oJa2xp6G95DrZHq9xPqDCfBQ",   // orange
-			"/ip4/35.237.172.74/tcp/4001/ipfs/QmQciAsxw5BsLuyboZf1FrrHHWuF9e4J6CzgsDE6Yegtkz",  // yellow
-			"/ip4/35.231.155.111/tcp/4001/ipfs/QmYhNKGNs4ch4m6njFAN4EHJWYizVuNj8gsipApcd95Aw4", // green
-			"/ip4/35.237.232.64/tcp/4001/ipfs/QmdvY8c34q6n6Af1rbcNNip41dY4Tufi5C56KVTqeo81Ar",  // blue
-			"/ip4/35.185.20.61/tcp/4001/ipfs/QmbGfe4Pf81jLqbJg9KsketSXfdXZtBfemtSwxma5QZ2jK",   // indigo
-			"/ip4/35.231.246.50/tcp/4001/ipfs/QmeBjgMZjAVk1ChFqqjDM2J6hjE4AaXEJuAGm2qnzUArEf",  // violet
+			"/ip4/35.231.230.13/tcp/4001/ipfs/QmdpGkbqDYRPCcwLYnEm8oYGz2G9aUZn9WwPjqvqw3XUAc",  // red
+			"/ip4/34.75.40.163/tcp/4001/ipfs/QmTRqTLbKndFC2rp6VzpyApxHCLrFV35setF1DQZaRWPVf",   // orange
+			"/ip4/35.237.172.74/tcp/4001/ipfs/QmegNYmwHUQFc3v3eemsYUVf3WiSg4RcMrh3hovA5LncJ2",  // yellow
+			"/ip4/35.231.155.111/tcp/4001/ipfs/QmessbA6uGLJ7HTwbUJ2niE49WbdPfzi27tdYXdAaGRB4G", // green
+			"/ip4/35.237.232.64/tcp/4001/ipfs/Qmc353gHY5Wx5iHKHPYj3QDqHP4hVA1MpoSsT6hwSyVx3r",  // blue
+			"/ip4/35.185.20.61/tcp/4001/ipfs/QmT9YHJF2YkysLqWhhiVTL5526VFtavic3bVueF9rCsjVi",   // indigo
+			"/ip4/35.231.246.50/tcp/4001/ipfs/QmQS2ryqZrjJtPKDy9VTkdPwdUSpTi1TdpGUaqAVwfxcNh",  // violet
 		},
 	}
 	return p2p

config/testdata/simple.yaml

@@ -23,5 +23,5 @@ Registry: null
 Remote: null
 Remotes: null
 Repo: null
-Revision: 2
+Revision: 3
 Stats: null