halbebruno/cloudflare_ddns
1
0
Fork 0
mirror of https://github.com/timothymiller/cloudflare-ddns.git synced 2026-09-20 14:39:04 -03:00
Code Issues Packages Projects Releases Wiki Activity

Add support for record_comment in configuration, deserialization, and API integration.

Browse Source
This commit is contained in:
Clifford W. Hansen
2026-07-22 18:16:14 +02:00
parent 4ef6ba1b74
commit 3307adaede
3 changed files with 150 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/config.rs
View File

@@ -31,6 +31,8 @@ pub struct LegacyConfig {
pub ip4_provider: Option<String>,
#[serde(default)]
pub ip6_provider: Option<String>,
#[serde(rename = "recordComment", alias = "record_comment", default)]
pub record_comment: Option<String>,
}
fn default_true() -> bool {
@@ -476,7 +478,7 @@ fn legacy_to_app_config(
delete_on_failure: false,
ttl,
proxied_expression: None,
record_comment: None,
record_comment: legacy.record_comment.clone(),
managed_comment_regex: None,
waf_list_description: None,
waf_list_item_comment: None,
@@ -1063,6 +1065,7 @@ mod tests {
ttl: 300,
ip4_provider: None,
ip6_provider: None,
record_comment: None,
};
let config = legacy_to_app_config(legacy, false, false).unwrap();
assert!(config.legacy_mode);
@@ -1091,6 +1094,7 @@ mod tests {
ttl: 120,
ip4_provider: None,
ip6_provider: None,
record_comment: None,
};
let config = legacy_to_app_config(legacy, true, true).unwrap();
assert!(
@@ -1121,6 +1125,7 @@ mod tests {
ttl: 300,
ip4_provider: None,
ip6_provider: None,
record_comment: None,
};
let config = legacy_to_app_config(legacy, false, false).unwrap();
assert!(matches!(config.auth, Auth::Key { ref api_key, ref email }
@@ -1145,6 +1150,7 @@ mod tests {
ttl: 300,
ip4_provider: Some("ipify".to_string()),
ip6_provider: Some("cloudflare.doh".to_string()),
record_comment: None,
};
let config = legacy_to_app_config(legacy, false, false).unwrap();
assert!(matches!(config.providers[&IpType::V4], ProviderType::Ipify));
@@ -1172,6 +1178,7 @@ mod tests {
ttl: 300,
ip4_provider: Some("none".to_string()),
ip6_provider: None,
record_comment: None,
};
let config = legacy_to_app_config(legacy, false, false).unwrap();
// ip4_provider=none should exclude V4 even though a=true
@@ -1197,6 +1204,7 @@ mod tests {
ttl: 300,
ip4_provider: Some("totally_invalid".to_string()),
ip6_provider: None,
record_comment: None,
};
let result = legacy_to_app_config(legacy, false, false);
assert!(result.is_err());
@@ -1204,6 +1212,30 @@ mod tests {
assert!(err.contains("ip4_provider"));
}
#[test]
fn test_legacy_to_app_config_with_record_comment() {
let legacy = LegacyConfig {
cloudflare: vec![LegacyCloudflareEntry {
authentication: LegacyAuthentication {
api_token: "tok".to_string(),
api_key: None,
},
zone_id: "z".to_string(),
subdomains: vec![],
proxied: false,
}],
a: true,
aaaa: false,
purge_unknown_records: false,
ttl: 300,
ip4_provider: None,
ip6_provider: None,
record_comment: Some("managed by cloudflare-ddns".to_string()),
};
let config = legacy_to_app_config(legacy, false, false).unwrap();
assert_eq!(config.record_comment, Some("managed by cloudflare-ddns".to_string()));
}
#[test]
fn test_legacy_config_deserializes_providers() {
let json = r#"{
@@ -1220,6 +1252,20 @@ mod tests {
assert_eq!(config.ip6_provider, Some("none".to_string()));
}
#[test]
fn test_legacy_config_deserializes_record_comment() {
let json = r#"{
"cloudflare": [{
"authentication": { "api_token": "tok" },
"zone_id": "z",
"subdomains": ["@"]
}],
"recordComment": "managed by cloudflare-ddns"
}"#;
let config = parse_legacy_config(json).unwrap();
assert_eq!(config.record_comment, Some("managed by cloudflare-ddns".to_string()));
}
#[test]
fn test_legacy_config_deserializes_without_providers() {
let json = r#"{