7b7df2c6af
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.
33 lines
608 B
Go
33 lines
608 B
Go
package geolocate
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/engine/httpx"
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
)
|
|
|
|
type avastResponse struct {
|
|
IP string `json:"ip"`
|
|
}
|
|
|
|
func avastIPLookup(
|
|
ctx context.Context,
|
|
httpClient *http.Client,
|
|
logger model.Logger,
|
|
userAgent string,
|
|
) (string, error) {
|
|
var v avastResponse
|
|
err := (&httpx.APIClient{
|
|
BaseURL: "https://ip-info.ff.avast.com",
|
|
HTTPClient: httpClient,
|
|
Logger: logger,
|
|
UserAgent: userAgent,
|
|
}).GetJSON(ctx, "/v1/info", &v)
|
|
if err != nil {
|
|
return DefaultProbeIP, err
|
|
}
|
|
return v.IP, nil
|
|
}
|