Merge pull request #701 from CeerDecy/upgrade-yaml

Upgrade serde_yaml
project-akri · Oct 14, 2024 · 66ce8ac · 66ce8ac
2 parents fb06f05 + 6159736
commit 66ce8ac
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 28 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,7 +23,7 @@ members = [
 resolver = "2"
 
 [workspace.package]
-version = "0.13.3"
+version = "0.13.4"
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://docs.akri.sh/"

diff --git a/agent/Cargo.toml b/agent/Cargo.toml
@@ -36,7 +36,7 @@ prost = "0.12"
 serde = "1.0.104"
 serde_derive = "1.0.104"
 serde_json = "1.0.45"
-serde_yaml = { version = "0.8.11", optional = true }
+serde_yaml = { version = "0.9", optional = true }
 simple-mermaid = "0.1" # used for docs
 thiserror = "1.0.50"
 tokio = { version = "1.0", features = ["rt-multi-thread", "time", "fs", "macros", "net"] }
@@ -57,7 +57,7 @@ akri-udev = { path = "../discovery-handlers/udev"}
 env_logger = "0.10.0"
 mock_instant = { version = "0.2", features = ["sync"] }
 mockall = "0.12"
-serde_yaml = "0.8.11"
+serde_yaml = "0.9"
 tempfile = "3.1.0"
 
 [features]

diff --git a/deployment/helm/Chart.yaml b/deployment/helm/Chart.yaml
@@ -16,9 +16,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.13.3
+version: 0.13.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 0.13.3
+appVersion: 0.13.4
diff --git a/discovery-handlers/debug-echo/Cargo.toml b/discovery-handlers/debug-echo/Cargo.toml
@@ -24,4 +24,4 @@ tonic = { version = "0.10", features = ["tls"] }
 akri-shared = { path = "../../shared" }
 anyhow = "1.0.38"
 serde_json = "1.0.45"
-serde_yaml = "0.8.11"
+serde_yaml = "0.9"
diff --git a/discovery-handlers/opcua/Cargo.toml b/discovery-handlers/opcua/Cargo.toml
@@ -18,6 +18,7 @@ log = "0.4"
 opcua = { version = "0.12.0", features = ["client"] }
 serde = "1.0.104"
 serde_derive = "1.0.1"
+serde_yaml = "0.9"
 tokio = { version = "1.0.2", features = ["time", "net", "sync"] }
 tokio-stream = { version =  "0.1", features = ["net"] }
 tonic = { version = "0.10", features = ["tls"] }

diff --git a/discovery-handlers/opcua/src/discovery_handler.rs b/discovery-handlers/opcua/src/discovery_handler.rs
@@ -52,6 +52,7 @@ fn lds_discovery_url() -> Vec<String> {
 #[derive(Serialize, Deserialize, Clone, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct OpcuaDiscoveryDetails {
+    #[serde(with = "serde_yaml::with::singleton_map")]
     pub opcua_discovery_method: OpcuaDiscoveryMethod,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub application_names: Option<FilterList>,

diff --git a/discovery-utils/Cargo.toml b/discovery-utils/Cargo.toml
@@ -18,7 +18,7 @@ log = "0.4"
 prost = "0.12"
 serde = "1.0"
 serde_derive = "1.0"
-serde_yaml = "0.8.11"
+serde_yaml = "0.9"
 tempfile = { version = "3.1.0", optional = true }
 tokio = { version = "1.0.1", features = ["time", "net", "sync"] }
 tokio-stream = { version =  "0.1", features = ["net"] }

diff --git a/shared/Cargo.toml b/shared/Cargo.toml
@@ -22,7 +22,7 @@ schemars = "0.8.0"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
-serde_yaml = "0.8"
+serde_yaml = "0.9"
 tokio = { version = "1.0.1", features = ["full"] }
 tonic = "0.10"
 tower = "0.4.8"

diff --git a/shared/src/akri/configuration.rs b/shared/src/akri/configuration.rs
@@ -119,7 +119,12 @@ pub struct ConfigurationSpec {
     /// This defines a workload that should be scheduled to any
     /// node that can access any capability described by this
     /// configuration
-    #[serde(default, skip_serializing_if = "Option::is_none")]
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        deserialize_with = "serde_yaml::with::singleton_map::deserialize",
+        serialize_with = "serde_yaml::with::singleton_map::serialize"
+    )]
     pub broker_spec: Option<BrokerSpec>,
 
     /// This defines a service that should be created to access

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.13.3
+0.13.4