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

refactor: move httpx into the internal package (#646)

Browse Source 
This concludes the TODO list at https://github.com/ooni/probe/issues/1951
This commit is contained in:
Simone Basso 2022-01-05 17:17:20 +01:00 committed by GitHub
parent dba861d262
commit f0181c432f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/cmd/apitool/main.go
View File

@ -17,8 +17,8 @@ import (
"github.com/apex/log" "github.com/apex/log"
"github.com/ooni/probe-cli/v3/internal/atomicx" "github.com/ooni/probe-cli/v3/internal/atomicx"
"github.com/ooni/probe-cli/v3/internal/engine/httpx"
"github.com/ooni/probe-cli/v3/internal/engine/probeservices" "github.com/ooni/probe-cli/v3/internal/engine/probeservices"
"github.com/ooni/probe-cli/v3/internal/httpx"
"github.com/ooni/probe-cli/v3/internal/kvstore" "github.com/ooni/probe-cli/v3/internal/kvstore"
"github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/netxlite"
"github.com/ooni/probe-cli/v3/internal/version" "github.com/ooni/probe-cli/v3/internal/version"

2
internal/cmd/oohelperd/internal/webconnectivity/dns_test.go
View File

@ -7,8 +7,8 @@ import (
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity" "github.com/ooni/probe-cli/v3/internal/engine/experiment/webconnectivity"
"github.com/ooni/probe-cli/v3/internal/netxlite"
"github.com/ooni/probe-cli/v3/internal/model/mocks" "github.com/ooni/probe-cli/v3/internal/model/mocks"
"github.com/ooni/probe-cli/v3/internal/netxlite"
) )
func stringPointerForString(s string) *string { func stringPointerForString(s string) *string {

2
internal/engine/experiment/webconnectivity/control.go
View File

@ -4,8 +4,8 @@ import (
"context" "context"
"github.com/ooni/probe-cli/v3/internal/engine/geolocate" "github.com/ooni/probe-cli/v3/internal/engine/geolocate"
"github.com/ooni/probe-cli/v3/internal/engine/httpx"
legacyerrorsx "github.com/ooni/probe-cli/v3/internal/engine/legacy/errorsx" legacyerrorsx "github.com/ooni/probe-cli/v3/internal/engine/legacy/errorsx"
"github.com/ooni/probe-cli/v3/internal/httpx"
"github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/model"
"github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/netxlite"
) )

2
internal/engine/experiment/websteps/control.go
View File

@ -3,8 +3,8 @@ package websteps
import ( import (
"context" "context"
"github.com/ooni/probe-cli/v3/internal/engine/httpx"
errorsxlegacy "github.com/ooni/probe-cli/v3/internal/engine/legacy/errorsx" errorsxlegacy "github.com/ooni/probe-cli/v3/internal/engine/legacy/errorsx"
"github.com/ooni/probe-cli/v3/internal/httpx"
"github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/model"
"github.com/ooni/probe-cli/v3/internal/netxlite" "github.com/ooni/probe-cli/v3/internal/netxlite"
) )

2
internal/engine/geolocate/avast.go
View File

@ -4,7 +4,7 @@ import (
"context" "context"
"net/http" "net/http"
"github.com/ooni/probe-cli/v3/internal/engine/httpx" "github.com/ooni/probe-cli/v3/internal/httpx"
"github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/model"
) )

2
internal/engine/geolocate/ipconfig.go
View File

@ -6,7 +6,7 @@ import (
"strings" "strings"
"github.com/ooni/probe-cli/v3/internal/engine/httpheader" "github.com/ooni/probe-cli/v3/internal/engine/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/httpx" "github.com/ooni/probe-cli/v3/internal/httpx"
"github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/model"
) )

2
internal/engine/geolocate/ipinfo.go
View File

@ -5,7 +5,7 @@ import (
"net/http" "net/http"
"github.com/ooni/probe-cli/v3/internal/engine/httpheader" "github.com/ooni/probe-cli/v3/internal/engine/httpheader"
"github.com/ooni/probe-cli/v3/internal/engine/httpx" "github.com/ooni/probe-cli/v3/internal/httpx"
"github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/model"
) )

2
internal/engine/geolocate/ubuntu.go
View File

@ -5,7 +5,7 @@ import (
"encoding/xml" "encoding/xml"
"net/http" "net/http"
"github.com/ooni/probe-cli/v3/internal/engine/httpx" "github.com/ooni/probe-cli/v3/internal/httpx"
"github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/model"
) )

2
internal/engine/legacy/errorsx/dialer_test.go
View File

@ -7,8 +7,8 @@ import (
"net" "net"
"testing" "testing"
"github.com/ooni/probe-cli/v3/internal/netxlite"
"github.com/ooni/probe-cli/v3/internal/model/mocks" "github.com/ooni/probe-cli/v3/internal/model/mocks"
"github.com/ooni/probe-cli/v3/internal/netxlite"
) )
func TestErrorWrapperDialerFailure(t *testing.T) { func TestErrorWrapperDialerFailure(t *testing.T) {

2
internal/engine/legacy/errorsx/resolver_test.go
View File

@ -6,8 +6,8 @@ import (
"net" "net"
"testing" "testing"
"github.com/ooni/probe-cli/v3/internal/netxlite"
"github.com/ooni/probe-cli/v3/internal/model/mocks" "github.com/ooni/probe-cli/v3/internal/model/mocks"
"github.com/ooni/probe-cli/v3/internal/netxlite"
) )
func TestErrorWrapperResolverSuccess(t *testing.T) { func TestErrorWrapperResolverSuccess(t *testing.T) {

2
internal/engine/legacy/errorsx/tls_test.go
View File

@ -8,8 +8,8 @@ import (
"net" "net"
"testing" "testing"
"github.com/ooni/probe-cli/v3/internal/netxlite"
"github.com/ooni/probe-cli/v3/internal/model/mocks" "github.com/ooni/probe-cli/v3/internal/model/mocks"
"github.com/ooni/probe-cli/v3/internal/netxlite"
) )
func TestErrorWrapperTLSHandshakerFailure(t *testing.T) { func TestErrorWrapperTLSHandshakerFailure(t *testing.T) {

2
internal/engine/netx/dialer/bytecounter_test.go
View File

@ -9,8 +9,8 @@ import (
"testing" "testing"
"github.com/ooni/probe-cli/v3/internal/bytecounter" "github.com/ooni/probe-cli/v3/internal/bytecounter"
"github.com/ooni/probe-cli/v3/internal/netxlite"
"github.com/ooni/probe-cli/v3/internal/model/mocks" "github.com/ooni/probe-cli/v3/internal/model/mocks"
"github.com/ooni/probe-cli/v3/internal/netxlite"
) )
func dorequest(ctx context.Context, url string) error { func dorequest(ctx context.Context, url string) error {

2
internal/engine/netx/dialer/saver_test.go
View File

@ -9,8 +9,8 @@ import (
"time" "time"
"github.com/ooni/probe-cli/v3/internal/engine/netx/trace" "github.com/ooni/probe-cli/v3/internal/engine/netx/trace"
"github.com/ooni/probe-cli/v3/internal/netxlite"
"github.com/ooni/probe-cli/v3/internal/model/mocks" "github.com/ooni/probe-cli/v3/internal/model/mocks"
"github.com/ooni/probe-cli/v3/internal/netxlite"
) )
func TestSaverDialerFailure(t *testing.T) { func TestSaverDialerFailure(t *testing.T) {

2
internal/engine/netx/netx_test.go
View File

@ -17,8 +17,8 @@ import (
"github.com/ooni/probe-cli/v3/internal/engine/netx/resolver" "github.com/ooni/probe-cli/v3/internal/engine/netx/resolver"
"github.com/ooni/probe-cli/v3/internal/engine/netx/tlsdialer" "github.com/ooni/probe-cli/v3/internal/engine/netx/tlsdialer"
"github.com/ooni/probe-cli/v3/internal/engine/netx/trace" "github.com/ooni/probe-cli/v3/internal/engine/netx/trace"
"github.com/ooni/probe-cli/v3/internal/netxlite"
"github.com/ooni/probe-cli/v3/internal/model/mocks" "github.com/ooni/probe-cli/v3/internal/model/mocks"
"github.com/ooni/probe-cli/v3/internal/netxlite"
) )
func TestNewResolverVanilla(t *testing.T) { func TestNewResolverVanilla(t *testing.T) {

2
internal/engine/netx/quicdialer/system_test.go
View File

@ -11,8 +11,8 @@ import (
"github.com/ooni/probe-cli/v3/internal/engine/netx/quicdialer" "github.com/ooni/probe-cli/v3/internal/engine/netx/quicdialer"
"github.com/ooni/probe-cli/v3/internal/engine/netx/trace" "github.com/ooni/probe-cli/v3/internal/engine/netx/trace"
"github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/model"
"github.com/ooni/probe-cli/v3/internal/netxlite"
"github.com/ooni/probe-cli/v3/internal/model/mocks" "github.com/ooni/probe-cli/v3/internal/model/mocks"
"github.com/ooni/probe-cli/v3/internal/netxlite"
"github.com/ooni/probe-cli/v3/internal/netxlite/quictesting" "github.com/ooni/probe-cli/v3/internal/netxlite/quictesting"
) )

2
internal/engine/probeservices/checkreportid.go
View File

@ -4,7 +4,7 @@ import (
"context" "context"
"net/url" "net/url"
"github.com/ooni/probe-cli/v3/internal/engine/httpx" "github.com/ooni/probe-cli/v3/internal/httpx"
) )
type checkReportIDResponse struct { type checkReportIDResponse struct {

2
internal/engine/probeservices/checkreportid_test.go
View File

@ -8,8 +8,8 @@ import (
"github.com/apex/log" "github.com/apex/log"
"github.com/ooni/probe-cli/v3/internal/atomicx" "github.com/ooni/probe-cli/v3/internal/atomicx"
"github.com/ooni/probe-cli/v3/internal/engine/httpx"
"github.com/ooni/probe-cli/v3/internal/engine/probeservices" "github.com/ooni/probe-cli/v3/internal/engine/probeservices"
"github.com/ooni/probe-cli/v3/internal/httpx"
"github.com/ooni/probe-cli/v3/internal/kvstore" "github.com/ooni/probe-cli/v3/internal/kvstore"
) )

2
internal/engine/probeservices/measurementmeta.go
View File

@ -5,7 +5,7 @@ import (
"net/url" "net/url"
"time" "time"
"github.com/ooni/probe-cli/v3/internal/engine/httpx" "github.com/ooni/probe-cli/v3/internal/httpx"
) )
// MeasurementMetaConfig contains configuration for GetMeasurementMeta. // MeasurementMetaConfig contains configuration for GetMeasurementMeta.

2
internal/engine/probeservices/measurementmeta_test.go
View File

@ -9,8 +9,8 @@ import (
"github.com/apex/log" "github.com/apex/log"
"github.com/ooni/probe-cli/v3/internal/atomicx" "github.com/ooni/probe-cli/v3/internal/atomicx"
"github.com/ooni/probe-cli/v3/internal/engine/httpx"
"github.com/ooni/probe-cli/v3/internal/engine/probeservices" "github.com/ooni/probe-cli/v3/internal/engine/probeservices"
"github.com/ooni/probe-cli/v3/internal/httpx"
"github.com/ooni/probe-cli/v3/internal/kvstore" "github.com/ooni/probe-cli/v3/internal/kvstore"
) )

2
internal/engine/probeservices/probeservices.go
View File

@ -29,7 +29,7 @@ import (
"net/url" "net/url"
"github.com/ooni/probe-cli/v3/internal/atomicx" "github.com/ooni/probe-cli/v3/internal/atomicx"
"github.com/ooni/probe-cli/v3/internal/engine/httpx" "github.com/ooni/probe-cli/v3/internal/httpx"
"github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/model"
) )

0
internal/engine/httpx/httpx.go → internal/httpx/httpx.go
View File

0
internal/engine/httpx/httpx_test.go → internal/httpx/httpx_test.go
View File

2
internal/netxlite/filtering/dns_test.go
View File

@ -11,8 +11,8 @@ import (
"github.com/apex/log" "github.com/apex/log"
"github.com/miekg/dns" "github.com/miekg/dns"
"github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/model"
"github.com/ooni/probe-cli/v3/internal/netxlite"
"github.com/ooni/probe-cli/v3/internal/model/mocks" "github.com/ooni/probe-cli/v3/internal/model/mocks"
"github.com/ooni/probe-cli/v3/internal/netxlite"
) )
func TestDNSProxy(t *testing.T) { func TestDNSProxy(t *testing.T) {

2
internal/netxlite/filtering/tls_test.go
View File

@ -9,8 +9,8 @@ import (
"testing" "testing"
"github.com/apex/log" "github.com/apex/log"
"github.com/ooni/probe-cli/v3/internal/netxlite"
"github.com/ooni/probe-cli/v3/internal/model/mocks" "github.com/ooni/probe-cli/v3/internal/model/mocks"
"github.com/ooni/probe-cli/v3/internal/netxlite"
) )
func TestTLSProxy(t *testing.T) { func TestTLSProxy(t *testing.T) {

2
internal/netxlite/filtering/tproxy_test.go
View File

@ -14,8 +14,8 @@ import (
"github.com/apex/log" "github.com/apex/log"
"github.com/ooni/probe-cli/v3/internal/model" "github.com/ooni/probe-cli/v3/internal/model"
"github.com/ooni/probe-cli/v3/internal/netxlite"
"github.com/ooni/probe-cli/v3/internal/model/mocks" "github.com/ooni/probe-cli/v3/internal/model/mocks"
"github.com/ooni/probe-cli/v3/internal/netxlite"
) )
// tProxyDialerAdapter adapts a netxlite.TProxyDialer to be a netxlite.Dialer. // tProxyDialerAdapter adapts a netxlite.TProxyDialer to be a netxlite.Dialer.

2
internal/ptx/ptx_test.go
View File

@ -13,8 +13,8 @@ import (
"github.com/apex/log" "github.com/apex/log"
"github.com/ooni/probe-cli/v3/internal/atomicx" "github.com/ooni/probe-cli/v3/internal/atomicx"
"github.com/ooni/probe-cli/v3/internal/netxlite"
"github.com/ooni/probe-cli/v3/internal/model/mocks" "github.com/ooni/probe-cli/v3/internal/model/mocks"
"github.com/ooni/probe-cli/v3/internal/netxlite"
) )
func TestListenerLoggerWorks(t *testing.T) { func TestListenerLoggerWorks(t *testing.T) {