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

Add rover supergraph print-json-schema #2139

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
133 changes: 59 additions & 74 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ apollo-parser = "0.8"
apollo-encoder = "0.8"

# https://github.com/apollographql/federation-rs
apollo-federation-types = "0.13.1"
apollo-federation-types = { git = "https://github.com/apollographql/federation-rs", branch = "dylan/supergraph-json-schema", version = "0.14.0", features = ["json_schema"] }

# crates.io dependencies
ariadne = "0.4"
Expand All @@ -72,13 +72,13 @@ assert_cmd = "2"
assert-json-diff = "2"
anyhow = "1"
backtrace = "0.3"
backoff = { version = "0.4", features = [ "tokio" ]}
backoff = { version = "0.4", features = ["tokio"] }
base64 = "0.22"
billboard = "0.2"
buildstructor = "0.5.4"
cargo_metadata = "0.18"
calm_io = "0.1"
camino = "1"
camino = { version = "1", features = ["serde1"] }
clap = "4"
chrono = "0.4"
ci_info = "0.14"
Expand Down Expand Up @@ -174,6 +174,7 @@ reqwest = { workspace = true, features = ["json"] }
robot-panic = { workspace = true }
rover-client = { workspace = true }
rover-std = { workspace = true }
schemars = "0.8.21"
semver = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
Expand Down Expand Up @@ -201,7 +202,7 @@ assert_fs = { workspace = true }
assert-json-diff = { workspace = true }
dircpy = "0.3.19"
duct = "0.13.7"
git2 = { workspace = true, features = ["https"]}
git2 = { workspace = true, features = ["https"] }
graphql-schema-diff = "0.2.0"
httpmock = { workspace = true }
indoc = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/rover-client/src/error.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use apollo_federation_types::build::BuildErrors;
use apollo_federation_types::rover::BuildErrors;
use thiserror::Error;

use crate::shared::{CheckTaskStatus, CheckWorkflowResponse, GraphRef, LintResponse};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::time::{Duration, Instant};

use apollo_federation_types::build::BuildError;
use apollo_federation_types::rover::BuildError;
use graphql_client::*;

use crate::blocking::StudioClient;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use crate::operations::subgraph::delete::types::*;
use crate::shared::GraphRef;
use crate::RoverClientError;

use apollo_federation_types::build::{BuildError, BuildErrors};
use apollo_federation_types::rover::{BuildError, BuildErrors};

use graphql_client::*;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use crate::{operations::subgraph::delete::runner::subgraph_delete_mutation, shar
pub(crate) type MutationComposition = subgraph_delete_mutation::SubgraphDeleteMutationGraphRemoveImplementingServiceAndTriggerComposition;
pub(crate) type MutationVariables = subgraph_delete_mutation::Variables;

use apollo_federation_types::build::BuildErrors;
use apollo_federation_types::rover::BuildErrors;

use serde::Serialize;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use crate::RoverClientError;

use graphql_client::*;

use apollo_federation_types::build::{BuildError, BuildErrors};
use apollo_federation_types::rover::{BuildError, BuildErrors};

#[derive(GraphQLQuery)]
// The paths are relative to the directory where your `Cargo.toml` is located.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pub(crate) type MutationVariables = subgraph_publish_mutation::Variables;
pub(crate) type UpdateResponse =
subgraph_publish_mutation::SubgraphPublishMutationGraphPublishSubgraph;

use apollo_federation_types::build::BuildErrors;
use apollo_federation_types::rover::BuildErrors;

type SchemaInput = subgraph_publish_mutation::PartialSchemaInput;
type GitContextInput = subgraph_publish_mutation::GitContextInput;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use apollo_federation_types::build::BuildError;
use apollo_federation_types::rover::BuildError;
use graphql_client::*;

use crate::blocking::StudioClient;
Expand Down Expand Up @@ -91,7 +91,7 @@ fn get_supergraph_sdl_from_response_data(

#[cfg(test)]
mod tests {
use apollo_federation_types::build::BuildErrors;
use apollo_federation_types::rover::BuildErrors;
use serde_json::json;

use super::*;
Expand Down
2 changes: 1 addition & 1 deletion src/command/dev/protocol/follower/message.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use anyhow::anyhow;
use apollo_federation_types::build::SubgraphDefinition;
use apollo_federation_types::javascript::SubgraphDefinition;
use serde::{Deserialize, Serialize};
use std::fmt::Debug;

Expand Down
2 changes: 1 addition & 1 deletion src/command/dev/protocol/follower/messenger.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::fmt::Debug;

use anyhow::anyhow;
use apollo_federation_types::build::SubgraphDefinition;
use apollo_federation_types::javascript::SubgraphDefinition;
use crossbeam_channel::{Receiver, Sender};

use crate::command::dev::protocol::{
Expand Down
Loading
Loading