chore: re-use same instance of reqwest::blocking::Client & add brotli support

Cargo.toml

@@ -57,6 +57,7 @@ humantime = "2.1.0"
 opener = "0.5.0"
 os_info = "3.0"
 prettytable-rs = "0.8.0"
+reqwest = {version = "0.11", default-features = false, features = ["blocking", "brotli", "gzip", "json", "rustls-tls-native-roots"]}
 regex = "1"
 semver = "1"
 serde = "1.0"
@@ -75,7 +76,6 @@ url = { version = "2.2.2", features = ["serde"] }
 assert_cmd = "1.0.5"
 assert_fs = "1.0.0"
 predicates = "1.0.8"
-reqwest = { version = "0.11.4", default-features = false, features = ["blocking", "rustls-tls-native-roots"] }
 rustversion = "1.0.5"
 serial_test = "0.5.0"
 

crates/rover-client/Cargo.toml

@@ -18,7 +18,7 @@ graphql-parser = "0.3.0"
 graphql_client = "0.9"
 http = "0.2"
 regex = "1.5.4"
-reqwest = {version = "0.11", default-features = false, features = ["blocking", "gzip", "json", "rustls-tls-native-roots"]}
+reqwest = {version = "0.11", default-features = false, features = ["blocking", "json"]}
 sdl-encoder = {path = "../sdl-encoder"}
 serde = "1"
 serde_json = "1"
@@ -32,5 +32,6 @@ reqwest = {version = "0.11", default-features = false, features = ["json", "bloc
 uuid = {version = "0.8", features = ["v4"]}
 
 [dev-dependencies]
+
 indoc = "1.0.3"
 pretty_assertions = "0.7.1"

crates/rover-client/build.rs

@@ -23,7 +23,12 @@ fn main() -> std::io::Result<()> {
     let schema_url = env::var("APOLLO_GPAPHQL_SCHEMA_URL")
         .unwrap_or_else(|_| "https://graphql.api.apollographql.com/api/schema".to_owned());
 
-    let client = Client::new();
+    let client = Client::builder()
+        .use_rustls_tls()
+        .tls_built_in_root_certs(true)
+        .build()
+        .expect("Could not create reqwest Client");
+
     let etag_path = PathBuf::from(".schema/etag.id");
 
     let should_update_schema = !(etag_path.exists()) || online::sync::check(None).is_ok();

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

@@ -8,27 +8,22 @@ use reqwest::{
 
 use std::collections::HashMap;
 
-pub(crate) fn get_client() -> Result<ReqwestClient, ReqwestError> {
-    ReqwestClient::builder()
-        .use_rustls_tls()
-        .tls_built_in_root_certs(true)
-        .gzip(true)
-        .build()
-}
-
 /// Represents a generic GraphQL client for making http requests.
 pub struct GraphQLClient {
-    client: ReqwestClient,
     graphql_endpoint: String,
+    client: ReqwestClient,
 }
 
 impl GraphQLClient {
     /// Construct a new [Client] from a `graphql_endpoint`.
     /// This client is used for generic GraphQL requests, such as introspection.
-    pub fn new(graphql_endpoint: &str) -> Result<GraphQLClient, ReqwestError> {
+    pub fn new(
+        graphql_endpoint: &str,
+        client: ReqwestClient,
+    ) -> Result<GraphQLClient, ReqwestError> {
         Ok(GraphQLClient {
-            client: get_client()?,
             graphql_endpoint: graphql_endpoint.to_string(),
+            client,
         })
     }
 

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

@@ -1,6 +1,5 @@
 mod client;
 mod studio_client;
 
-pub(crate) use client::get_client;
 pub use client::GraphQLClient;
 pub use studio_client::StudioClient;

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

@@ -2,7 +2,7 @@ use crate::{blocking::GraphQLClient, headers, RoverClientError};
 use houston::Credential;
 
 use graphql_client::GraphQLQuery;
-use reqwest::Error as ReqwestError;
+use reqwest::{blocking::Client as ReqwestClient, Error as ReqwestError};
 
 /// Represents a client for making GraphQL requests to Apollo Studio.
 pub struct StudioClient {
@@ -18,10 +18,11 @@ impl StudioClient {
         credential: Credential,
         graphql_endpoint: &str,
         version: &str,
+        client: ReqwestClient,
     ) -> Result<StudioClient, ReqwestError> {
         Ok(StudioClient {
             credential,
-            client: GraphQLClient::new(graphql_endpoint)?,
+            client: GraphQLClient::new(graphql_endpoint, client)?,
             version: version.to_string(),
         })
     }

crates/rover-client/src/releases.rs

@@ -1,11 +1,12 @@
-use crate::{blocking::get_client, RoverClientError};
+use crate::RoverClientError;
 use regex::Regex;
+use reqwest::blocking::Client;
 
 const LATEST_RELEASE_URL: &str = "https://github.com/apollographql/rover/releases/latest";
 
 /// Looks up the latest release version, and returns it as a string
-pub fn get_latest_release() -> Result<String, RoverClientError> {
-    let res = get_client()?.head(LATEST_RELEASE_URL).send()?;
+pub fn get_latest_release(client: Client) -> Result<String, RoverClientError> {
+    let res = client.head(LATEST_RELEASE_URL).send()?;
 
     let release_url = res.url().to_string();
     let release_url_parts: Vec<&str> = release_url.split('/').collect();

crates/rover-client/tests/client.rs

@@ -1,15 +1,27 @@
+use reqwest::blocking::Client;
 const STUDIO_PROD_API_ENDPOINT: &str = "https://graphql.api.apollographql.com/api/graphql";
 
+pub(crate) fn get_client() -> Client {
+    Client::builder()
+        .use_rustls_tls()
+        .tls_built_in_root_certs(true)
+        .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).is_ok());
+        assert!(GraphQLClient::new(STUDIO_PROD_API_ENDPOINT, get_client()).is_ok(),);
     }
 
     #[test]
@@ -20,7 +32,8 @@ mod tests {
                 origin: CredentialOrigin::EnvVar,
             },
             "0.1.0",
-            STUDIO_PROD_API_ENDPOINT
+            STUDIO_PROD_API_ENDPOINT,
+            get_client()
         )
         .is_ok());
     }

crates/sputnik/Cargo.toml

@@ -8,7 +8,7 @@ edition = "2018"
 camino = "1.0"
 ci_info = { version = "0.14", features = ["serde-1"] }
 git2 = "0.13"
-reqwest = { version = "0.11", features = ["blocking", "rustls-tls-native-roots"] }
+reqwest = { version = "0.11", default-features = false, features = ["blocking"] }
 semver = { version = "1", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

crates/sputnik/src/report.rs

@@ -1,4 +1,5 @@
 use camino::{Utf8Path, Utf8PathBuf};
+use reqwest::blocking::Client;
 use url::Url;
 use uuid::Uuid;
 
@@ -38,12 +39,15 @@ pub trait Report {
 
     /// returns the globally persistent machine identifier
     /// and writes it if it does not exist
-    /// the default implemenation uses self.machine_id_config()
+    /// the default implementation uses self.machine_id_config()
     /// as the location the machine identifier is written to.
     fn machine_id(&self) -> Result<Uuid, SputnikError> {
         let config_path = self.machine_id_config()?;
         get_or_write_machine_id(&config_path)
     }
+
+    /// returns the Client to use when sending telemetry data
+    fn client(&self) -> Client;
 }
 
 fn get_or_write_machine_id(path: &Utf8PathBuf) -> Result<Uuid, SputnikError> {