Run modernize (#21546)

`go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest -fix -test ./...` executed.

`go generate ./...` ran afterwards to keep generated.

internal/config/identity/openid/jwt.go

@@ -38,7 +38,7 @@ type publicKeys struct {
 	*sync.RWMutex
 
 	// map of kid to public key
-	pkMap map[string]interface{}
+	pkMap map[string]any
 }
 
 func (pk *publicKeys) parseAndAdd(b io.Reader) error {
@@ -59,14 +59,14 @@ func (pk *publicKeys) parseAndAdd(b io.Reader) error {
 	return nil
 }
 
-func (pk *publicKeys) add(keyID string, key interface{}) {
+func (pk *publicKeys) add(keyID string, key any) {
 	pk.Lock()
 	defer pk.Unlock()
 
 	pk.pkMap[keyID] = key
 }
 
-func (pk *publicKeys) get(kid string) interface{} {
+func (pk *publicKeys) get(kid string) any {
 	pk.RLock()
 	defer pk.RUnlock()
 	return pk.pkMap[kid]
@@ -103,7 +103,7 @@ var (
 	ErrTokenExpired = errors.New("token expired")
 )
 
-func updateClaimsExpiry(dsecs string, claims map[string]interface{}) error {
+func updateClaimsExpiry(dsecs string, claims map[string]any) error {
 	expStr := claims["exp"]
 	if expStr == "" {
 		return ErrTokenExpired
@@ -133,7 +133,7 @@ const (
 )
 
 // Validate - validates the id_token.
-func (r *Config) Validate(ctx context.Context, arn arn.ARN, token, accessToken, dsecs string, claims map[string]interface{}) error {
+func (r *Config) Validate(ctx context.Context, arn arn.ARN, token, accessToken, dsecs string, claims map[string]any) error {
 	jp := new(jwtgo.Parser)
 	jp.ValidMethods = []string{
 		"RS256", "RS384", "RS512",
@@ -143,7 +143,7 @@ func (r *Config) Validate(ctx context.Context, arn arn.ARN, token, accessToken,
 		"ES3256", "ES3384", "ES3512",
 	}
 
-	keyFuncCallback := func(jwtToken *jwtgo.Token) (interface{}, error) {
+	keyFuncCallback := func(jwtToken *jwtgo.Token) (any, error) {
 		kid, ok := jwtToken.Header["kid"].(string)
 		if !ok {
 			return nil, fmt.Errorf("Invalid kid value %v", jwtToken.Header["kid"])
@@ -221,7 +221,7 @@ func (r *Config) Validate(ctx context.Context, arn arn.ARN, token, accessToken,
 	return nil
 }
 
-func (r *Config) updateUserinfoClaims(ctx context.Context, arn arn.ARN, accessToken string, claims map[string]interface{}) error {
+func (r *Config) updateUserinfoClaims(ctx context.Context, arn arn.ARN, accessToken string, claims map[string]any) error {
 	pCfg, ok := r.arnProviderCfgsMap[arn]
 	// If claim user info is enabled, get claims from userInfo
 	// and overwrite them with the claims from JWT.

internal/config/identity/openid/jwt_test.go

@@ -39,7 +39,7 @@ import (
 
 func TestUpdateClaimsExpiry(t *testing.T) {
 	testCases := []struct {
-		exp             interface{}
+		exp             any
 		dsecs           string
 		expectedFailure bool
 	}{
@@ -58,9 +58,8 @@ func TestUpdateClaimsExpiry(t *testing.T) {
 	}
 
 	for _, testCase := range testCases {
-		testCase := testCase
 		t.Run("", func(t *testing.T) {
-			claims := map[string]interface{}{}
+			claims := map[string]any{}
 			claims["exp"] = testCase.exp
 			err := updateClaimsExpiry(testCase.dsecs, claims)
 			if err != nil && !testCase.expectedFailure {
@@ -99,7 +98,7 @@ func TestJWTHMACType(t *testing.T) {
 			ExpiresAt: 253428928061,
 			Audience:  "76b95ae5-33ef-4283-97b7-d2a85dc2d8f4",
 		},
-		Header: map[string]interface{}{
+		Header: map[string]any{
 			"typ": "JWT",
 			"alg": jwtgo.SigningMethodHS256.Alg(),
 			"kid": "76b95ae5-33ef-4283-97b7-d2a85dc2d8f4",
@@ -119,7 +118,7 @@ func TestJWTHMACType(t *testing.T) {
 
 	pubKeys := publicKeys{
 		RWMutex: &sync.RWMutex{},
-		pkMap:   map[string]interface{}{},
+		pkMap:   map[string]any{},
 	}
 	pubKeys.add("76b95ae5-33ef-4283-97b7-d2a85dc2d8f4", []byte("WNGvKVyyNmXq0TraSvjaDN9CtpFgx35IXtGEffMCPR0"))
 
@@ -165,7 +164,7 @@ func TestJWT(t *testing.T) {
 
 	pubKeys := publicKeys{
 		RWMutex: &sync.RWMutex{},
-		pkMap:   map[string]interface{}{},
+		pkMap:   map[string]any{},
 	}
 	err := pubKeys.parseAndAdd(bytes.NewBuffer([]byte(jsonkey)))
 	if err != nil {

internal/config/identity/openid/openid.go

@@ -22,7 +22,9 @@ import (
 	"encoding/base64"
 	"errors"
 	"io"
+	"maps"
 	"net/http"
+	"slices"
 	"sort"
 	"strconv"
 	"strings"
@@ -186,15 +188,9 @@ func (r *Config) Clone() Config {
 		transport:          r.transport,
 		closeRespFn:        r.closeRespFn,
 	}
-	for k, v := range r.arnProviderCfgsMap {
-		cfg.arnProviderCfgsMap[k] = v
-	}
-	for k, v := range r.ProviderCfgs {
-		cfg.ProviderCfgs[k] = v
-	}
-	for k, v := range r.roleArnPolicyMap {
-		cfg.roleArnPolicyMap[k] = v
-	}
+	maps.Copy(cfg.arnProviderCfgsMap, r.arnProviderCfgsMap)
+	maps.Copy(cfg.ProviderCfgs, r.ProviderCfgs)
+	maps.Copy(cfg.roleArnPolicyMap, r.roleArnPolicyMap)
 	return cfg
 }
 
@@ -210,7 +206,7 @@ func LookupConfig(s config.Config, transport http.RoundTripper, closeRespFn func
 		ProviderCfgs:       map[string]*providerCfg{},
 		pubKeys: publicKeys{
 			RWMutex: &sync.RWMutex{},
-			pkMap:   map[string]interface{}{},
+			pkMap:   map[string]any{},
 		},
 		roleArnPolicyMap: map[arn.ARN]string{},
 		transport:        openIDClientTransport,
@@ -308,7 +304,7 @@ func LookupConfig(s config.Config, transport http.RoundTripper, closeRespFn func
 
 		if scopeList := getCfgVal(Scopes); scopeList != "" {
 			var scopes []string
-			for _, scope := range strings.Split(scopeList, ",") {
+			for scope := range strings.SplitSeq(scopeList, ",") {
 				scope = strings.TrimSpace(scope)
 				if scope == "" {
 					return c, config.Errorf("empty scope value is not allowed '%s', please refer to our documentation", scopeList)
@@ -414,13 +410,7 @@ func (r *Config) GetConfigInfo(s config.Config, cfgName string) ([]madmin.IDPCfg
 		return nil, err
 	}
 
-	present := false
-	for _, cfg := range openIDConfigs {
-		if cfg == cfgName {
-			present = true
-			break
-		}
-	}
+	present := slices.Contains(openIDConfigs, cfgName)
 
 	if !present {
 		return nil, ErrProviderConfigNotFound

internal/config/identity/openid/providercfg.go

@@ -113,7 +113,7 @@ func (p *providerCfg) GetRoleArn() string {
 // claims as part of the normal oauth2 flow, instead rely
 // on service providers making calls to IDP to fetch additional
 // claims available from the UserInfo endpoint
-func (p *providerCfg) UserInfo(ctx context.Context, accessToken string, transport http.RoundTripper) (map[string]interface{}, error) {
+func (p *providerCfg) UserInfo(ctx context.Context, accessToken string, transport http.RoundTripper) (map[string]any, error) {
 	if p.JWKS.URL == nil || p.JWKS.URL.String() == "" {
 		return nil, errors.New("openid not configured")
 	}
@@ -147,7 +147,7 @@ func (p *providerCfg) UserInfo(ctx context.Context, accessToken string, transpor
 		return nil, errors.New(resp.Status)
 	}
 
-	claims := map[string]interface{}{}
+	claims := map[string]any{}
 	if err = json.NewDecoder(resp.Body).Decode(&claims); err != nil {
 		// uncomment this for debugging when needed.
 		// reqBytes, _ := httputil.DumpRequest(req, false)