fix/nanocld: update event for secret and resource (#907)

* fix/nanocld: update event for secret and resource
next-hat · May 6, 2024 · 2327324 · 2327324
1 parent b3667f7
commit 2327324
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 83 deletions.
diff --git a/bin/nanocld/specs/swagger.yaml b/bin/nanocld/specs/swagger.yaml
diff --git a/bin/nanocld/src/objects/generic/patch.rs b/bin/nanocld/src/objects/generic/patch.rs
@@ -7,6 +7,10 @@ pub trait ObjPatchByPk {
   type ObjPatchIn;
   type ObjPatchOut;
 
+  fn get_patch_event() -> NativeEventAction {
+    NativeEventAction::Updating
+  }
+
   async fn fn_patch_obj_by_pk(
     pk: &str,
     obj: &Self::ObjPatchIn,
@@ -22,7 +26,7 @@ pub trait ObjPatchByPk {
     Self::ObjPatchOut: Into<EventActor> + Clone,
   {
     let obj = Self::fn_patch_obj_by_pk(pk, obj, state).await?;
-    state.emit_normal_native_action(&obj, NativeEventAction::Updating);
+    state.emit_normal_native_action(&obj, Self::get_patch_event());
     Ok(obj)
   }
 }
diff --git a/bin/nanocld/src/objects/generic/put.rs b/bin/nanocld/src/objects/generic/put.rs
@@ -7,6 +7,10 @@ pub trait ObjPutByPk {
   type ObjPutIn;
   type ObjPutOut;
 
+  fn get_put_event() -> NativeEventAction {
+    NativeEventAction::Updating
+  }
+
   async fn fn_put_obj_by_pk(
     pk: &str,
     obj: &Self::ObjPutIn,
@@ -22,7 +26,7 @@ pub trait ObjPutByPk {
     Self::ObjPutOut: Into<EventActor> + Clone,
   {
     let obj = Self::fn_put_obj_by_pk(pk, obj, state).await?;
-    state.emit_normal_native_action(&obj, NativeEventAction::Updating);
+    state.emit_normal_native_action(&obj, Self::get_put_event());
     Ok(obj)
   }
 }
diff --git a/bin/nanocld/src/objects/resource.rs b/bin/nanocld/src/objects/resource.rs
@@ -1,5 +1,8 @@
 use nanocl_error::http::{HttpResult, HttpError};
-use nanocl_stubs::resource::{ResourcePartial, Resource};
+use nanocl_stubs::{
+  resource::{Resource, ResourcePartial},
+  system::NativeEventAction,
+};
 
 use crate::{
   repositories::generic::*,
@@ -60,6 +63,10 @@ impl ObjPutByPk for ResourceDb {
   type ObjPutIn = ResourcePartial;
   type ObjPutOut = Resource;
 
+  fn get_put_event() -> NativeEventAction {
+    NativeEventAction::Update
+  }
+
   async fn fn_put_obj_by_pk(
     pk: &str,
     obj: &Self::ObjPutIn,

diff --git a/bin/nanocld/src/objects/secret.rs b/bin/nanocld/src/objects/secret.rs
@@ -1,5 +1,8 @@
 use nanocl_error::http::HttpResult;
-use nanocl_stubs::secret::{Secret, SecretPartial, SecretUpdate};
+use nanocl_stubs::{
+  secret::{Secret, SecretPartial, SecretUpdate},
+  system::NativeEventAction,
+};
 
 use crate::{
   repositories::generic::*,
@@ -41,6 +44,10 @@ impl ObjPatchByPk for SecretDb {
   type ObjPatchIn = SecretUpdate;
   type ObjPatchOut = Secret;
 
+  fn get_patch_event() -> NativeEventAction {
+    NativeEventAction::Update
+  }
+
   async fn fn_patch_obj_by_pk(
     pk: &str,
     obj: &Self::ObjPatchIn,

diff --git a/bin/ncdns/specs/swagger.yaml b/bin/ncdns/specs/swagger.yaml
@@ -32,7 +32,6 @@ paths:
       tags:
       - Rules
       summary: Create/Update a new DnsRule
-      description: Create/Update a new DnsRule
       operationId: apply_rule
       parameters:
       - name: name
@@ -58,7 +57,6 @@ paths:
       tags:
       - Rules
       summary: Delete a ProxyRule
-      description: Delete a ProxyRule
       operationId: remove_rule
       parameters:
       - name: name

diff --git a/bin/ncproxy/specs/swagger.yaml b/bin/ncproxy/specs/swagger.yaml
@@ -35,7 +35,6 @@ paths:
       tags:
       - Rules
       summary: Create/Update a new ProxyRule
-      description: Create/Update a new ProxyRule
       operationId: apply_rule
       parameters:
       - name: name
@@ -61,7 +60,6 @@ paths:
       tags:
       - Rules
       summary: Delete a ProxyRule
-      description: Delete a ProxyRule
       operationId: remove_rule
       parameters:
       - name: name

diff --git a/bin/ncproxy/src/models/templates/http.conf b/bin/ncproxy/src/models/templates/http.conf
@@ -14,11 +14,11 @@ server {
   ssl_certificate         {{ssl.Certificate}};
   ssl_certificate_key     {{ssl.CertificateKey}};{% if ssl.Dhparam %}
   ssl_dhparam             {{ssl.Dhparam}};
-  ssl_protocols         SSLv3 TLSv1 TLSv1.1 TLSv1.2;
-  ssl_ciphers           HIGH:!aNULL:!MD5;
-  ssl_session_cache     shared:SSL:20m;
-  ssl_session_timeout   4h;
-  ssl_handshake_timeout 30s;
+  ssl_protocols           SSLv3 TLSv1 TLSv1.1 TLSv1.2;
+  ssl_ciphers             HIGH:!aNULL:!MD5;
+  ssl_session_cache       shared:SSL:20m;
+  ssl_session_timeout     4h;
+  ssl_handshake_timeout   30s;
   {% endif %}{% if ssl.CertificateClient %}ssl_client_certificate  {{ssl.CertificateClient}};
   {% endif %}{% if ssl.VerifyClient %}
   ssl_verify_client       on;

diff --git a/bin/ncproxy/src/models/templates/stream.conf b/bin/ncproxy/src/models/templates/stream.conf
@@ -8,11 +8,11 @@ server {
   {% if ssl %}
   ssl_certificate         {{ ssl.Certificate }};
   ssl_certificate_key     {{ ssl.CertificateKey }};
-  ssl_protocols         SSLv3 TLSv1 TLSv1.1 TLSv1.2;
-  ssl_ciphers           HIGH:!aNULL:!MD5;
-  ssl_session_cache     shared:SSL:20m;
-  ssl_session_timeout   4h;
-  ssl_handshake_timeout 30s;
+  ssl_protocols           SSLv3 TLSv1 TLSv1.1 TLSv1.2;
+  ssl_ciphers             HIGH:!aNULL:!MD5;
+  ssl_session_cache       shared:SSL:20m;
+  ssl_session_timeout     4h;
+  ssl_handshake_timeout   30s;
   {% if ssl.Dhparam %}
   ssl_dhparam             {{ ssl.Dhparam }};
   {% endif %}

diff --git a/bin/ncproxy/src/utils/rule.rs b/bin/ncproxy/src/utils/rule.rs
@@ -132,7 +132,7 @@ pub async fn gen_ssl_config(
       let key_path = format!("{secret_path}.key");
       tokio::fs::write(&key_path, ssl_config.certificate_key.clone()).await?;
       if let Some(certificate_client) = ssl_config.certificate_client {
-        let certificate_client_path = format!("{secret_path}.client.cert");
+        let certificate_client_path = format!("{secret_path}.ca");
         tokio::fs::write(&certificate_client_path, certificate_client).await?;
         ssl_config.certificate_client = Some(certificate_client_path);
       }