Skip to content

Commit

Permalink
Merge pull request kubernetes#460 from alexzielenski/nondeterminism
Browse files Browse the repository at this point in the history
bugfix: resolve non-determinism in deduplicating enum comments
  • Loading branch information
k8s-ci-robot authored Feb 27, 2024
2 parents f107216 + af4151f commit 6eff651
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion pkg/generators/enum.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,14 @@ func (et *enumType) addIfNotPresent(value *enumValue) {
// If we already have an enum case with the same value, then ignore this new
// one. This can happen if an enum aliases one from another package and
// re-exports the cases.
for _, existing := range et.Values {
for i, existing := range et.Values {
if existing.Value == value.Value {

// Take the value of the longer comment (or some other deterministic tie breaker)
if len(existing.Comment) < len(value.Comment) || (len(existing.Comment) == len(value.Comment) && existing.Comment > value.Comment) {
et.Values[i] = value
}

return
}
}
Expand Down

0 comments on commit 6eff651

Please sign in to comment.