c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
See https://github.com/ooni/probe/issues/1335#issuecomment-771499511
This commit is contained in:
Simone Basso 2021-02-02 10:32:46 +01:00 committed by GitHub
parent faa9308b1e
commit b1ce300c8d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
68 changed files with 86 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

0
internal/autorun/autorun.go → cmd/ooniprobe/internal/autorun/autorun.go
View File

2
internal/autorun/autorun_darwin.go → cmd/ooniprobe/internal/autorun/autorun_darwin.go
View File

@ -12,7 +12,7 @@ import (
"text/template" "text/template"
"github.com/apex/log" "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" "github.com/ooni/probe-engine/cmd/jafar/shellx"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )

0
internal/bindata/bindata.go → cmd/ooniprobe/internal/bindata/bindata.go
View File

4
internal/cli/app/app.go → cmd/ooniprobe/internal/cli/app/app.go
View File

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

6
internal/cli/autorun/autorun.go → cmd/ooniprobe/internal/cli/autorun/autorun.go
View File

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

6
internal/cli/geoip/geoip.go → cmd/ooniprobe/internal/cli/geoip/geoip.go
View File

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

4
internal/cli/geoip/geoip_test.go → cmd/ooniprobe/internal/cli/geoip/geoip_test.go
View File

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

4
internal/cli/info/info.go → cmd/ooniprobe/internal/cli/info/info.go
View File

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

4
internal/cli/info/info_test.go → cmd/ooniprobe/internal/cli/info/info_test.go
View File

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

6
internal/cli/list/list.go → cmd/ooniprobe/internal/cli/list/list.go
View File

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

8
internal/cli/onboard/onboard.go → cmd/ooniprobe/internal/cli/onboard/onboard.go
View File

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

2
internal/cli/reset/reset.go → cmd/ooniprobe/internal/cli/reset/reset.go
View File

@ -5,7 +5,7 @@ import (
"github.com/alecthomas/kingpin" "github.com/alecthomas/kingpin"
"github.com/apex/log" "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() { func init() {

4
internal/cli/rm/rm.go → cmd/ooniprobe/internal/cli/rm/rm.go
View File

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

12
internal/cli/root/root.go → cmd/ooniprobe/internal/cli/root/root.go
View File

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

8
internal/cli/run/run.go → cmd/ooniprobe/internal/cli/run/run.go
View File

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

6
internal/cli/show/show.go → cmd/ooniprobe/internal/cli/show/show.go
View File

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

2
internal/cli/upload/upload.go → cmd/ooniprobe/internal/cli/upload/upload.go
View File

@ -3,7 +3,7 @@ package upload
import ( import (
"github.com/alecthomas/kingpin" "github.com/alecthomas/kingpin"
"github.com/apex/log" "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() { func init() {

4
internal/cli/version/version.go → cmd/ooniprobe/internal/cli/version/version.go
View File

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

4
internal/config/parser.go → cmd/ooniprobe/internal/config/parser.go
View File

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

0
internal/config/parser_test.go → cmd/ooniprobe/internal/config/parser_test.go
View File

0
internal/config/settings.go → cmd/ooniprobe/internal/config/settings.go
View File

0
internal/config/testdata/config-v0.json → cmd/ooniprobe/internal/config/testdata/config-v0.json vendored
View File

0
internal/config/testdata/valid-config.json → cmd/ooniprobe/internal/config/testdata/valid-config.json vendored
View File

0
internal/crashreport/crashreport.go → cmd/ooniprobe/internal/crashreport/crashreport.go
View File

4
internal/database/actions.go → cmd/ooniprobe/internal/database/actions.go
View File

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

0
internal/database/actions_test.go → cmd/ooniprobe/internal/database/actions_test.go
View File

2
internal/database/database.go → cmd/ooniprobe/internal/database/database.go
View File

@ -4,7 +4,7 @@ import (
"database/sql" "database/sql"
"github.com/apex/log" "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" migrate "github.com/rubenv/sql-migrate"
"upper.io/db.v3/lib/sqlbuilder" "upper.io/db.v3/lib/sqlbuilder"
"upper.io/db.v3/sqlite" "upper.io/db.v3/sqlite"

0
internal/database/database_test.go → cmd/ooniprobe/internal/database/database_test.go
View File

0
internal/database/models.go → cmd/ooniprobe/internal/database/models.go
View File

0
internal/enginex/enginex.go → cmd/ooniprobe/internal/enginex/enginex.go
View File

0
internal/log/handlers/batch/batch.go → cmd/ooniprobe/internal/log/handlers/batch/batch.go
View File

2
internal/log/handlers/cli/cli.go → cmd/ooniprobe/internal/log/handlers/cli/cli.go
View File

@ -11,7 +11,7 @@ import (
"github.com/apex/log" "github.com/apex/log"
"github.com/fatih/color" "github.com/fatih/color"
colorable "github.com/mattn/go-colorable" 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. // Default handler outputting to stderr.

2
internal/log/handlers/cli/measurements.go → cmd/ooniprobe/internal/log/handlers/cli/measurements.go
View File

@ -9,7 +9,7 @@ import (
"time" "time"
"github.com/apex/log" "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 { func statusIcon(ok bool) string {

0
internal/log/handlers/cli/progress/progress.go → cmd/ooniprobe/internal/log/handlers/cli/progress/progress.go
View File

4
internal/log/handlers/cli/results.go → cmd/ooniprobe/internal/log/handlers/cli/results.go
View File

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

0
internal/log/handlers/syslog/syslog.c → cmd/ooniprobe/internal/log/handlers/syslog/syslog.c
View File

0
internal/log/handlers/syslog/syslog.go → cmd/ooniprobe/internal/log/handlers/syslog/syslog.go
View File

0
internal/nettests/dash.go → cmd/ooniprobe/internal/nettests/dash.go
View File

0
internal/nettests/facebook_messenger.go → cmd/ooniprobe/internal/nettests/facebook_messenger.go
View File

0
internal/nettests/groups.go → cmd/ooniprobe/internal/nettests/groups.go
View File

0
internal/nettests/http_header_field_manipulation.go → cmd/ooniprobe/internal/nettests/http_header_field_manipulation.go
View File

0
internal/nettests/http_invalid_request_line.go → cmd/ooniprobe/internal/nettests/http_invalid_request_line.go
View File

0
internal/nettests/ndt.go → cmd/ooniprobe/internal/nettests/ndt.go
View File

6
internal/nettests/nettests.go → cmd/ooniprobe/internal/nettests/nettests.go
View File

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

6
internal/nettests/nettests_test.go → cmd/ooniprobe/internal/nettests/nettests_test.go
View File

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

0
internal/nettests/psiphon.go → cmd/ooniprobe/internal/nettests/psiphon.go
View File

0
internal/nettests/riseupvpn.go → cmd/ooniprobe/internal/nettests/riseupvpn.go
View File

4
internal/nettests/run.go → cmd/ooniprobe/internal/nettests/run.go
View File

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

0
internal/nettests/telegram.go → cmd/ooniprobe/internal/nettests/telegram.go
View File

0
internal/nettests/tor.go → cmd/ooniprobe/internal/nettests/tor.go
View File

2
internal/nettests/web_connectivity.go → cmd/ooniprobe/internal/nettests/web_connectivity.go
View File

@ -4,7 +4,7 @@ import (
"context" "context"
"github.com/apex/log" "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" engine "github.com/ooni/probe-engine"
) )

0
internal/nettests/whatsapp.go → cmd/ooniprobe/internal/nettests/whatsapp.go
View File

10
internal/ooni/ooni.go → cmd/ooniprobe/internal/ooni/ooni.go
View File

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

0
internal/ooni/ooni_test.go → cmd/ooniprobe/internal/ooni/ooni_test.go
View File

4
internal/oonitest/oonitest.go → cmd/ooniprobe/internal/oonitest/oonitest.go
View File

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

4
internal/output/output.go → cmd/ooniprobe/internal/output/output.go
View File

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

0
internal/utils/homedir/homedir.go → cmd/ooniprobe/internal/utils/homedir/homedir.go
View File

2
internal/utils/paths.go → cmd/ooniprobe/internal/utils/paths.go
View File

@ -7,7 +7,7 @@ import (
"path/filepath" "path/filepath"
"time" "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 // RequiredDirs returns the required ooni home directories

0
internal/utils/shutil/shutil.go → cmd/ooniprobe/internal/utils/shutil/shutil.go
View File

0
internal/utils/util_test.go → cmd/ooniprobe/internal/utils/util_test.go
View File

0
internal/utils/utils.go → cmd/ooniprobe/internal/utils/utils.go
View File

0
internal/version/version.go → cmd/ooniprobe/internal/version/version.go
View File

26
cmd/ooniprobe/main.go
View File

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

0
testdata/testing-config.json → cmd/ooniprobe/testdata/testing-config.json vendored
View File

2
go.mod
View File

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

2
smoketest.sh
View File

@ -6,4 +6,4 @@ if [ "$#" != 1 ]; then
fi fi
$1 onboard --yes $1 onboard --yes
# Important! DO NOT run performance from CI b/c it will overload m-lab servers # 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

2
updatebindata.sh
View File

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