Use octocrab for GraphQL queries (#187)

Remove the manual use of reqwest::Client for graphql queries and use
octocrab instead.

This removes the need to specify the github api base url multiple times.
We instead leverage the global octocrab instance for which we configure
the api base url once.

This is beneficial for a cleaner implementation of Github Enterprise
support (#158), as we can configure the base url once.

For an example of what GHE support could look like on top of this, here
is a draft PR jtietema#1

---------

Co-authored-by: Sven Over <sp@cedenti.st>

Author: jtietema

spr/src/commands/list.rs

@@ -8,7 +8,6 @@
 use crate::error::Error;
 use crate::error::Result;
 use graphql_client::{GraphQLQuery, Response};
-use reqwest;
 
 #[allow(clippy::upper_case_acronyms)]
 type URI = String;
@@ -21,7 +20,6 @@ type URI = String;
 pub struct SearchQuery;
 
 pub async fn list(
-    graphql_client: reqwest::Client,
     config: &crate::config::Config,
 ) -> Result<()> {
     let variables = search_query::Variables {
@@ -31,13 +29,9 @@ pub async fn list(
         ),
     };
     let request_body = SearchQuery::build_query(variables);
-    let res = graphql_client
-        .post("https://api.github.com/graphql")
-        .json(&request_body)
-        .send()
+    let response_body: Response<search_query::ResponseData> = octocrab::instance()
+        .post("/graphql",Some(&request_body))
         .await?;
-    let response_body: Response<search_query::ResponseData> =
-        res.json().await?;
 
     print_pr_info(response_body).ok_or_else(|| Error::new("unexpected error"))
 }

spr/src/github.rs

@@ -21,7 +21,6 @@ use std::collections::{HashMap, HashSet};
 pub struct GitHub {
     config: crate::config::Config,
     git: crate::git::Git,
-    graphql_client: reqwest::Client,
 }
 
 #[derive(Debug, Clone)]
@@ -134,12 +133,10 @@ impl GitHub {
     pub fn new(
         config: crate::config::Config,
         git: crate::git::Git,
-        graphql_client: reqwest::Client,
     ) -> Self {
         Self {
             config,
             git,
-            graphql_client,
         }
     }
 
@@ -165,7 +162,6 @@ impl GitHub {
         let GitHub {
             config,
             git,
-            graphql_client,
         } = self;
 
         let variables = pull_request_query::Variables {
@@ -174,13 +170,9 @@ impl GitHub {
             number: number as i64,
         };
         let request_body = PullRequestQuery::build_query(variables);
-        let res = graphql_client
-            .post("https://api.github.com/graphql")
-            .json(&request_body)
-            .send()
+        let response_body: Response<pull_request_query::ResponseData> = octocrab::instance()
+            .post("/graphql", Some(&request_body))
             .await?;
-        let response_body: Response<pull_request_query::ResponseData> =
-            res.json().await?;
 
         if let Some(errors) = response_body.errors {
             let error =
@@ -395,15 +387,10 @@ impl GitHub {
             number: number as i64,
         };
         let request_body = PullRequestMergeabilityQuery::build_query(variables);
-        let res = self
-            .graphql_client
-            .post("https://api.github.com/graphql")
-            .json(&request_body)
-            .send()
-            .await?;
-        let response_body: Response<
-            pull_request_mergeability_query::ResponseData,
-        > = res.json().await?;
+        let response_body: Response<pull_request_mergeability_query::ResponseData> =
+            octocrab::instance()
+                .post("/graphql", Some(&request_body))
+                .await?;
 
         if let Some(errors) = response_body.errors {
             let error = Err(Error::new(format!(

spr/src/main.rs

@@ -170,14 +170,9 @@ pub async fn spr() -> Result<()> {
         format!("Bearer {}", github_auth_token).parse()?,
     );
 
-    let graphql_client = reqwest::Client::builder()
-        .default_headers(headers)
-        .build()?;
-
     let mut gh = spr::github::GitHub::new(
         config.clone(),
         git.clone(),
-        graphql_client.clone(),
     );
 
     match cli.command {
@@ -190,7 +185,7 @@ pub async fn spr() -> Result<()> {
         Commands::Amend(opts) => {
             commands::amend::amend(opts, &git, &mut gh, &config).await?
         }
-        Commands::List => commands::list::list(graphql_client, &config).await?,
+        Commands::List => commands::list::list(&config).await?,
         Commands::Patch(opts) => {
             commands::patch::patch(opts, &git, &mut gh, &config).await?
         }