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

refactor(httpclientx): couple URL and cloudfront host header #1584

Merged
merged 59 commits into from
May 2, 2024

Conversation

bassosimone
Copy link
Contributor

@bassosimone bassosimone commented May 2, 2024

Closes ooni/probe#2727.

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.
Conflicts:
	internal/probeservices/login_test.go
Conflicts:
	internal/testingx/oonicollector.go
Conflicts:
	internal/probeservices/collector_test.go
Conflicts:
	internal/probeservices/bouncer.go
	internal/probeservices/collector.go
	internal/probeservices/login.go
	internal/probeservices/measurementmeta.go
	internal/probeservices/psiphon.go
	internal/probeservices/register.go
	internal/probeservices/tor.go
While there, add additional tests ensuring that we're actually
writing into the key-value store after check-in.

Also, ensure that failure to write into the key-value store
does not break check-in for good.
Conflicts:
	internal/legacy/mockable/mockable.go
	internal/mocks/session.go
@bassosimone bassosimone changed the title Issue/2727 refactor(httpclientx): couple URL and cloudfront host header May 2, 2024
@bassosimone bassosimone marked this pull request as ready for review May 2, 2024 14:34
@bassosimone bassosimone requested a review from hellais as a code owner May 2, 2024 14:34
@bassosimone bassosimone merged commit 9dbe15c into master May 2, 2024
19 checks passed
@bassosimone bassosimone deleted the issue/2727 branch May 2, 2024 14:46
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.

httpclientx: couple cloudfront host and URL
1 participant