feat(composition): composition rewrite

Cargo.toml

@@ -69,14 +69,15 @@ apollo-parser = "0.8"
 apollo-encoder = "0.8"
 
 # https://github.com/apollographql/federation-rs
-apollo-federation-types = "0.14.0"
+apollo-federation-types = "0.14.1"
 
 # crates.io dependencies
+anyhow = "1"
 ariadne = "0.4"
 assert_fs = "1"
 assert_cmd = "2"
 assert-json-diff = "2"
-anyhow = "1"
+async-trait = "0.1.82"
 backtrace = "0.3"
 backoff = { version = "0.4", features = ["tokio"] }
 base64 = "0.22"
@@ -109,6 +110,7 @@ httpmock = "0.7"
 hyper = "1.0"
 interprocess = { version = "2", default-features = false }
 indoc = "2"
+itertools = "0.13.0"
 lazycell = "1"
 lazy_static = "1.4"
 notify = { version = "6", default-features = false, features = [
@@ -164,24 +166,29 @@ zip = "2.0"
 [dependencies]
 anyhow = { workspace = true }
 assert_fs = { workspace = true }
+async-trait = { workspace = true }
 apollo-federation-types = { workspace = true }
 apollo-parser = { workspace = true }
 billboard = { workspace = true }
 binstall = { workspace = true }
+buildstructor = { workspace = true }
 calm_io = { workspace = true }
 camino = { workspace = true }
 clap = { workspace = true, features = ["color", "derive", "env"] }
 chrono = { workspace = true }
 console = { workspace = true }
 crossbeam-channel = { workspace = true }
 ctrlc = { workspace = true }
+derive-getters = { workspace = true }
 dialoguer = { workspace = true }
 flate2 = { workspace = true }
+futures = { workspace = true }
 graphql_client = { workspace = true }
 heck = { workspace = true }
 http = { workspace = true }
 houston = { workspace = true }
 interprocess = { workspace = true }
+itertools = { workspace = true }
 prettytable-rs = { workspace = true }
 lazycell = { workspace = true }
 lazy_static = { workspace = true }
@@ -200,19 +207,20 @@ sputnik = { workspace = true }
 strsim = { workspace = true }
 strum = { workspace = true }
 strum_macros = { workspace = true }
+tap = { workspace = true }
 tar = { workspace = true }
 tempfile = { workspace = true }
 timber = { workspace = true }
 termimad = { workspace = true }
 thiserror = { workspace = true }
+tokio = { workspace = true, features = ["rt", "rt-multi-thread", "macros", "process", "sync"] }
+tokio-stream = { workspace = true }
 toml = { workspace = true }
 tower = { workspace = true }
 tracing = { workspace = true }
 which = { workspace = true }
 uuid = { workspace = true }
 url = { workspace = true, features = ["serde"] }
-tokio = { workspace = true, features = ["rt", "rt-multi-thread", "macros"] }
-futures = { workspace = true }
 
 [dev-dependencies]
 assert_cmd = { workspace = true }
@@ -225,6 +233,7 @@ graphql-schema-diff = "0.2.0"
 httpmock = { workspace = true }
 indoc = { workspace = true }
 mime = "0.3.17"
+mockall = "0.13.0"
 portpicker = "0.1.1"
 predicates = { workspace = true }
 rand = "0.8.5"
@@ -234,5 +243,4 @@ reqwest = { workspace = true, features = ["native-tls-vendored"] }
 rstest = { workspace = true }
 serial_test = { workspace = true }
 speculoos = { workspace = true }
-tokio = { workspace = true }
 tracing-test = "0.2.5"

crates/rover-client/src/operations/subgraph/introspect/introspect_query.graphql

@@ -3,4 +3,4 @@ query SubgraphIntrospectQuery {
     _service {
         sdl
     }
-}
+}

src/command/dev/mod.rs

@@ -3,6 +3,7 @@ use std::net::IpAddr;
 use apollo_federation_types::config::FederationVersion;
 use camino::Utf8PathBuf;
 use clap::Parser;
+use derive_getters::Getters;
 use serde::Serialize;
 
 use rover_client::shared::GraphRef;
@@ -55,7 +56,7 @@ pub struct DevOpts {
     pub supergraph_opts: SupergraphOpts,
 }
 
-#[derive(Debug, Parser, Serialize, Clone)]
+#[derive(Debug, Parser, Serialize, Clone, Getters)]
 pub struct SupergraphOpts {
     /// The port the graph router should listen on.
     ///

src/command/mod.rs

@@ -13,7 +13,7 @@ pub(crate) mod output;
 mod persisted_queries;
 mod readme;
 pub(crate) mod subgraph;
-mod supergraph;
+pub(crate) mod supergraph;
 pub(crate) mod template;
 mod update;
 

src/command/subgraph/introspect.rs

@@ -49,11 +49,11 @@ impl Introspect {
             }
         };
 
-        Ok(
-            introspect::run(SubgraphIntrospectInput { headers }, &client, should_retry)
-                .await?
-                .result,
-        )
+        let sdl = introspect::run(SubgraphIntrospectInput { headers }, &client, should_retry)
+            .await?
+            .result;
+
+        Ok(sdl)
     }
 
     pub async fn exec_and_watch(

src/command/subgraph/mod.rs

@@ -1,7 +1,7 @@
 mod check;
 mod delete;
 mod fetch;
-mod introspect;
+pub mod introspect;
 mod lint;
 mod list;
 mod publish;