From e8275ae4f189cacef94b6d9bc2d83f793fbd9c9e Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon@apollographql.com>
Date: Thu, 4 Aug 2022 12:15:29 +0200
Subject: [PATCH 1/2] Give a reachable public path to some items
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… that were only public through appearing in other APIs.

Part of https://github.com/apollographql/router/issues/1305
---
 apollo-router/src/error.rs        |  2 ++
 apollo-router/src/lib.rs          | 10 +++-------
 apollo-router/src/services/mod.rs |  5 +++--
 apollo-router/src/spec/mod.rs     |  2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/apollo-router/src/error.rs b/apollo-router/src/error.rs
index 864131130f..ed6831b30e 100644
--- a/apollo-router/src/error.rs
+++ b/apollo-router/src/error.rs
@@ -17,10 +17,12 @@ use thiserror::Error;
 use tokio::task::JoinError;
 use tracing::level_filters::LevelFilter;
 
+pub use crate::configuration::ConfigurationError;
 pub(crate) use crate::graphql::Error;
 use crate::graphql::Response;
 use crate::json_ext::Path;
 use crate::json_ext::Value;
+pub use crate::reload::Error as ReloadError;
 pub use crate::spec::SpecError;
 
 /// Error types for execution.
diff --git a/apollo-router/src/lib.rs b/apollo-router/src/lib.rs
index 89bbf25e63..335f4d0fe7 100644
--- a/apollo-router/src/lib.rs
+++ b/apollo-router/src/lib.rs
@@ -73,14 +73,10 @@ mod state_machine;
 pub mod subscriber;
 mod traits;
 
-pub use configuration::Configuration;
+pub use configuration::*;
 pub use context::Context;
-pub use executable::main;
-pub use executable::Executable;
-pub use router::ApolloRouter;
-pub use router::ConfigurationKind;
-pub use router::SchemaKind;
-pub use router::ShutdownKind;
+pub use executable::*;
+pub use router::*;
 pub use router_factory::__create_test_service_factory_from_yaml;
 pub use services::http_ext;
 pub use spec::Schema;
diff --git a/apollo-router/src/services/mod.rs b/apollo-router/src/services/mod.rs
index 3432542325..1e76fe24c4 100644
--- a/apollo-router/src/services/mod.rs
+++ b/apollo-router/src/services/mod.rs
@@ -17,11 +17,11 @@ use http_ext::IntoHeaderValue;
 use multimap::MultiMap;
 use serde_json_bytes::ByteString;
 use static_assertions::assert_impl_all;
-pub use subgraph_service::SubgraphService;
 use tower::BoxError;
 
 pub use self::execution_service::*;
 pub use self::router_service::*;
+pub use self::subgraph_service::*;
 use crate::error::Error;
 use crate::graphql::Request;
 use crate::graphql::Response;
@@ -31,7 +31,8 @@ use crate::json_ext::Value;
 use crate::query_planner::fetch::OperationKind;
 use crate::query_planner::QueryPlan;
 use crate::query_planner::QueryPlanOptions;
-use crate::*;
+pub use crate::spec::Query;
+use crate::Context;
 
 mod execution_service;
 pub mod http_ext;
diff --git a/apollo-router/src/spec/mod.rs b/apollo-router/src/spec/mod.rs
index 3432704057..834c697477 100644
--- a/apollo-router/src/spec/mod.rs
+++ b/apollo-router/src/spec/mod.rs
@@ -7,7 +7,7 @@ mod selection;
 use displaydoc::Display;
 pub(crate) use field_type::*;
 pub(crate) use fragments::*;
-pub(crate) use query::*;
+pub use query::Query;
 pub use schema::Schema;
 pub(crate) use selection::*;
 use thiserror::Error;

From d87451ec59e2b2c7effea92bdf76fbf996a498b2 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon@apollographql.com>
Date: Thu, 4 Aug 2022 12:16:34 +0200
Subject: [PATCH 2/2] Remove some items from the (documented) public API

---
 apollo-router/src/lib.rs                   | 1 +
 apollo-router/src/plugins/telemetry/mod.rs | 2 +-
 apollo-router/src/services/mod.rs          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apollo-router/src/lib.rs b/apollo-router/src/lib.rs
index 335f4d0fe7..88348f967b 100644
--- a/apollo-router/src/lib.rs
+++ b/apollo-router/src/lib.rs
@@ -77,6 +77,7 @@ pub use configuration::*;
 pub use context::Context;
 pub use executable::*;
 pub use router::*;
+#[doc(hidden)]
 pub use router_factory::__create_test_service_factory_from_yaml;
 pub use services::http_ext;
 pub use spec::Schema;
diff --git a/apollo-router/src/plugins/telemetry/mod.rs b/apollo-router/src/plugins/telemetry/mod.rs
index fb32d174a0..b9af3f2fc4 100644
--- a/apollo-router/src/plugins/telemetry/mod.rs
+++ b/apollo-router/src/plugins/telemetry/mod.rs
@@ -76,7 +76,7 @@ mod metrics;
 mod otlp;
 mod tracing;
 
-pub static ROUTER_SPAN_NAME: &str = "router";
+static ROUTER_SPAN_NAME: &str = "router";
 static CLIENT_NAME: &str = "apollo_telemetry::client_name";
 static CLIENT_VERSION: &str = "apollo_telemetry::client_version";
 const ATTRIBUTES: &str = "apollo_telemetry::metrics_attributes";
diff --git a/apollo-router/src/services/mod.rs b/apollo-router/src/services/mod.rs
index 1e76fe24c4..971e0391f2 100644
--- a/apollo-router/src/services/mod.rs
+++ b/apollo-router/src/services/mod.rs
@@ -37,7 +37,7 @@ use crate::Context;
 mod execution_service;
 pub mod http_ext;
 pub(crate) mod layers;
-pub mod new_service;
+pub(crate) mod new_service;
 mod router_service;
 pub(crate) mod subgraph_service;