Switch to generic Set

Signed-off-by: Andy Goldstein <[email protected]>

Author: ncdc

pkg/internal/clientgen/fake_type.go

@@ -66,7 +66,7 @@ func (c *FakeTypedClient) WriteContent(w io.Writer) error {
 	extraImports := map[string]string{   // import path -> alias
 		"": c.Group.PackageAlias, // unset paths on input/output tags use the default api package
 	}
-	extensionVerbs := sets.NewString()
+	extensionVerbs := sets.New[string]()
 	for i, extension := range c.Kind.Extensions {
 		extensionVerbs.Insert(extension.Verb)
 		for _, importPath := range []string{extension.InputPath, extension.ResultPath} {

pkg/parser/extract.go

@@ -34,11 +34,11 @@ import (
 // isForbiddenGroupVersion hacks around the k8s client-set, where types have +genclient but aren't meant to have
 // generated clients ... ?
 func isForbiddenGroupVersion(group types.Group, version types.Version) bool {
-	forbidden := map[string]sets.String{
-		"abac.authorization.kubernetes.io": sets.NewString("v0", "v1beta1"),
-		"componentconfig":                  sets.NewString("v1alpha1"),
-		"imagepolicy.k8s.io":               sets.NewString("v1alpha1"),
-		"admission.k8s.io":                 sets.NewString("v1", "v1beta1"),
+	forbidden := map[string]sets.Set[string]{
+		"abac.authorization.kubernetes.io": sets.New[string]("v0", "v1beta1"),
+		"componentconfig":                  sets.New[string]("v1alpha1"),
+		"imagepolicy.k8s.io":               sets.New[string]("v1alpha1"),
+		"admission.k8s.io":                 sets.New[string]("v1", "v1beta1"),
 	}
 	versions, ok := forbidden[group.String()]
 	return ok && versions.Has(version.String())

pkg/parser/markers.go

@@ -101,9 +101,9 @@ func IsNamespaced(info *markers.TypeInfo) bool {
 }
 
 // SupportedVerbs determines which verbs the type supports
-func SupportedVerbs(info *markers.TypeInfo) (sets.String, error) {
+func SupportedVerbs(info *markers.TypeInfo) (sets.Set[string], error) {
 	if info.Markers.Get(NoVerbsMarker.Name) != nil {
-		return sets.NewString(), nil
+		return sets.New[string](), nil
 	}
 
 	extractVerbs := func(info *markers.TypeInfo, name string) ([]string, error) {
@@ -119,26 +119,26 @@ func SupportedVerbs(info *markers.TypeInfo) (sets.String, error) {
 
 	onlyVerbs, err := extractVerbs(info, OnlyVerbsMarker.Name)
 	if err != nil {
-		return sets.NewString(), err
+		return sets.New[string](), err
 	}
 	if len(onlyVerbs) > 0 {
-		return sets.NewString(onlyVerbs...), nil
+		return sets.New[string](onlyVerbs...), nil
 	}
 
-	baseVerbs := sets.NewString(genutil.SupportedVerbs...)
+	baseVerbs := sets.New[string](genutil.SupportedVerbs...)
 	if info.Markers.Get(ReadOnlyMarker.Name) != nil {
-		baseVerbs = sets.NewString(genutil.ReadonlyVerbs...)
+		baseVerbs = sets.New[string](genutil.ReadonlyVerbs...)
 	}
 
 	if info.Markers.Get(NoStatusMarker.Name) != nil {
-		baseVerbs = baseVerbs.Difference(sets.NewString("updateStatus", "applyStatus"))
+		baseVerbs = baseVerbs.Difference(sets.New[string]("updateStatus", "applyStatus"))
 	}
 
 	skipVerbs, err := extractVerbs(info, SkipVerbsMarker.Name)
 	if err != nil {
-		return sets.NewString(), err
+		return sets.New[string](), err
 	}
-	return baseVerbs.Difference(sets.NewString(skipVerbs...)), nil
+	return baseVerbs.Difference(sets.New[string](skipVerbs...)), nil
 }
 
 func ClientExtensions(info *markers.TypeInfo) []Extension {

pkg/parser/types.go

@@ -27,7 +27,7 @@ import (
 type Kind struct {
 	kind           string
 	namespaced     bool
-	SupportedVerbs sets.String
+	SupportedVerbs sets.Set[string]
 	Extensions     []Extension
 	namer          namer.Namer
 }
@@ -58,7 +58,7 @@ func (k *Kind) SupportsListWatch() bool {
 // then ensure we add in fake_type.go entries for the extension
 // changes we've already made should enable clients to exist for it
 
-func NewKind(kind string, namespaced bool, supportedVerbs sets.String, extensions []Extension) Kind {
+func NewKind(kind string, namespaced bool, supportedVerbs sets.Set[string], extensions []Extension) Kind {
 	return Kind{
 		kind:           kind,
 		namespaced:     namespaced,