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.

Sign up for GitHub

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

Jump to bottom

fix: rover dev when used with Enterprise features #1608

Merged
merged 2 commits into from
May 26, 2023
Merged

fix: rover dev when used with Enterprise features #1608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
730bdee
fix: `rover dev` when used with Enterprise features
dbanty May 25, 2023
b81b0a6
Merge branch 'main' into rover-dev-enterprise
EverlastingBugstopper May 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/command/dev/router/command.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
use std::env::var;
use std::{
io::{BufRead, BufReader},
process::{Child, Command, Stdio},
Expand Down Expand Up @@ -39,6 +40,13 @@ impl BackgroundTask {

command.stdout(Stdio::piped()).stderr(Stdio::piped());

if let Ok(apollo_key) = var("APOLLO_KEY") {
command.env("APOLLO_KEY", apollo_key);
EverlastingBugstopper marked this conversation as resolved.
Show resolved Hide resolved
}
if let Ok(apollo_graph_ref) = var("APOLLO_GRAPH_REF") {
command.env("APOLLO_GRAPH_REF", apollo_graph_ref);
}

let mut child = command
.spawn()
.with_context(|| "could not spawn child process")?;
Expand Down
1 change: 0 additions & 1 deletion src/command/dev/router/runner.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ impl RouterRunner {
.get(&endpoint)
.header("Content-Type", "application/json")
.send()
.and_then(|r| r.error_for_status())
.map(|_| {
ready = true;
});
Expand Down