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

refactor(httpx): improve and modernize (1/n) (#647)

Browse source 
This PR starts to implement the refactoring described at https://github.com/ooni/probe/issues/1951. I originally wrote more patches than the ones in this PR, but overall they were not readable. Since I want to squash and merge, here's a reasonable subset of the original patches that will still be readable and understandable in the future.
This commit is contained in:
Simone Basso 2022-01-05 12:48:32 +01:00 • committed by GitHub
commit 7b7df2c6af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 173 additions and 294 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,7 @@ func avastIPLookup(
userAgent string,
) (string, error) {
var v avastResponse
err := (httpx.Client{
err := (&httpx.APIClient{
BaseURL: "https://ip-info.ff.avast.com",
HTTPClient: httpClient,
Logger: logger,

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

@ -16,7 +16,7 @@ func ipConfigIPLookup(
logger model.Logger,
userAgent string,
) (string, error) {
data, err := (httpx.Client{
data, err := (&httpx.APIClient{
BaseURL: "https://ipconfig.io",
HTTPClient: httpClient,
Logger: logger,

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

@ -20,7 +20,7 @@ func ipInfoIPLookup(
userAgent string,
) (string, error) {
var v ipInfoResponse
err := (httpx.Client{
err := (&httpx.APIClient{
Accept: "application/json",
BaseURL: "https://ipinfo.io",
HTTPClient: httpClient,

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

@ -20,7 +20,7 @@ func ubuntuIPLookup(
logger model.Logger,
userAgent string,
) (string, error) {
data, err := (httpx.Client{
data, err := (&httpx.APIClient{
BaseURL: "https://geoip.ubuntu.com/",
HTTPClient: httpClient,
Logger: logger,