Bump serde_yaml from 0.8.26 to 0.9.4 (#743)

esrlabs · Aug 10, 2022 · 5d6559b · 5d6559b
1 parent d2fc8b8
commit 5d6559b
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 32 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/northstar-nstar/Cargo.toml b/northstar-nstar/Cargo.toml
@@ -23,7 +23,7 @@ prettytable-rs = "0.8.0"
 regex = "1.6.0"
 serde = "1.0.143"
 serde_json = "1.0.83"
-serde_yaml = "0.8.26"
+serde_yaml = "0.9.4"
 tokio = { version = "1.20.1", features = ["fs", "io-std", "io-util", "macros", "net", "rt", "time"] }
 tokio-util = "0.7.3"
 url = "2.2.2"
diff --git a/northstar-runtime/Cargo.toml b/northstar-runtime/Cargo.toml
@@ -47,7 +47,7 @@ serde = { version = "1.0.143", features = ["derive", "rc"] }
 serde_json = { version = "1.0.83", optional = true }
 serde_plain = { version = "1.0.0", optional = true }
 serde_with = { version = "2.0.0", optional = true }
-serde_yaml = { version = "0.8.26", optional = true }
+serde_yaml = { version = "0.9.4", optional = true }
 sha2 = { version = "0.10.2", optional = true }
 strum = { version = "0.24.1", optional = true }
 strum_macros = { version = "0.24.3", optional = true }

diff --git a/northstar-runtime/src/seccomp/types.rs b/northstar-runtime/src/seccomp/types.rs
@@ -4,9 +4,9 @@ use std::collections::HashMap;
 
 /// Predefined seccomp profile
 #[derive(Clone, Eq, PartialEq, Debug, Hash, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
 pub enum Profile {
     /// Default seccomp filter similar to docker's default profile
-    #[serde(rename = "default")]
     Default,
 }
 
@@ -24,12 +24,11 @@ pub struct Seccomp {
 
 /// Syscall rule
 #[derive(Clone, Eq, PartialEq, Debug, Serialize, Deserialize)]
+#[serde(deny_unknown_fields, rename_all = "snake_case")]
 pub enum SyscallRule {
     /// Any syscall argument is allowed
-    #[serde(rename = "any")]
     Any,
     /// Explicit list of allowed syscalls arguments
-    #[serde(rename = "args")]
     Args(SyscallArgRule),
 }
 
@@ -40,6 +39,7 @@ pub struct SyscallArgRule {
     /// Index of syscall argument
     pub index: usize,
     /// Value of syscall argument
+    #[serde(skip_serializing_if = "Option::is_none")]
     pub values: Option<Vec<u64>>,
     /// Bitmask of syscall argument
     #[serde(skip_serializing_if = "Option::is_none")]

diff --git a/northstar-tests/test-container/manifest.yaml b/northstar-tests/test-container/manifest.yaml
@@ -46,12 +46,11 @@ seccomp:
   profile:
     default
   allow:
-    delete_module:
-      args:
-        index: 1
-        values: [
-            1,
-        ]
-        mask: 0x06
+    delete_module: !args
+      index: 1
+      values: [
+          1,
+      ]
+      mask: 0x06
 selinux:
   context: unconfined_u:object_r:user_home_t:s0
diff --git a/northstar-tests/tests/npk.rs b/northstar-tests/tests/npk.rs
@@ -15,8 +15,7 @@ uid: 100
 gid: 1
 env:
   HELLO: north";
-const TEST_MANIFEST_UNPACKED: &str = "---
-name: hello
+const TEST_MANIFEST_UNPACKED: &str = "name: hello
 version: 0.0.2
 init: /hello
 env: