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

Upgrade http, ruma, reqwest and wiremock dependencies #3362

Merged
merged 2 commits into from
Apr 30, 2024

Conversation

zecakeh
Copy link
Collaborator

@zecakeh zecakeh commented Apr 30, 2024

They need to be updated together because the latters depend on the former.

matrix-authentication-service is still using http 0.2 so we need to add a conversion layer between both major versions for OIDC requests for now.

We need to update vodozemac too because of a dependency resolution issue.

They need to be updated together
because the latters depend on the former.

matrix-authentication-service is still using http 0.2
so we need to add a conversion layer between both major versions
for OIDC requests.

We need to update vodozemac too because of a dependency resolution issue.

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
@zecakeh zecakeh requested a review from a team as a code owner April 30, 2024 10:22
@zecakeh zecakeh requested review from bnjbvr and removed request for a team April 30, 2024 10:22
Copy link
Member

@bnjbvr bnjbvr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer that we'd wait for the matrix-authentication-service crate to update its HTTP crate instead of adding all the HttpOld/HttpNew conversation stuff.

Out of curiosity: are you making this PR because you require it for some reasons, or is it only careful maintenance? (in any case, thanks for opening such a PR!)

Copy link

codecov bot commented Apr 30, 2024

Codecov Report

Attention: Patch coverage is 0% with 46 lines in your changes are missing coverage. Please review.

Project coverage is 83.49%. Comparing base (ea1a010) to head (dbb21ed).

Files Patch % Lines
crates/matrix-sdk/src/http_client/http_helpers.rs 0.00% 41 Missing ⚠️
crates/matrix-sdk/src/http_client/mod.rs 0.00% 5 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3362      +/-   ##
==========================================
- Coverage   83.62%   83.49%   -0.14%     
==========================================
  Files         242      243       +1     
  Lines       25009    25052      +43     
==========================================
+ Hits        20915    20916       +1     
- Misses       4094     4136      +42     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Member

@bnjbvr bnjbvr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually it's a nice step forward as it removes a bunch of duplicated crates in the dependency tree, and we can easily get rid of the http_old conversion code later on. Thanks!

@poljar
Copy link
Contributor

poljar commented Apr 30, 2024

Actually it's a nice step forward as it removes a bunch of duplicated crates in the dependency tree, and we can easily get rid of the http_old conversion code later on. Thanks!

For reference, I looked into updating MAS itself, but it's blocked by open-telemetry/opentelemetry-rust#1674 getting merged and released.

@zecakeh
Copy link
Collaborator Author

zecakeh commented Apr 30, 2024

Out of curiosity: are you making this PR because you require it for some reasons, or is it only careful maintenance? (in any case, thanks for opening such a PR!)

No we don't require it for the moment, I just knew it was probably going to be a big change, so I wanted to get a head start.

For reference, I looked into updating MAS itself, but it's blocked by open-telemetry/opentelemetry-rust#1674 getting merged and released.

Yeah we have been waiting a bit to update http in Ruma so we could avoid the conversion layer for the SDK, but we would like to make a new release soon and we wanted to upgrade http before it.

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
@zecakeh
Copy link
Collaborator Author

zecakeh commented Apr 30, 2024

Merged main branch to resolve conflict

@bnjbvr bnjbvr merged commit 856dd01 into matrix-org:main Apr 30, 2024
35 checks passed
@zecakeh zecakeh deleted the upgrade-ruma branch April 30, 2024 12:15
@zecakeh zecakeh mentioned this pull request Apr 30, 2024
2 tasks
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.

None yet

3 participants