Fix default config and version

data/default-config.json

@@ -7,7 +7,7 @@
     "include_ip": false,
     "include_asn": true,
     "include_gps": true,
-    "upload_results": true,
+    "upload_results": true
   },
   "notifications": {
     "enabled": true,
@@ -59,5 +59,5 @@
     "include_country": true,
     "use_domain_fronting": false,
     "send_crash_reports": true
-  },
+  }
 }

internal/bindata/bindata.go

@@ -80,26 +80,26 @@ func (fi bindataFileInfo) Sys() interface{} {
 }
 
 var _bindataDataDefaultconfigjson = []byte(
-	"\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x94\x41\x6f\xdb\x3c\x0c\x86\xef\xfd\x15\x82\xce\x75\x53\xe0\xbb\xe5" +
+	"\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x8c\x94\x41\x6f\x1b\x2d\x10\x86\xef\xfe\x15\x88\x73\x36\x8e\xf4\xdd\x7c" +
-	"\xf8\xdd\x76\xd8\x3a\x60\xbb\x15\x85\xa0\x48\xb4\x4d\x4c\x26\x35\x91\x4e\x16\x0c\xfd\xef\x83\xdc\x34\x56\xda\xae" +
+	"\xfc\x6e\x3d\xb4\xa9\xd4\xde\xa2\x08\x61\x98\xdd\x1d\x95\x9d\xa1\x30\x6b\xd7\xaa\xf2\xdf\x2b\x88\xed\x65\x93\x34" +
-	"\xeb\xd1\xef\x4b\xd1\xe4\x43\x4a\xbf\xaf\x8c\xb1\xce\x6e\x8d\xfd\x3e\xa2\x18\x14\x73\xe4\xb9\x98\xbb\xbb\x2f\x9f" +
+	"\xcd\x91\xf7\x1d\x06\xe6\x99\x81\xdf\x1b\xa5\xb4\xd1\x3b\xa5\xbf\x8f\x98\x15\x66\x75\xe2\x39\xa9\xfb\xfb\x2f\x9f" +
-	"\xcc\xd7\xc2\x3b\x30\x81\xa9\xc7\xc1\xf4\x98\xe0\xc6\x7c\x03\x30\xa3\x6a\x96\xed\x66\xc3\x4c\x78\x83\xbc\x19\x21" +
+	"\xd4\xd7\xc4\x7b\x50\x8e\xa9\xc7\x41\xf5\x18\xe0\x56\x7d\x03\x50\xa3\x48\xcc\xbb\xed\x96\x99\xf0\x16\x79\x3b\x42" +
-	"\xe5\x4d\xae\xb1\x5d\x48\x68\x7a\x2e\xa6\x4a\xf6\x7a\x49\xbd\x87\x22\xc8\x64\xb7\xe6\xf6\x49\x40\xea\xb9\x4c\x10" +
+	"\x88\xdb\x58\x62\x3b\x17\x50\xf5\x9c\x54\x91\xf4\x4d\x4d\x7d\x80\x94\x91\x49\xef\xd4\xdd\xb3\x80\xd4\x73\x9a\xc0" +
-	"\x5d\x60\x12\x20\xb5\x5b\xd3\xfb\x24\xb0\xb8\x7e\x56\x76\x73\x8e\x5e\xc1\x6e\x8d\x96\xf9\x49\x96\xd1\x17\xa4\xc1" +
+	"\x1b\xc7\x94\x81\x44\xef\x54\x6f\x43\x86\xea\xda\x59\xd8\xcc\xd1\x5b\x01\xbd\x53\x92\xe6\x67\x39\x8f\x36\x21\x0d" +
-	"\x6e\x4d\xad\xd7\x18\x8b\x14\xd2\x1c\xc1\x61\x6e\x8f\x37\x86\x17\x6a\x12\x34\xc6\x90\xe5\xd2\x98\x73\x62\x1f\x5d" +
+	"\x7a\xa7\xca\x7d\x95\xd2\x48\x2e\xcc\x1e\x0c\xc6\x76\x7b\x63\xd8\x4c\x4d\x82\xc6\x18\x62\x5e\x1b\x73\x0c\x6c\xbd" +
-	"\x01\x99\x93\xbe\xf0\x04\x28\xba\x50\xbc\x8c\xae\x40\xe6\x72\xf6\xaf\x8c\x79\x5c\x2a\x23\x56\xec\x31\x78\x45\x26" +
+	"\x49\x90\xe7\x20\x17\x6f\xa3\xd4\x53\x3d\x99\x58\xb0\x47\x67\x05\x99\xf2\x72\x3e\x90\xdd\x07\xf0\xeb\x4c\x35\xf6" +
-	"\x59\xeb\x03\xf2\xbb\x04\xf1\x32\xdb\x12\x7b\x74\x4c\x4e\x41\xd4\x05\x9e\x72\x02\x7d\x82\xf3\x66\x18\xc1\x41\x9e" +
+	"\x64\x98\x8c\x40\x16\xe3\x78\x8a\x01\xe4\xb9\xf8\x37\xc3\x08\x8e\xf9\x72\xff\xeb\x89\x05\xc1\x64\x05\x7c\xcd\xb2" +
-	"\xfb\x3b\xff\xb1\x22\x9a\xbc\x42\x5c\xb2\x5c\x50\x59\xff\xda\x22\x39\xa9\x4b\x78\x4d\x77\xbf\xc8\xc6\xd8\x03\xec" +
+	"\xaa\x7a\x39\xb5\x2d\xf9\xac\xd6\xf0\x92\xee\xa1\xca\x4a\xe9\x23\xec\x3b\xc7\x44\xe0\x04\x0f\x28\x27\x7d\x73\x71" +
-	"\xba\xc0\x44\x10\x14\xf7\xa8\x47\x7b\xfd\xec\xf4\x3e\xc0\x8e\xf9\x47\x37\x81\x08\xd0\x00\x65\xf5\x0e\xa3\x57\xf1" +
+	"\x7a\xeb\x60\xcf\xfc\xa3\x9b\x20\x67\xa0\x01\xd2\xe2\x1d\x47\x2b\xd9\xc6\xb8\x28\x02\x01\x86\x64\xa7\x45\xf1\x36" +
-	"\x39\xaf\x8a\x42\x82\xa1\xf8\x69\x55\xa2\x97\x71\xfd\xa2\xa8\xeb\x47\xdd\x9e\x0e\x69\xef\x13\xc6\xae\xc0\xcf\x19" +
+	"\x8f\xcb\x8a\xbc\x2c\x8b\x32\x1d\x1d\xd2\xc1\x06\xf4\x5d\x82\x9f\x33\x64\xe9\x02\x12\xbc\x08\x19\xc1\x7a\x48\x5d" +
-	"\x44\xbb\x84\x04\x2f\x42\x46\xf0\x11\x4a\xd7\x23\xa4\xd8\x4d\x9e\x30\xcf\x69\xa1\x6c\x97\xb0\x87\x53\x73\x13\x93" +
+	"\x8f\x10\x7c\x37\x59\xc2\x38\x87\x4a\x59\xd7\xb0\xc7\x73\x71\x13\x93\x8c\xe1\x64\x6c\x08\x7c\xb4\xe4\xca\x58\xe8" +
-	"\x8e\xe9\xe8\x7c\x4a\x7c\xf0\x14\xea\xda\xd8\xff\x6e\x6f\x3f\xff\x6f\xcf\xc4\x16\xda\x02\x5a\x61\x35\x33\x3a\xc0" +
+	"\xff\xee\xee\x3e\xff\xaf\xaf\xc4\x2a\xed\x0c\x52\x60\x35\x3d\x3a\xc2\x3e\xa3\xc0\xa2\x34\xac\x9c\x15\x18\x38\x61" +
-	"\x4e\x50\x61\x55\x1a\x56\xc1\x2b\x0c\x5c\x70\x71\xef\x1f\x16\xfb\xf1\xbc\x49\xa2\x9e\xd4\x55\x36\x7e\x68\x07\xf0" +
+	"\x75\x1f\x1e\xab\xfd\x74\x9d\x94\x2c\x96\xc4\x14\x36\x76\x68\x1b\xf0\x0e\xec\xf7\xa1\xbe\x85\xb5\x05\x7b\x96\xd6" +
-	"\x0e\xec\xf7\xa1\xbe\x85\xb5\x05\x7b\x92\x2e\xeb\xc8\x50\xea\x4d\x3a\x35\xfd\x91\x0a\xea\x20\x9e\x53\xb5\xd3\x71" +
+	"\xf7\x88\x90\xca\x4b\x39\x17\xfd\x91\x1b\x94\x46\x5c\x52\xb5\xdd\x31\x19\xd2\x01\x52\x41\x57\xa6\x4b\xbf\xe1\x99" +
-	"\x02\x65\x0f\xa5\xa2\xab\xdb\x65\xdf\xf0\x5c\xdd\xfe\xd7\x01\x75\xd0\x7f\x3d\xdd\x98\x97\xc7\x2f\xda\x98\x30\xc6" +
+	"\xc8\x49\x5e\x07\x94\x46\xff\x75\x77\x63\xae\xb7\xaf\xca\x98\xd0\xfb\x00\x7b\xfe\xf5\xc1\x22\xfe\x3d\x40\x1f\x1c" +
-	"\x04\x3b\xfe\xf5\xc1\x26\xfe\xbd\x40\x1f\x5c\xa1\x33\xcf\xf5\x6a\xc5\x7d\xa5\x19\x5f\xbf\x33\x81\x67\xd2\x72\x7c" +
+	"\xa1\x2b\xcf\xe5\x69\xf9\x43\xa1\xe9\x5f\xff\x23\x8e\x67\x92\x74\x7a\xf1\x33\x64\x30\x9e\x27\x8b\x64\xfa\xc4\x74" +
-	"\xf1\x72\x08\xb8\xc8\x93\x47\x72\x7d\x61\x3a\xdd\xc5\xe6\xb6\x3e\x5e\xfd\x09\x00\x00\xff\xff\xdf\xd2\xaa\xf7\x5f" +
+	"\x7e\x8b\xed\xd3\xcb\x40\xde\xb8\x54\x38\x24\x28\x08\xda\xff\x63\xf3\xb4\xf9\x13\x00\x00\xff\xff\xe0\xc5\x07\x53" +
-	"\x05\x00\x00")
+	"\x5e\x05\x00\x00")
 
 func bindataDataDefaultconfigjsonBytes() ([]byte, error) {
 	return bindataRead(

internal/cli/app/app.go

@@ -3,13 +3,13 @@ package app
 import (
 	"os"
 
+	ooni "github.com/ooni/probe-cli"
 	"github.com/ooni/probe-cli/internal/cli/root"
-	"github.com/ooni/probe-cli/internal/cli/version"
 )
 
 // Run the app. This is the main app entry point
 func Run() error {
-	root.Cmd.Version(version.Version)
+	root.Cmd.Version(ooni.Version)
 	_, err := root.Cmd.Parse(os.Args[1:])
 	return err
 }

internal/cli/root/root.go

@@ -7,7 +7,6 @@ import (
 	"github.com/ooni/probe-cli/internal/log/handlers/batch"
 	"github.com/ooni/probe-cli/internal/log/handlers/cli"
 	"github.com/ooni/probe-cli/utils"
-	"github.com/ooni/probe-cli/internal/cli/version/version.go"
 )
 
 // Cmd is the root command
@@ -33,7 +32,7 @@ func init() {
 		}
 		if *isVerbose {
 			log.SetLevel(log.DebugLevel)
-			log.Debugf("ooni version %s", version.Version)
+			log.Debugf("ooni version %s", ooni.Version)
 		}
 
 		Init = func() (*ooni.Context, error) {

internal/cli/version/version.go

@@ -4,15 +4,15 @@ import (
 	"fmt"
 
 	"github.com/alecthomas/kingpin"
+	ooni "github.com/ooni/probe-cli"
 	"github.com/ooni/probe-cli/internal/cli/root"
 )
 
-const Version = "3.0.0-dev.0"
 
 func init() {
 	cmd := root.Command("version", "Show version.")
 	cmd.Action(func(_ *kingpin.ParseContext) error {
-		fmt.Println(Version)
+		fmt.Println(ooni.Version)
 		return nil
 	})
 }

nettests/nettests.go

@@ -10,7 +10,6 @@ import (
 	"github.com/fatih/color"
 	"github.com/measurement-kit/go-measurement-kit"
 	ooni "github.com/ooni/probe-cli"
-	"github.com/ooni/probe-cli/internal/cli/version"
 	"github.com/ooni/probe-cli/internal/database"
 	"github.com/ooni/probe-cli/internal/output"
 	"github.com/ooni/probe-cli/utils"
@@ -122,7 +121,7 @@ func (c *Controller) Init(nt *mk.Nettest) error {
 		DisableReportFile: false,
 		DisableCollector:  false,
 		SoftwareName:      "ooniprobe",
-		SoftwareVersion:   version.Version,
+		SoftwareVersion:   ooni.Version,
 
 		OutputPath:       msmtPath,
 		GeoIPCountryPath: geoIPCountryPath,

ooni.go

@@ -16,6 +16,8 @@ import (
 	"github.com/pkg/errors"
 )
 
+const Version = "3.0.0-dev.0"
+
 // Context for OONI Probe
 type Context struct {
 	Config   *config.Config