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

metricdog and updog: remove reqwest proxy workaround #1592

Merged
merged 2 commits into from
May 26, 2021
Merged

metricdog and updog: remove reqwest proxy workaround #1592

merged 2 commits into from
May 26, 2021

Conversation

webern
Copy link
Contributor

@webern webern commented May 21, 2021

Issue number:

Closes #1332

Description of changes:

Before reqwest 11.1 we needed to check HTTPS_PROXY and, if it had no protocol, prepend the default (http://). After 11.1 this behavior is provided by reqwest.

Testing done:

I ran a tinyproxy server and gave Bottlerocket this in its userdata:

[settings.network]
https-proxy = "192.168.57.178:8888"

I ran Bottlerocket and observed that updog check-update and metricdog were functioning properly and I could see their traffic going through the tinyproxy server.

Prior to seanmonstar/reqwest#1178, this would not have worked because reqwest did not default to http:// in the absence of a protocol.

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

We had a workaround for HTTPS_PROXY values that have no protocol. The
workaround is no longer needed because reqwest now does what we want.
We had a workaround for HTTPS_PROXY values that have no protocol. The
workaround is no longer needed because reqwest now does what we want.
@webern webern marked this pull request as ready for review May 24, 2021 20:02
@webern webern requested review from tjkirch and etungsten May 24, 2021 20:02
@webern webern merged commit f3ac7c8 into bottlerocket-os:develop May 26, 2021
@webern webern deleted the issue-1332 branch May 26, 2021 21:21
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.

metricdog and updog: remove reqwest proxy workaround
3 participants