chore: upgrade to ntex 3.0 (#1361)

* chore: upgrade to ntex 3.0

* fix: unit tests

Author: 0xle0ne

Cargo.lock

@@ -44,7 +44,7 @@ serde_yaml = "0.9"
 tabled = "0.20"
 indicatif = "0.18"
 serde_json = "1.0"
-ntex = { version = "2", features = ["tokio", "openssl"] }
+ntex = { version = "3", features = ["tokio", "openssl"] }
 serde = { version = "1.0", features = ["derive"] }
 clap = { version = "4.5", features = ["derive", "cargo"] }
 tokio = { version = "1.49", features = ["fs"] }

bin/nanocl/Cargo.toml

@@ -1,5 +1,3 @@
-use ntex::http;
-
 use nanocl_error::http::HttpError;
 use nanocl_error::http_client::{HttpClientError, HttpClientResult};
 use nanocl_error::io::{FromIo, IoResult};
@@ -8,11 +6,11 @@ use crate::version::{CHANNEL, VERSION};
 
 /// Get template from our GitHub repo for installation
 async fn get() -> HttpClientResult<String> {
-  let client = http::client::Client::new();
+  let client = ntex::client::Client::new().await;
   let url = format!(
     "https://raw.githubusercontent.com/next-hat/nanocl/release/{CHANNEL}/bin/nanocl/{VERSION}/installer.yml"
   );
-  let mut res = client.get(url).send().await.map_err(|err| {
+  let res = client.get(url).send().await.map_err(|err| {
     err.map_err_context(|| "Unable to fetch installer template")
   })?;
   let status = res.status();

bin/nanocl/src/utils/installer.rs

@@ -26,7 +26,7 @@ impl StateSource {
     .as_str()
     .to_owned();
     std::thread::spawn(move || {
-      ntex::rt::System::new(&url)
+      ntex::rt::System::new(&url, ntex::rt::DefaultRuntime)
         .block_on(async move { utils::state::download_statefile(&url).await })
     })
     .join()

bin/nanocl/src/utils/liquid.rs

@@ -26,7 +26,7 @@ pub async fn download_statefile(url: &str) -> IoResult<(String, String)> {
   } else {
     format!("https://{url}")
   };
-  let client = ntex::http::Client::default();
+  let client = ntex::client::Client::new().await;
   let mut res = client
     .get(&url)
     .header("User-Agent", "nanocl")

bin/nanocl/src/utils/state.rs

@@ -59,7 +59,7 @@ clap = { version = "4.5", features = ["derive"] }
 url = { version = "2", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
 uuid = { version = "1.16", features = ["serde", "v4"] }
-ntex = { version = "2", features = ["tokio", "openssl"] }
+ntex = { version = "3", features = ["tokio", "openssl"] }
 diesel = { version = "2.3", features = [
   "postgres",
   "r2d2",
@@ -85,7 +85,7 @@ nanocl_stubs = { version = "0.17", features = ["serde", "clap"] }
 nanocl_utils = { version = "0.8", features = ["unix", "ntex", "logger"] }
 utoipa = { version = "5", features = ["yaml"], optional = true }
 notify = "8.0"
-ntex-cors = "2"
+ntex-cors = "3"
 rand = "0.9"
 openssl = { version = "0.10" }
 ipnet = { version = "2.10.0", features = ["serde"] }

bin/nanocld/Cargo.toml

@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use diesel::prelude::*;
-use nanocl_error::io::IoResult;
+use nanocl_error::io::{IoError, IoResult};
 use nanocl_stubs::generic::GenericFilter;
 
 use crate::{
@@ -127,7 +127,13 @@ impl DistributedMutexDb {
       let item = query.get_result(&mut conn).map_err(Self::map_err)?;
       Ok(item)
     })
-    .await?
+    .await
+    .map_err(|err| {
+      IoError::interrupted(
+        "Interrupted while getting lock",
+        err.to_string().as_str(),
+      )
+    })?
   }
 
   pub async fn del_lock(
@@ -148,6 +154,12 @@ impl DistributedMutexDb {
       query.execute(&mut conn).map_err(Self::map_err)?;
       Ok(())
     })
-    .await?
+    .await
+    .map_err(|err| {
+      IoError::interrupted(
+        "Interrupted while deleting lock",
+        err.to_string().as_str(),
+      )
+    })?
   }
 }

bin/nanocld/src/repositories/distributed_mutex.rs

@@ -29,7 +29,13 @@ pub trait RepositoryCreate: super::RepositoryBase {
         .map_err(Self::map_err)?;
       Ok(item)
     })
-    .await?
+    .await
+    .map_err(|err| {
+      IoError::interrupted(
+        "Interrupted while creating item",
+        err.to_string().as_str(),
+      )
+    })?
   }
 
   async fn create_try_from<I>(item: I, pool: &Pool) -> IoResult<Self>

bin/nanocld/src/repositories/generic/create.rs

@@ -1,6 +1,6 @@
 use diesel::{associations::HasTable, prelude::*, query_builder, query_dsl};
 
-use nanocl_error::io::IoResult;
+use nanocl_error::io::{IoError, IoResult};
 
 use nanocl_stubs::generic::GenericFilter;
 
@@ -32,7 +32,13 @@ pub trait RepositoryDelByPk: super::RepositoryBase {
         .map_err(Self::map_err)?;
       Ok(())
     })
-    .await?
+    .await
+    .map_err(|err| {
+      IoError::interrupted(
+        "Interrupted while deleting item",
+        err.to_string().as_str(),
+      )
+    })?
   }
 }
 
@@ -65,6 +71,12 @@ pub trait RepositoryDelBy: super::RepositoryBase {
       query.execute(&mut conn).map_err(Self::map_err)?;
       Ok(())
     })
-    .await?
+    .await
+    .map_err(|err| {
+      IoError::interrupted(
+        "Interrupted while deleting item",
+        err.to_string().as_str(),
+      )
+    })?
   }
 }

bin/nanocld/src/repositories/generic/delete.rs

@@ -1,6 +1,6 @@
 use diesel::{prelude::*, query_dsl::methods::LoadQuery};
 
-use nanocl_error::io::IoResult;
+use nanocl_error::io::{IoError, IoResult};
 
 use nanocl_stubs::generic::{GenericClause, GenericFilter};
 
@@ -38,7 +38,13 @@ pub trait RepositoryReadBy: super::RepositoryBase {
         .map_err(Self::map_err)?;
       Ok(item)
     })
-    .await?
+    .await
+    .map_err(|err| {
+      IoError::interrupted(
+        "Interrupted while reading item",
+        err.to_string().as_str(),
+      )
+    })?
   }
 
   async fn read_by_pk<Pk>(pk: &Pk, pool: &Pool) -> IoResult<Self::Output>
@@ -71,7 +77,13 @@ pub trait RepositoryReadBy: super::RepositoryBase {
         .map_err(Self::map_err)?;
       Ok(items)
     })
-    .await?
+    .await
+    .map_err(|err| {
+      IoError::interrupted(
+        "Interrupted while reading item",
+        err.to_string().as_str(),
+      )
+    })?
   }
 }
 
@@ -139,6 +151,12 @@ pub trait RepositoryCountBy: RepositoryBase {
         .map_err(Self::map_err)?;
       Ok(count)
     })
-    .await?
+    .await
+    .map_err(|err| {
+      IoError::interrupted(
+        "Interrupted while reading item",
+        err.to_string().as_str(),
+      )
+    })?
   }
 }