Skip to content
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
42 changes: 21 additions & 21 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions crates/solid-pod-rs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ rand = { version = "0.8", optional = true }
# Sprint 11 (row 120-124): multi-format config loader. YAML + TOML are
# optional so consumers that only care about JSON aren't dragged in.
# Gated behind `config-loader`.
serde_yaml = { version = "0.9", optional = true }
serde_norway = { version = "0.9", optional = true }
toml = { version = "0.8", optional = true }

[features]
Expand Down Expand Up @@ -184,7 +184,7 @@ dpop-symmetric-test = []
# Sprint 11 (row 120-124): extends with auto-detected YAML/TOML file
# loading, env overlay, and CLI overlay. YAML/TOML deps are pulled in
# only when this feature is enabled.
config-loader = ["jss-v04", "dep:serde_yaml", "dep:toml"]
config-loader = ["jss-v04", "dep:serde_norway", "dep:toml"]

# Sprint 6 C: RFC 9421 HTTP Message Signatures on outgoing webhook
# deliveries, Retry-After handling, circuit breaker. Consumers opt in.
Expand Down
2 changes: 1 addition & 1 deletion crates/solid-pod-rs/src/config/sources.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ fn load_file(path: &Path) -> Result<Value, PodError> {

let v: Value = match ext.as_deref() {
#[cfg(feature = "config-loader")]
Some("yaml") | Some("yml") => serde_yaml::from_str(&content).map_err(|e| {
Some("yaml") | Some("yml") => serde_norway::from_str(&content).map_err(|e| {
PodError::Backend(format!("config file {path:?} is not valid YAML: {e}"))
})?,

Expand Down
Loading