Skip to content

Commit

Permalink
Merge pull request #11628 from dastrobu/Linting_error_on_null_in_depe…
Browse files Browse the repository at this point in the history
…ndencies_is_misleading_#11627

change linting error messages for null values in arrays
  • Loading branch information
hickeyma committed Jan 6, 2023
2 parents bb13245 + 6a5f240 commit 1819f1f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion pkg/chart/dependency.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ type Dependency struct {
// loaded.
func (d *Dependency) Validate() error {
if d == nil {
return ValidationError("dependency cannot be an empty list")
return ValidationError("dependencies must not contain empty or null nodes")
}
d.Name = sanitizeString(d.Name)
d.Version = sanitizeString(d.Version)
Expand Down
2 changes: 1 addition & 1 deletion pkg/chart/metadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type Maintainer struct {
// Validate checks valid data and sanitizes string characters.
func (m *Maintainer) Validate() error {
if m == nil {
return ValidationError("maintainer cannot be an empty list")
return ValidationError("maintainers must not contain empty or null nodes")
}
m.Name = sanitizeString(m.Name)
m.Email = sanitizeString(m.Email)
Expand Down
4 changes: 2 additions & 2 deletions pkg/chart/metadata_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ func TestValidate(t *testing.T) {
nil,
},
},
ValidationError("dependency cannot be an empty list"),
ValidationError("dependencies must not contain empty or null nodes"),
},
{
&Metadata{
Expand All @@ -94,7 +94,7 @@ func TestValidate(t *testing.T) {
nil,
},
},
ValidationError("maintainer cannot be an empty list"),
ValidationError("maintainers must not contain empty or null nodes"),
},
{
&Metadata{APIVersion: "v2", Name: "test", Version: "1.2.3.4"},
Expand Down

0 comments on commit 1819f1f

Please sign in to comment.