Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions tools/codegen/pkg/crdify/generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,9 @@ func (g *generator) genGroupVersion(name string, version generation.APIVersionCo

for _, crdResults := range runResults.CRDValidation {
for _, err := range crdResults.Errors {
result.Errors = append(result.Errors, fmt.Errorf("%s: %w", crdResults.Name, errors.New(err)))
resErr := fmt.Errorf("%s: %w", crdResults.Name, errors.New(err))
result.Errors = append(result.Errors, resErr)
errs = append(errs, resErr)
}

for _, warn := range crdResults.Warnings {
Expand All @@ -220,7 +222,9 @@ func (g *generator) genGroupVersion(name string, version generation.APIVersionCo

versionedResultFunc := func(version, property string, compResult validations.ComparisonResult) {
for _, err := range compResult.Errors {
result.Errors = append(result.Errors, fmt.Errorf("(%s) %s - %s: %w", version, property, compResult.Name, errors.New(err)))
resErr := fmt.Errorf("(%s) %s - %s: %w", version, property, compResult.Name, errors.New(err))
result.Errors = append(result.Errors, resErr)
errs = append(errs, resErr)
}

for _, warn := range compResult.Warnings {
Expand All @@ -234,6 +238,10 @@ func (g *generator) genGroupVersion(name string, version generation.APIVersionCo
results = append(results, result)
}

if len(errs) > 0 {
return results, kerrors.NewAggregate(errs)
}

return results, nil
}

Expand Down