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

refactor: merge dnsx and errorsx into netxlite (#517)

Browse Source 
When preparing a tutorial for netxlite, I figured it is easier
to tell people "hey, this is the package you should use for all
low-level networking stuff" rather than introducing people to
a set of packages working together where some piece of functionality
is here and some other piece is there.

Part of https://github.com/ooni/probe/issues/1591
This commit is contained in:
Simone Basso
2021-09-28 12:42:01 +02:00
committed by GitHub
parent de130d249c
commit 6d3a4f1db8
169 changed files with 575 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/ooapi/apis.go
+1 -1
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-09-05 13:54:18.962287 +0200 CEST m=+0.000333710
// 2021-09-28 12:05:20.164257 +0200 CEST m=+0.000193834
package ooapi
internal/ooapi/apis_test.go
+13 -13
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-09-05 13:54:19.316964 +0200 CEST m=+0.000287376
// 2021-09-28 12:05:20.537692 +0200 CEST m=+0.000164918
package ooapi
@@ -17,7 +17,7 @@ import (
"testing"
"github.com/google/go-cmp/cmp"
"github.com/ooni/probe-cli/v3/internal/netxlite/iox"
"github.com/ooni/probe-cli/v3/internal/netxlite"
"github.com/ooni/probe-cli/v3/internal/ooapi/apimodel"
)
@@ -177,7 +177,7 @@ func (h *handleCheckReportID) ServeHTTP(w http.ResponseWriter, r *http.Request)
}
h.count++
if r.Body != nil {
data, err := iox.ReadAllContext(r.Context(), r.Body)
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -440,7 +440,7 @@ func (h *handleCheckIn) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
h.count++
if r.Body != nil {
data, err := iox.ReadAllContext(r.Context(), r.Body)
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -685,7 +685,7 @@ func (h *handleLogin) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
h.count++
if r.Body != nil {
data, err := iox.ReadAllContext(r.Context(), r.Body)
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -912,7 +912,7 @@ func (h *handleMeasurementMeta) ServeHTTP(w http.ResponseWriter, r *http.Request
}
h.count++
if r.Body != nil {
data, err := iox.ReadAllContext(r.Context(), r.Body)
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -1175,7 +1175,7 @@ func (h *handleRegister) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
h.count++
if r.Body != nil {
data, err := iox.ReadAllContext(r.Context(), r.Body)
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -1402,7 +1402,7 @@ func (h *handleTestHelpers) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
h.count++
if r.Body != nil {
data, err := iox.ReadAllContext(r.Context(), r.Body)
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -1671,7 +1671,7 @@ func (h *handlePsiphonConfig) ServeHTTP(w http.ResponseWriter, r *http.Request)
}
h.count++
if r.Body != nil {
data, err := iox.ReadAllContext(r.Context(), r.Body)
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -1942,7 +1942,7 @@ func (h *handleTorTargets) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
h.count++
if r.Body != nil {
data, err := iox.ReadAllContext(r.Context(), r.Body)
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -2192,7 +2192,7 @@ func (h *handleURLs) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
h.count++
if r.Body != nil {
data, err := iox.ReadAllContext(r.Context(), r.Body)
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -2437,7 +2437,7 @@ func (h *handleOpenReport) ServeHTTP(w http.ResponseWriter, r *http.Request) {
}
h.count++
if r.Body != nil {
data, err := iox.ReadAllContext(r.Context(), r.Body)
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -2682,7 +2682,7 @@ func (h *handleSubmitMeasurement) ServeHTTP(w http.ResponseWriter, r *http.Reque
}
h.count++
if r.Body != nil {
data, err := iox.ReadAllContext(r.Context(), r.Body)
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
internal/ooapi/caching.go
+1 -1
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-09-05 13:54:19.664951 +0200 CEST m=+0.000206417
// 2021-09-28 12:05:20.806737 +0200 CEST m=+0.000196043
package ooapi
internal/ooapi/caching_test.go
+1 -1
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-09-05 13:54:19.945161 +0200 CEST m=+0.000190709
// 2021-09-28 12:05:21.094817 +0200 CEST m=+0.000177376
package ooapi
internal/ooapi/callers.go
+1 -1
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-09-05 13:54:20.211832 +0200 CEST m=+0.000215876
// 2021-09-28 12:05:21.383065 +0200 CEST m=+0.000204043
package ooapi
internal/ooapi/clientcall.go
+1 -1
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-09-05 13:54:20.571825 +0200 CEST m=+0.000210710
// 2021-09-28 12:05:21.649124 +0200 CEST m=+0.000178126
package ooapi
internal/ooapi/clientcall_test.go
+11 -11
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-09-05 13:54:20.84233 +0200 CEST m=+0.000203459
// 2021-09-28 12:05:21.914519 +0200 CEST m=+0.000179917
package ooapi
@@ -16,7 +16,7 @@ import (
"github.com/google/go-cmp/cmp"
"github.com/ooni/probe-cli/v3/internal/kvstore"
"github.com/ooni/probe-cli/v3/internal/netxlite/iox"
"github.com/ooni/probe-cli/v3/internal/netxlite"
"github.com/ooni/probe-cli/v3/internal/ooapi/apimodel"
)
@@ -42,7 +42,7 @@ func (h *handleClientCallCheckReportID) ServeHTTP(w http.ResponseWriter, r *http
}
h.count++
if r.Body != nil {
data, err := iox.ReadAllContext(r.Context(), r.Body)
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -135,7 +135,7 @@ func (h *handleClientCallCheckIn) ServeHTTP(w http.ResponseWriter, r *http.Reque
}
h.count++
if r.Body != nil {
data, err := iox.ReadAllContext(r.Context(), r.Body)
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -227,7 +227,7 @@ func (h *handleClientCallMeasurementMeta) ServeHTTP(w http.ResponseWriter, r *ht
}
h.count++
if r.Body != nil {
data, err := iox.ReadAllContext(r.Context(), r.Body)
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -320,7 +320,7 @@ func (h *handleClientCallTestHelpers) ServeHTTP(w http.ResponseWriter, r *http.R
}
h.count++
if r.Body != nil {
data, err := iox.ReadAllContext(r.Context(), r.Body)
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -435,7 +435,7 @@ func (h *handleClientCallPsiphonConfig) ServeHTTP(w http.ResponseWriter, r *http
}
h.count++
if r.Body != nil {
data, err := iox.ReadAllContext(r.Context(), r.Body)
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -550,7 +550,7 @@ func (h *handleClientCallTorTargets) ServeHTTP(w http.ResponseWriter, r *http.Re
}
h.count++
if r.Body != nil {
data, err := iox.ReadAllContext(r.Context(), r.Body)
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -643,7 +643,7 @@ func (h *handleClientCallURLs) ServeHTTP(w http.ResponseWriter, r *http.Request)
}
h.count++
if r.Body != nil {
data, err := iox.ReadAllContext(r.Context(), r.Body)
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -736,7 +736,7 @@ func (h *handleClientCallOpenReport) ServeHTTP(w http.ResponseWriter, r *http.Re
}
h.count++
if r.Body != nil {
data, err := iox.ReadAllContext(r.Context(), r.Body)
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -828,7 +828,7 @@ func (h *handleClientCallSubmitMeasurement) ServeHTTP(w http.ResponseWriter, r *
}
h.count++
if r.Body != nil {
data, err := iox.ReadAllContext(r.Context(), r.Body)
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
internal/ooapi/cloners.go
+1 -1
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-09-05 13:54:21.153077 +0200 CEST m=+0.000199334
// 2021-09-28 12:05:22.176937 +0200 CEST m=+0.000169251
package ooapi
internal/ooapi/fake_test.go
+2 -2
View File
@@ -6,7 +6,7 @@ import (
"net/http"
"time"
"github.com/ooni/probe-cli/v3/internal/netxlite/iox"
"github.com/ooni/probe-cli/v3/internal/netxlite"
)
type FakeCodec struct {
@@ -31,7 +31,7 @@ type FakeHTTPClient struct {
func (c *FakeHTTPClient) Do(req *http.Request) (*http.Response, error) {
time.Sleep(10 * time.Microsecond)
if req.Body != nil {
_, _ = iox.ReadAllContext(req.Context(), req.Body)
_, _ = netxlite.ReadAllContext(req.Context(), req.Body)
req.Body.Close()
}
if c.Err != nil {
internal/ooapi/fakeapi_test.go
+1 -1
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-09-05 13:54:21.412036 +0200 CEST m=+0.000169751
// 2021-09-28 12:05:22.411961 +0200 CEST m=+0.000187918
package ooapi
internal/ooapi/internal/generator/apistest.go
+2 -2
View File
@@ -231,7 +231,7 @@ func (d *Descriptor) genTestRoundTrip(sb *strings.Builder) {
fmt.Fprint(sb, "\t}\n")
fmt.Fprint(sb, "\th.count++\n")
fmt.Fprint(sb, "\tif r.Body != nil {\n")
fmt.Fprint(sb, "\t\tdata, err := iox.ReadAllContext(r.Context(), r.Body)\n")
fmt.Fprint(sb, "\t\tdata, err := netxlite.ReadAllContext(r.Context(), r.Body)\n")
fmt.Fprint(sb, "\t\tif err != nil {\n")
fmt.Fprintf(sb, "\t\t\tw.WriteHeader(400)\n")
fmt.Fprintf(sb, "\t\t\treturn\n")
@@ -451,7 +451,7 @@ func GenAPIsTestGo(file string) {
fmt.Fprint(&sb, "\t\"sync\"\n")
fmt.Fprint(&sb, "\n")
fmt.Fprint(&sb, "\t\"github.com/google/go-cmp/cmp\"\n")
fmt.Fprint(&sb, "\t\"github.com/ooni/probe-cli/v3/internal/netxlite/iox\"\n")
fmt.Fprint(&sb, "\t\"github.com/ooni/probe-cli/v3/internal/netxlite\"\n")
fmt.Fprint(&sb, "\t\"github.com/ooni/probe-cli/v3/internal/ooapi/apimodel\"\n")
fmt.Fprint(&sb, ")\n")
for _, desc := range Descriptors {
internal/ooapi/internal/generator/clientcalltest.go
+2 -2
View File
@@ -57,7 +57,7 @@ func (d *Descriptor) genTestClientCallRoundTrip(sb *strings.Builder) {
fmt.Fprint(sb, "\t}\n")
fmt.Fprint(sb, "\th.count++\n")
fmt.Fprint(sb, "\tif r.Body != nil {\n")
fmt.Fprint(sb, "\t\tdata, err := iox.ReadAllContext(r.Context(), r.Body)\n")
fmt.Fprint(sb, "\t\tdata, err := netxlite.ReadAllContext(r.Context(), r.Body)\n")
fmt.Fprint(sb, "\t\tif err != nil {\n")
fmt.Fprintf(sb, "\t\t\tw.WriteHeader(400)\n")
fmt.Fprintf(sb, "\t\t\treturn\n")
@@ -168,7 +168,7 @@ func GenClientCallTestGo(file string) {
fmt.Fprint(&sb, "\t\"sync\"\n")
fmt.Fprint(&sb, "\n")
fmt.Fprint(&sb, "\t\"github.com/google/go-cmp/cmp\"\n")
fmt.Fprint(&sb, "\t\"github.com/ooni/probe-cli/v3/internal/netxlite/iox\"\n")
fmt.Fprint(&sb, "\t\"github.com/ooni/probe-cli/v3/internal/netxlite\"\n")
fmt.Fprint(&sb, "\t\"github.com/ooni/probe-cli/v3/internal/kvstore\"\n")
fmt.Fprint(&sb, "\t\"github.com/ooni/probe-cli/v3/internal/ooapi/apimodel\"\n")
fmt.Fprint(&sb, ")\n")
internal/ooapi/internal/generator/responses.go
+2 -2
View File
@@ -23,7 +23,7 @@ func (d *Descriptor) genNewResponse(sb *strings.Builder) {
fmt.Fprint(sb, "\t}\n")
fmt.Fprint(sb, "\tdefer resp.Body.Close()\n")
fmt.Fprint(sb, "\treader := io.LimitReader(resp.Body, 4<<20)\n")
fmt.Fprint(sb, "\tdata, err := iox.ReadAllContext(ctx, reader)\n")
fmt.Fprint(sb, "\tdata, err := netxlite.ReadAllContext(ctx, reader)\n")
fmt.Fprint(sb, "\tif err != nil {\n")
fmt.Fprint(sb, "\t\treturn nil, err\n")
fmt.Fprint(sb, "\t}\n")
@@ -71,7 +71,7 @@ func GenResponsesGo(file string) {
fmt.Fprint(&sb, "\t\"io\"\n")
fmt.Fprint(&sb, "\t\"net/http\"\n")
fmt.Fprint(&sb, "\n")
fmt.Fprint(&sb, "\t\"github.com/ooni/probe-cli/v3/internal/netxlite/iox\"\n")
fmt.Fprint(&sb, "\t\"github.com/ooni/probe-cli/v3/internal/netxlite\"\n")
fmt.Fprint(&sb, "\t\"github.com/ooni/probe-cli/v3/internal/ooapi/apimodel\"\n")
fmt.Fprint(&sb, ")\n\n")
for _, desc := range Descriptors {
internal/ooapi/login.go
+1 -1
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-09-05 13:54:21.648163 +0200 CEST m=+0.000177959
// 2021-09-28 12:05:22.674011 +0200 CEST m=+0.000198918
package ooapi
internal/ooapi/login_test.go
+1 -1
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-09-05 13:54:21.967872 +0200 CEST m=+0.000174460
// 2021-09-28 12:05:22.959095 +0200 CEST m=+0.000193418
package ooapi
internal/ooapi/loginhandler_test.go
+3 -3
View File
@@ -9,7 +9,7 @@ import (
"time"
"github.com/ooni/probe-cli/v3/internal/atomicx"
"github.com/ooni/probe-cli/v3/internal/netxlite/iox"
"github.com/ooni/probe-cli/v3/internal/netxlite"
"github.com/ooni/probe-cli/v3/internal/ooapi/apimodel"
)
@@ -72,7 +72,7 @@ func (lh *LoginHandler) register(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(400)
return
}
data, err := iox.ReadAllContext(r.Context(), r.Body)
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
@@ -113,7 +113,7 @@ func (lh *LoginHandler) login(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(400)
return
}
data, err := iox.ReadAllContext(r.Context(), r.Body)
data, err := netxlite.ReadAllContext(r.Context(), r.Body)
if err != nil {
w.WriteHeader(400)
return
internal/ooapi/requests.go
+1 -1
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-09-05 13:54:22.226116 +0200 CEST m=+0.000176793
// 2021-09-28 12:05:23.239796 +0200 CEST m=+0.000205959
package ooapi
internal/ooapi/responses.go
+13 -13
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-09-05 13:54:22.556115 +0200 CEST m=+0.000158543
// 2021-09-28 12:05:23.599657 +0200 CEST m=+0.000196001
package ooapi
@@ -10,7 +10,7 @@ import (
"io"
"net/http"
"github.com/ooni/probe-cli/v3/internal/netxlite/iox"
"github.com/ooni/probe-cli/v3/internal/netxlite"
"github.com/ooni/probe-cli/v3/internal/ooapi/apimodel"
)
@@ -26,7 +26,7 @@ func (api *simpleCheckReportIDAPI) newResponse(ctx context.Context, resp *http.R
}
defer resp.Body.Close()
reader := io.LimitReader(resp.Body, 4<<20)
data, err := iox.ReadAllContext(ctx, reader)
data, err := netxlite.ReadAllContext(ctx, reader)
if err != nil {
return nil, err
}
@@ -49,7 +49,7 @@ func (api *simpleCheckInAPI) newResponse(ctx context.Context, resp *http.Respons
}
defer resp.Body.Close()
reader := io.LimitReader(resp.Body, 4<<20)
data, err := iox.ReadAllContext(ctx, reader)
data, err := netxlite.ReadAllContext(ctx, reader)
if err != nil {
return nil, err
}
@@ -72,7 +72,7 @@ func (api *simpleLoginAPI) newResponse(ctx context.Context, resp *http.Response,
}
defer resp.Body.Close()
reader := io.LimitReader(resp.Body, 4<<20)
data, err := iox.ReadAllContext(ctx, reader)
data, err := netxlite.ReadAllContext(ctx, reader)
if err != nil {
return nil, err
}
@@ -95,7 +95,7 @@ func (api *simpleMeasurementMetaAPI) newResponse(ctx context.Context, resp *http
}
defer resp.Body.Close()
reader := io.LimitReader(resp.Body, 4<<20)
data, err := iox.ReadAllContext(ctx, reader)
data, err := netxlite.ReadAllContext(ctx, reader)
if err != nil {
return nil, err
}
@@ -118,7 +118,7 @@ func (api *simpleRegisterAPI) newResponse(ctx context.Context, resp *http.Respon
}
defer resp.Body.Close()
reader := io.LimitReader(resp.Body, 4<<20)
data, err := iox.ReadAllContext(ctx, reader)
data, err := netxlite.ReadAllContext(ctx, reader)
if err != nil {
return nil, err
}
@@ -141,7 +141,7 @@ func (api *simpleTestHelpersAPI) newResponse(ctx context.Context, resp *http.Res
}
defer resp.Body.Close()
reader := io.LimitReader(resp.Body, 4<<20)
data, err := iox.ReadAllContext(ctx, reader)
data, err := netxlite.ReadAllContext(ctx, reader)
if err != nil {
return nil, err
}
@@ -167,7 +167,7 @@ func (api *simplePsiphonConfigAPI) newResponse(ctx context.Context, resp *http.R
}
defer resp.Body.Close()
reader := io.LimitReader(resp.Body, 4<<20)
data, err := iox.ReadAllContext(ctx, reader)
data, err := netxlite.ReadAllContext(ctx, reader)
if err != nil {
return nil, err
}
@@ -193,7 +193,7 @@ func (api *simpleTorTargetsAPI) newResponse(ctx context.Context, resp *http.Resp
}
defer resp.Body.Close()
reader := io.LimitReader(resp.Body, 4<<20)
data, err := iox.ReadAllContext(ctx, reader)
data, err := netxlite.ReadAllContext(ctx, reader)
if err != nil {
return nil, err
}
@@ -219,7 +219,7 @@ func (api *simpleURLsAPI) newResponse(ctx context.Context, resp *http.Response,
}
defer resp.Body.Close()
reader := io.LimitReader(resp.Body, 4<<20)
data, err := iox.ReadAllContext(ctx, reader)
data, err := netxlite.ReadAllContext(ctx, reader)
if err != nil {
return nil, err
}
@@ -242,7 +242,7 @@ func (api *simpleOpenReportAPI) newResponse(ctx context.Context, resp *http.Resp
}
defer resp.Body.Close()
reader := io.LimitReader(resp.Body, 4<<20)
data, err := iox.ReadAllContext(ctx, reader)
data, err := netxlite.ReadAllContext(ctx, reader)
if err != nil {
return nil, err
}
@@ -265,7 +265,7 @@ func (api *simpleSubmitMeasurementAPI) newResponse(ctx context.Context, resp *ht
}
defer resp.Body.Close()
reader := io.LimitReader(resp.Body, 4<<20)
data, err := iox.ReadAllContext(ctx, reader)
data, err := netxlite.ReadAllContext(ctx, reader)
if err != nil {
return nil, err
}
internal/ooapi/swagger_test.go
+2 -2
View File
@@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT.
// 2021-09-05 13:54:22.884854 +0200 CEST m=+0.000556501
// 2021-09-28 12:05:23.978512 +0200 CEST m=+0.000565751
package ooapi
@@ -9,7 +9,7 @@ const swagger = `{
"swagger": "2.0",
"info": {
"title": "OONI API specification",
"version": "0.20210905.9115422"
"version": "0.20210928.9100523"
},
"host": "api.ooni.io",
"basePath": "/",
internal/ooapi/swaggerdiff_test.go
+2 -2
View File
@@ -13,7 +13,7 @@ import (
"github.com/hexops/gotextdiff"
"github.com/hexops/gotextdiff/myers"
"github.com/hexops/gotextdiff/span"
"github.com/ooni/probe-cli/v3/internal/netxlite/iox"
"github.com/ooni/probe-cli/v3/internal/netxlite"
"github.com/ooni/probe-cli/v3/internal/ooapi/internal/openapi"
)
@@ -37,7 +37,7 @@ func getServerModel(serverURL string) *openapi.Swagger {
log.Fatal(err)
}
defer resp.Body.Close()
data, err := iox.ReadAllContext(context.Background(), resp.Body)
data, err := netxlite.ReadAllContext(context.Background(), resp.Body)
if err != nil {
log.Fatal(err)
}