feat: override to staging relays #2551
Merged
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
iroh-net/src/endpoint.rs
Outdated
| @@ -59,6 +59,9 @@ pub use iroh_base::node_addr::{AddrInfo, NodeAddr}; | |||
| /// is still no connection the configured [`Discovery`] will be used however. | |||
| const DISCOVERY_WAIT_PERIOD: Duration = Duration::from_millis(500); | |||
|
|
|||
| /// Environment variable to force the use of staging relays. | |||
| pub const ENV_FORCE_STAGING_RELAYS: &str = "IROH_FORCE_STAGING_RELAYS"; | |||
There was a problem hiding this comment.
if you put the env var in here, I would also put the check in here and make it public function
There was a problem hiding this comment.
does this still need pub?
iroh-cli/src/config.rs
Outdated
| default_eu_relay_node(), | ||
| default_ap_relay_node(), | ||
| ] | ||
| .into() |
There was a problem hiding this comment.
this should just be a function from iroh_net, to avoid this duplication
Arqu
commented
Jul 25, 2024
iroh-net/src/relay/map.rs
Outdated
| @@ -133,6 +145,17 @@ pub struct RelayNode { | |||
| pub stun_port: u16, | |||
| } | |||
|
|
|||
| impl RelayNode { | |||
| /// Creates a new relay node from itself. | |||
| pub fn copied(&self) -> Self { | |||
There was a problem hiding this comment.
I don't know what's the expected naming or way to do this properly. I just needed to get it out of the arc and this was cheap and easy enough.
There was a problem hiding this comment.
no need for this method, just use this to get it out of the arc: https://doc.rust-lang.org/std/sync/struct.Arc.html#method.unwrap_or_clone
There was a problem hiding this comment.
Figured there was a saner way to do this.
dignifiedquire
approved these changes
Jul 28, 2024
|
Documentation for this PR has been generated and is available at: https://n0-computer.github.io/iroh/pr/2551/docs/iroh/ Last updated: 2024-07-28T21:38:18Z |
4 tasks
github-merge-queue bot
pushed a commit
that referenced
this pull request
Jul 29, 2024
## Description Now that #2551 is landed, time to force all our repos to set this env var. ## Breaking Changes <!-- Optional, if there are any breaking changes document them, including how to migrate older code. --> ## Notes & open questions <!-- Any notes, remarks or open questions you have to make about the PR. --> ## Change checklist - [x] Self-review. - [ ] Documentation updates following the [style guide](https://rust-lang.github.io/rfcs/1574-more-api-documentation-conventions.html#appendix-a-full-conventions-text), if relevant. - [ ] Tests if relevant. - [ ] All breaking changes documented.
rklaehn
pushed a commit
to n0-computer/iroh-blobs
that referenced
this pull request
Oct 22, 2024
## Description Now that n0-computer/iroh#2551 is landed, time to force all our repos to set this env var. ## Breaking Changes <!-- Optional, if there are any breaking changes document them, including how to migrate older code. --> ## Notes & open questions <!-- Any notes, remarks or open questions you have to make about the PR. --> ## Change checklist - [x] Self-review. - [ ] Documentation updates following the [style guide](https://rust-lang.github.io/rfcs/1574-more-api-documentation-conventions.html#appendix-a-full-conventions-text), if relevant. - [ ] Tests if relevant. - [ ] All breaking changes documented.
matheus23
pushed a commit
to n0-computer/iroh-doctor
that referenced
this pull request
Oct 22, 2024
## Description Now that n0-computer/iroh#2551 is landed, time to force all our repos to set this env var. ## Breaking Changes <!-- Optional, if there are any breaking changes document them, including how to migrate older code. --> ## Notes & open questions <!-- Any notes, remarks or open questions you have to make about the PR. --> ## Change checklist - [x] Self-review. - [ ] Documentation updates following the [style guide](https://rust-lang.github.io/rfcs/1574-more-api-documentation-conventions.html#appendix-a-full-conventions-text), if relevant. - [ ] Tests if relevant. - [ ] All breaking changes documented.
matheus23
pushed a commit
that referenced
this pull request
Nov 14, 2024
## Description Now that #2551 is landed, time to force all our repos to set this env var. ## Breaking Changes <!-- Optional, if there are any breaking changes document them, including how to migrate older code. --> ## Notes & open questions <!-- Any notes, remarks or open questions you have to make about the PR. --> ## Change checklist - [x] Self-review. - [ ] Documentation updates following the [style guide](https://rust-lang.github.io/rfcs/1574-more-api-documentation-conventions.html#appendix-a-full-conventions-text), if relevant. - [ ] Tests if relevant. - [ ] All breaking changes documented.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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
While I'm not a huge fan of this piece of code, I don't really see much of an alternative as we want to be able to force the override to use staging relays even in "prod" environments or when it's deeply integrated such as the FFI library cases.
This should allow us to override the default relay maps for all of our CI setups in all of our repos.
Breaking Changes
Notes & open questions
Change checklist