Skip to content

Commit ab449df

Browse files
chore: Replace unmaintained and vulnerable dependencies (#473)
* chore: Replace unmaintained and vulnerable dependencies * chore: Replace deprecated AsyncFd::new with AsyncFd::register * chore: Upgrade utoipa and utoipa-swagger-ui * fix: Revert stdin flags if AsyncStdin cannot be created
1 parent e3a9d47 commit ab449df

29 files changed

Lines changed: 1438 additions & 1445 deletions

‎Cargo.lock‎

Lines changed: 491 additions & 503 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.nix‎

Lines changed: 844 additions & 867 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,9 @@ rstest = "0.26"
4949
semver = { version = "1.0", features = ["serde"] }
5050
serde = { version = "1.0", features = ["derive"] }
5151
serde_json = "1.0"
52-
serde_yaml = "0.9"
5352
sha2 = "0.11"
5453
snafu = { version = "0.9", features = ["futures"] }
55-
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.117.0", default-features = false, features = ["crds", "kube-ws", "kube-http-proxy", "kube-socks5"] }
54+
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.121.0", default-features = false, features = ["crds", "kube-ws", "kube-http-proxy", "kube-socks5"] }
5655
tera = "2.0"
5756
termion = "4.0"
5857
tokio = { version = "1.53", features = ["rt-multi-thread", "macros", "fs", "process", "io-std"] }
@@ -63,10 +62,11 @@ tracing-indicatif = "0.3.9"
6362
tracing-subscriber = "0.3"
6463
url = "2.5"
6564
urlencoding = "2.1.3"
66-
utoipa = { version = "5.4", features = ["indexmap"] }
67-
utoipa-swagger-ui = { version = "9.0", features = ["axum"] }
65+
utoipa = { version = "6.0", features = ["indexmap"] }
66+
utoipa-swagger-ui = { version = "10.0", features = ["axum"] }
6867
uuid = { version = "1.10", features = ["v4"] }
6968
which = "8.0"
69+
yaml_serde = "0.10"
7070

7171
[patch."https://github.com/stackabletech/operator-rs.git"]
7272
# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }

‎crate-hashes.json‎

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎rust/stackable-cockpit/Cargo.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,27 @@ helm-sys = { path = "../helm-sys" }
1818
bcrypt.workspace = true
1919
clap.workspace = true
2020
either.workspace = true
21+
futures.workspace = true
2122
hex.workspace = true
2223
indexmap.workspace = true
24+
indicatif.workspace = true
2325
rand.workspace = true
2426
reqwest.workspace = true
2527
semver.workspace = true
26-
serde_json.workspace = true
27-
serde_yaml.workspace = true
2828
serde.workspace = true
29+
serde_json.workspace = true
2930
sha2.workspace = true
3031
snafu.workspace = true
3132
stackable-operator.workspace = true
3233
tera.workspace = true
3334
tokio.workspace = true
34-
tracing.workspace = true
3535
tracing-indicatif.workspace = true
36+
tracing.workspace = true
3637
url.workspace = true
3738
urlencoding.workspace = true
3839
utoipa = { workspace = true, optional = true }
3940
which.workspace = true
40-
futures.workspace = true
41-
indicatif.workspace = true
41+
yaml_serde.workspace = true
4242

4343
[dev-dependencies]
4444
rstest.workspace = true

‎rust/stackable-cockpit/src/engine/kind/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub enum Error {
4040
DockerCheckCommand { source: docker::Error },
4141

4242
#[snafu(display("failed to covert kind config to YAML"))]
43-
ConfigSerialization { source: serde_yaml::Error },
43+
ConfigSerialization { source: yaml_serde::Error },
4444
}
4545

4646
#[derive(Debug)]
@@ -80,7 +80,7 @@ impl Cluster {
8080

8181
debug!("Creating kind cluster config");
8282
let config = Config::new(self.node_count, self.cp_node_count);
83-
let config_string = serde_yaml::to_string(&config).context(ConfigSerializationSnafu)?;
83+
let config_string = yaml_serde::to_string(&config).context(ConfigSerializationSnafu)?;
8484

8585
debug!("Creating kind cluster");
8686
let mut kind_cmd = Command::new("kind")

‎rust/stackable-cockpit/src/helm.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pub struct Chart {
2929
pub name: String,
3030
pub repo: ChartRepo,
3131
pub version: String,
32-
pub options: serde_yaml::Value,
32+
pub options: yaml_serde::Value,
3333
}
3434

3535
#[derive(Debug, Deserialize)]
@@ -81,7 +81,7 @@ pub enum Error {
8181
DeserializeJson { source: serde_json::Error },
8282

8383
#[snafu(display("failed to deserialize YAML data"))]
84-
DeserializeYaml { source: serde_yaml::Error },
84+
DeserializeYaml { source: yaml_serde::Error },
8585

8686
#[snafu(display("failed to retrieve remote content"))]
8787
FetchRemoteContent { source: reqwest::Error },
@@ -537,7 +537,7 @@ where
537537
.await
538538
.context(FetchRemoteContentSnafu)?;
539539

540-
serde_yaml::from_str(&index_file_content).context(DeserializeYamlSnafu)
540+
yaml_serde::from_str(&index_file_content).context(DeserializeYamlSnafu)
541541
}
542542

543543
#[cfg(test)]

‎rust/stackable-cockpit/src/platform/demo/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pub use spec::*;
1313
#[derive(Debug, Deserialize, Serialize)]
1414
#[serde(rename_all = "camelCase")]
1515
pub struct DemosV2 {
16-
#[serde(with = "serde_yaml::with::singleton_map_recursive")]
16+
#[serde(with = "yaml_serde::with::singleton_map_recursive")]
1717
demos: IndexMap<String, DemoSpec>,
1818
}
1919

‎rust/stackable-cockpit/src/platform/demo/params.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use serde_yaml::Mapping;
21
use stackable_operator::kvp::Labels;
2+
use yaml_serde::Mapping;
33

44
use crate::platform::operator::ChartSourceType;
55

‎rust/stackable-cockpit/src/platform/manifests.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ pub enum Error {
6363
/// This error indicates that Helm chart options could not be serialized
6464
/// into YAML.
6565
#[snafu(display("failed to serialize Helm chart options"))]
66-
SerializeOptions { source: serde_yaml::Error },
66+
SerializeOptions { source: yaml_serde::Error },
6767

6868
/// This error indicates that the creation of a kube client failed.
6969
#[snafu(display("failed to create Kubernetes client"))]
@@ -127,7 +127,7 @@ pub trait InstallManifestsExt {
127127
};
128128

129129
// Serialize chart options to string
130-
let values_yaml = serde_yaml::to_string(&helm_chart.options)
130+
let values_yaml = yaml_serde::to_string(&helm_chart.options)
131131
.context(SerializeOptionsSnafu)?;
132132

133133
// Install the Helm chart using the Helm wrapper

0 commit comments

Comments
 (0)