File tree Expand file tree Collapse file tree 2 files changed +8
-3
lines changed Expand file tree Collapse file tree 2 files changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -283,8 +283,6 @@ func (sv *semverTemplate) generateChannels(semverChannels *bundleVersions) []dec
283
283
}
284
284
285
285
func (sv * semverTemplate ) linkChannels (unlinkedChannels map [string ]* declcfg.Channel , harvestedVersions * bundleVersions ) []declcfg.Channel {
286
- channels := []declcfg.Channel {}
287
-
288
286
// bundle --> version lookup
289
287
bundleVersions := make (map [string ]semver.Version )
290
288
for _ , vs := range * harvestedVersions {
@@ -295,6 +293,7 @@ func (sv *semverTemplate) linkChannels(unlinkedChannels map[string]*declcfg.Chan
295
293
}
296
294
}
297
295
296
+ channels := make ([]declcfg.Channel , 0 , len (unlinkedChannels ))
298
297
for _ , channel := range unlinkedChannels {
299
298
entries := & channel .Entries
300
299
sort .Slice (* entries , func (i , j int ) bool {
Original file line number Diff line number Diff line change 1
1
package semver
2
2
3
3
import (
4
+ sortcmp "cmp"
4
5
"fmt"
6
+ "slices"
5
7
"strings"
6
8
"testing"
7
9
@@ -251,7 +253,11 @@ func TestLinkChannels(t *testing.T) {
251
253
for _ , tt := range tests {
252
254
t .Run (tt .name , func (t * testing.T ) {
253
255
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 )
255
261
if diff != "" {
256
262
t .Errorf ("unexpected channel diff (-expected +received):\n %s" , diff )
257
263
}
You can’t perform that action at this time.
0 commit comments