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

refactor(engine): *http.Client -> model.HTTPClient (#836)

Browse Source 
This diff makes the implementation of the engine package more
abstract by changing HTTPClient() to return a model.HTTPClient
as opposed to returning an *http.Client.

Part of https://github.com/ooni/probe/issues/2184
This commit is contained in:
Simone Basso 2022-07-08 11:08:10 +02:00 committed by GitHub
parent d419ed8ac8
commit 6019b25baf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/engine/mockable/mockable.go
View File

@ -3,7 +3,6 @@ package mockable
import ( import (
"context" "context"
"net/http"
"net/url" "net/url"
"github.com/ooni/probe-cli/v3/internal/engine/probeservices" "github.com/ooni/probe-cli/v3/internal/engine/probeservices"
@ -14,7 +13,7 @@ import (
// Session allows to mock sessions. // Session allows to mock sessions.
type Session struct { type Session struct {
MockableTestHelpers map[string][]model.OOAPIService MockableTestHelpers map[string][]model.OOAPIService
MockableHTTPClient *http.Client MockableHTTPClient model.HTTPClient
MockableLogger model.Logger MockableLogger model.Logger
MockableMaybeResolverIP string MockableMaybeResolverIP string
MockableProbeASNString string MockableProbeASNString string
@ -45,7 +44,7 @@ func (sess *Session) GetTestHelpersByName(name string) ([]model.OOAPIService, bo
} }
// DefaultHTTPClient implements ExperimentSession.DefaultHTTPClient // DefaultHTTPClient implements ExperimentSession.DefaultHTTPClient
func (sess *Session) DefaultHTTPClient() *http.Client { func (sess *Session) DefaultHTTPClient() model.HTTPClient {
return sess.MockableHTTPClient return sess.MockableHTTPClient
} }

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

@ -25,7 +25,6 @@ package probeservices
import ( import (
"errors" "errors"
"net/http"
"net/url" "net/url"
"github.com/ooni/probe-cli/v3/internal/atomicx" "github.com/ooni/probe-cli/v3/internal/atomicx"
@ -56,7 +55,7 @@ var (
// Session is how this package sees a Session. // Session is how this package sees a Session.
type Session interface { type Session interface {
DefaultHTTPClient() *http.Client DefaultHTTPClient() model.HTTPClient
KeyValueStore() model.KeyValueStore KeyValueStore() model.KeyValueStore
Logger() model.Logger Logger() model.Logger
ProxyURL() *url.URL ProxyURL() *url.URL

2
internal/engine/session.go
View File

@ -337,7 +337,7 @@ func (s *Session) GetTestHelpersByName(name string) ([]model.OOAPIService, bool)
} }
// DefaultHTTPClient returns the session's default HTTP client. // DefaultHTTPClient returns the session's default HTTP client.
func (s *Session) DefaultHTTPClient() *http.Client { func (s *Session) DefaultHTTPClient() model.HTTPClient {
return &http.Client{Transport: s.httpDefaultTransport} return &http.Client{Transport: s.httpDefaultTransport}
} }

6
internal/engine/session_integration_test.go
View File

@ -26,7 +26,11 @@ func TestSessionByteCounter(t *testing.T) {
} }
s := newSessionForTesting(t) s := newSessionForTesting(t)
client := s.DefaultHTTPClient() client := s.DefaultHTTPClient()
resp, err := client.Get("https://www.google.com") req, err := http.NewRequest("GET", "https://www.google.com", nil)
if err != nil {
t.Fatal(err)
}
resp, err := client.Do(req)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

3
internal/model/experiment.go
View File

@ -2,7 +2,6 @@ package model
import ( import (
"context" "context"
"net/http"
) )
// //
@ -13,7 +12,7 @@ import (
// ExperimentSession is the experiment's view of a session. // ExperimentSession is the experiment's view of a session.
type ExperimentSession interface { type ExperimentSession interface {
GetTestHelpersByName(name string) ([]OOAPIService, bool) GetTestHelpersByName(name string) ([]OOAPIService, bool)
DefaultHTTPClient() *http.Client DefaultHTTPClient() HTTPClient
FetchPsiphonConfig(ctx context.Context) ([]byte, error) FetchPsiphonConfig(ctx context.Context) ([]byte, error)
FetchTorTargets(ctx context.Context, cc string) (map[string]OOAPITorTarget, error) FetchTorTargets(ctx context.Context, cc string) (map[string]OOAPITorTarget, error)
FetchURLList(ctx context.Context, config OOAPIURLListConfig) ([]OOAPIURLInfo, error) FetchURLList(ctx context.Context, config OOAPIURLListConfig) ([]OOAPIURLInfo, error)