Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade serde_yaml #701

Merged
merged 4 commits into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down
4 changes: 2 additions & 2 deletions agent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand All @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions deployment/helm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion discovery-handlers/debug-echo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
1 change: 1 addition & 0 deletions discovery-handlers/opcua/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
1 change: 1 addition & 0 deletions discovery-handlers/opcua/src/discovery_handler.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
Expand Down
2 changes: 1 addition & 1 deletion discovery-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion shared/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 6 additions & 1 deletion shared/src/akri/configuration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.13.3
0.13.4
Loading