chore: remove a few unwrap calls

supabase · Oct 4, 2023 · 8f46ebd · 8f46ebd
1 parent ab54506
commit 8f46ebd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/wrappers/src/fdw/logflare_fdw/logflare_fdw.rs b/wrappers/src/fdw/logflare_fdw/logflare_fdw.rs
@@ -18,20 +18,19 @@ use supabase_wrappers::prelude::*;
 
 use super::{LogflareFdwError, LogflareFdwResult};
 
-fn create_client(api_key: &str) -> ClientWithMiddleware {
+fn create_client(api_key: &str) -> LogflareFdwResult<ClientWithMiddleware> {
     let mut headers = HeaderMap::new();
     let header_name = HeaderName::from_static("x-api-key");
-    let mut auth_value = HeaderValue::from_str(api_key).unwrap();
+    let mut auth_value = HeaderValue::from_str(api_key)?;
     auth_value.set_sensitive(true);
     headers.insert(header_name, auth_value);
     let client = reqwest::Client::builder()
         .default_headers(headers)
-        .build()
-        .unwrap();
+        .build()?;
     let retry_policy = ExponentialBackoff::builder().build_with_max_retries(3);
-    ClientBuilder::new(client)
+    Ok(ClientBuilder::new(client)
         .with(RetryTransientMiddleware::new_with_policy(retry_policy))
-        .build()
+        .build())
 }
 
 fn extract_params(quals: &[Qual]) -> Option<Vec<Qual>> {
@@ -205,7 +204,8 @@ impl ForeignDataWrapper<LogflareFdwError> for LogflareFdw {
                 let key_id = require_option("api_key_id", options)?;
                 get_vault_secret(key_id).map(|api_key| create_client(&api_key))
             }
-        };
+        }
+        .transpose()?;
 
         stats::inc_stats(Self::FDW_NAME, stats::Metric::CreateTimes, 1);
 

diff --git a/wrappers/src/fdw/logflare_fdw/mod.rs b/wrappers/src/fdw/logflare_fdw/mod.rs
@@ -1,6 +1,7 @@
 #![allow(clippy::module_inception)]
 mod logflare_fdw;
 
+use http::header::InvalidHeaderValue;
 use pgrx::pg_sys::panic::ErrorReport;
 use pgrx::prelude::PgSqlErrorCode;
 use thiserror::Error;
@@ -33,8 +34,14 @@ enum LogflareFdwError {
     #[error("parse url failed: {0}")]
     UrlParseError(#[from] url::ParseError),
 
+    #[error("invalid api_key header: {0}")]
+    InvalidApiKeyHeader(#[from] InvalidHeaderValue),
+
     #[error("request failed: {0}")]
-    RequestError(#[from] reqwest_middleware::Error),
+    RequestError(#[from] reqwest::Error),
+
+    #[error("request middleware failed: {0}")]
+    RequestMiddlewareError(#[from] reqwest_middleware::Error),
 
     #[error("parse JSON response failed: {0}")]
     JsonParseError(#[from] serde_json::Error),