Make validation error similar and explicit for both metadatas

Signed-off-by: Benoit Tigeot <benoit.tigeot@lifen.fr>
pull/31491/head
Benoit Tigeot 10 months ago
parent c04e18e452
commit f4b139a82c
No known key found for this signature in database
GPG Key ID: 8E6D4FC8AEBDA62C

@ -68,11 +68,11 @@ type MetadataLegacy struct {
} }
func (m *MetadataLegacy) Validate() error { func (m *MetadataLegacy) Validate() error {
if !validPluginName.MatchString(m.Name) {
if m.Name == "" { if m.Name == "" {
return fmt.Errorf("plugin name is empty or missing: ensure plugin.yaml contains 'name:' field (lowercase)") return fmt.Errorf("missing plugin name")
} }
return fmt.Errorf("invalid plugin name %q: plugin names can only contain ASCII characters a-z, A-Z, 0-9, _ and -", m.Name) if !validPluginName.MatchString(m.Name) {
return fmt.Errorf("invalid plugin name %q: must contain only a-z, A-Z, 0-9, _ and -", m.Name)
} }
m.Usage = sanitizeString(m.Usage) m.Usage = sanitizeString(m.Usage)

@ -47,8 +47,11 @@ type MetadataV1 struct {
} }
func (m *MetadataV1) Validate() error { func (m *MetadataV1) Validate() error {
if m.Name == "" {
return fmt.Errorf("missing plugin `name`")
}
if !validPluginName.MatchString(m.Name) { if !validPluginName.MatchString(m.Name) {
return fmt.Errorf("invalid plugin `name`") return fmt.Errorf("invalid plugin `name` %q: must contain only a-z, A-Z, 0-9, _ and -", m.Name)
} }
if m.APIVersion != "v1" { if m.APIVersion != "v1" {

Loading…
Cancel
Save