Merge branch 'nightly' into release/nightly/bin/nanocld/0.15.0

README.md

@@ -1,5 +1,5 @@
 <div align="center">
-  <img src="https://download.next-hat.com/ressources/images/logo.png" >
+  <img width="200" height="200" src="https://download.next-hat.com/ressources/images/logo.png" >
   <h1>Nanocl</h1>
   <p>
 
@@ -35,7 +35,7 @@
 `Nanocl` is all about easing your container and VM management with Rust-powered platform.
 With `Nanocl`, say goodbye to complex setups and hello to easy, efficient deployments.
 We stand for robust performance and efficiency with simplicity, trimming the bloat to keep your systems lean.
-**_Join us and help shape the future of cloud computing - it's about time things got a bit more rusty_**.
+**_Join our [discord][discord] and help shape the future of cloud computing - it's about time things got a bit more rusty_**.
 
 ## 📙 Table of Contents
 

bin/nanocl/Cargo.toml

@@ -44,7 +44,7 @@ serde_yaml = "0.9"
 tabled = "0.15"
 indicatif = "0.17"
 serde_json = "1.0"
-ntex = { version = "1.2", features = ["tokio", "openssl"] }
+ntex = { version = "2", features = ["tokio", "openssl"] }
 serde = { version = "1.0", features = ["derive"] }
 clap = { version = "4.5", features = ["derive", "cargo"] }
 tokio = { version = "1.36", features = ["fs"] }
@@ -70,7 +70,7 @@ nanocl_utils = { version = "0.6", features = ["unix"] }
 ctrlc = "3.4"
 toml = "0.8"
 ring = "0.17"
-nix = { version = "0.28", features = ["user"] }
+nix = { version = "0.29", features = ["user"] }
 dotenvy = "0.15"
 openssl = "0.10"
 async-recursion = "1.1"

bin/nanocl/src/commands/state.rs

@@ -244,7 +244,7 @@ fn gen_client(
         url,
         version: Some(version.into()),
         ..Default::default()
-      })
+      })?
     }
     api_version if state_ref.data.api_version.starts_with('v') => {
       NanocldClient::connect_to(&ConnectOpts {
@@ -257,7 +257,7 @@ fn gen_client(
           .ssl
           .clone(),
         version: Some(api_version.clone()),
-      })
+      })?
     }
     _ => {
       let mut paths = state_ref
@@ -278,7 +278,7 @@ fn gen_client(
         url,
         version: Some(version.into()),
         ..Default::default()
-      })
+      })?
     }
   };
   Ok(client)

bin/nanocl/src/main.rs

@@ -1,7 +1,7 @@
 use clap::Parser;
 use dotenvy::dotenv;
 
-use nanocld_client::{ConnectOpts, NanocldClient};
+use nanocld_client::{stubs::system::SslConfig, ConnectOpts, NanocldClient};
 use nanocl_error::io::{IoError, IoResult};
 
 mod utils;
@@ -29,7 +29,6 @@ fn create_cli_config(cli_args: &Cli) -> IoResult<CliConfig> {
     }
   }
   let endpoint = context.endpoints.get("Nanocl").unwrap();
-  #[allow(unused)]
   let mut host = cli_args.host.clone().unwrap_or(endpoint.host.clone());
   #[cfg(any(feature = "dev", feature = "test"))]
   {
@@ -40,11 +39,35 @@ fn create_cli_config(cli_args: &Cli) -> IoResult<CliConfig> {
         .unwrap_or("http://nanocl.internal:8585".into());
     }
   }
+  let mut ssl = match &endpoint.ssl {
+    Some(ssl) => {
+      let cert = std::fs::read_to_string(ssl.cert.clone().unwrap())?;
+      let cert_key = std::fs::read_to_string(ssl.cert_key.clone().unwrap())?;
+      Some(SslConfig {
+        cert: Some(cert),
+        cert_key: Some(cert_key),
+        ..Default::default()
+      })
+    }
+    None => None,
+  };
+  if let Ok(c) = std::env::var("CERT") {
+    if let Ok(ck) = std::env::var("CERT_KEY") {
+      ssl = Some(SslConfig {
+        cert: Some(c),
+        cert_key: Some(ck),
+        ..Default::default()
+      });
+    }
+  }
+  if let Ok(h) = std::env::var("HOST") {
+    host = h;
+  }
   let client = NanocldClient::connect_to(&ConnectOpts {
     url: host.clone(),
-    ssl: endpoint.ssl.clone(),
+    ssl,
     ..Default::default()
-  });
+  })?;
   Ok(CliConfig {
     host,
     client,
@@ -160,7 +183,7 @@ mod tests {
     // Try to stop a cargo
     assert_cli_ok!("cargo", "stop", CARGO_NAME);
     // Try to remove cargo
-    assert_cli_ok!("cargo", "rm", "-yf", CARGO_NAME);
+    assert_cli_ok!("cargo", "rm", "-y", CARGO_NAME);
   }
 
   /// Test state file when then include other state files

bin/nanocl/src/utils/mod.rs

@@ -19,6 +19,7 @@ pub mod tests {
       url: "http://nanocl.internal:8585".into(),
       ..Default::default()
     })
+    .expect("Failed to create a nanocl client")
   }
 
   #[macro_export]

bin/nanocld/Cargo.toml

@@ -59,13 +59,14 @@ clap = { version = "4.5", features = ["derive"] }
 url = { version = "2", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
 uuid = { version = "1.8", features = ["serde", "v4"] }
-ntex = { version = "1.2", features = ["tokio", "openssl"] }
+ntex = { version = "2", features = ["tokio", "openssl"] }
 diesel = { version = "2.1", features = [
   "postgres",
   "r2d2",
   "chrono",
   "uuid",
   "serde_json",
+  "i-implement-a-third-party-backend-and-opt-into-breaking-changes",
 ] }
 tokio = { version = "1.36", features = ["fs", "process", "io-std"] }
 tokio-util = "0.7"
@@ -83,6 +84,6 @@ nanocl_stubs = { version = "0.15", features = ["serde", "clap"] }
 nanocl_utils = { version = "0.6", features = ["unix", "ntex", "logger"] }
 utoipa = { version = "4.2", features = ["yaml"], optional = true }
 notify = "6.1"
-ntex-cors = "1.0"
+ntex-cors = "2"
 rand = "0.8"
 openssl = { version = "0.10" }

bin/nanocld/specs/swagger.yaml

@@ -3643,10 +3643,8 @@ components:
       description: Generic filter for list operation
       properties:
         where:
-          type: object
-          description: Where clause
-          additionalProperties:
-            $ref: '#/components/schemas/GenericClause'
+          allOf:
+          - $ref: '#/components/schemas/GenericWhere'
           nullable: true
         limit:
           type: integer
@@ -3658,6 +3656,12 @@ components:
           description: Offset to navigate through items
           nullable: true
           minimum: 0
+        order_by:
+          type: array
+          items:
+            type: string
+          description: Order by
+          nullable: true
     GenericResources:
       type: object
       properties:
@@ -3688,6 +3692,18 @@ components:
         Value:
           type: string
           nullable: true
+    GenericWhere:
+      type: object
+      properties:
+        or:
+          type: array
+          items:
+            type: object
+            additionalProperties:
+              $ref: '#/components/schemas/GenericClause'
+          nullable: true
+      additionalProperties:
+        $ref: '#/components/schemas/GenericClause'
     GraphDriverData:
       type: object
       description: Information about the storage driver used to store the container's and image's filesystem.