proxmox-mirrors/proxmox
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox synced 2025-08-15 16:01:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixup schema entry for updaters with explicit types

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2021-08-10 14:17:09 +02:00
parent 34020ea3d6
commit 783cbcb499
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
proxmox-api-macro/src/api/structs.rs
View File

@ -498,9 +498,8 @@ fn handle_updater_field(
} }
}; };
field_schema.optional = field.ty.clone().into();
let span = Span::call_site(); let span = Span::call_site();
field_schema.optional = field.ty.clone().into();
let updater = syn::TypePath { let updater = syn::TypePath {
qself: Some(syn::QSelf { qself: Some(syn::QSelf {
lt_token: syn::token::Lt { spans: [span] }, lt_token: syn::token::Lt { spans: [span] },
@ -515,6 +514,16 @@ fn handle_updater_field(
&["proxmox", "api", "schema", "Updatable", "Updater"], &["proxmox", "api", "schema", "Updatable", "Updater"],
), ),
}; };
// we also need to update the schema to point to the updater's schema for `type: Foo` entries
if let SchemaItem::ExternType(path) = &mut field_schema.schema.item {
*path = syn::ExprPath {
attrs: Vec::new(),
qself: updater.qself.clone(),
path: updater.path.clone(),
};
}
field.ty = syn::Type::Path(updater); field.ty = syn::Type::Path(updater);
if field_schema.flatten_in_struct { if field_schema.flatten_in_struct {

2
proxmox-api-macro/tests/updater.rs
View File

@ -38,7 +38,7 @@ pub struct Complex {
}, },
)] )]
/// One of the baaaad cases. /// One of the baaaad cases.
#[derive(Updater)] #[derive(Default, Updater)]
#[serde(rename_all = "kebab-case")] #[serde(rename_all = "kebab-case")]
pub struct SuperComplex { pub struct SuperComplex {
/// An extra field not part of the flattened struct. /// An extra field not part of the flattened struct.