mirror of
https://github.com/helm/helm.git
synced 2026-05-28 04:35:48 -04:00
Make validation error similar and explicit for both metadatas
Signed-off-by: Benoit Tigeot <benoit.tigeot@lifen.fr>
This commit is contained in:
parent
c04e18e452
commit
f4b139a82c
2 changed files with 8 additions and 5 deletions
|
|
@ -68,11 +68,11 @@ type MetadataLegacy struct {
|
|||
}
|
||||
|
||||
func (m *MetadataLegacy) Validate() error {
|
||||
if m.Name == "" {
|
||||
return fmt.Errorf("missing plugin name")
|
||||
}
|
||||
if !validPluginName.MatchString(m.Name) {
|
||||
if m.Name == "" {
|
||||
return fmt.Errorf("plugin name is empty or missing: ensure plugin.yaml contains 'name:' field (lowercase)")
|
||||
}
|
||||
return fmt.Errorf("invalid plugin name %q: plugin names can only contain ASCII characters a-z, A-Z, 0-9, _ and -", 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)
|
||||
|
||||
|
|
|
|||
|
|
@ -47,8 +47,11 @@ type MetadataV1 struct {
|
|||
}
|
||||
|
||||
func (m *MetadataV1) Validate() error {
|
||||
if m.Name == "" {
|
||||
return fmt.Errorf("missing plugin `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" {
|
||||
|
|
|
|||
Loading…
Reference in a new issue