fix: import path should be github.com/ooni/probe-cli/v3 (#200)

See https://github.com/ooni/probe/issues/1335#issuecomment-771499511

.gitignore

@@ -1,3 +1,4 @@
+/ooniprobe.exe
 /ooniprobe
 /coverage.cov
 /testdata/gotmp

cmd/ooniprobe/internal/autorun/autorun_darwin.go

@@ -12,7 +12,7 @@ import (
 	"text/template"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/utils"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/utils"
 	"github.com/ooni/probe-engine/cmd/jafar/shellx"
 	"golang.org/x/sys/unix"
 )

cmd/ooniprobe/internal/cli/app/app.go

@@ -4,8 +4,8 @@ import (
 	"os"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/cli/root"
-	"github.com/ooni/probe-cli/internal/version"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/root"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/version"
 )
 
 // Run the app. This is the main app entry point

cmd/ooniprobe/internal/cli/autorun/autorun.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/alecthomas/kingpin"
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/autorun"
-	"github.com/ooni/probe-cli/internal/cli/onboard"
-	"github.com/ooni/probe-cli/internal/cli/root"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/autorun"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/onboard"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/root"
 )
 
 var errNotImplemented = errors.New("autorun: not implemented on this platform")

cmd/ooniprobe/internal/cli/geoip/geoip.go

@@ -3,9 +3,9 @@ package geoip
 import (
 	"github.com/alecthomas/kingpin"
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/cli/root"
-	"github.com/ooni/probe-cli/internal/ooni"
-	"github.com/ooni/probe-cli/internal/output"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/root"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/ooni"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/output"
 )
 
 func init() {

cmd/ooniprobe/internal/cli/geoip/geoip_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/ooni"
-	"github.com/ooni/probe-cli/internal/oonitest"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/ooni"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/oonitest"
 )
 
 func TestNewProbeCLIFailed(t *testing.T) {

cmd/ooniprobe/internal/cli/info/info.go

@@ -3,8 +3,8 @@ package info
 import (
 	"github.com/alecthomas/kingpin"
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/cli/root"
-	"github.com/ooni/probe-cli/internal/ooni"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/root"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/ooni"
 )
 
 func init() {

cmd/ooniprobe/internal/cli/info/info_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/ooni"
-	"github.com/ooni/probe-cli/internal/oonitest"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/ooni"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/oonitest"
 )
 
 func TestNewProbeCLIFailed(t *testing.T) {

cmd/ooniprobe/internal/cli/list/list.go

@@ -3,9 +3,9 @@ package list
 import (
 	"github.com/alecthomas/kingpin"
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/cli/root"
-	"github.com/ooni/probe-cli/internal/database"
-	"github.com/ooni/probe-cli/internal/output"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/root"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/database"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/output"
 )
 
 func init() {

cmd/ooniprobe/internal/cli/onboard/onboard.go

@@ -6,10 +6,10 @@ import (
 	"github.com/alecthomas/kingpin"
 	"github.com/apex/log"
 	"github.com/fatih/color"
-	"github.com/ooni/probe-cli/internal/cli/root"
-	"github.com/ooni/probe-cli/internal/config"
-	"github.com/ooni/probe-cli/internal/ooni"
-	"github.com/ooni/probe-cli/internal/output"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/root"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/config"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/ooni"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/output"
 	"github.com/pkg/errors"
 	"gopkg.in/AlecAivazis/survey.v1"
 )

cmd/ooniprobe/internal/cli/reset/reset.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/alecthomas/kingpin"
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/cli/root"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/root"
 )
 
 func init() {

cmd/ooniprobe/internal/cli/rm/rm.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/alecthomas/kingpin"
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/cli/root"
-	"github.com/ooni/probe-cli/internal/database"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/root"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/database"
 	survey "gopkg.in/AlecAivazis/survey.v1"
 	db "upper.io/db.v3"
 	"upper.io/db.v3/lib/sqlbuilder"

cmd/ooniprobe/internal/cli/root/root.go

@@ -3,12 +3,12 @@ package root
 import (
 	"github.com/alecthomas/kingpin"
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/log/handlers/batch"
-	"github.com/ooni/probe-cli/internal/log/handlers/cli"
-	"github.com/ooni/probe-cli/internal/log/handlers/syslog"
-	"github.com/ooni/probe-cli/internal/ooni"
-	"github.com/ooni/probe-cli/internal/utils"
-	"github.com/ooni/probe-cli/internal/version"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/log/handlers/batch"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/log/handlers/cli"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/log/handlers/syslog"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/ooni"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/utils"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/version"
 )
 
 // Cmd is the root command

cmd/ooniprobe/internal/cli/run/run.go

@@ -6,10 +6,10 @@ import (
 	"github.com/alecthomas/kingpin"
 	"github.com/apex/log"
 	"github.com/fatih/color"
-	"github.com/ooni/probe-cli/internal/cli/onboard"
-	"github.com/ooni/probe-cli/internal/cli/root"
-	"github.com/ooni/probe-cli/internal/nettests"
-	"github.com/ooni/probe-cli/internal/ooni"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/onboard"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/root"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/nettests"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/ooni"
 )
 
 func init() {

cmd/ooniprobe/internal/cli/show/show.go

@@ -3,9 +3,9 @@ package nettest
 import (
 	"github.com/alecthomas/kingpin"
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/cli/root"
-	"github.com/ooni/probe-cli/internal/database"
-	"github.com/ooni/probe-cli/internal/output"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/root"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/database"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/output"
 )
 
 func init() {

cmd/ooniprobe/internal/cli/upload/upload.go

@@ -3,7 +3,7 @@ package upload
 import (
 	"github.com/alecthomas/kingpin"
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/cli/root"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/root"
 )
 
 func init() {

cmd/ooniprobe/internal/cli/version/version.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 
 	"github.com/alecthomas/kingpin"
-	"github.com/ooni/probe-cli/internal/cli/root"
-	"github.com/ooni/probe-cli/internal/version"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/root"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/version"
 )
 
 func init() {

cmd/ooniprobe/internal/config/parser.go

@@ -6,8 +6,8 @@ import (
 	"sync"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/crashreport"
-	"github.com/ooni/probe-cli/internal/utils"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/crashreport"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/utils"
 	"github.com/pkg/errors"
 )
 

cmd/ooniprobe/internal/database/actions.go

@@ -13,8 +13,8 @@ import (
 	"time"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/enginex"
-	"github.com/ooni/probe-cli/internal/utils"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/enginex"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/utils"
 	"github.com/pkg/errors"
 	db "upper.io/db.v3"
 	"upper.io/db.v3/lib/sqlbuilder"

cmd/ooniprobe/internal/database/database.go

@@ -4,7 +4,7 @@ import (
 	"database/sql"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/bindata"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/bindata"
 	migrate "github.com/rubenv/sql-migrate"
 	"upper.io/db.v3/lib/sqlbuilder"
 	"upper.io/db.v3/sqlite"

cmd/ooniprobe/internal/log/handlers/cli/cli.go

@@ -11,7 +11,7 @@ import (
 	"github.com/apex/log"
 	"github.com/fatih/color"
 	colorable "github.com/mattn/go-colorable"
-	"github.com/ooni/probe-cli/internal/utils"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/utils"
 )
 
 // Default handler outputting to stderr.

cmd/ooniprobe/internal/log/handlers/cli/measurements.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/utils"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/utils"
 )
 
 func statusIcon(ok bool) string {

cmd/ooniprobe/internal/log/handlers/cli/results.go

@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/database"
-	"github.com/ooni/probe-cli/internal/utils"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/database"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/utils"
 )
 
 func formatSpeed(speed float64) string {

cmd/ooniprobe/internal/nettests/nettests.go

@@ -7,9 +7,9 @@ import (
 
 	"github.com/apex/log"
 	"github.com/fatih/color"
-	"github.com/ooni/probe-cli/internal/database"
-	"github.com/ooni/probe-cli/internal/ooni"
-	"github.com/ooni/probe-cli/internal/output"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/database"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/ooni"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/output"
 	engine "github.com/ooni/probe-engine"
 	"github.com/ooni/probe-engine/model"
 	"github.com/pkg/errors"

cmd/ooniprobe/internal/nettests/nettests_test.go

@@ -5,9 +5,9 @@ import (
 	"path"
 	"testing"
 
-	"github.com/ooni/probe-cli/internal/database"
-	"github.com/ooni/probe-cli/internal/ooni"
-	"github.com/ooni/probe-cli/internal/utils/shutil"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/database"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/ooni"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/utils/shutil"
 )
 
 func newOONIProbe(t *testing.T) *ooni.Probe {

cmd/ooniprobe/internal/nettests/run.go

@@ -2,8 +2,8 @@ package nettests
 
 import (
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/database"
-	"github.com/ooni/probe-cli/internal/ooni"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/database"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/ooni"
 	"github.com/pkg/errors"
 )
 

cmd/ooniprobe/internal/nettests/web_connectivity.go

@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/database"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/database"
 	engine "github.com/ooni/probe-engine"
 )
 

cmd/ooniprobe/internal/ooni/ooni.go

@@ -8,11 +8,11 @@ import (
 	"syscall"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/bindata"
-	"github.com/ooni/probe-cli/internal/config"
-	"github.com/ooni/probe-cli/internal/database"
-	"github.com/ooni/probe-cli/internal/enginex"
-	"github.com/ooni/probe-cli/internal/utils"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/bindata"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/config"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/database"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/enginex"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/utils"
 	engine "github.com/ooni/probe-engine"
 	"github.com/pkg/errors"
 	"upper.io/db.v3/lib/sqlbuilder"

cmd/ooniprobe/internal/oonitest/oonitest.go

@@ -5,8 +5,8 @@ import (
 	"sync"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/config"
-	"github.com/ooni/probe-cli/internal/ooni"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/config"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/ooni"
 	"upper.io/db.v3/lib/sqlbuilder"
 )
 

cmd/ooniprobe/internal/output/output.go

@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/database"
-	"github.com/ooni/probe-cli/internal/utils"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/database"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/utils"
 )
 
 // MeasurementJSON prints the JSON of a measurement

cmd/ooniprobe/internal/utils/paths.go

@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/ooni/probe-cli/internal/utils/homedir"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/utils/homedir"
 )
 
 // RequiredDirs returns the required ooni home directories

cmd/ooniprobe/main.go

@@ -2,19 +2,19 @@ package main
 
 import (
 	"github.com/apex/log"
-	"github.com/ooni/probe-cli/internal/cli/app"
-	_ "github.com/ooni/probe-cli/internal/cli/autorun"
-	_ "github.com/ooni/probe-cli/internal/cli/geoip"
-	_ "github.com/ooni/probe-cli/internal/cli/info"
-	_ "github.com/ooni/probe-cli/internal/cli/list"
-	_ "github.com/ooni/probe-cli/internal/cli/onboard"
-	_ "github.com/ooni/probe-cli/internal/cli/reset"
-	_ "github.com/ooni/probe-cli/internal/cli/rm"
-	_ "github.com/ooni/probe-cli/internal/cli/run"
-	_ "github.com/ooni/probe-cli/internal/cli/show"
-	_ "github.com/ooni/probe-cli/internal/cli/upload"
-	_ "github.com/ooni/probe-cli/internal/cli/version"
-	"github.com/ooni/probe-cli/internal/crashreport"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/app"
+	_ "github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/autorun"
+	_ "github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/geoip"
+	_ "github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/info"
+	_ "github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/list"
+	_ "github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/onboard"
+	_ "github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/reset"
+	_ "github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/rm"
+	_ "github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/run"
+	_ "github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/show"
+	_ "github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/upload"
+	_ "github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/cli/version"
+	"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/crashreport"
 )
 
 func main() {

go.mod

@@ -1,4 +1,4 @@
-module github.com/ooni/probe-cli
+module github.com/ooni/probe-cli/v3
 
 go 1.14
 

smoketest.sh

@@ -6,4 +6,4 @@ if [ "$#" != 1 ]; then
 fi
 $1 onboard --yes
 # Important! DO NOT run performance from CI b/c it will overload m-lab servers
-$1 run websites --config testdata/testing-config.json -v --no-collector
+$1 run websites --config cmd/ooniprobe/testdata/testing-config.json -v --no-collector

updatebindata.sh

@@ -7,4 +7,4 @@ if [ "$version" != "4.0.0" ]; then
   echo "FATAL: unexpected go-bindata version" 1>&2
   exit 1
 fi
-$gobindata -nometadata -o internal/bindata/bindata.go -pkg bindata data/...
+$gobindata -nometadata -o cmd/ooniprobe/internal/bindata/bindata.go -pkg bindata data/...