chore: bump serde_yaml to latest to solve security issues and error t…

…est cases (#623) * chore: bump serde_yaml to latest to solve security issues and error test cases * chore: bump kcl version to v0.5.1 * chore: update test cases due to upgrade serde_yaml deps.
kcl-lang · Jul 26, 2023 · 77b6a25 · 77b6a25
1 parent fd85ed0
commit 77b6a25
Show file tree

Hide file tree

Showing 13 changed files with 80 additions and 70 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.5.0
+0.5.1
diff --git a/kclvm/Cargo.lock b/kclvm/Cargo.lock
diff --git a/kclvm/api/Cargo.toml b/kclvm/api/Cargo.toml
@@ -12,7 +12,7 @@ tempfile = "3.5.0"
 prost = "0.11.8"
 prost-types = "0.11.8"
 serde_json = "1.0"
-serde_yaml = "0.9.2"
+serde_yaml = "0.9.25"
 anyhow = "1.0.70"
 serde = { version = "1", features = ["derive"] }
 indexmap = "1.0"

diff --git a/kclvm/config/Cargo.toml b/kclvm/config/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 serde = { version = "1", features = ["derive"] }
-serde_yaml = "0.8.7"
+serde_yaml = "0.9.25"
 serde_json = "1.0"
 indexmap = "1.0"
 ahash = "0.7.2"

diff --git a/kclvm/runner/src/custom_manifests_data/list.stdout.golden b/kclvm/runner/src/custom_manifests_data/list.stdout.golden
@@ -1,17 +1,17 @@
 k1:
-  - 1
-  - 2
+- 1
+- 2
 k2:
-  - 3
-  - 4
+- 3
+- 4
 ---
 k3:
-  - 5
-  - 6
+- 5
+- 6
 k4:
-  - 7
-  - 8
+- 7
+- 8
 ---
 k5:
-  - 9
-  - 10
+- 9
+- 10
diff --git a/kclvm/runtime/Cargo.toml b/kclvm/runtime/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2021"
 kclvm_runtime_internal_macros = { path = "./internal_macros" }
 serde_json =  {package = "serde_json", version = "= 1.0.86"}
 serde = { version = "1", features = ["derive"] }
-serde_yaml = "0.8.23"
+serde_yaml = "0.9.25"
 
 base64 = "0.13.0"
 libc = "0.2.112"

diff --git a/kclvm/runtime/src/manifests/tests.rs b/kclvm/runtime/src/manifests/tests.rs
@@ -17,7 +17,7 @@ fn test_kclvm_manifests_yaml_stream() {
             YamlEncodeOptions::default(),
         ),
         (
-            "a:\n  - 1\n  - 2\n  - 3\nb: s\n",
+            "a:\n- 1\n- 2\n- 3\nb: s\n",
             ValueRef::list(Some(&[&ValueRef::dict(Some(&[
                 ("a", &ValueRef::list_int(&[1, 2, 3])),
                 ("b", &ValueRef::str("s")),
@@ -36,7 +36,7 @@ fn test_kclvm_manifests_yaml_stream() {
             },
         ),
         (
-            "a: 1\nb: ~\n",
+            "a: 1\nb: null\n",
             ValueRef::list(Some(&[&ValueRef::dict(Some(&[
                 ("a", &ValueRef::int(1)),
                 ("b", &ValueRef::none()),

diff --git a/kclvm/runtime/src/manifests/yaml.rs b/kclvm/runtime/src/manifests/yaml.rs
@@ -39,7 +39,7 @@ mod test_manifests_yaml {
                 YamlEncodeOptions::default(),
             ),
             (
-                "a:\n  - 1\n  - 2\n  - 3\nb: s\n",
+                "a:\n- 1\n- 2\n- 3\nb: s\n",
                 ValueRef::list(Some(&[&ValueRef::dict(Some(&[
                     ("a", &ValueRef::list_int(&[1, 2, 3])),
                     ("b", &ValueRef::str("s")),
@@ -58,7 +58,7 @@ mod test_manifests_yaml {
                 },
             ),
             (
-                "a: 1\nb: ~\n",
+                "a: 1\nb: null\n",
                 ValueRef::list(Some(&[&ValueRef::dict(Some(&[
                     ("a", &ValueRef::int(1)),
                     ("b", &ValueRef::none()),