Skip to content

Commit 69308e9

Browse files
mattfenwickmattfenwick
committed
upgrade to collections 0.1.0
1 parent eb8cac6 commit 69308e9

File tree

10 files changed

+36
-30
lines changed

10 files changed

+36
-30
lines changed

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.18
55
require (
66
github.com/go-resty/resty/v2 v2.5.0
77
github.com/jstemmer/go-junit-report v0.9.1
8-
github.com/mattfenwick/collections v0.0.8
8+
github.com/mattfenwick/collections v0.1.0
99
github.com/olekukonko/tablewriter v0.0.4
1010
github.com/onsi/ginkgo/v2 v2.1.4
1111
github.com/onsi/gomega v1.19.0

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,8 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN
241241
github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
242242
github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA=
243243
github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
244-
github.com/mattfenwick/collections v0.0.8 h1:9U+ZYBdZZIS7sC42bSV0nymyTzFjsLKNuQedUi6jiV8=
245-
github.com/mattfenwick/collections v0.0.8/go.mod h1:6JmZGWNsbA4g6OzJQGAOTalNWMPghEOl1q4abMZAJSQ=
244+
github.com/mattfenwick/collections v0.1.0 h1:4wN8xVs5gzU8amlRGeQNbDLTQvPsBRi79ZxiSZJBbVY=
245+
github.com/mattfenwick/collections v0.1.0/go.mod h1:6JmZGWNsbA4g6OzJQGAOTalNWMPghEOl1q4abMZAJSQ=
246246
github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
247247
github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
248248
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=

‎pkg/connectivity/printer.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package connectivity
33
import (
44
"fmt"
55
"github.com/mattfenwick/collections/pkg/builtins"
6+
"github.com/mattfenwick/collections/pkg/slices"
67
log "github.com/sirupsen/logrus"
78
"golang.org/x/exp/maps"
89
"math"
@@ -74,11 +75,11 @@ func (m *markdownRow) GetResult() string {
7475
}
7576

7677
func (t *Printer) printMarkdownFeatureTable(primaryCounts map[string]map[bool]int, tagCounts map[string]map[string]map[bool]int) string {
77-
primaries := builtins.Sort(maps.Keys(tagCounts))
78+
primaries := slices.SortBy(builtins.CompareOrdered[string], maps.Keys(tagCounts))
7879

7980
var rows []*markdownRow
8081
for _, primary := range primaries {
81-
subs := builtins.Sort(maps.Keys(tagCounts[primary]))
82+
subs := slices.SortBy(builtins.CompareOrdered[string], maps.Keys(tagCounts[primary]))
8283
rows = append(rows, &markdownRow{Name: primary, IsPrimary: true, Pass: primaryCounts[primary][true], Fail: primaryCounts[primary][false]})
8384
for _, sub := range subs {
8485
counts := tagCounts[primary][sub]

‎pkg/connectivity/probe/pod.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package probe
22

33
import (
44
"fmt"
5-
collections "github.com/mattfenwick/collections/pkg"
5+
"github.com/mattfenwick/collections/pkg/slices"
66
"github.com/mattfenwick/cyclonus/pkg/generator"
77
"github.com/mattfenwick/cyclonus/pkg/kube"
88
"github.com/pkg/errors"
@@ -111,14 +111,14 @@ func (p *Pod) KubeService() *v1.Service {
111111
Namespace: p.Namespace,
112112
},
113113
Spec: v1.ServiceSpec{
114-
Ports: collections.MapSlice(func(cont *Container) v1.ServicePort { return cont.KubeServicePort() }, p.Containers),
114+
Ports: slices.Map(func(cont *Container) v1.ServicePort { return cont.KubeServicePort() }, p.Containers),
115115
Selector: p.Labels,
116116
},
117117
}
118118
}
119119

120120
func (p *Pod) KubeContainers() []v1.Container {
121-
return collections.MapSlice(func(cont *Container) v1.Container { return cont.KubeContainer() }, p.Containers)
121+
return slices.Map(func(cont *Container) v1.Container { return cont.KubeContainer() }, p.Containers)
122122
}
123123

124124
func (p *Pod) ResolveNamedPort(port string) (int, error) {

‎pkg/connectivity/probe/resource-printer.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package probe
33
import (
44
"fmt"
55
"github.com/mattfenwick/collections/pkg/builtins"
6+
"github.com/mattfenwick/collections/pkg/slices"
67
"github.com/olekukonko/tablewriter"
78
"github.com/pkg/errors"
89
"golang.org/x/exp/maps"
@@ -58,7 +59,7 @@ func (r *Resources) RenderTable() string {
5859
}
5960

6061
func labelsToLines(labels map[string]string) string {
61-
keys := builtins.Sort(maps.Keys(labels))
62+
keys := slices.SortBy(builtins.CompareOrdered[string], maps.Keys(labels))
6263
var lines []string
6364
for _, key := range keys {
6465
lines = append(lines, fmt.Sprintf("%s: %s", key, labels[key]))

‎pkg/connectivity/probe/resources.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package probe
22

33
import (
4-
collections "github.com/mattfenwick/collections/pkg"
54
"github.com/mattfenwick/collections/pkg/builtins"
5+
"github.com/mattfenwick/collections/pkg/slices"
66
"github.com/mattfenwick/cyclonus/pkg/kube"
77
"github.com/pkg/errors"
88
"github.com/sirupsen/logrus"
@@ -242,7 +242,7 @@ func (r *Resources) DeletePod(ns string, podName string) (*Resources, error) {
242242
}
243243

244244
func (r *Resources) SortedPodNames() []string {
245-
return builtins.Sort(collections.MapSlice(
245+
return slices.SortBy(builtins.CompareOrdered[string], slices.Map(
246246
func(p *Pod) string { return p.PodString().String() },
247247
r.Pods))
248248
}

‎pkg/connectivity/probe/table.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package probe
22

33
import (
44
"github.com/mattfenwick/collections/pkg/builtins"
5+
"github.com/mattfenwick/collections/pkg/slices"
56
"github.com/mattfenwick/cyclonus/pkg/utils"
67
"github.com/pkg/errors"
78
"golang.org/x/exp/maps"
@@ -78,7 +79,7 @@ func (t *Table) renderTableHelper(render func(*JobResult) string) string {
7879
isSingleElement = false
7980
break
8081
}
81-
keys := builtins.Sort(maps.Keys(dict))
82+
keys := slices.SortBy(builtins.CompareOrdered[string], maps.Keys(dict))
8283
schema[strings.Join(keys, "_")] = true
8384
if len(schema) > 1 {
8485
isSchemaUniform = false
@@ -120,7 +121,7 @@ func (t *Table) renderSimpleTable(render func(*JobResult) string) string {
120121
func (t *Table) renderUniformMultiTable(render func(*JobResult) string) string {
121122
key := t.Wrapped.Keys()[0]
122123
first := t.Get(key.From, key.To)
123-
keys := builtins.Sort(maps.Keys(first.JobResults))
124+
keys := slices.SortBy(builtins.CompareOrdered[string], maps.Keys(first.JobResults))
124125
schema := strings.Join(keys, "\n")
125126
return t.Wrapped.Table(schema, true, func(fr, to string, i interface{}) string {
126127
dict := t.Get(fr, to).JobResults
@@ -135,7 +136,7 @@ func (t *Table) renderUniformMultiTable(render func(*JobResult) string) string {
135136
func (t *Table) renderNonuniformTable(render func(*JobResult) string) string {
136137
return t.Wrapped.Table("", true, func(fr, to string, i interface{}) string {
137138
dict := t.Get(fr, to).JobResults
138-
keys := builtins.Sort(maps.Keys(dict))
139+
keys := slices.SortBy(builtins.CompareOrdered[string], maps.Keys(dict))
139140
var lines []string
140141
for _, k := range keys {
141142
lines = append(lines, k+": "+render(dict[k]))

‎pkg/kube/labelselector.go

+9-6
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package kube
22

33
import (
44
"fmt"
5-
collections "github.com/mattfenwick/collections/pkg"
65
"github.com/mattfenwick/collections/pkg/builtins"
6+
"github.com/mattfenwick/collections/pkg/slices"
77
"github.com/mattfenwick/cyclonus/pkg/utils"
88
"golang.org/x/exp/maps"
99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -93,8 +93,8 @@ func IsLabelSelectorEmpty(l metav1.LabelSelector) bool {
9393
// SerializeLabelSelector deterministically converts a metav1.LabelSelector
9494
// into a string
9595
func SerializeLabelSelector(ls metav1.LabelSelector) string {
96-
labelKeys := builtins.Sort(maps.Keys(ls.MatchLabels))
97-
keyVals := collections.MapSlice(func(key string) string {
96+
labelKeys := slices.SortBy(builtins.CompareOrdered[string], maps.Keys(ls.MatchLabels))
97+
keyVals := slices.Map(func(key string) string {
9898
return fmt.Sprintf("%s: %s", key, ls.MatchLabels[key])
9999
}, labelKeys)
100100
// this looks weird -- we're using an array to make the order deterministic
@@ -108,16 +108,19 @@ func LabelSelectorTableLines(selector metav1.LabelSelector) string {
108108
var lines []string
109109
if len(selector.MatchLabels) > 0 {
110110
lines = append(lines, "Match labels:")
111-
for _, key := range builtins.Sort(maps.Keys(selector.MatchLabels)) {
111+
for _, key := range slices.SortBy(builtins.CompareOrdered[string], maps.Keys(selector.MatchLabels)) {
112112
val := selector.MatchLabels[key]
113113
lines = append(lines, fmt.Sprintf(" %s: %s", key, val))
114114
}
115115
}
116116
if len(selector.MatchExpressions) > 0 {
117117
lines = append(lines, "Match expressions:")
118-
sortedMatchExpressions := builtins.SortOn(selector.MatchExpressions, func(l metav1.LabelSelectorRequirement) string { return l.Key })
118+
sortedMatchExpressions := slices.SortOnBy(
119+
func(l metav1.LabelSelectorRequirement) string { return l.Key },
120+
builtins.CompareOrdered[string],
121+
selector.MatchExpressions)
119122
for _, exp := range sortedMatchExpressions {
120-
lines = append(lines, fmt.Sprintf(" %s %s %+v", exp.Key, exp.Operator, builtins.Sort(exp.Values)))
123+
lines = append(lines, fmt.Sprintf(" %s %s %+v", exp.Key, exp.Operator, slices.SortBy(builtins.CompareOrdered[string], exp.Values)))
121124
}
122125
}
123126
return strings.Join(lines, "\n")

‎pkg/linter/checks.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"fmt"
55
collections "github.com/mattfenwick/collections/pkg"
66
"github.com/mattfenwick/collections/pkg/builtins"
7+
"github.com/mattfenwick/collections/pkg/slices"
78
"github.com/mattfenwick/cyclonus/pkg/matcher"
89
"github.com/mattfenwick/cyclonus/pkg/utils"
910
"github.com/olekukonko/tablewriter"
@@ -82,14 +83,12 @@ func NetpolKey(netpol *networkingv1.NetworkPolicy) string {
8283
return fmt.Sprintf("%s/%s", netpol.Namespace, netpol.Name)
8384
}
8485

85-
func sortBy(w Warning) collections.SliceOrd[collections.String] {
86+
func sortOn(w Warning) []string {
8687
origin := "1"
8788
if w.OriginIsSource() {
8889
origin = "0"
8990
}
90-
return collections.MapSlice(
91-
collections.WrapString,
92-
[]string{origin, string(w.GetCheck()), w.GetTarget(), w.GetSourcePolicies()})
91+
return []string{origin, string(w.GetCheck()), w.GetTarget(), w.GetSourcePolicies()}
9392
}
9493

9594
type resolvedWarning struct {
@@ -111,7 +110,7 @@ func (r *resolvedWarning) GetTarget() string {
111110
}
112111

113112
func (r *resolvedWarning) GetSourcePolicies() string {
114-
target := builtins.Sort(collections.MapSlice(NetpolKey, r.Target.SourceRules))
113+
target := slices.SortBy(builtins.CompareOrdered[string], slices.Map(NetpolKey, r.Target.SourceRules))
115114
return strings.Join(target, "\n")
116115
}
117116

@@ -123,7 +122,7 @@ func WarningsTable(warnings []Warning) string {
123122
table.SetReflowDuringAutoWrap(false)
124123
table.SetAutoWrapText(false)
125124

126-
sortedWarnings := collections.SortOn[Warning, collections.SliceOrd[collections.String]](warnings, sortBy)
125+
sortedWarnings := slices.SortOnBy(sortOn, slices.CompareSlice[string](builtins.CompareOrdered[string]), warnings)
127126
for _, w := range sortedWarnings {
128127
origin := "Source"
129128
if !w.OriginIsSource() {

‎pkg/matcher/explain.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package matcher
22

33
import (
44
"fmt"
5-
collections "github.com/mattfenwick/collections/pkg"
65
"github.com/mattfenwick/collections/pkg/builtins"
6+
"github.com/mattfenwick/collections/pkg/slices"
77
"github.com/mattfenwick/cyclonus/pkg/kube"
88
"github.com/mattfenwick/cyclonus/pkg/utils"
99
"github.com/olekukonko/tablewriter"
@@ -49,8 +49,9 @@ func (s *SliceBuilder) TargetsTableLines(targets []*Target, isIngress bool) {
4949
ruleType = "Egress"
5050
}
5151
for _, target := range targets {
52-
sourceRules := builtins.Sort(collections.MapSlice(
53-
func(sr *networkingv1.NetworkPolicy) string {
52+
sourceRules := slices.SortBy(
53+
builtins.CompareOrdered[string],
54+
slices.Map(func(sr *networkingv1.NetworkPolicy) string {
5455
return fmt.Sprintf("%s/%s", sr.Namespace, sr.Name)
5556
}, target.SourceRules))
5657
targetString := fmt.Sprintf("namespace: %s\n%s", target.Namespace, kube.LabelSelectorTableLines(target.PodSelector))
@@ -60,7 +61,7 @@ func (s *SliceBuilder) TargetsTableLines(targets []*Target, isIngress bool) {
6061
if len(target.Peers) == 0 {
6162
s.Append("no pods, no ips", "no ports, no protocols")
6263
} else {
63-
for _, peer := range builtins.SortOn(target.Peers, func(p PeerMatcher) string { return utils.DumpJSON(p) }) {
64+
for _, peer := range slices.SortOnBy(func(p PeerMatcher) string { return utils.DumpJSON(p) }, builtins.CompareOrdered[string], target.Peers) {
6465
switch a := peer.(type) {
6566
case *AllPeersMatcher:
6667
s.Append("all pods, all ips", "all ports, all protocols")

0 commit comments

Comments
 (0)