Skip to content

Commit dba075a

Browse files
author
Per Goncalves da Silva
committed
Add sort to linkChannels output before diff check
Signed-off-by: Per Goncalves da Silva <[email protected]>
1 parent 2629279 commit dba075a

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

alpha/template/semver/semver.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,6 @@ func (sv *semverTemplate) generateChannels(semverChannels *bundleVersions) []dec
283283
}
284284

285285
func (sv *semverTemplate) linkChannels(unlinkedChannels map[string]*declcfg.Channel, harvestedVersions *bundleVersions) []declcfg.Channel {
286-
channels := []declcfg.Channel{}
287-
288286
// bundle --> version lookup
289287
bundleVersions := make(map[string]semver.Version)
290288
for _, vs := range *harvestedVersions {
@@ -295,6 +293,7 @@ func (sv *semverTemplate) linkChannels(unlinkedChannels map[string]*declcfg.Chan
295293
}
296294
}
297295

296+
channels := make([]declcfg.Channel, 0, len(unlinkedChannels))
298297
for _, channel := range unlinkedChannels {
299298
entries := &channel.Entries
300299
sort.Slice(*entries, func(i, j int) bool {

alpha/template/semver/semver_test.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package semver
22

33
import (
4+
sortcmp "cmp"
45
"fmt"
6+
"slices"
57
"strings"
68
"testing"
79

@@ -251,7 +253,11 @@ func TestLinkChannels(t *testing.T) {
251253
for _, tt := range tests {
252254
t.Run(tt.name, func(t *testing.T) {
253255
sv := &semverTemplate{pkg: "a", GenerateMajorChannels: tt.generateMajorChannels, GenerateMinorChannels: tt.generateMinorChannels}
254-
diff := cmp.Diff(tt.out, sv.linkChannels(tt.unlinkedChannels, &channelOperatorVersions))
256+
actual := sv.linkChannels(tt.unlinkedChannels, &channelOperatorVersions)
257+
slices.SortFunc(actual, func(a, b declcfg.Channel) int {
258+
return sortcmp.Compare(a.Name, b.Name)
259+
})
260+
diff := cmp.Diff(tt.out, actual)
255261
if diff != "" {
256262
t.Errorf("unexpected channel diff (-expected +received):\n%s", diff)
257263
}

0 commit comments

Comments
 (0)