Skip to content

Commit ef57447

Browse files
committed
Switch to serde_yaml_ng
serde_yml turns out to be maintained weirdly (issues disabled, weird refactors) and is now archived anyway. _ng is what the community is now recommending. Signed-off-by: Robert Detjens <[email protected]>
1 parent 0fbb636 commit ef57447

File tree

6 files changed

+16
-28
lines changed

6 files changed

+16
-28
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ clap = { version = "4.5.4", features = ["unicode", "env", "derive"] }
99
itertools = "0.12.1"
1010
glob = "0.3.1"
1111
serde = { version = "1.0", features = ["derive"] }
12-
serde_yml = "0.0.12"
12+
serde_yaml_ng = "0.10.0"
1313
serde_nested_with = "0.2.5"
1414
fully_pub = "0.1.4"
1515
void = "1"

src/clients.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ pub async fn apply_manifest_yaml(
303303

304304
// this manifest has multiple documents (crds, deployment)
305305
for yaml in multidoc_deserialize(manifest)? {
306-
let obj: DynamicObject = serde_yml::from_value(yaml)?;
306+
let obj: DynamicObject = serde_yaml_ng::from_value(yaml)?;
307307
trace!(
308308
"applying resource {} {}",
309309
obj.types.clone().unwrap_or_default().kind,
@@ -334,14 +334,14 @@ pub async fn apply_manifest_yaml(
334334
}
335335

336336
/// Deserialize multi-document yaml string into a Vec of the documents
337-
fn multidoc_deserialize(data: &str) -> Result<Vec<serde_yml::Value>> {
337+
fn multidoc_deserialize(data: &str) -> Result<Vec<serde_yaml_ng::Value>> {
338338
use serde::Deserialize;
339339

340340
let mut docs = vec![];
341-
for de in serde_yml::Deserializer::from_str(data) {
342-
match serde_yml::Value::deserialize(de)? {
341+
for de in serde_yaml_ng::Deserializer::from_str(data) {
342+
match serde_yaml_ng::Value::deserialize(de)? {
343343
// discard any empty documents (e.g. from trailing ---)
344-
serde_yml::Value::Null => (),
344+
serde_yaml_ng::Value::Null => (),
345345
not_null => docs.push(not_null),
346346
};
347347
}

src/cluster_setup/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use kube::{Api, ResourceExt};
1616
use minijinja;
1717
use owo_colors::OwoColorize;
1818
use serde;
19-
use serde_yml;
19+
use serde_yaml_ng;
2020
use tempfile;
2121
use tracing::{debug, error, info, trace, warn};
2222

@@ -95,7 +95,7 @@ pub async fn install_extdns(profile: &config::ProfileConfig) -> Result<()> {
9595
let values = render_strict(
9696
VALUES_TEMPLATE,
9797
minijinja::context! {
98-
provider_credentials => serde_yml::to_string(&profile.dns)?,
98+
provider_credentials => serde_yaml_ng::to_string(&profile.dns)?,
9999
chal_domain => profile.challenges_domain
100100
},
101101
)?;

src/configparser/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ struct ProfileConfig {
142142
kubeconfig: Option<String>,
143143
kubecontext: String,
144144
s3: S3Config,
145-
dns: serde_yml::Value,
145+
dns: serde_yaml_ng::Value,
146146
}
147147

148148
#[derive(Debug, PartialEq, Clone, Serialize, Deserialize)]

src/tests/parsing/config.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ fn all_yaml() {
111111
access_key: "accesskey".to_string(),
112112
secret_key: "secretkey".to_string(),
113113
},
114-
dns: serde_yml::to_value(HashMap::from([
114+
dns: serde_yaml_ng::to_value(HashMap::from([
115115
("provider", "somebody"),
116116
("thing", "whatever"),
117117
]))
@@ -231,7 +231,7 @@ fn registry_tag_format() {
231231
access_key: "accesskey".to_string(),
232232
secret_key: "secretkey".to_string(),
233233
},
234-
dns: serde_yml::to_value(HashMap::from([
234+
dns: serde_yaml_ng::to_value(HashMap::from([
235235
("provider", "somebody"),
236236
("thing", "whatever"),
237237
]))

0 commit comments

Comments
 (0)