API: expose desired and effective state with runtime status

This commit is contained in:
Alexey
2026-11-03 22:10:01 +03:00
parent 5040195ca7
commit 996274bed3
32 changed files with 2114 additions and 121 deletions
+1 -75
View File
@@ -1,9 +1,7 @@
use std::collections::BTreeSet;
use super::*;
use crate::api::model::FieldIssue;
pub(super) const MAX_PATHS: usize = 4096;
pub(super) use crate::api::config_projection::{MAX_PATHS, changed_paths};
pub(super) fn issue(
path: impl Into<String>,
@@ -114,78 +112,6 @@ pub(super) fn reject_unknown(patch: &Json) -> Result<(), ApiFailure> {
Err(error)
}
/// Paths only: no before/after values or dynamic keys are returned. Arrays use
/// indices, open maps use their documented placeholder to avoid leaking identities.
pub(super) fn changed_paths(old: &Json, new: &Json) -> Vec<String> {
fn walk(old: Option<&Json>, new: Option<&Json>, path: &str, out: &mut BTreeSet<String>) {
if old == new {
return;
}
if out.len() > MAX_PATHS {
return;
}
let map_key = if path == "dc_overrides" {
Some("{dc}")
} else if path == "censorship.exclusive_mask" {
Some("{hostname}")
} else if path.starts_with("access.") {
Some("{entry}")
} else {
None
};
match (old, new) {
(Some(Json::Object(_)), _) | (_, Some(Json::Object(_))) => {
let a = old.and_then(Json::as_object);
let b = new.and_then(Json::as_object);
let keys: BTreeSet<_> = a
.into_iter()
.flat_map(|v| v.keys())
.chain(b.into_iter().flat_map(|v| v.keys()))
.collect();
if keys.is_empty() {
out.insert(path.to_string());
}
for key in keys {
let key_path = map_key.unwrap_or(key);
let next = if path.is_empty() {
key_path.to_string()
} else {
format!("{path}.{key_path}")
};
walk(
a.and_then(|v| v.get(key)),
b.and_then(|v| v.get(key)),
&next,
out,
);
}
}
(Some(Json::Array(_)), _) | (_, Some(Json::Array(_))) => {
let a = old
.and_then(Json::as_array)
.map(Vec::as_slice)
.unwrap_or_default();
let b = new
.and_then(Json::as_array)
.map(Vec::as_slice)
.unwrap_or_default();
if a.is_empty() && b.is_empty() {
out.insert(path.to_string());
}
for index in 0..a.len().max(b.len()) {
walk(a.get(index), b.get(index), &format!("{path}[{index}]"), out);
}
}
_ => {
out.insert(path.to_string());
}
}
}
let mut paths = BTreeSet::new();
walk(Some(old), Some(new), "", &mut paths);
paths.into_iter().collect()
}
#[derive(Debug, Serialize)]
pub(in crate::api) struct NormalizationEffect {
pub(super) path: String,
+12 -9
View File
@@ -10,21 +10,24 @@ use hyper::{HeaderMap, StatusCode};
use super::*;
#[derive(Debug, Serialize)]
pub(super) struct RuntimeBaseline {
pub(super) active_generation: u64,
pub(super) config_epoch: u64,
pub(super) runtime_match: String,
pub(in crate::api) struct RuntimeBaseline {
pub(in crate::api) active_generation: u64,
pub(in crate::api) config_epoch: u64,
pub(in crate::api) runtime_match: String,
}
#[derive(Clone)]
pub(super) struct RuntimeFence {
pub(in crate::api) struct RuntimeFence {
active: Arc<arc_swap::ArcSwap<RuntimeGeneration>>,
generation: Arc<RuntimeGeneration>,
pub(super) config: Arc<ProxyConfig>,
pub(in crate::api) config: Arc<ProxyConfig>,
}
impl RuntimeFence {
pub(super) fn capture(shared: &ApiShared, expected: Option<&str>) -> Result<Self, ApiFailure> {
pub(in crate::api) fn capture(
shared: &ApiShared,
expected: Option<&str>,
) -> Result<Self, ApiFailure> {
let generation = shared.active_runtime.load_full();
let config = generation.config();
let fence = Self {
@@ -39,7 +42,7 @@ impl RuntimeFence {
Ok(fence)
}
pub(super) fn baseline(&self) -> RuntimeBaseline {
pub(in crate::api) fn baseline(&self) -> RuntimeBaseline {
static PROCESS: OnceLock<String> = OnceLock::new();
let process = PROCESS.get_or_init(|| {
let mut bytes = [0_u8; 16];
@@ -63,7 +66,7 @@ impl RuntimeFence {
&& Arc::ptr_eq(&self.active.load_full(), &self.generation)
}
pub(super) fn ensure_current(&self) -> Result<(), ApiFailure> {
pub(in crate::api) fn ensure_current(&self) -> Result<(), ApiFailure> {
if self.matches() {
Ok(())
} else {