Skip to content

Commit 9ce96d7

Browse files
mattfenwickmattfenwick
committed
update collections
1 parent 2399194 commit 9ce96d7

15 files changed

+48
-48
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.1.5
8+
github.com/mattfenwick/collections v0.1.6
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.1.5 h1:uffG2TZh2hdiiB9i6v/lJ2xck9IIIBA6FokctWiK5QM=
245-
github.com/mattfenwick/collections v0.1.5/go.mod h1:6JmZGWNsbA4g6OzJQGAOTalNWMPghEOl1q4abMZAJSQ=
244+
github.com/mattfenwick/collections v0.1.6 h1:rbip28GALt86KwuhsN+7jy92rtVW7A4HScH35fCL2Io=
245+
github.com/mattfenwick/collections v0.1.6/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

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package connectivity
22

33
import (
44
"fmt"
5-
"github.com/mattfenwick/collections/pkg/slices"
5+
"github.com/mattfenwick/collections/pkg/slice"
66
log "github.com/sirupsen/logrus"
77
"golang.org/x/exp/maps"
88
"math"
@@ -73,11 +73,11 @@ func (m *markdownRow) GetResult() string {
7373
}
7474

7575
func (t *Printer) printMarkdownFeatureTable(primaryCounts map[string]map[bool]int, tagCounts map[string]map[string]map[bool]int) string {
76-
primaries := slices.Sort(maps.Keys(tagCounts))
76+
primaries := slice.Sort(maps.Keys(tagCounts))
7777

7878
var rows []*markdownRow
7979
for _, primary := range primaries {
80-
subs := slices.Sort(maps.Keys(tagCounts[primary]))
80+
subs := slice.Sort(maps.Keys(tagCounts[primary]))
8181
rows = append(rows, &markdownRow{Name: primary, IsPrimary: true, Pass: primaryCounts[primary][true], Fail: primaryCounts[primary][false]})
8282
for _, sub := range subs {
8383
counts := tagCounts[primary][sub]
@@ -138,7 +138,7 @@ func passFailTable(caption string, passFailCounts map[string]map[bool]int, passe
138138
Failed: passFailCounts[feature][false],
139139
})
140140
}
141-
rows = slices.SortOn(PassedPercentage, rows)
141+
rows = slice.SortOn(PassedPercentage, rows)
142142

143143
if passedTotal != nil || failedTotal != nil {
144144
rows = append(rows, &passFailRow{Feature: "Total", Passed: *passedTotal, Failed: *failedTotal})

‎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-
"github.com/mattfenwick/collections/pkg/slices"
5+
"github.com/mattfenwick/collections/pkg/slice"
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: slices.Map(func(cont *Container) v1.ServicePort { return cont.KubeServicePort() }, p.Containers),
114+
Ports: slice.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 slices.Map(func(cont *Container) v1.Container { return cont.KubeContainer() }, p.Containers)
121+
return slice.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

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

33
import (
44
"fmt"
5-
"github.com/mattfenwick/collections/pkg/slices"
5+
"github.com/mattfenwick/collections/pkg/slice"
66
"github.com/olekukonko/tablewriter"
77
"github.com/pkg/errors"
88
"golang.org/x/exp/maps"
@@ -29,7 +29,7 @@ func (r *Resources) RenderTable() string {
2929
nsToPod[ns] = append(nsToPod[ns], pod)
3030
}
3131

32-
namespaces := slices.Sort(maps.Keys(nsToPod))
32+
namespaces := slice.Sort(maps.Keys(nsToPod))
3333
for _, ns := range namespaces {
3434
labels := r.Namespaces[ns]
3535
nsLabelLines := labelsToLines(labels)
@@ -53,7 +53,7 @@ func (r *Resources) RenderTable() string {
5353
}
5454

5555
func labelsToLines(labels map[string]string) string {
56-
keys := slices.Sort(maps.Keys(labels))
56+
keys := slice.Sort(maps.Keys(labels))
5757
var lines []string
5858
for _, key := range keys {
5959
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,7 +1,7 @@
11
package probe
22

33
import (
4-
"github.com/mattfenwick/collections/pkg/slices"
4+
"github.com/mattfenwick/collections/pkg/slice"
55
"github.com/mattfenwick/cyclonus/pkg/kube"
66
"github.com/pkg/errors"
77
"github.com/sirupsen/logrus"
@@ -241,7 +241,7 @@ func (r *Resources) DeletePod(ns string, podName string) (*Resources, error) {
241241
}
242242

243243
func (r *Resources) SortedPodNames() []string {
244-
return slices.Sort(slices.Map(
244+
return slice.Sort(slice.Map(
245245
func(p *Pod) string { return p.PodString().String() },
246246
r.Pods))
247247
}

‎pkg/connectivity/probe/table.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package probe
22

33
import (
4-
"github.com/mattfenwick/collections/pkg/slices"
4+
"github.com/mattfenwick/collections/pkg/slice"
55
"github.com/mattfenwick/cyclonus/pkg/utils"
66
"github.com/pkg/errors"
77
"golang.org/x/exp/maps"
@@ -78,7 +78,7 @@ func (t *Table) renderTableHelper(render func(*JobResult) string) string {
7878
isSingleElement = false
7979
break
8080
}
81-
keys := slices.Sort(maps.Keys(dict))
81+
keys := slice.Sort(maps.Keys(dict))
8282
schema[strings.Join(keys, "_")] = true
8383
if len(schema) > 1 {
8484
isSchemaUniform = false
@@ -120,7 +120,7 @@ func (t *Table) renderSimpleTable(render func(*JobResult) string) string {
120120
func (t *Table) renderUniformMultiTable(render func(*JobResult) string) string {
121121
key := t.Wrapped.Keys()[0]
122122
first := t.Get(key.From, key.To)
123-
keys := slices.Sort(maps.Keys(first.JobResults))
123+
keys := slice.Sort(maps.Keys(first.JobResults))
124124
schema := strings.Join(keys, "\n")
125125
return t.Wrapped.Table(schema, true, func(fr, to string, i interface{}) string {
126126
dict := t.Get(fr, to).JobResults
@@ -135,7 +135,7 @@ func (t *Table) renderUniformMultiTable(render func(*JobResult) string) string {
135135
func (t *Table) renderNonuniformTable(render func(*JobResult) string) string {
136136
return t.Wrapped.Table("", true, func(fr, to string, i interface{}) string {
137137
dict := t.Get(fr, to).JobResults
138-
keys := slices.Sort(maps.Keys(dict))
138+
keys := slice.Sort(maps.Keys(dict))
139139
var lines []string
140140
for _, k := range keys {
141141
lines = append(lines, k+": "+render(dict[k]))

‎pkg/kube/labelselector.go

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

33
import (
44
"fmt"
5-
"github.com/mattfenwick/collections/pkg/slices"
5+
"github.com/mattfenwick/collections/pkg/slice"
66
"github.com/mattfenwick/cyclonus/pkg/utils"
77
"golang.org/x/exp/maps"
88
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -92,9 +92,9 @@ func IsLabelSelectorEmpty(l metav1.LabelSelector) bool {
9292
// SerializeLabelSelector deterministically converts a metav1.LabelSelector
9393
// into a string
9494
func SerializeLabelSelector(ls metav1.LabelSelector) string {
95-
keyVals := slices.Map(func(key string) string {
95+
keyVals := slice.Map(func(key string) string {
9696
return fmt.Sprintf("%s: %s", key, ls.MatchLabels[key])
97-
}, slices.Sort(maps.Keys(ls.MatchLabels)))
97+
}, slice.Sort(maps.Keys(ls.MatchLabels)))
9898
// this looks weird -- we're using an array to make the order deterministic
9999
return utils.JsonStringNoIndent([]interface{}{"MatchLabels", keyVals, "MatchExpression", ls.MatchExpressions})
100100
}
@@ -106,18 +106,18 @@ func LabelSelectorTableLines(selector metav1.LabelSelector) string {
106106
var lines []string
107107
if len(selector.MatchLabels) > 0 {
108108
lines = append(lines, "Match labels:")
109-
for _, key := range slices.Sort(maps.Keys(selector.MatchLabels)) {
109+
for _, key := range slice.Sort(maps.Keys(selector.MatchLabels)) {
110110
val := selector.MatchLabels[key]
111111
lines = append(lines, fmt.Sprintf(" %s: %s", key, val))
112112
}
113113
}
114114
if len(selector.MatchExpressions) > 0 {
115115
lines = append(lines, "Match expressions:")
116-
sortedMatchExpressions := slices.SortOn(
116+
sortedMatchExpressions := slice.SortOn(
117117
func(l metav1.LabelSelectorRequirement) string { return l.Key },
118118
selector.MatchExpressions)
119119
for _, exp := range sortedMatchExpressions {
120-
lines = append(lines, fmt.Sprintf(" %s %s %+v", exp.Key, exp.Operator, slices.Sort(exp.Values)))
120+
lines = append(lines, fmt.Sprintf(" %s %s %+v", exp.Key, exp.Operator, slice.Sort(exp.Values)))
121121
}
122122
}
123123
return strings.Join(lines, "\n")

‎pkg/kube/netpol/policies.go

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

33
import (
44
"fmt"
5-
"github.com/mattfenwick/collections/pkg/slices"
5+
"github.com/mattfenwick/collections/pkg/slice"
66
"golang.org/x/exp/maps"
77
v1 "k8s.io/api/core/v1"
88
networkingv1 "k8s.io/api/networking/v1"
@@ -17,7 +17,7 @@ func label(key, val string) map[string]string {
1717

1818
func LabelString(labels map[string]string) string {
1919
// 1. first, sort the keys so we get a deterministic answer
20-
keys := slices.Sort(maps.Keys(labels))
20+
keys := slice.Sort(maps.Keys(labels))
2121
// 2. now use the sorted keys to generate chunks
2222
var chunks []string
2323
for _, key := range keys {

‎pkg/linter/checks.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package linter
33
import (
44
"fmt"
55
collections "github.com/mattfenwick/collections/pkg"
6-
"github.com/mattfenwick/collections/pkg/slices"
6+
"github.com/mattfenwick/collections/pkg/slice"
77
"github.com/mattfenwick/cyclonus/pkg/matcher"
88
"github.com/mattfenwick/cyclonus/pkg/utils"
99
"github.com/olekukonko/tablewriter"
@@ -105,7 +105,7 @@ func (r *resolvedWarning) GetTarget() string {
105105
}
106106

107107
func (r *resolvedWarning) GetSourcePolicies() string {
108-
target := slices.Sort(slices.Map(NetpolKey, r.Target.SourceRules))
108+
target := slice.Sort(slice.Map(NetpolKey, r.Target.SourceRules))
109109
return strings.Join(target, "\n")
110110
}
111111

@@ -117,7 +117,7 @@ func WarningsTable(warnings []Warning) string {
117117
table.SetReflowDuringAutoWrap(false)
118118
table.SetAutoWrapText(false)
119119

120-
sortedWarnings := slices.SortOnBy(sortKey, slices.CompareSlicePairwise[string](), warnings)
120+
sortedWarnings := slice.SortOnBy(sortKey, slice.CompareSlicePairwise[string](), warnings)
121121
for _, w := range sortedWarnings {
122122
origin := "Source"
123123
if !w.OriginIsSource() {

‎pkg/matcher/explain.go

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

33
import (
44
"fmt"
5-
"github.com/mattfenwick/collections/pkg/slices"
5+
"github.com/mattfenwick/collections/pkg/slice"
66
"github.com/mattfenwick/cyclonus/pkg/kube"
77
"github.com/mattfenwick/cyclonus/pkg/utils"
88
"github.com/olekukonko/tablewriter"
@@ -48,8 +48,8 @@ func (s *SliceBuilder) TargetsTableLines(targets []*Target, isIngress bool) {
4848
ruleType = "Egress"
4949
}
5050
for _, target := range targets {
51-
sourceRules := slices.Sort(
52-
slices.Map(func(sr *networkingv1.NetworkPolicy) string {
51+
sourceRules := slice.Sort(
52+
slice.Map(func(sr *networkingv1.NetworkPolicy) string {
5353
return fmt.Sprintf("%s/%s", sr.Namespace, sr.Name)
5454
}, target.SourceRules))
5555
targetString := fmt.Sprintf("namespace: %s\n%s", target.Namespace, kube.LabelSelectorTableLines(target.PodSelector))
@@ -59,7 +59,7 @@ func (s *SliceBuilder) TargetsTableLines(targets []*Target, isIngress bool) {
5959
if len(target.Peers) == 0 {
6060
s.Append("no pods, no ips", "no ports, no protocols")
6161
} else {
62-
for _, peer := range slices.SortOn(func(p PeerMatcher) string { return utils.DumpJSON(p) }, target.Peers) {
62+
for _, peer := range slice.SortOn(func(p PeerMatcher) string { return utils.DumpJSON(p) }, target.Peers) {
6363
switch a := peer.(type) {
6464
case *AllPeersMatcher:
6565
s.Append("all pods, all ips", "all ports, all protocols")

‎pkg/matcher/ippeermatcher.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package matcher
33
import (
44
"encoding/json"
55
"fmt"
6-
"github.com/mattfenwick/collections/pkg/slices"
6+
"github.com/mattfenwick/collections/pkg/slice"
77
"github.com/mattfenwick/cyclonus/pkg/kube"
88
v1 "k8s.io/api/core/v1"
99
networkingv1 "k8s.io/api/networking/v1"
@@ -21,7 +21,7 @@ type IPPeerMatcher struct {
2121
// CIDR and excepts.
2222
func (i *IPPeerMatcher) PrimaryKey() string {
2323
block := i.IPBlock
24-
except := slices.Sort(i.IPBlock.Except)
24+
except := slice.Sort(i.IPBlock.Except)
2525
return fmt.Sprintf("%s: [%s]", block.CIDR, strings.Join(except, ", "))
2626
}
2727

‎pkg/matcher/policy.go

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

33
import (
44
"fmt"
5-
"github.com/mattfenwick/collections/pkg/slices"
5+
"github.com/mattfenwick/collections/pkg/slice"
66
"github.com/mattfenwick/cyclonus/pkg/kube"
77
"github.com/olekukonko/tablewriter"
88
"golang.org/x/exp/maps"
@@ -28,8 +28,8 @@ func NewPolicyWithTargets(ingress []*Target, egress []*Target) *Policy {
2828

2929
func (p *Policy) SortedTargets() ([]*Target, []*Target) {
3030
key := func(t *Target) string { return t.GetPrimaryKey() }
31-
ingress := slices.SortOn(key, maps.Values(p.Ingress))
32-
egress := slices.SortOn(key, maps.Values(p.Egress))
31+
ingress := slice.SortOn(key, maps.Values(p.Ingress))
32+
egress := slice.SortOn(key, maps.Values(p.Egress))
3333
return ingress, egress
3434
}
3535

@@ -105,7 +105,7 @@ func (ar *AllowedResult) Table() string {
105105
}
106106

107107
func addTargetsToTable(table *tablewriter.Table, ruleType string, action string, targets []*Target) {
108-
sortedTargets := slices.SortOn(func(t *Target) string { return t.GetPrimaryKey() }, targets)
108+
sortedTargets := slice.SortOn(func(t *Target) string { return t.GetPrimaryKey() }, targets)
109109
for _, t := range sortedTargets {
110110
targetString := fmt.Sprintf("namespace: %s\n%s", t.Namespace, kube.LabelSelectorTableLines(t.PodSelector))
111111
table.Append([]string{ruleType, action, targetString})
@@ -152,7 +152,7 @@ func (p *Policy) IsIngressOrEgressAllowed(traffic *Traffic, isIngress bool) *Dir
152152
}
153153

154154
// 3. Check if any matching targets allow this traffic
155-
pair := slices.Partition(func(t *Target) bool {
155+
pair := slice.Partition(func(t *Target) bool {
156156
return t.Allows(peer, traffic.ResolvedPort, traffic.ResolvedPortName, traffic.Protocol)
157157
}, matchingTargets)
158158
allowers, deniers := pair.Fst, pair.Snd

‎pkg/matcher/simplifier.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package matcher
22

33
import (
4-
"github.com/mattfenwick/collections/pkg/slices"
4+
"github.com/mattfenwick/collections/pkg/slice"
55
"github.com/pkg/errors"
66
"golang.org/x/exp/maps"
77
)
@@ -47,8 +47,8 @@ func simplifyPortsForAllPeers(matchers []*PortsForAllPeersMatcher) *PortsForAllP
4747

4848
func simplifyPodMatchers(pms []*PodPeerMatcher) []*PodPeerMatcher {
4949
key := func(ppm *PodPeerMatcher) string { return ppm.PrimaryKey() }
50-
combine := func(ppms []*PodPeerMatcher) *PodPeerMatcher { return slices.Foldl(CombinePodPeerMatchers, nil, ppms) }
51-
groupedSimplified := slices.Map(combine, maps.Values(slices.GroupOn(key, pms)))
50+
combine := func(ppms []*PodPeerMatcher) *PodPeerMatcher { return slice.Foldl(CombinePodPeerMatchers, nil, ppms) }
51+
groupedSimplified := slice.Map(combine, maps.Values(slice.GroupOn(key, pms)))
5252
//grouped := map[string]*PodPeerMatcher{}
5353
//for _, pm := range pms {
5454
// key := pm.PrimaryKey()
@@ -58,7 +58,7 @@ func simplifyPodMatchers(pms []*PodPeerMatcher) []*PodPeerMatcher {
5858
// grouped[key] = CombinePodPeerMatchers(grouped[key], pm)
5959
// }
6060
//}
61-
return slices.SortOn(key, groupedSimplified)
61+
return slice.SortOn(key, groupedSimplified)
6262
}
6363

6464
func simplifyIPMatchers(ims []*IPPeerMatcher) []*IPPeerMatcher {
@@ -71,7 +71,7 @@ func simplifyIPMatchers(ims []*IPPeerMatcher) []*IPPeerMatcher {
7171
grouped[key] = CombineIPPeerMatchers(grouped[key], im)
7272
}
7373
}
74-
return slices.SortOn(func(i *IPPeerMatcher) string { return i.PrimaryKey() }, maps.Values(grouped))
74+
return slice.SortOn(func(i *IPPeerMatcher) string { return i.PrimaryKey() }, maps.Values(grouped))
7575
}
7676

7777
func simplifyIPsAndPodsIntoAlls(all *PortsForAllPeersMatcher, ips []*IPPeerMatcher, pods []*PodPeerMatcher) ([]*IPPeerMatcher, []*PodPeerMatcher) {

‎pkg/matcher/traffic.go

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

33
import (
44
"fmt"
5-
"github.com/mattfenwick/collections/pkg/slices"
5+
"github.com/mattfenwick/collections/pkg/slice"
66
"github.com/olekukonko/tablewriter"
77
"golang.org/x/exp/maps"
88
v1 "k8s.io/api/core/v1"
@@ -51,7 +51,7 @@ func (t *Traffic) Table() string {
5151

5252
func labelsToString(labels map[string]string) string {
5353
format := func(k string) string { return fmt.Sprintf("%s: %s", k, labels[k]) }
54-
return strings.Join(slices.Map(format, slices.Sort(maps.Keys(labels))), "\n")
54+
return strings.Join(slice.Map(format, slice.Sort(maps.Keys(labels))), "\n")
5555
}
5656

5757
type TrafficPeer struct {

0 commit comments

Comments
 (0)