Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: introduce the httpclientx package #1569

Merged
merged 38 commits into from
Apr 26, 2024
Merged

feat: introduce the httpclientx package #1569

merged 38 commits into from
Apr 26, 2024

Conversation

bassosimone
Copy link
Contributor

@bassosimone bassosimone commented Apr 26, 2024

This package tries to replace both httpx and httpapi. This commit includes a design document explaining the rationale and the process for performing this replacement. I have been using this package for a while at #1560. It seems clear to me that, at this point, we want to merge. So, I have extracted just the package from #1560 to reduce the size of the diff.

The TL;DR of this new package is to ensure we have the same functionality of httpx and httpapi but we're also simplifying the codebase by (a) replacing two other packages and (b) dropping the requirement that we wanted to generate a swagger from the API implementation, which lead to overly complex code, and, what is possibly worst, to code that at the end of the day we were not using for comparing to the backend's swagger.

Part of ooni/probe#2700.

This diff includes a first attempt at consolidating the patterns with
which we invoke OONI and third-party API calls.

I have refactored the code of httpx and httpapi into a new package
called httpclientx, added some tests, started converting some parts
of the tree, and explained myself in a design document.

Part of ooni/probe#2700
Spotted thanks to a very paranoid check inside ./internal/oonirun.

Was not a problem before for `httpx` because of its usage pattern and may
or may not be a problem for the `httpapi` package (did not check since
this work is focused on replacing both `httpx` and `httpapi`).
Previously, we were gracefully handling this case, but honestly it is
not the best approach to pretend there's an empty structure if the server
breaks the API and returns `"null"` rather than an object.

That said, it was still awesome to have this test in place because it
helped us to figure out this extra condition of which httpclientx should
be aware and that this problem needs to be dealt with systematically
inside the httpclientx package.
Conflicts:
	internal/enginelocate/cloudflare.go
	internal/enginelocate/ubuntu.go
Conflicts:
	internal/oonirun/v2_test.go
As before, here I am going to ensure there's redundancy.
@bassosimone bassosimone merged commit 3a4652e into master Apr 26, 2024
18 checks passed
@bassosimone bassosimone deleted the issue/2700b branch April 26, 2024 15:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant