ooni / probe-cli / 8896593946

72%

Build Type

push

github

Committed by web-flow

Commit Message

refactor(probeservices): httpx -> httpclientx (#1576)

This issue replaces httpx with httpclientx for probeservices.

Part of https://github.com/ooni/probe/issues/2723.

---

Here are some checks to make sure we' not changing API semantics.

## GetTestHelpers

Before:

```Go
	err = c.APIClientTemplate.WithBodyLogging().Build().GetJSON(ctx, "/api/v1/test-helpers", &output)
```

After:

```Go
	// construct the URL to use
	URL, err := urlx.ResolveReference(c.BaseURL, "/api/v1/test-helpers", "")
	if err != nil {
		return nil, err
	}

	// get the response
	return httpclientx.GetJSON[map[string][]model.OOAPIService](ctx, URL, &httpclientx.Config{
		Client:    c.HTTPClient,
		Logger:    c.Logger,
		UserAgent: c.UserAgent,
	})
```

In both cases: uses the same client and user agent, uses the same URL
path, uses logging.

## OpenReport

Before:

```Go
	var cor model.OOAPICollectorOpenResponse
	if err := c.APIClientTemplate.WithBodyLogging().Build().PostJSON(ctx, "/report", rt, &cor); err != nil {
```

After:

```Go
	URL, err := urlx.ResolveReference(c.BaseURL, "/report", "")
	if err != nil {
		return nil, err
	}

	cor, err := httpclientx.PostJSON[model.OOAPIReportTemplate, *model.OOAPICollectorOpenResponse](
		ctx, URL, rt, &httpclientx.Config{
			Client:    c.HTTPClient,
			Logger:    c.Logger,
			UserAgent: c.UserAgent,
		},
	)
```

In both cases: uses the same client and user agent, uses the same URL
path, uses logging.

## SubmitMeasurement

Before:

```Go
	err := r.client.APIClientTemplate.WithBodyLogging().Build().PostJSON(
		ctx, fmt.Sprintf("/report/%s", r.ID), model.OOAPICollectorUpdateRequest{
			Format:  "json",
			Content: m,
		}, &updateResponse,
```

After:

```Go
	URL, err := urlx.ResolveReference(r.client.BaseURL, fmt.Sprintf("/report/%s", r.ID), "")
	if err != nil {
		return err
	}

	apiReq := model.OOAPICollectorUpdateRequest{
		Format:  "json",
		Content: ... (continued)

Run Details

119 of 119 new or added lines in 8 files covered. (100.0%)

1 existing line in 1 file now uncovered.

27130 of 32559 relevant lines covered (83.33%)

61.4 hits per line