Implement breaking changes for apollo-federation-types 0.14

Cargo.toml

@@ -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 = "0.14.0-alpha.0"
 
 # crates.io dependencies
 ariadne = "0.4"
@@ -72,7 +72,7 @@ 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"
@@ -201,7 +201,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 }

crates/rover-client/src/error.rs

@@ -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};

crates/rover-client/src/operations/subgraph/check_workflow/runner.rs

@@ -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;

crates/rover-client/src/operations/subgraph/delete/runner.rs

@@ -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::*;
 

crates/rover-client/src/operations/subgraph/delete/types.rs

@@ -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;
 

crates/rover-client/src/operations/subgraph/publish/runner.rs

@@ -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.

crates/rover-client/src/operations/subgraph/publish/types.rs

@@ -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;

crates/rover-client/src/operations/supergraph/fetch/runner.rs

@@ -1,4 +1,4 @@
-use apollo_federation_types::build::BuildError;
+use apollo_federation_types::rover::BuildError;
 use graphql_client::*;
 
 use crate::blocking::StudioClient;

src/command/dev/protocol/follower/message.rs

@@ -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;
 

src/command/dev/protocol/follower/messenger.rs

@@ -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::{

src/command/dev/protocol/leader.rs

@@ -8,8 +8,8 @@ use std::{
 
 use anyhow::{anyhow, Context};
 use apollo_federation_types::{
-    build::SubgraphDefinition,
     config::{FederationVersion, SupergraphConfig},
+    javascript::SubgraphDefinition,
 };
 use camino::Utf8PathBuf;
 use crossbeam_channel::{bounded, Receiver, Sender};
@@ -414,7 +414,11 @@ impl LeaderSession {
         let mut supergraph_config: SupergraphConfig = self
             .subgraphs
             .iter()
-            .map(|((name, url), sdl)| SubgraphDefinition::new(name, url.to_string(), sdl))
+            .map(|((name, url), sdl)| SubgraphDefinition {
+                name: name.clone(),
+                url: url.to_string(),
+                sdl: sdl.clone(),
+            })
             .collect::<Vec<SubgraphDefinition>>()
             .into();
 

src/command/dev/protocol/types.rs

@@ -1,7 +1,7 @@
 use crate::command::supergraph::compose::CompositionOutput;
 
 use anyhow::Result;
-use apollo_federation_types::build::SubgraphDefinition;
+use apollo_federation_types::javascript::SubgraphDefinition;
 use reqwest::Url;
 
 pub type SubgraphName = String;

src/command/dev/watcher.rs

@@ -2,7 +2,7 @@ use std::str::FromStr;
 use std::{collections::HashMap, time::Duration};
 
 use anyhow::{anyhow, Context};
-use apollo_federation_types::build::SubgraphDefinition;
+use apollo_federation_types::javascript::SubgraphDefinition;
 use camino::{Utf8Path, Utf8PathBuf};
 use reqwest::Client;
 use tokio::time::MissedTickBehavior::Delay;
@@ -195,7 +195,11 @@ impl SubgraphSchemaWatcher {
             SubgraphSchemaWatcherKind::Once(sdl) => (sdl.clone(), None),
         };
 
-        let subgraph_definition = SubgraphDefinition::new(name, url, sdl);
+        let subgraph_definition = SubgraphDefinition {
+            name,
+            url: url.to_string(),
+            sdl,
+        };
 
         Ok((subgraph_definition, refresher))
     }

src/command/supergraph/compose/do_compose.rs

@@ -4,8 +4,8 @@ use anyhow::{anyhow, Context};
 use apollo_federation_types::config::FederationVersion::LatestFedTwo;
 use apollo_federation_types::config::SupergraphConfig;
 use apollo_federation_types::{
-    build::BuildResult,
     config::{FederationVersion, PluginVersion},
+    rover::BuildResult,
 };
 use camino::Utf8PathBuf;
 use clap::{Args, Parser};

src/command/supergraph/compose/mod.rs

@@ -10,7 +10,7 @@ mod do_compose;
 #[cfg(feature = "composition-js")]
 pub(crate) use do_compose::Compose;
 
-use apollo_federation_types::build::BuildHint;
+use apollo_federation_types::rover::BuildHint;
 
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct CompositionOutput {

src/error/mod.rs

@@ -15,7 +15,7 @@ use std::borrow::BorrowMut;
 use std::error::Error;
 use std::fmt::{self, Debug, Display};
 
-use apollo_federation_types::build::BuildErrors;
+use apollo_federation_types::rover::BuildErrors;
 
 use crate::options::JsonVersion;
 

src/utils/supergraph_config.rs

@@ -1,10 +1,11 @@
 use std::str::FromStr;
 
 use anyhow::anyhow;
-use apollo_federation_types::build::{BuildError, BuildErrors, SubgraphDefinition};
 use apollo_federation_types::config::{
     FederationVersion, SchemaSource, SubgraphConfig, SupergraphConfig,
 };
+use apollo_federation_types::javascript::SubgraphDefinition;
+use apollo_federation_types::rover::{BuildError, BuildErrors};
 use apollo_parser::{cst, Parser};
 use futures::future::join_all;
 
@@ -701,10 +702,10 @@ pub(crate) async fn resolve_supergraph_yaml(
     // futs we're able to run them all at once rather than in parallel (even when async); takes
     // resolution down from ~1min for 100 subgraphs to ~10s
     let futs = supergraph_config
-        .iter()
+        .into_iter()
         .map(|(subgraph_name, subgraph_data)| async {
             let cloned_subgraph_name = subgraph_name.to_string();
-            let result = match &subgraph_data.schema {
+            let result = match subgraph_data.schema {
                 SchemaSource::File { file } => {
                     let relative_schema_path = match unresolved_supergraph_yaml {
                         FileDescriptorType::File(config_path) => match config_path.parent() {
@@ -729,8 +730,10 @@ pub(crate) async fn resolve_supergraph_yaml(
                                 .routing_url
                                 .clone()
                                 .ok_or_else(err_no_routing_url)
-                                .map(|url| {
-                                    SubgraphDefinition::new(subgraph_name.clone(), url, &schema)
+                                .map(|url| SubgraphDefinition {
+                                    name: subgraph_name,
+                                    url,
+                                    sdl: schema,
                                 })
                         })
                 }
@@ -762,11 +765,14 @@ pub(crate) async fn resolve_supergraph_yaml(
 
                         // We don't require a routing_url in config for this variant of a schema,
                         // if one isn't provided, just use the URL they passed for introspection.
-                        let url = &subgraph_data
+                        let url = subgraph_data
                             .routing_url
-                            .clone()
                             .unwrap_or_else(|| subgraph_url.to_string());
-                        SubgraphDefinition::new(subgraph_name.clone(), url, schema)
+                        SubgraphDefinition {
+                            name: subgraph_name,
+                            url,
+                            sdl: schema,
+                        }
                     })
                     .map_err(RoverError::from)
                 }
@@ -776,7 +782,7 @@ pub(crate) async fn resolve_supergraph_yaml(
                 } => {
                     // WARNING: here's where we're returning an error on invalid graph refs; before
                     // this would bubble up and, I _think_, early abort the resolving
-                    let graph_ref = match GraphRef::from_str(graph_ref) {
+                    let graph_ref = match GraphRef::from_str(&graph_ref) {
                         Ok(graph_ref) => graph_ref,
                         Err(_err) => return Err(err_invalid_graph_ref()),
                     };
@@ -806,23 +812,25 @@ pub(crate) async fn resolve_supergraph_yaml(
                         {
                             let url = subgraph_data
                                 .routing_url
-                                .clone()
                                 .unwrap_or(graph_registry_routing_url);
-                            SubgraphDefinition::new(
-                                subgraph_name.clone(),
+                            SubgraphDefinition {
+                                name: subgraph_name,
                                 url,
-                                &result.sdl.contents,
-                            )
+                                sdl: result.sdl.contents,
+                            }
                         } else {
                             panic!("whoops: rebase me");
                         }
                     })
                 }
                 SchemaSource::Sdl { sdl } => subgraph_data
                     .routing_url
-                    .clone()
                     .ok_or_else(err_no_routing_url)
-                    .map(|url| SubgraphDefinition::new(subgraph_name.clone(), url, sdl)),
+                    .map(|url| SubgraphDefinition {
+                        name: subgraph_name,
+                        url,
+                        sdl,
+                    }),
             };
             Ok((cloned_subgraph_name, result))
         });