11package kube
22
33import (
4- "encoding/json"
54 "fmt"
6- "github.com/pkg/errors"
5+ collections "github.com/mattfenwick/collections/pkg"
6+ "github.com/mattfenwick/collections/pkg/builtins"
7+ "github.com/mattfenwick/cyclonus/pkg/utils"
8+ "golang.org/x/exp/maps"
79 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
8- "sort"
910 "strings"
1011)
1112
@@ -92,23 +93,12 @@ func IsLabelSelectorEmpty(l metav1.LabelSelector) bool {
9293// SerializeLabelSelector deterministically converts a metav1.LabelSelector
9394// into a string
9495func SerializeLabelSelector (ls metav1.LabelSelector ) string {
95- var labelKeys []string
96- for key := range ls .MatchLabels {
97- labelKeys = append (labelKeys , key )
98- }
99- sort .Slice (labelKeys , func (i , j int ) bool {
100- return labelKeys [i ] < labelKeys [j ]
101- })
102- var keyVals []string
103- for _ , key := range labelKeys {
104- keyVals = append (keyVals , fmt .Sprintf ("%s: %s" , key , ls .MatchLabels [key ]))
105- }
106- // this is weird, but use an array to make the order deterministic
107- bytes , err := json .Marshal ([]interface {}{"MatchLabels" , keyVals , "MatchExpression" , ls .MatchExpressions })
108- if err != nil {
109- panic (errors .Wrapf (err , "unable to marshal json" ))
110- }
111- return string (bytes )
96+ labelKeys := builtins .Sort (maps .Keys (ls .MatchLabels ))
97+ keyVals := collections .MapSlice (func (key string ) string {
98+ return fmt .Sprintf ("%s: %s" , key , ls .MatchLabels [key ])
99+ }, labelKeys )
100+ // this looks weird -- we're using an array to make the order deterministic
101+ return utils .JsonStringNoIndent ([]interface {}{"MatchLabels" , keyVals , "MatchExpression" , ls .MatchExpressions })
112102}
113103
114104func LabelSelectorTableLines (selector metav1.LabelSelector ) string {
@@ -118,14 +108,16 @@ func LabelSelectorTableLines(selector metav1.LabelSelector) string {
118108 var lines []string
119109 if len (selector .MatchLabels ) > 0 {
120110 lines = append (lines , "Match labels:" )
121- for key , val := range selector .MatchLabels {
111+ for _ , key := range builtins .Sort (maps .Keys (selector .MatchLabels )) {
112+ val := selector .MatchLabels [key ]
122113 lines = append (lines , fmt .Sprintf (" %s: %s" , key , val ))
123114 }
124115 }
125116 if len (selector .MatchExpressions ) > 0 {
126117 lines = append (lines , "Match expressions:" )
127- for _ , exp := range selector .MatchExpressions {
128- lines = append (lines , fmt .Sprintf (" %s %s %+v" , exp .Key , exp .Operator , exp .Values ))
118+ sortedMatchExpressions := builtins .SortOn (selector .MatchExpressions , func (l metav1.LabelSelectorRequirement ) string { return l .Key })
119+ for _ , exp := range sortedMatchExpressions {
120+ lines = append (lines , fmt .Sprintf (" %s %s %+v" , exp .Key , exp .Operator , builtins .Sort (exp .Values )))
129121 }
130122 }
131123 return strings .Join (lines , "\n " )
0 commit comments