rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-05-19 14:10:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

use serde deny_unknown_fields

Browse Source
This commit is contained in:
Dmitry Rodionov
2023-05-18 17:28:05 +03:00
parent 88ad410a81
commit 15bde20c4b
2 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
control_plane/src/pageserver.rs
View File

@@ -369,7 +369,6 @@ impl PageServerNode {
evictions_low_residence_duration_metric_threshold: settings
.remove("evictions_low_residence_duration_metric_threshold")
.map(|x| x.to_string()),
other: Default::default(),
};
let request = models::TenantCreateRequest {
new_tenant_id,
@@ -460,7 +459,6 @@ impl PageServerNode {
evictions_low_residence_duration_metric_threshold: settings
.remove("evictions_low_residence_duration_metric_threshold")
.map(|x| x.to_string()),
other: Default::default(),
}
};

19
libs/pageserver_api/src/models.rs
View File

@@ -134,6 +134,7 @@ pub struct TimelineCreateRequest {
#[serde_as]
#[derive(Serialize, Deserialize, Default)]
#[serde(deny_unknown_fields)]
pub struct TenantCreateRequest {
#[serde(default)]
#[serde_as(as = "Option<DisplayFromStr>")]
@@ -172,22 +173,6 @@ pub struct TenantConfig {
pub eviction_policy: Option<serde_json::Value>,
pub min_resident_size_override: Option<u64>,
pub evictions_low_residence_duration_metric_threshold: Option<String>,
#[serde(flatten)]
pub other: HashMap<String, RejectValue>,
}
pub struct RejectValue(PhantomData<()>);
impl<'de> serde::Deserialize<'de> for RejectValue {
fn deserialize<D: serde::Deserializer<'de>>(_: D) -> Result<Self, D::Error> {
Err(serde::de::Error::custom("Unrecognized tenant settings"))
}
}
impl serde::Serialize for RejectValue {
fn serialize<S: serde::Serializer>(&self, _: S) -> Result<S::Ok, S::Error> {
unreachable!()
}
}
#[serde_as]
@@ -211,6 +196,7 @@ impl TenantCreateRequest {
#[serde_as]
#[derive(Serialize, Deserialize)]
#[serde(deny_unknown_fields)]
pub struct TenantConfigRequest {
#[serde_as(as = "DisplayFromStr")]
pub tenant_id: TenantId,
@@ -245,7 +231,6 @@ impl TenantConfigRequest {
eviction_policy: None,
min_resident_size_override: None,
evictions_low_residence_duration_metric_threshold: None,
other: HashMap::new(),
};
TenantConfigRequest { tenant_id, config }
}