compose/dev: don't delete remote routing_urls

This pulls in apollographql/federation-rs#574 which improves the logic used to merge remote and local config such that if your local config does not specify a `routing_url` for a subgraph that also exists in the remote config, the remote config's URL is used instead of deleting it. Update the docs.
apollographql · Sep 6, 2024 · 47acec4 · 47acec4
1 parent 0b232ac
commit 47acec4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 66 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/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.13.2"
 
 # 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"
@@ -102,7 +102,9 @@ interprocess = { version = "2", default-features = false }
 indoc = "2"
 lazycell = "1"
 lazy_static = "1.4"
-notify = { version = "6", default-features = false, features = ["macos_kqueue"] }
+notify = { version = "6", default-features = false, features = [
+    "macos_kqueue",
+] }
 notify-debouncer-full = "0.3.1"
 opener = "0.7"
 os_info = "3.7"
@@ -201,7 +203,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 }

diff --git a/docs/source/commands/supergraphs.mdx b/docs/source/commands/supergraphs.mdx
@@ -87,6 +87,8 @@ rover supergraph compose \
 
 ```
 
+Note that you only need to set `routing_url` if you want to change it from the routing URL registered for the subgraph in GraphOS.
+
 ### YAML configuration file
 
 The supergraph configuration file (often referred to as `supergraph.yaml`) includes configuration options for each of your [subgraphs](/federation/building-supergraphs/subgraphs-overview/). The following example file configures a supergraph with two subgraphs (`films` and `people`):
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,6 +87,8 @@ rover supergraph compose \ @@
     ```
+    Note that you only need to set `routing_url` if you want to change it from the routing URL registered for the subgraph in GraphOS.
     ### YAML configuration file
     The supergraph configuration file (often referred to as `supergraph.yaml`) includes configuration options for each of your [subgraphs](/federation/building-supergraphs/subgraphs-overview/). The following example file configures a supergraph with two subgraphs (`films` and `people`):
@@ Expand Down @@