Merge branch 'nightly' into release/nightly/bin/ncproxy/0.12.0

bin/nanocl/changelog.md

@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `HOST` env variable to override the default host
 - `CERT` and `CERT_KEY` env variable to pass certificate and certificate key to the client
 - `nanocl state apply --remove-orphans` to remove orphaned objects
+- `nanocl secret create tls` now accept path to the certificate and key
 
 ### Fixed
 

bin/nanocl/src/models/secret.rs

@@ -41,6 +41,7 @@ pub struct EnvCreateOpts {
 
 /// Create a new nanocl.io/tls secret
 #[derive(Clone, Parser, Serialize)]
+#[serde(rename_all = "PascalCase")]
 pub struct TlsCreateOpts {
   /// Certificate
   #[clap(long)]
@@ -63,6 +64,7 @@ pub struct TlsCreateOpts {
 
 /// Create a new nanocl.io/container-registry secret
 #[derive(Clone, Parser, Serialize)]
+#[serde(rename_all = "PascalCase")]
 pub struct ContainerRegistryCreateOpts {
   pub username: Option<String>,
   pub password: Option<String>,
@@ -81,6 +83,26 @@ impl TryFrom<SecretCreateOpts> for SecretPartial {
         ("nanocl.io/env", serde_json::to_value(&env.values)?)
       }
       SecretKindCreateCommand::Tls(tls) => {
+        let mut cert = tls.certificate.clone();
+        let mut cert_key = tls.certificate_key.clone();
+        let mut cert_client = tls.certificate_client.clone();
+        if std::path::Path::new(&cert).exists() {
+          cert = std::fs::read_to_string(&cert)?;
+        }
+        if std::path::Path::new(&cert_key).exists() {
+          cert_key = std::fs::read_to_string(&cert_key)?;
+        }
+        if let Some(ca) = &cert_client {
+          if std::path::Path::new(ca).exists() {
+            cert_client = Some(std::fs::read_to_string(ca)?);
+          }
+        }
+        let tls = TlsCreateOpts {
+          certificate: cert,
+          certificate_key: cert_key,
+          certificate_client: cert_client,
+          ..tls.to_owned()
+        };
         ("nanocl.io/tls", serde_json::to_value(tls)?)
       }
       SecretKindCreateCommand::ContainerRegistry(container_registry) => (

bin/nanocld/src/system/docker_event.rs

@@ -107,46 +107,49 @@ async fn exec_docker(
       }
     }
     "die" => {
-      let actual_status =
-        ObjPsStatusDb::read_by_pk(&kind_key, &state.inner.pool).await?;
-      match (&kind, &actual_status.wanted) {
-        (EventActorKind::Cargo, status)
-          if status != &ObjPsStatusKind::Stop.to_string()
-            || status != &ObjPsStatusKind::Start.to_string() =>
-        {
-          ObjPsStatusDb::update_actual_status(
-            &kind_key,
-            &ObjPsStatusKind::Fail,
-            &state.inner.pool,
-          )
-          .await?;
-          let cargo =
-            CargoDb::transform_read_by_pk(&kind_key, &state.inner.pool).await?;
-          state.emit_warning_native_action(
-            &cargo,
-            NativeEventAction::Fail,
-            Some(format!("Process {name}")),
-          );
-        }
-        (EventActorKind::Vm, status)
-          if status != &ObjPsStatusKind::Stop.to_string()
-            || status != &ObjPsStatusKind::Start.to_string() =>
-        {
-          ObjPsStatusDb::update_actual_status(
-            &kind_key,
-            &ObjPsStatusKind::Fail,
-            &state.inner.pool,
-          )
-          .await?;
-          let vm =
-            VmDb::transform_read_by_pk(&kind_key, &state.inner.pool).await?;
-          state.emit_warning_native_action(
-            &vm,
-            NativeEventAction::Fail,
-            Some(format!("Process {name}")),
-          );
+      if !name.starts_with("tmp-") {
+        let actual_status =
+          ObjPsStatusDb::read_by_pk(&kind_key, &state.inner.pool).await?;
+        match (&kind, &actual_status.wanted) {
+          (EventActorKind::Cargo, status)
+            if status != &ObjPsStatusKind::Stop.to_string()
+              || status != &ObjPsStatusKind::Start.to_string() =>
+          {
+            ObjPsStatusDb::update_actual_status(
+              &kind_key,
+              &ObjPsStatusKind::Fail,
+              &state.inner.pool,
+            )
+            .await?;
+            let cargo =
+              CargoDb::transform_read_by_pk(&kind_key, &state.inner.pool)
+                .await?;
+            state.emit_warning_native_action(
+              &cargo,
+              NativeEventAction::Fail,
+              Some(format!("Process {name}")),
+            );
+          }
+          (EventActorKind::Vm, status)
+            if status != &ObjPsStatusKind::Stop.to_string()
+              || status != &ObjPsStatusKind::Start.to_string() =>
+          {
+            ObjPsStatusDb::update_actual_status(
+              &kind_key,
+              &ObjPsStatusKind::Fail,
+              &state.inner.pool,
+            )
+            .await?;
+            let vm =
+              VmDb::transform_read_by_pk(&kind_key, &state.inner.pool).await?;
+            state.emit_warning_native_action(
+              &vm,
+              NativeEventAction::Fail,
+              Some(format!("Process {name}")),
+            );
+          }
+          _ => {}
         }
-        _ => {}
       }
       action.clone_into(&mut event.action);
     }