refactor: allow errors to propagate out of init_client

Author: winstxnhdw

compiler-cli/src/http.rs

@@ -27,11 +27,8 @@ impl gleam_core::io::HttpClient for HttpClient {
         let request = request
             .try_into()
             .expect("Unable to convert HTTP request for use by reqwest library");
-        let mut response = REQWEST_CLIENT
-            .get_or_init(|| init_client().expect("Unable to create reqwest client"))
-            .execute(request)
-            .await
-            .map_err(Error::http)?;
+        let client = init_client().map_err(Error::http)?;
+        let mut response = client.execute(request).await.map_err(Error::http)?;
         let mut builder = Response::builder()
             .status(response.status())
             .version(response.version());
@@ -44,21 +41,28 @@ impl gleam_core::io::HttpClient for HttpClient {
     }
 }
 
-fn init_client() -> Result<Client, Error> {
+fn init_client() -> Result<&'static Client, Error> {
+    if let Some(client) = REQWEST_CLIENT.get() {
+        return Ok(client);
+    }
+
     let certificate_path = std::env::var("GLEAM_CACERTS_PATH")
         .map_err(|_| Error::CannotReadCertificate { path: "".into() })?;
+
     let certificate_bytes =
         std::fs::read(&certificate_path).map_err(|_| Error::CannotReadCertificate {
             path: certificate_path.clone(),
         })?;
+
     let certificate =
         Certificate::from_pem(&certificate_bytes).map_err(|_| Error::CannotReadCertificate {
             path: certificate_path.clone(),
         })?;
-    Client::builder()
-        .add_root_certificate(certificate)
-        .build()
-        .map_err(|_| Error::CannotReadCertificate {
-            path: certificate_path,
-        })
+
+    match Client::builder().add_root_certificate(certificate).build() {
+        Ok(client) => Ok(REQWEST_CLIENT.get_or_init(|| client)),
+        Err(_) => Err(Error::CannotReadCertificate {
+            path: certificate_path.clone(),
+        }),
+    }
 }