Skip to content

Commit

Permalink
refactor: move more commands to internal/cmd (ooni#207)
Browse files Browse the repository at this point in the history 
* refactor: move more commands to internal/cmd

Part of ooni/probe#1335.

We would like all commands to be at the same level of engine
rather than inside engine (now that we can do it).

* fix: update .gitignore

* refactor: also move jafar outside engine

* We should be good now?
  • Loading branch information
@bassosimone
bassosimone authored Feb 3, 2021
1 parent 8dfad0a commit 863595a
Show file tree
Hide file tree
Showing 85 changed files with 72 additions and 65 deletions.
6 changes: 6 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@
/*.jsonl
/*.tar.gz
/*.zip
/apitool
/apitool.exe
/coverage.cov
/miniooni
/miniooni.exe
/oohelper
/oohelper.exe
/oohelperd
/oohelperd.exe
/ooniprobe
/ooniprobe.exe
/ooniprobe_checksums.txt
Expand Down
2 changes: 1 addition & 1 deletion cmd/ooniprobe/internal/autorun/autorun_darwin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (

"github.com/apex/log"
"github.com/ooni/probe-cli/v3/cmd/ooniprobe/internal/utils"
"github.com/ooni/probe-cli/v3/internal/engine/cmd/jafar/shellx"
"github.com/ooni/probe-cli/v3/internal/engine/shellx"
"golang.org/x/sys/unix"
)

Expand Down
4 changes: 4 additions & 0 deletions internal/cmd/README.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Directory github.com/ooni/probe-cli/internal/cmd

This directory contains the source code for the CLI tools we build
but we don't want to expose to the outside world.
0 internal/engine/cmd/apitool/README.md → internal/cmd/apitool/README.md
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions internal/engine/cmd/apitool/main.go → internal/cmd/apitool/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (

"github.com/apex/log"
"github.com/ooni/probe-cli/v3/internal/engine/atomicx"
"github.com/ooni/probe-cli/v3/internal/engine/internal/httpx"
"github.com/ooni/probe-cli/v3/internal/engine/internal/kvstore"
"github.com/ooni/probe-cli/v3/internal/engine/httpx"
"github.com/ooni/probe-cli/v3/internal/engine/kvstore"
"github.com/ooni/probe-cli/v3/internal/engine/netx"
"github.com/ooni/probe-cli/v3/internal/engine/probeservices"
"github.com/ooni/probe-cli/v3/internal/engine/version"
Expand Down
0 internal/engine/cmd/apitool/main_test.go → internal/cmd/apitool/main_test.go
View file
File renamed without changes.
1 change: 1 addition & 0 deletions internal/cmd/jafar/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/badproxy.pem
0 internal/engine/cmd/jafar/README.md → internal/cmd/jafar/README.md
View file
File renamed without changes.
0 ...nal/engine/cmd/jafar/badproxy/badproxy.go → internal/cmd/jafar/badproxy/badproxy.go
View file
File renamed without changes.
0 ...ngine/cmd/jafar/badproxy/badproxy_test.go → internal/cmd/jafar/badproxy/badproxy_test.go
View file
File renamed without changes.
0 ...nal/engine/cmd/jafar/flagx/stringarray.go → internal/cmd/jafar/flagx/stringarray.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ngine/cmd/jafar/flagx/stringarray_test.go → internal/cmd/jafar/flagx/stringarray_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
"github.com/ooni/probe-cli/v3/internal/engine/cmd/jafar/flagx"
"github.com/ooni/probe-cli/v3/internal/cmd/jafar/flagx"
)

func TestStringArray(t *testing.T) {
Expand Down
0 ...l/engine/cmd/jafar/httpproxy/httpproxy.go → internal/cmd/jafar/httpproxy/httpproxy.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ine/cmd/jafar/httpproxy/httpproxy_test.go → ...nal/cmd/jafar/httpproxy/httpproxy_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"net/http"
"testing"

"github.com/ooni/probe-cli/v3/internal/engine/cmd/jafar/uncensored"
"github.com/ooni/probe-cli/v3/internal/cmd/jafar/uncensored"
)

func TestPass(t *testing.T) {
Expand Down
0 ...nal/engine/cmd/jafar/iptables/iptables.go → internal/cmd/jafar/iptables/iptables.go
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions ...far/iptables/iptables_integration_test.go → ...far/iptables/iptables_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"time"

"github.com/apex/log"
"github.com/ooni/probe-cli/v3/internal/engine/cmd/jafar/resolver"
"github.com/ooni/probe-cli/v3/internal/engine/cmd/jafar/shellx"
"github.com/ooni/probe-cli/v3/internal/engine/cmd/jafar/uncensored"
"github.com/ooni/probe-cli/v3/internal/cmd/jafar/resolver"
"github.com/ooni/probe-cli/v3/internal/cmd/jafar/uncensored"
"github.com/ooni/probe-cli/v3/internal/engine/shellx"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion ...gine/cmd/jafar/iptables/iptables_linux.go → ...rnal/cmd/jafar/iptables/iptables_linux.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
package iptables

import (
"github.com/ooni/probe-cli/v3/internal/engine/cmd/jafar/shellx"
"github.com/ooni/probe-cli/v3/internal/engine/runtimex"
"github.com/ooni/probe-cli/v3/internal/engine/shellx"
)

type linuxShell struct{}
Expand Down
0 ...md/jafar/iptables/iptables_unsupported.go → ...md/jafar/iptables/iptables_unsupported.go
View file
File renamed without changes.
16 changes: 8 additions & 8 deletions internal/engine/cmd/jafar/main.go → internal/cmd/jafar/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ import (
"github.com/apex/log"
"github.com/apex/log/handlers/cli"
"github.com/miekg/dns"
"github.com/ooni/probe-cli/v3/internal/engine/cmd/jafar/badproxy"
"github.com/ooni/probe-cli/v3/internal/engine/cmd/jafar/flagx"
"github.com/ooni/probe-cli/v3/internal/engine/cmd/jafar/httpproxy"
"github.com/ooni/probe-cli/v3/internal/engine/cmd/jafar/iptables"
"github.com/ooni/probe-cli/v3/internal/engine/cmd/jafar/resolver"
"github.com/ooni/probe-cli/v3/internal/engine/cmd/jafar/shellx"
"github.com/ooni/probe-cli/v3/internal/engine/cmd/jafar/tlsproxy"
"github.com/ooni/probe-cli/v3/internal/engine/cmd/jafar/uncensored"
"github.com/ooni/probe-cli/v3/internal/cmd/jafar/badproxy"
"github.com/ooni/probe-cli/v3/internal/cmd/jafar/flagx"
"github.com/ooni/probe-cli/v3/internal/cmd/jafar/httpproxy"
"github.com/ooni/probe-cli/v3/internal/cmd/jafar/iptables"
"github.com/ooni/probe-cli/v3/internal/cmd/jafar/resolver"
"github.com/ooni/probe-cli/v3/internal/cmd/jafar/tlsproxy"
"github.com/ooni/probe-cli/v3/internal/cmd/jafar/uncensored"
"github.com/ooni/probe-cli/v3/internal/engine/runtimex"
"github.com/ooni/probe-cli/v3/internal/engine/shellx"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions internal/engine/cmd/jafar/main_test.go → internal/cmd/jafar/main_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"runtime"
"testing"

"github.com/ooni/probe-cli/v3/internal/engine/cmd/jafar/iptables"
"github.com/ooni/probe-cli/v3/internal/engine/cmd/jafar/shellx"
"github.com/ooni/probe-cli/v3/internal/cmd/jafar/iptables"
"github.com/ooni/probe-cli/v3/internal/engine/shellx"
)

func ensureWeStartOverWithIPTables() {
Expand Down
0 ...nal/engine/cmd/jafar/resolver/resolver.go → internal/cmd/jafar/resolver/resolver.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ngine/cmd/jafar/resolver/resolver_test.go → internal/cmd/jafar/resolver/resolver_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

"github.com/miekg/dns"
"github.com/ooni/probe-cli/v3/internal/engine/cmd/jafar/uncensored"
"github.com/ooni/probe-cli/v3/internal/cmd/jafar/uncensored"
)

func TestPass(t *testing.T) {
Expand Down
0 ...nal/engine/cmd/jafar/tlsproxy/tlsproxy.go → internal/cmd/jafar/tlsproxy/tlsproxy.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ngine/cmd/jafar/tlsproxy/tlsproxy_test.go → internal/cmd/jafar/tlsproxy/tlsproxy_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"sync"
"testing"

"github.com/ooni/probe-cli/v3/internal/engine/cmd/jafar/uncensored"
"github.com/ooni/probe-cli/v3/internal/cmd/jafar/uncensored"
)

func TestPass(t *testing.T) {
Expand Down
0 ...engine/cmd/jafar/uncensored/uncensored.go → internal/cmd/jafar/uncensored/uncensored.go
View file
File renamed without changes.
0 ...e/cmd/jafar/uncensored/uncensored_test.go → ...l/cmd/jafar/uncensored/uncensored_test.go
View file
File renamed without changes.
0 internal/engine/cmd/oohelper/README.md → internal/cmd/oohelper/README.md
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...al/engine/cmd/oohelper/internal/client.go → internal/cmd/oohelper/internal/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (

"github.com/apex/log"
"github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity"
"github.com/ooni/probe-cli/v3/internal/engine/internal/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/runtimex"
"github.com/ooni/probe-cli/v3/internal/engine/netx"
"github.com/ooni/probe-cli/v3/internal/engine/version"
Expand Down
2 changes: 1 addition & 1 deletion ...gine/cmd/oohelper/internal/client_test.go → ...rnal/cmd/oohelper/internal/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"reflect"
"testing"

"github.com/ooni/probe-cli/v3/internal/engine/cmd/oohelper/internal"
"github.com/ooni/probe-cli/v3/internal/cmd/oohelper/internal"
)

func TestMakeTCPEndpoints(t *testing.T) {
Expand Down
0 ...engine/cmd/oohelper/internal/fake_test.go → internal/cmd/oohelper/internal/fake_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/engine/cmd/oohelper/oohelper.go → internal/cmd/oohelper/oohelper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"net/http"

"github.com/apex/log"
"github.com/ooni/probe-cli/v3/internal/engine/cmd/oohelper/internal"
"github.com/ooni/probe-cli/v3/internal/cmd/oohelper/internal"
"github.com/ooni/probe-cli/v3/internal/engine/runtimex"
"github.com/ooni/probe-cli/v3/internal/engine/netx"
)
Expand Down
0 ...rnal/engine/cmd/oohelper/oohelper_test.go → internal/cmd/oohelper/oohelper_test.go
View file
File renamed without changes.
0 internal/engine/cmd/oohelperd/README.md → internal/cmd/oohelperd/README.md
View file
File renamed without changes.
0 ...rnal/engine/cmd/oohelperd/internal/dns.go → internal/cmd/oohelperd/internal/dns.go
View file
File renamed without changes.
0 ...ngine/cmd/oohelperd/internal/fake_test.go → internal/cmd/oohelperd/internal/fake_test.go
View file
File renamed without changes.
0 ...nal/engine/cmd/oohelperd/internal/http.go → internal/cmd/oohelperd/internal/http.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ngine/cmd/oohelperd/internal/http_test.go → internal/cmd/oohelperd/internal/http_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"sync"
"testing"

"github.com/ooni/probe-cli/v3/internal/engine/cmd/oohelperd/internal"
"github.com/ooni/probe-cli/v3/internal/cmd/oohelperd/internal"
)

func TestHTTPDoWithInvalidURL(t *testing.T) {
Expand Down
0 ...engine/cmd/oohelperd/internal/internal.go → internal/cmd/oohelperd/internal/internal.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...e/cmd/oohelperd/internal/internal_test.go → ...l/cmd/oohelperd/internal/internal_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"
"testing"

"github.com/ooni/probe-cli/v3/internal/engine/cmd/oohelperd/internal"
"github.com/ooni/probe-cli/v3/internal/cmd/oohelperd/internal"
"github.com/ooni/probe-cli/v3/internal/engine/netx/resolver"
)

Expand Down
0 .../engine/cmd/oohelperd/internal/measure.go → internal/cmd/oohelperd/internal/measure.go
View file
File renamed without changes.
0 ...gine/cmd/oohelperd/internal/tcpconnect.go → ...rnal/cmd/oohelperd/internal/tcpconnect.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/engine/cmd/oohelperd/oohelperd.go → internal/cmd/oohelperd/oohelperd.go
View file
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/v3/internal/engine/cmd/oohelperd/internal"
"github.com/ooni/probe-cli/v3/internal/cmd/oohelperd/internal"
"github.com/ooni/probe-cli/v3/internal/engine/netx"
)

Expand Down
0 ...al/engine/cmd/oohelperd/oohelperd_test.go → internal/cmd/oohelperd/oohelperd_test.go
View file
File renamed without changes.
2 changes: 0 additions & 2 deletions internal/engine/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
/.vscode
/apitool
/asn.mmdb
/badproxy.pem
/ca-bundle.pem
/cmd/jafar/badproxy.pem
/country.mmdb
/example.org
/jafar
Expand Down
3 changes: 0 additions & 3 deletions internal/engine/cmd/README.md
View file

This file was deleted.

2 changes: 1 addition & 1 deletion internal/engine/experiment/hhfm/hhfm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"time"

"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
"github.com/ooni/probe-cli/v3/internal/engine/internal/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/internal/randx"
"github.com/ooni/probe-cli/v3/internal/engine/model"
"github.com/ooni/probe-cli/v3/internal/engine/netx"
Expand Down
2 changes: 1 addition & 1 deletion internal/engine/experiment/tor/tor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"time"

"github.com/ooni/probe-cli/v3/internal/engine/atomicx"
"github.com/ooni/probe-cli/v3/internal/engine/internal/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/runtimex"
"github.com/ooni/probe-cli/v3/internal/engine/legacy/netxlogger"
"github.com/ooni/probe-cli/v3/internal/engine/legacy/oonidatamodel"
Expand Down
2 changes: 1 addition & 1 deletion internal/engine/experiment/urlgetter/runner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"net/http/cookiejar"
"net/url"

"github.com/ooni/probe-cli/v3/internal/engine/internal/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/runtimex"
"github.com/ooni/probe-cli/v3/internal/engine/netx"
"github.com/ooni/probe-cli/v3/internal/engine/netx/errorx"
Expand Down
2 changes: 1 addition & 1 deletion internal/engine/experiment/urlgetter/runner_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/ooni/probe-cli/v3/internal/engine/atomicx"
"github.com/ooni/probe-cli/v3/internal/engine/experiment/urlgetter"
"github.com/ooni/probe-cli/v3/internal/engine/internal/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
)

func TestRunnerWithInvalidURLScheme(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/engine/experiment/webconnectivity/control.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

"github.com/ooni/probe-cli/v3/internal/engine/geolocate"
"github.com/ooni/probe-cli/v3/internal/engine/internal/httpx"
"github.com/ooni/probe-cli/v3/internal/engine/httpx"
"github.com/ooni/probe-cli/v3/internal/engine/model"
"github.com/ooni/probe-cli/v3/internal/engine/netx/errorx"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/engine/experiment/webconnectivity/webconnectivity.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"time"

"github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity/internal"
"github.com/ooni/probe-cli/v3/internal/engine/internal/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/model"
"github.com/ooni/probe-cli/v3/internal/engine/netx/archival"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/engine/geolocate/avast.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"net/http"

"github.com/ooni/probe-cli/v3/internal/engine/internal/httpx"
"github.com/ooni/probe-cli/v3/internal/engine/httpx"
)

type avastResponse struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/engine/geolocate/avast_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"

"github.com/apex/log"
"github.com/ooni/probe-cli/v3/internal/engine/internal/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
)

func TestIPLookupWorksUsingAvast(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions internal/engine/geolocate/ipconfig.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"net/http"
"strings"

"github.com/ooni/probe-cli/v3/internal/engine/internal/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/internal/httpx"
"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/httpx"
)

func ipConfigIPLookup(
Expand Down
2 changes: 1 addition & 1 deletion internal/engine/geolocate/ipconfig_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"

"github.com/apex/log"
"github.com/ooni/probe-cli/v3/internal/engine/internal/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
)

func TestIPLookupWorksUsingIPConfig(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions internal/engine/geolocate/ipinfo.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"net/http"

"github.com/ooni/probe-cli/v3/internal/engine/internal/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/internal/httpx"
"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/httpx"
)

type ipInfoResponse struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/engine/geolocate/ipinfo_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"

"github.com/apex/log"
"github.com/ooni/probe-cli/v3/internal/engine/internal/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
)

func TestIPLookupWorksUsingIPInfo(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion internal/engine/geolocate/stun_test.go
View file
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/v3/internal/engine/internal/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
"github.com/pion/stun"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/engine/geolocate/ubuntu.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"encoding/xml"
"net/http"

"github.com/ooni/probe-cli/v3/internal/engine/internal/httpx"
"github.com/ooni/probe-cli/v3/internal/engine/httpx"
)

type ubuntuResponse struct {
Expand Down
2 changes: 1 addition & 1 deletion internal/engine/geolocate/ubuntu_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"

"github.com/apex/log"
"github.com/ooni/probe-cli/v3/internal/engine/internal/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
)

func TestUbuntuParseError(t *testing.T) {
Expand Down
0 ...rnal/engine/internal/httpheader/accept.go → internal/engine/httpheader/accept.go
View file
File renamed without changes.
0 ...ine/internal/httpheader/acceptlanguage.go → internal/engine/httpheader/acceptlanguage.go
View file
File renamed without changes.
0 ...l/engine/internal/httpheader/useragent.go → internal/engine/httpheader/useragent.go
View file
File renamed without changes.
0 internal/engine/internal/httpx/fake_test.go → internal/engine/httpx/fake_test.go
View file
File renamed without changes.
0 internal/engine/internal/httpx/fetch.go → internal/engine/httpx/fetch.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/engine/internal/httpx/fetch_test.go → internal/engine/httpx/fetch_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"

"github.com/apex/log"
"github.com/ooni/probe-cli/v3/internal/engine/internal/httpx"
"github.com/ooni/probe-cli/v3/internal/engine/httpx"
)

func TestFetchResourceIntegration(t *testing.T) {
Expand Down
0 internal/engine/internal/httpx/jsonapi.go → internal/engine/httpx/jsonapi.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...nal/engine/internal/httpx/jsonapi_test.go → internal/engine/httpx/jsonapi_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/apex/log"
"github.com/google/go-cmp/cmp"
"github.com/ooni/probe-cli/v3/internal/engine/internal/httpx"
"github.com/ooni/probe-cli/v3/internal/engine/httpx"
"github.com/ooni/probe-cli/v3/internal/engine/netx/dialer"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/engine/inputloader_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/apex/log"
"github.com/google/go-cmp/cmp"
engine "github.com/ooni/probe-cli/v3/internal/engine"
"github.com/ooni/probe-cli/v3/internal/engine/internal/kvstore"
"github.com/ooni/probe-cli/v3/internal/engine/kvstore"
"github.com/ooni/probe-cli/v3/internal/engine/model"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/engine/internal/mockable/mockable.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/http"
"net/url"

"github.com/ooni/probe-cli/v3/internal/engine/internal/kvstore"
"github.com/ooni/probe-cli/v3/internal/engine/kvstore"
"github.com/ooni/probe-cli/v3/internal/engine/internal/psiphonx"
"github.com/ooni/probe-cli/v3/internal/engine/runtimex"
"github.com/ooni/probe-cli/v3/internal/engine/internal/torx"
Expand Down
0 internal/engine/internal/kvstore/kvstore.go → internal/engine/kvstore/kvstore.go
View file
File renamed without changes.
0 ...l/engine/internal/kvstore/kvstore_test.go → internal/engine/kvstore/kvstore_test.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion internal/engine/netx/resolver/dnsoverhttps.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"net/http"
"time"

"github.com/ooni/probe-cli/v3/internal/engine/internal/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
)

// DNSOverHTTPS is a DNS over HTTPS RoundTripper. Requests are submitted over
Expand Down
2 changes: 1 addition & 1 deletion internal/engine/netx/resolver/dnsoverhttps_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"testing"

"github.com/ooni/probe-cli/v3/internal/engine/internal/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/netx/resolver"
)

Expand Down
Loading

0 comments on commit 863595a

Please sign in to comment.