This repository has been archived by the owner on Jul 26, 2024. It is now read-only.
refactor: Replace location determination with common-rs crate #219
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pjenvey
suggested changes
Jul 24, 2021
src/server/mod.rs
Outdated
| @@ -17,7 +21,7 @@ use crate::{ | |||
|
|
|||
| pub mod cache; | |||
| pub mod img_storage; | |||
| pub mod location; | |||
| // pub mod location; | |||
src/web/handlers.rs
Outdated
| tags::Tags, | ||
| web::{middleware::sentry as l_sentry, DeviceInfo}, | ||
| }; | ||
| use actix_web_location::Location; |
There was a problem hiding this comment.
nit: should go up top under the actix_web import
src/web/test.rs
Outdated
|
|
||
| /// customizing the settings | ||
| fn get_test_settings() -> Settings { | ||
| let treq = test::TestRequest::with_uri("/").to_http_request(); | ||
| Settings { | ||
| maxminddb_loc: Some(MMDB_LOC.to_owned()), | ||
| maxminddb_loc: Some(PathBuf::from(MMDB_LOC)), |
There was a problem hiding this comment.
nit: could just into this, avoiding the PathBuf import
Suggested change
| maxminddb_loc: Some(PathBuf::from(MMDB_LOC)), | |
| maxminddb_loc: Some(MMDB_LOC.into()), |
This drops support for GCS provided location headers, which are not being used currently. We should consider adding that feature to the shared crate as well.
mythmon
force-pushed
the
extract-location
branch
from
83cb06b to
b362d93
Compare
pjenvey
previously approved these changes
Aug 16, 2021
There was a problem hiding this comment.
Sorry @mythmon I totally missed the last update.
I've fixed the merge conflicts here: https://github.com/mozilla-services/contile/tree/extract-location-merge
Shall I push that merge to your branch?
|
Yes please. Thanks for doing the merge again. |
jrconlin
approved these changes
Aug 16, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The location parsing code that Contile had was useful, so I stole it to put into mozilla-services/common-rs#14. This PR re-integrates that code as an external crate. Note that this is currently pulling the crate straight from that PR. That means the other PR should merge and this PR should be updated to point to crates.io before we merge this PR.
This drops support for GCS provided location headers, which are not being used currently. We should consider adding that feature to the shared crate as well.
Testing
MaxMind based location should work exactly the same as before. Non-location features should be unaffected.