c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cleanup: merge httpheader and httpfailure into model (#758)

Browse source 
These two small packages could easily be merged into the model
package, since they're clearly model-like packages.

Part of https://github.com/ooni/probe/issues/2115
This commit is contained in:
Simone Basso 2022-05-25 09:54:50 +02:00 • committed by GitHub
commit 2d721baa91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 74 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/engine/geolocate/cloudflare.go
View file

@ -6,7 +6,6 @@ import (
"regexp"
"strings"
"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
"github.com/ooni/probe-cli/v3/internal/httpx"
"github.com/ooni/probe-cli/v3/internal/model"
)
@ -21,7 +20,7 @@ func cloudflareIPLookup(
BaseURL: "https://www.cloudflare.com",
HTTPClient: httpClient,
Logger: logger,
UserAgent: httpheader.CLIUserAgent(),
UserAgent: model.HTTPHeaderUserAgent,
}).WithBodyLogging().Build().FetchResource(ctx, "/cdn-cgi/trace")
if err != nil {
return DefaultProbeIP, err

4
internal/engine/geolocate/cloudflare_test.go
View file

@ -7,7 +7,7 @@ import (
"testing"
"github.com/apex/log"
"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
"github.com/ooni/probe-cli/v3/internal/model"
)
func TestIPLookupWorksUsingcloudlflare(t *testing.T) {
@ -15,7 +15,7 @@ func TestIPLookupWorksUsingcloudlflare(t *testing.T) {
context.Background(),
http.DefaultClient,
log.Log,
httpheader.UserAgent(),
model.HTTPHeaderUserAgent,
)
if err != nil {
t.Fatal(err)

6
internal/engine/geolocate/stun_test.go
View file

@ -9,7 +9,7 @@ import (
"time"
"github.com/apex/log"
"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
"github.com/ooni/probe-cli/v3/internal/model"
"github.com/pion/stun"
)
@ -128,7 +128,7 @@ func TestIPLookupWorksUsingSTUNEkiga(t *testing.T) {
context.Background(),
http.DefaultClient,
log.Log,
httpheader.UserAgent(),
model.HTTPHeaderUserAgent,
)
if err != nil {
t.Fatal(err)
@ -143,7 +143,7 @@ func TestIPLookupWorksUsingSTUNGoogle(t *testing.T) {
context.Background(),
http.DefaultClient,
log.Log,
httpheader.UserAgent(),
model.HTTPHeaderUserAgent,
)
if err != nil {
t.Fatal(err)

6
internal/engine/geolocate/ubuntu_test.go
View file

@ -9,7 +9,7 @@ import (
"testing"
"github.com/apex/log"
"github.com/ooni/probe-cli/v3/internal/engine/httpheader"
"github.com/ooni/probe-cli/v3/internal/model"
)
func TestUbuntuParseError(t *testing.T) {
@ -22,7 +22,7 @@ func TestUbuntuParseError(t *testing.T) {
},
}},
log.Log,
httpheader.UserAgent(),
model.HTTPHeaderUserAgent,
)
if err == nil || !strings.HasPrefix(err.Error(), "XML syntax error") {
t.Fatalf("not the error we expected: %+v", err)
@ -37,7 +37,7 @@ func TestIPLookupWorksUsingUbuntu(t *testing.T) {
context.Background(),
http.DefaultClient,
log.Log,
httpheader.UserAgent(),
model.HTTPHeaderUserAgent,
)
if err != nil {
t.Fatal(err)