diff --git a/internal/cli/root/root.go b/internal/cli/root/root.go index 62726b6..e37c338 100644 --- a/internal/cli/root/root.go +++ b/internal/cli/root/root.go @@ -6,7 +6,7 @@ import ( ooni "github.com/ooni/probe-cli" "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/utils" "github.com/ooni/probe-cli/version" ) diff --git a/internal/config/parser.go b/internal/config/parser.go index 3bd5da2..c8f99e1 100644 --- a/internal/config/parser.go +++ b/internal/config/parser.go @@ -7,7 +7,7 @@ import ( "github.com/apex/log" "github.com/ooni/probe-cli/internal/crashreport" - "github.com/ooni/probe-cli/utils" + "github.com/ooni/probe-cli/internal/utils" "github.com/pkg/errors" ) diff --git a/internal/database/actions.go b/internal/database/actions.go index 5bce0b7..0cb0818 100644 --- a/internal/database/actions.go +++ b/internal/database/actions.go @@ -12,7 +12,7 @@ import ( "github.com/apex/log" "github.com/ooni/probe-cli/internal/enginex" - "github.com/ooni/probe-cli/utils" + "github.com/ooni/probe-cli/internal/utils" "github.com/pkg/errors" db "upper.io/db.v3" "upper.io/db.v3/lib/sqlbuilder" diff --git a/internal/log/handlers/cli/cli.go b/internal/log/handlers/cli/cli.go index c3de93e..b9cfafe 100644 --- a/internal/log/handlers/cli/cli.go +++ b/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/utils" + "github.com/ooni/probe-cli/internal/utils" ) // Default handler outputting to stderr. diff --git a/internal/log/handlers/cli/measurements.go b/internal/log/handlers/cli/measurements.go index fa27c75..86e488d 100644 --- a/internal/log/handlers/cli/measurements.go +++ b/internal/log/handlers/cli/measurements.go @@ -9,7 +9,7 @@ import ( "time" "github.com/apex/log" - "github.com/ooni/probe-cli/utils" + "github.com/ooni/probe-cli/internal/utils" ) func statusIcon(ok bool) string { diff --git a/internal/log/handlers/cli/results.go b/internal/log/handlers/cli/results.go index faee35a..97ea165 100644 --- a/internal/log/handlers/cli/results.go +++ b/internal/log/handlers/cli/results.go @@ -9,7 +9,7 @@ import ( "github.com/apex/log" "github.com/ooni/probe-cli/internal/database" - "github.com/ooni/probe-cli/utils" + "github.com/ooni/probe-cli/internal/utils" ) func formatSpeed(speed float64) string { diff --git a/internal/nettests/nettests_test.go b/internal/nettests/nettests_test.go index a557a34..d3c129a 100644 --- a/internal/nettests/nettests_test.go +++ b/internal/nettests/nettests_test.go @@ -7,7 +7,7 @@ import ( ooni "github.com/ooni/probe-cli" "github.com/ooni/probe-cli/internal/database" - "github.com/ooni/probe-cli/utils/shutil" + "github.com/ooni/probe-cli/internal/utils/shutil" ) func newTestingContext(t *testing.T) *ooni.Context { diff --git a/internal/output/output.go b/internal/output/output.go index 92c37c7..eb96a9e 100644 --- a/internal/output/output.go +++ b/internal/output/output.go @@ -8,7 +8,7 @@ import ( "github.com/apex/log" "github.com/ooni/probe-cli/internal/database" - "github.com/ooni/probe-cli/utils" + "github.com/ooni/probe-cli/internal/utils" ) // MeasurementJSON prints the JSON of a measurement diff --git a/utils/homedir/homedir.go b/internal/utils/homedir/homedir.go similarity index 100% rename from utils/homedir/homedir.go rename to internal/utils/homedir/homedir.go diff --git a/utils/paths.go b/internal/utils/paths.go similarity index 97% rename from utils/paths.go rename to internal/utils/paths.go index 7ffa16f..dbc7e4e 100644 --- a/utils/paths.go +++ b/internal/utils/paths.go @@ -7,7 +7,7 @@ import ( "path/filepath" "time" - "github.com/ooni/probe-cli/utils/homedir" + "github.com/ooni/probe-cli/internal/utils/homedir" ) // RequiredDirs returns the required ooni home directories diff --git a/utils/shutil/shutil.go b/internal/utils/shutil/shutil.go similarity index 100% rename from utils/shutil/shutil.go rename to internal/utils/shutil/shutil.go diff --git a/utils/util_test.go b/internal/utils/util_test.go similarity index 100% rename from utils/util_test.go rename to internal/utils/util_test.go diff --git a/utils/utils.go b/internal/utils/utils.go similarity index 100% rename from utils/utils.go rename to internal/utils/utils.go diff --git a/ooni.go b/ooni.go index e2fcc6e..466a5f8 100644 --- a/ooni.go +++ b/ooni.go @@ -12,7 +12,7 @@ import ( "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/utils" + "github.com/ooni/probe-cli/internal/utils" engine "github.com/ooni/probe-engine" "github.com/ooni/probe-engine/model" "github.com/pkg/errors"