use improved set

Author: mattfenwick

go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/go-resty/resty/v2 v2.5.0
 	github.com/jstemmer/go-junit-report v0.9.1
-	github.com/mattfenwick/collections v0.1.6
+	github.com/mattfenwick/collections v0.1.7
 	github.com/olekukonko/tablewriter v0.0.4
 	github.com/onsi/ginkgo/v2 v2.1.4
 	github.com/onsi/gomega v1.19.0

go.sum

@@ -241,8 +241,8 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA=
 github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/mattfenwick/collections v0.1.6 h1:rbip28GALt86KwuhsN+7jy92rtVW7A4HScH35fCL2Io=
-github.com/mattfenwick/collections v0.1.6/go.mod h1:6JmZGWNsbA4g6OzJQGAOTalNWMPghEOl1q4abMZAJSQ=
+github.com/mattfenwick/collections v0.1.7 h1:92ehnds2KGUsHm+kvgqH8n8QdDXRMchpw/HvEeI1hx4=
+github.com/mattfenwick/collections v0.1.7/go.mod h1:6JmZGWNsbA4g6OzJQGAOTalNWMPghEOl1q4abMZAJSQ=
 github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
 github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=

pkg/cli/analyze.go

@@ -2,7 +2,7 @@ package cli
 
 import (
 	"fmt"
-	collections "github.com/mattfenwick/collections/pkg"
+	"github.com/mattfenwick/collections/pkg/set"
 	"github.com/mattfenwick/cyclonus/pkg/connectivity/probe"
 	"github.com/mattfenwick/cyclonus/pkg/generator"
 	"github.com/mattfenwick/cyclonus/pkg/linter"
@@ -161,7 +161,7 @@ func ExplainPolicies(explainedPolicies *matcher.Policy) {
 }
 
 func Lint(kubePolicies []*networkingv1.NetworkPolicy) {
-	warnings := linter.Lint(kubePolicies, collections.NewSet[linter.Check](nil))
+	warnings := linter.Lint(kubePolicies, set.NewSet[linter.Check](nil))
 	fmt.Println(linter.WarningsTable(warnings))
 }
 

pkg/generator/tags.go

@@ -1,7 +1,9 @@
 package generator
 
 import (
+	"github.com/mattfenwick/collections/pkg/slice"
 	"github.com/pkg/errors"
+	"golang.org/x/exp/maps"
 	"sort"
 	"strings"
 )
@@ -234,12 +236,7 @@ func (s StringSet) GroupTags() map[string][]string {
 }
 
 func (s StringSet) Keys() []string {
-	var stringSlice []string
-	for k := range s {
-		stringSlice = append(stringSlice, k)
-	}
-	sort.Strings(stringSlice)
-	return stringSlice
+	return slice.Sort(maps.Keys(s))
 }
 
 func (s StringSet) ContainsAny(stringSlice []string) bool {

pkg/linter/checks.go

@@ -2,7 +2,7 @@ package linter
 
 import (
 	"fmt"
-	collections "github.com/mattfenwick/collections/pkg"
+	"github.com/mattfenwick/collections/pkg/set"
 	"github.com/mattfenwick/collections/pkg/slice"
 	"github.com/mattfenwick/cyclonus/pkg/matcher"
 	"github.com/mattfenwick/cyclonus/pkg/utils"
@@ -130,7 +130,7 @@ func WarningsTable(warnings []Warning) string {
 	return str.String()
 }
 
-func Lint(kubePolicies []*networkingv1.NetworkPolicy, skip *collections.Set[Check, Check]) []Warning {
+func Lint(kubePolicies []*networkingv1.NetworkPolicy, skip *set.Set[Check]) []Warning {
 	policies := matcher.BuildNetworkPolicies(false, kubePolicies)
 	warnings := append(LintSourcePolicies(kubePolicies), LintResolvedPolicies(policies)...)