address reviews

Author: mjudeikis

backend/oidc/oidc.go

@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"net"
 	"os"
+	"slices"
 	"time"
 
 	"github.com/davecgh/go-spew/spew"
@@ -40,8 +41,7 @@ func New(caBundleFile string, listener net.Listener, addrOverride string) (*Serv
 	var tlsConfig *tls.Config
 	s := &Server{}
 	if caBundleFile != "" {
-		var err error
-		tlsConfig, err = LoadTLSConfig(caBundleFile)
+		tlsConfig, err := LoadTLSConfig(caBundleFile)
 		if err != nil {
 			return nil, fmt.Errorf("failed to load CA bundle file: %w", err)
 		}
@@ -86,7 +86,8 @@ func (s *Server) AddRoutes(mux *mux.Router) {
 	s.server.AddRoutes(mux)
 }
 
-// URL returns the base URL of the embedded OIDC server.
+// Config returns the OIDC configuration for clients to connect to the embedded OIDC server.
+// It is partially auto-generated by mockoidc and partially overridden to match kube-bind specific URLs.
 func (s *Server) Config(callbackURL, issuerURL string) (*Config, error) {
 	c := &Config{
 		ClientID:     s.server.Config().ClientID,
@@ -124,10 +125,8 @@ func ensureOfflineAccessScope() {
 	offlineAccess := "offline_access"
 
 	// Check if offline_access is already in the supported scopes
-	for _, scope := range mockoidc.ScopesSupported {
-		if scope == offlineAccess {
-			return // Already present
-		}
+	if slices.Contains(mockoidc.ScopesSupported, offlineAccess) {
+		return // Already present
 	}
 
 	// Add offline_access to the supported scopes

cli/pkg/kubectl/base/kubeconfig.go

@@ -139,8 +139,8 @@ func EnsureKubeconfigSecret(ctx context.Context, kubeconfig, name string, client
 	return secret, false, nil
 }
 
-// LoadRestConfigFromFile loads a kubeconfig string and returns a rest.Config
-func LoadRestConfigFromFile(kubeconfig string) (*rest.Config, error) {
+// LoadRestConfigFromString loads a kubeconfig string and returns a rest.Config
+func LoadRestConfigFromString(kubeconfig string) (*rest.Config, error) {
 	config, err := clientcmd.RESTConfigFromKubeConfig([]byte(kubeconfig))
 	if err != nil {
 		return nil, fmt.Errorf("failed to build config from kubeconfig: %w", err)

cli/pkg/kubectl/dev/plugin/create.go

@@ -236,7 +236,7 @@ func (o *DevOptions) createCluster(ctx context.Context, clusterName, clusterConf
 	fmt.Fprint(o.Streams.ErrOut, "Wrote kubeconfig "+kubeconfigPath+"\n")
 
 	if installKubeBind {
-		restConfig, err := base.LoadRestConfigFromFile(kubeConfigFile)
+		restConfig, err := base.LoadRestConfigFromString(kubeConfigFile)
 		if err != nil {
 			return err
 		}