On April 23, 2020 7:56 am, Thomas Lamprecht wrote: > On 4/9/20 4:10 PM, Dominik Csapak wrote: >> we use this format for all 'delete' options but we have some options >> that have a '-' in the name (e.g. 'sync-defaults-options') that cannot >> be deleted if it is not included >> >> Signed-off-by: Dominik Csapak <d.csa...@proxmox.com> >> --- >> src/PVE/JSONSchema.pm | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm >> index 01a3cce..1d28f36 100644 >> --- a/src/PVE/JSONSchema.pm >> +++ b/src/PVE/JSONSchema.pm >> @@ -169,7 +169,7 @@ register_format('pve-configid', \&pve_verify_configid); >> sub pve_verify_configid { >> my ($id, $noerr) = @_; >> >> - if ($id !~ m/^[a-z][a-z0-9_]+$/i) { >> + if ($id !~ m/^[a-z][a-z0-9_-]+$/i) { >> return undef if $noerr; >> die "invalid configuration ID '$id'\n"; >> } > > Fabian, Wolfgang: Any objection here? I think it should be OK, but we may > want to adapt the pve-container and qemu-server config parsers to accept > also the minus in keys, as it will be for sure sooner or later used there > then too. Quick-checking other parsers wouldn't hurt either. :)
had some off-list discussions with Dominik about this already, it seems like he checked all the relevant call sites. the only thing I'd still like to see as follow up is re-using this verifier for the guest config parsers when parsing the snapshot section header (by chance, they already contain the '-', but the next time we add a character that might not be the case and we might miss it which would cause some fun bugs ;)). Reviewed-By: Fabian Grünbichler <f.gruenbich...@proxmox.com> _______________________________________________ pve-devel mailing list pve-devel@pve.proxmox.com https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel