Skip to content

Commit d7bf7ba

Browse files
authored
Merge pull request #4687 from kersten/chore/normalize-error-handling-in-plugin-helpers
🌱 (chore): normalize error messages and wrap errors using %w
2 parents b1c3968 + d75da0b commit d7bf7ba

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

pkg/plugin/helpers.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,17 @@ func SplitKey(key string) (string, string) {
4343
// Validate ensures a Plugin is valid.
4444
func Validate(p Plugin) error {
4545
if err := validateName(p.Name()); err != nil {
46-
return fmt.Errorf("invalid plugin name %q: %v", p.Name(), err)
46+
return fmt.Errorf("invalid plugin name %q: %w", p.Name(), err)
4747
}
4848
if err := p.Version().Validate(); err != nil {
49-
return fmt.Errorf("invalid plugin version %q: %v", p.Version(), err)
49+
return fmt.Errorf("invalid plugin version %q: %w", p.Version(), err)
5050
}
5151
if len(p.SupportedProjectVersions()) == 0 {
5252
return fmt.Errorf("plugin %q must support at least one project version", KeyFor(p))
5353
}
5454
for _, projectVersion := range p.SupportedProjectVersions() {
5555
if err := projectVersion.Validate(); err != nil {
56-
return fmt.Errorf("plugin %q supports an invalid project version %q: %v", KeyFor(p), projectVersion, err)
56+
return fmt.Errorf("plugin %q supports an invalid project version %q: %w", KeyFor(p), projectVersion, err)
5757
}
5858
}
5959
return nil
@@ -63,13 +63,13 @@ func Validate(p Plugin) error {
6363
func ValidateKey(key string) error {
6464
name, version := SplitKey(key)
6565
if err := validateName(name); err != nil {
66-
return fmt.Errorf("invalid plugin name %q: %v", name, err)
66+
return fmt.Errorf("invalid plugin name %q: %w", name, err)
6767
}
6868
// CLI-set plugins do not have to contain a version.
6969
if version != "" {
7070
var v Version
7171
if err := v.Parse(version); err != nil {
72-
return fmt.Errorf("invalid plugin version %q: %v", version, err)
72+
return fmt.Errorf("invalid plugin version %q: %w", version, err)
7373
}
7474
}
7575
return nil

0 commit comments

Comments
 (0)