From c81393b31a7bbabf2467ba8b5d18b9e64fde7b7e Mon Sep 17 00:00:00 2001 From: Simone Basso Date: Fri, 13 Nov 2020 17:47:29 +0100 Subject: [PATCH] refactor: move ooni into the internal package (#168) With this commit we've reorganised the package structure. Now I will go more in depth and perform further refactoring. --- internal/cli/onboard/onboard.go | 2 +- internal/cli/root/root.go | 2 +- internal/cli/run/run.go | 2 +- internal/nettests/nettests.go | 2 +- internal/nettests/nettests_test.go | 2 +- ooni.go => internal/ooni/ooni.go | 0 ooni_test.go => internal/ooni/ooni_test.go | 0 7 files changed, 5 insertions(+), 5 deletions(-) rename ooni.go => internal/ooni/ooni.go (100%) rename ooni_test.go => internal/ooni/ooni_test.go (100%) diff --git a/internal/cli/onboard/onboard.go b/internal/cli/onboard/onboard.go index 82308ad..d5bc2bf 100644 --- a/internal/cli/onboard/onboard.go +++ b/internal/cli/onboard/onboard.go @@ -6,7 +6,7 @@ import ( "github.com/alecthomas/kingpin" "github.com/apex/log" "github.com/fatih/color" - ooni "github.com/ooni/probe-cli" + "github.com/ooni/probe-cli/internal/ooni" "github.com/ooni/probe-cli/internal/cli/root" "github.com/ooni/probe-cli/internal/config" "github.com/ooni/probe-cli/internal/output" diff --git a/internal/cli/root/root.go b/internal/cli/root/root.go index 69d58d3..26d544c 100644 --- a/internal/cli/root/root.go +++ b/internal/cli/root/root.go @@ -3,7 +3,7 @@ package root import ( "github.com/alecthomas/kingpin" "github.com/apex/log" - ooni "github.com/ooni/probe-cli" + "github.com/ooni/probe-cli/internal/ooni" "github.com/ooni/probe-cli/internal/log/handlers/batch" "github.com/ooni/probe-cli/internal/log/handlers/cli" "github.com/ooni/probe-cli/internal/utils" diff --git a/internal/cli/run/run.go b/internal/cli/run/run.go index 51f2a92..daf1bb3 100644 --- a/internal/cli/run/run.go +++ b/internal/cli/run/run.go @@ -6,7 +6,7 @@ import ( "github.com/alecthomas/kingpin" "github.com/apex/log" "github.com/fatih/color" - ooni "github.com/ooni/probe-cli" + "github.com/ooni/probe-cli/internal/ooni" "github.com/ooni/probe-cli/internal/cli/onboard" "github.com/ooni/probe-cli/internal/cli/root" "github.com/ooni/probe-cli/internal/database" diff --git a/internal/nettests/nettests.go b/internal/nettests/nettests.go index fd8e2f8..97019eb 100644 --- a/internal/nettests/nettests.go +++ b/internal/nettests/nettests.go @@ -7,7 +7,7 @@ import ( "github.com/apex/log" "github.com/fatih/color" - ooni "github.com/ooni/probe-cli" + "github.com/ooni/probe-cli/internal/ooni" "github.com/ooni/probe-cli/internal/database" "github.com/ooni/probe-cli/internal/output" engine "github.com/ooni/probe-engine" diff --git a/internal/nettests/nettests_test.go b/internal/nettests/nettests_test.go index d3c129a..34d010c 100644 --- a/internal/nettests/nettests_test.go +++ b/internal/nettests/nettests_test.go @@ -5,7 +5,7 @@ import ( "path" "testing" - ooni "github.com/ooni/probe-cli" + "github.com/ooni/probe-cli/internal/ooni" "github.com/ooni/probe-cli/internal/database" "github.com/ooni/probe-cli/internal/utils/shutil" ) diff --git a/ooni.go b/internal/ooni/ooni.go similarity index 100% rename from ooni.go rename to internal/ooni/ooni.go diff --git a/ooni_test.go b/internal/ooni/ooni_test.go similarity index 100% rename from ooni_test.go rename to internal/ooni/ooni_test.go