chore: updates introspector-gadget (#1386)

Cargo.toml

@@ -65,7 +65,7 @@ apollo-federation-types = { git = "https://github.com/apollographql/federation-r
 billboard = { git = "https://github.com/EverlastingBugstopper/billboard.git", branch = "main" }
 
 # https://github.com/apollographql/introspector-gadget
-introspector-gadget = "0.1"
+introspector-gadget = "0.2"
 
 # https://github.com/EverlastingBugstopper/awc
 saucer = { git = "https://github.com/EverlastingBugstopper/awc.git", rev = "fd8df605e39fdbdf4985f255a7390afccc2600cd" }

crates/rover-client/src/blocking/studio_client.rs

@@ -8,8 +8,8 @@ use introspector_gadget::error::RoverClientError as IntrospectorGadgetError;
 use houston::{Credential, CredentialOrigin};
 
 use graphql_client::GraphQLQuery;
+use reqwest::blocking::Client as ReqwestClient;
 use reqwest::header::{HeaderMap, HeaderValue};
-use reqwest::{blocking::Client as ReqwestClient, Error as ReqwestError};
 
 /// Represents a client for making GraphQL requests to Apollo Studio.
 pub struct StudioClient {
@@ -28,13 +28,13 @@ impl StudioClient {
         version: &str,
         is_sudo: bool,
         client: ReqwestClient,
-    ) -> Result<StudioClient, ReqwestError> {
-        Ok(StudioClient {
+    ) -> StudioClient {
+        StudioClient {
             credential,
-            client: GraphQLClient::new(graphql_endpoint, client)?,
+            client: GraphQLClient::new(graphql_endpoint, client),
             version: version.to_string(),
             is_sudo,
-        })
+        }
     }
 
     /// Client method for making a GraphQL request to Apollo Studio.

crates/rover-client/tests/client.rs

@@ -1,42 +1,5 @@
-use reqwest::blocking::Client;
-const STUDIO_PROD_API_ENDPOINT: &str = "https://api.apollographql.com/graphql";
-
-pub(crate) fn get_client() -> Client {
-    Client::builder()
-        .gzip(true)
-        .brotli(true)
-        .build()
-        .expect("Could not create reqwest Client")
-}
-
 #[cfg(test)]
 mod tests {
-    use super::*;
-    use houston::{Credential, CredentialOrigin};
-    use rover_client::blocking::{GraphQLClient, StudioClient};
-
-    use crate::STUDIO_PROD_API_ENDPOINT;
-
-    #[test]
-    fn it_can_build_client() {
-        assert!(GraphQLClient::new(STUDIO_PROD_API_ENDPOINT, get_client()).is_ok(),);
-    }
-
-    #[test]
-    fn it_can_build_studio_client() {
-        assert!(StudioClient::new(
-            Credential {
-                api_key: "api:key:here".to_string(),
-                origin: CredentialOrigin::EnvVar,
-            },
-            "0.1.0",
-            STUDIO_PROD_API_ENDPOINT,
-            false,
-            get_client(),
-        )
-        .is_ok());
-    }
-
     #[test]
     fn schema_at_stable_path() {
         // this path must remain stable as we upload it as part of our release process

src/command/graph/introspect.rs

@@ -29,7 +29,7 @@ impl Introspect {
     }
 
     pub fn exec(&self, client: &Client, should_retry: bool) -> Result<String> {
-        let client = GraphQLClient::new(self.opts.endpoint.as_ref(), client.clone())?;
+        let client = GraphQLClient::new(self.opts.endpoint.as_ref(), client.clone());
 
         // add the flag headers to a hashmap to pass along to rover-client
         let mut headers = HashMap::new();

src/command/subgraph/introspect.rs

@@ -31,7 +31,7 @@ impl Introspect {
     }
 
     pub fn exec(&self, client: &Client, should_retry: bool) -> Result<String> {
-        let client = GraphQLClient::new(self.opts.endpoint.as_ref(), client.clone())?;
+        let client = GraphQLClient::new(self.opts.endpoint.as_ref(), client.clone());
 
         // add the flag headers to a hashmap to pass along to rover-client
         let mut headers = HashMap::new();

src/command/supergraph/resolve_config.rs

@@ -68,7 +68,7 @@ pub(crate) fn resolve_supergraph_yaml(
                 // given a federated introspection URL, use subgraph introspect to
                 // obtain SDL and add it to subgraph_definition.
                 let client =
-                    GraphQLClient::new(subgraph_url.as_ref(), client_config.get_reqwest_client()?)?;
+                    GraphQLClient::new(subgraph_url.as_ref(), client_config.get_reqwest_client()?);
 
                 let introspection_response = introspect::run(
                     SubgraphIntrospectInput {

src/utils/client.rs

@@ -162,6 +162,6 @@ impl StudioClientConfig {
             &self.version,
             self.is_sudo,
             self.get_reqwest_client()?,
-        )?)
+        ))
     }
 }