Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 16 commits into from
Feb 2, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f908a79
chore: create ooni/probe-cli/v3
bassosimone Feb 1, 2021
bf1e453
refactor: move internal package into cmd/ooniprobe
bassosimone Feb 1, 2021
92ed443
chore: import ooni/[email protected] as internal/engine
bassosimone Feb 1, 2021
fb7a9e9
chore: remove the previous implementation
bassosimone Feb 2, 2021
823d96a
fix(build.sh): build inside v3
bassosimone Feb 2, 2021
5686a2d
chore: remove duplicate code of conduct
bassosimone Feb 2, 2021
ba25247
chore: updatebindata.sh now uses the v3 directory
bassosimone Feb 2, 2021
7df0046
chore: back-out merging the engine so soon
bassosimone Feb 2, 2021
b3bc3f4
tidy up go modules
bassosimone Feb 2, 2021
cd778ff
fix: we can get rid of the external testdata
bassosimone Feb 2, 2021
3d505ff
fix: bindata workflow
bassosimone Feb 2, 2021
1af8704
fix: address errors in github workflows
bassosimone Feb 2, 2021
e69f49a
fix(golang.yml): try to force working directory
bassosimone Feb 2, 2021
1edeb1f
Attempt using the format where we don't shuffle things around?
bassosimone Feb 2, 2021
8c9a534
further reduce diff with master
bassosimone Feb 2, 2021
183ccc1
final changes hopefully
bassosimone Feb 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/ooniprobe.exe
/ooniprobe
/coverage.cov
/testdata/gotmp
Expand Down
0 internal/autorun/autorun.go → cmd/ooniprobe/internal/autorun/autorun.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/autorun/autorun_darwin.go → ...iprobe/internal/autorun/autorun_darwin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
0 internal/bindata/bindata.go → cmd/ooniprobe/internal/bindata/bindata.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions internal/cli/app/app.go → cmd/ooniprobe/internal/cli/app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions internal/cli/autorun/autorun.go → ...ooniprobe/internal/cli/autorun/autorun.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 3 additions & 3 deletions internal/cli/geoip/geoip.go → cmd/ooniprobe/internal/cli/geoip/geoip.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions internal/cli/geoip/geoip_test.go → ...oniprobe/internal/cli/geoip/geoip_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions internal/cli/info/info.go → cmd/ooniprobe/internal/cli/info/info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions internal/cli/info/info_test.go → cmd/ooniprobe/internal/cli/info/info_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions internal/cli/list/list.go → cmd/ooniprobe/internal/cli/list/list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
8 changes: 4 additions & 4 deletions internal/cli/onboard/onboard.go → ...ooniprobe/internal/cli/onboard/onboard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/cli/reset/reset.go → cmd/ooniprobe/internal/cli/reset/reset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions internal/cli/rm/rm.go → cmd/ooniprobe/internal/cli/rm/rm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions internal/cli/root/root.go → cmd/ooniprobe/internal/cli/root/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions internal/cli/run/run.go → cmd/ooniprobe/internal/cli/run/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions internal/cli/show/show.go → cmd/ooniprobe/internal/cli/show/show.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion internal/cli/upload/upload.go → cmd/ooniprobe/internal/cli/upload/upload.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions internal/cli/version/version.go → ...ooniprobe/internal/cli/version/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions internal/config/parser.go → cmd/ooniprobe/internal/config/parser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 internal/config/parser_test.go → cmd/ooniprobe/internal/config/parser_test.go
View file
Open in desktop
File renamed without changes.
0 internal/config/settings.go → cmd/ooniprobe/internal/config/settings.go
View file
Open in desktop
File renamed without changes.
0 internal/config/testdata/config-v0.json → ...e/internal/config/testdata/config-v0.json
View file
Open in desktop
File renamed without changes.
0 internal/config/testdata/valid-config.json → ...nternal/config/testdata/valid-config.json
View file
Open in desktop
File renamed without changes.
0 internal/crashreport/crashreport.go → ...probe/internal/crashreport/crashreport.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions internal/database/actions.go → cmd/ooniprobe/internal/database/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 internal/database/actions_test.go → ...niprobe/internal/database/actions_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/database/database.go → cmd/ooniprobe/internal/database/database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 internal/database/database_test.go → ...iprobe/internal/database/database_test.go
View file
Open in desktop
File renamed without changes.
0 internal/database/models.go → cmd/ooniprobe/internal/database/models.go
View file
Open in desktop
File renamed without changes.
0 internal/enginex/enginex.go → cmd/ooniprobe/internal/enginex/enginex.go
View file
Open in desktop
File renamed without changes.
0 internal/log/handlers/batch/batch.go → ...robe/internal/log/handlers/batch/batch.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/log/handlers/cli/cli.go → ...oniprobe/internal/log/handlers/cli/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion internal/log/handlers/cli/measurements.go → ...internal/log/handlers/cli/measurements.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 ...nal/log/handlers/cli/progress/progress.go → ...nal/log/handlers/cli/progress/progress.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions internal/log/handlers/cli/results.go → ...robe/internal/log/handlers/cli/results.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 internal/log/handlers/syslog/syslog.c → ...obe/internal/log/handlers/syslog/syslog.c
View file
Open in desktop
File renamed without changes.
0 internal/log/handlers/syslog/syslog.go → ...be/internal/log/handlers/syslog/syslog.go
View file
Open in desktop
File renamed without changes.
0 internal/nettests/dash.go → cmd/ooniprobe/internal/nettests/dash.go
View file
Open in desktop
File renamed without changes.
0 internal/nettests/facebook_messenger.go → ...e/internal/nettests/facebook_messenger.go
View file
Open in desktop
File renamed without changes.
0 internal/nettests/groups.go → cmd/ooniprobe/internal/nettests/groups.go
View file
Open in desktop
File renamed without changes.
0 ...ettests/http_header_field_manipulation.go → ...ettests/http_header_field_manipulation.go
View file
Open in desktop
File renamed without changes.
0 ...nal/nettests/http_invalid_request_line.go → ...nal/nettests/http_invalid_request_line.go
View file
Open in desktop
File renamed without changes.
0 internal/nettests/ndt.go → cmd/ooniprobe/internal/nettests/ndt.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions internal/nettests/nettests.go → cmd/ooniprobe/internal/nettests/nettests.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions internal/nettests/nettests_test.go → ...iprobe/internal/nettests/nettests_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
0 internal/nettests/psiphon.go → cmd/ooniprobe/internal/nettests/psiphon.go
View file
Open in desktop
File renamed without changes.
0 internal/nettests/riseupvpn.go → cmd/ooniprobe/internal/nettests/riseupvpn.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions internal/nettests/run.go → cmd/ooniprobe/internal/nettests/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 internal/nettests/telegram.go → cmd/ooniprobe/internal/nettests/telegram.go
View file
Open in desktop
File renamed without changes.
0 internal/nettests/tor.go → cmd/ooniprobe/internal/nettests/tor.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/nettests/web_connectivity.go → ...obe/internal/nettests/web_connectivity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
0 internal/nettests/whatsapp.go → cmd/ooniprobe/internal/nettests/whatsapp.go
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions internal/ooni/ooni.go → cmd/ooniprobe/internal/ooni/ooni.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 internal/ooni/ooni_test.go → cmd/ooniprobe/internal/ooni/ooni_test.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions internal/oonitest/oonitest.go → cmd/ooniprobe/internal/oonitest/oonitest.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/output/output.go → cmd/ooniprobe/internal/output/output.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 internal/utils/homedir/homedir.go → ...niprobe/internal/utils/homedir/homedir.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/utils/paths.go → cmd/ooniprobe/internal/utils/paths.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 internal/utils/shutil/shutil.go → ...ooniprobe/internal/utils/shutil/shutil.go
View file
Open in desktop
File renamed without changes.
0 internal/utils/util_test.go → cmd/ooniprobe/internal/utils/util_test.go
View file
Open in desktop
File renamed without changes.
0 internal/utils/utils.go → cmd/ooniprobe/internal/utils/utils.go
View file
Open in desktop
File renamed without changes.
0 internal/version/version.go → cmd/ooniprobe/internal/version/version.go
View file
Open in desktop
File renamed without changes.
26 changes: 13 additions & 13 deletions cmd/ooniprobe/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
0 testdata/testing-config.json → cmd/ooniprobe/testdata/testing-config.json
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/ooni/probe-cli
module github.com/ooni/probe-cli/v3

go 1.14

Expand Down
2 changes: 1 addition & 1 deletion smoketest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading