oonirun: use httpclientx

internal/oonirun/v2.go

@@ -14,7 +14,7 @@ import (
 	"github.com/hexops/gotextdiff"
 	"github.com/hexops/gotextdiff/myers"
 	"github.com/hexops/gotextdiff/span"
-	"github.com/ooni/probe-cli/v3/internal/httpx"
+	"github.com/ooni/probe-cli/v3/internal/httpclientx"
 	"github.com/ooni/probe-cli/v3/internal/kvstore"
 	"github.com/ooni/probe-cli/v3/internal/model"
 	"github.com/ooni/probe-cli/v3/internal/runtimex"
@@ -64,21 +64,12 @@ type V2Nettest struct {
 // a static URL (e.g., from a GitHub repo or from a Gist).
 func getV2DescriptorFromHTTPSURL(ctx context.Context, client model.HTTPClient,
 	logger model.Logger, URL string) (*V2Descriptor, error) {
-	template := httpx.APIClientTemplate{
-		Accept:        "",
-		Authorization: "",
-		BaseURL:       URL,
-		HTTPClient:    client,
-		Host:          "",
-		LogBody:       true,
+	return httpclientx.GetJSON[*V2Descriptor](ctx, URL, &httpclientx.Config{
+		Authorization: "", // not needed
+		Client:        client,
 		Logger:        logger,
 		UserAgent:     model.HTTPHeaderUserAgent,
-	}
-	var desc V2Descriptor
-	if err := template.Build().GetJSON(ctx, "", &desc); err != nil {
-		return nil, err
-	}
-	return &desc, nil
+	})
 }
 
 // v2DescriptorCache contains all the known v2Descriptor entries.

internal/oonirun/v2_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/ooni/probe-cli/v3/internal/httpclientx"
 	"github.com/ooni/probe-cli/v3/internal/kvstore"
 	"github.com/ooni/probe-cli/v3/internal/mocks"
 	"github.com/ooni/probe-cli/v3/internal/model"
@@ -200,8 +201,7 @@ func TestOONIRunV2LinkNilDescriptor(t *testing.T) {
 	r := NewLinkRunner(config, server.URL)
 
 	// make sure we correctly handled an invalid "null" descriptor
-	if err := r.Run(ctx); err != nil {
-		t.Fatal(err)
+	if err := r.Run(ctx); !errors.Is(err, httpclientx.ErrIsNil) {
 		t.Fatal("unexpected error", err)
 	}
 }