chore(golangci-lint): updating to sets with generics

Signed-off-by: Dario Tranchitella <[email protected]>
projectcapsule · Dec 29, 2023 · 1dae49a · 1dae49a
1 parent a00bfaf
commit 1dae49a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/internal/controllers/capsule_configuration.go b/internal/controllers/capsule_configuration.go
@@ -26,11 +26,11 @@ type CapsuleConfiguration struct {
 }
 
 //nolint:gochecknoglobals
-var CapsuleUserGroups sets.String
+var CapsuleUserGroups sets.Set[string]
 
 func (c *CapsuleConfiguration) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {
 	if len(c.DeprecatedCapsuleUserGroups) > 0 {
-		CapsuleUserGroups = sets.NewString(c.DeprecatedCapsuleUserGroups...)
+		CapsuleUserGroups = sets.New[string](c.DeprecatedCapsuleUserGroups...)
 
 		return nil
 	}
@@ -57,7 +57,7 @@ func (c *CapsuleConfiguration) Reconcile(ctx context.Context, request reconcile.
 		panic(err)
 	}
 
-	CapsuleUserGroups = sets.NewString(capsuleConfig.Spec.UserGroups...)
+	CapsuleUserGroups = sets.New(capsuleConfig.Spec.UserGroups...)
 
 	return reconcile.Result{}, nil
 }
diff --git a/internal/modules/utils/selector.go b/internal/modules/utils/selector.go
@@ -42,7 +42,7 @@ func HandleGetSelector(ctx context.Context, obj client.Object, client client.Rea
 func HandleListSelector(requirements []labels.Requirement) (selector labels.Selector, err error) {
 	selector = labels.NewSelector()
 
-	requirementsMap := make(map[string]sets.String)
+	requirementsMap := make(map[string]sets.Set[string])
 	generateRequirementsKey := func(requirement labels.Requirement) string { //nolint:nolintlint
 		switch requirement.Operator() { //nolint:exhaustive
 		case selection.Equals, selection.DoubleEquals, selection.In:
@@ -58,18 +58,18 @@ func HandleListSelector(requirements []labels.Requirement) (selector labels.Sele
 		key := generateRequirementsKey(requirement)
 
 		if _, ok := requirementsMap[key]; !ok {
-			requirementsMap[key] = requirement.Values()
+			requirementsMap[key] = sets.Set[string](requirement.Values())
 
 			continue
 		}
 
-		requirementsMap[key] = requirementsMap[key].Union(requirement.Values())
+		requirementsMap[key] = requirementsMap[key].Union(sets.Set[string](requirement.Values()))
 	}
 
 	for k, v := range requirementsMap {
 		key, op := strings.Split(k, ":")[0], strings.Split(k, ":")[1]
 
-		requirement, err := labels.NewRequirement(key, selection.Operator(op), v.List())
+		requirement, err := labels.NewRequirement(key, selection.Operator(op), v.UnsortedList())
 		if err != nil {
 			return nil, err
 		}

diff --git a/internal/webserver/middleware/allowed_requests.go b/internal/webserver/middleware/allowed_requests.go
@@ -11,7 +11,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/sets"
 )
 
-func CheckPaths(log logr.Logger, allowedPaths sets.String, skipTo func(writer http.ResponseWriter, request *http.Request)) mux.MiddlewareFunc {
+func CheckPaths(log logr.Logger, allowedPaths sets.Set[string], skipTo func(writer http.ResponseWriter, request *http.Request)) mux.MiddlewareFunc {
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
 			if allowedPaths.Has(request.URL.Path) {

diff --git a/internal/webserver/middleware/user_in_group.go b/internal/webserver/middleware/user_in_group.go
@@ -15,7 +15,7 @@ import (
 	req "github.com/projectcapsule/capsule-proxy/internal/request"
 )
 
-func CheckUserInIgnoredGroupMiddleware(client client.Writer, log logr.Logger, claim string, authTypes []req.AuthType, ignoredUserGroups sets.String, fn func(writer http.ResponseWriter, request *http.Request)) mux.MiddlewareFunc {
+func CheckUserInIgnoredGroupMiddleware(client client.Writer, log logr.Logger, claim string, authTypes []req.AuthType, ignoredUserGroups sets.Set[string], fn func(writer http.ResponseWriter, request *http.Request)) mux.MiddlewareFunc {
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(writer http.ResponseWriter, request *http.Request) {
 			if ignoredUserGroups.Len() > 0 {

diff --git a/internal/webserver/webserver.go b/internal/webserver/webserver.go
@@ -64,9 +64,9 @@ func NewKubeFilter(opts options.ListenerOpts, srv options.ServerOptions, rbRefle
 		reader:                clientOverride,
 		writer:                client,
 		managerReader:         client,
-		allowedPaths:          sets.NewString("/api", "/apis", "/version"),
+		allowedPaths:          sets.New("/api", "/apis", "/version"),
 		authTypes:             opts.AuthTypes(),
-		ignoredUserGroups:     sets.NewString(opts.IgnoredGroupNames()...),
+		ignoredUserGroups:     sets.New(opts.IgnoredGroupNames()...),
 		reverseProxy:          reverseProxy,
 		bearerToken:           opts.BearerToken(),
 		usernameClaimField:    opts.PreferredUsernameClaim(),
@@ -77,9 +77,9 @@ func NewKubeFilter(opts options.ListenerOpts, srv options.ServerOptions, rbRefle
 }
 
 type kubeFilter struct {
-	allowedPaths          sets.String
+	allowedPaths          sets.Set[string]
 	authTypes             []req.AuthType
-	ignoredUserGroups     sets.String
+	ignoredUserGroups     sets.Set[string]
 	reverseProxy          *httputil.ReverseProxy
 	bearerToken           string
 	usernameClaimField    string