Chore: use any rather than interface{} (#74066)

pkg/services/auth/authimpl/auth_token.go

@@ -215,7 +215,7 @@ func (s *UserAuthTokenService) RotateToken(ctx context.Context, cmd auth.RotateC
 		return nil, auth.ErrInvalidSessionToken
 	}
 
-	res, err, _ := s.singleflight.Do(cmd.UnHashedToken, func() (interface{}, error) {
+	res, err, _ := s.singleflight.Do(cmd.UnHashedToken, func() (any, error) {
 		token, err := s.LookupToken(ctx, cmd.UnHashedToken)
 		if err != nil {
 			return nil, err
@@ -312,7 +312,7 @@ func (s *UserAuthTokenService) TryRotateToken(ctx context.Context, token *auth.U
 		newToken *auth.UserToken
 	}
 
-	rotResult, err, _ := s.singleflight.Do(fmt.Sprint(model.Id), func() (interface{}, error) {
+	rotResult, err, _ := s.singleflight.Do(fmt.Sprint(model.Id), func() (any, error) {
 		var needsRotation bool
 		rotatedAt := time.Unix(model.RotatedAt, 0)
 		if model.AuthTokenSeen {
@@ -462,7 +462,7 @@ func (s *UserAuthTokenService) BatchRevokeAllUserTokens(ctx context.Context, use
 		user_id_params := strings.Repeat(",?", len(userIds)-1)
 		sql := "DELETE from user_auth_token WHERE user_id IN (?" + user_id_params + ")"
 
-		params := []interface{}{sql}
+		params := []any{sql}
 		for _, v := range userIds {
 			params = append(params, v)
 		}

pkg/services/auth/jwt/auth.go

@@ -53,7 +53,7 @@ type AuthService struct {
 
 	keySet           keySet
 	log              log.Logger
-	expect           map[string]interface{}
+	expect           map[string]any
 	expectRegistered jwt.Expected
 }
 

pkg/services/auth/jwt/auth_test.go

@@ -262,19 +262,19 @@ func TestClaimValidation(t *testing.T) {
 	scenario(t, "validates non-registered (custom) claims for equality", func(t *testing.T, sc scenarioContext) {
 		var err error
 
-		_, err = sc.authJWTSvc.Verify(sc.ctx, sign(t, key, map[string]interface{}{"my-str": "foo", "my-number": 123}, nil))
+		_, err = sc.authJWTSvc.Verify(sc.ctx, sign(t, key, map[string]any{"my-str": "foo", "my-number": 123}, nil))
 		require.NoError(t, err)
 
-		_, err = sc.authJWTSvc.Verify(sc.ctx, sign(t, key, map[string]interface{}{"my-str": "bar", "my-number": 123}, nil))
+		_, err = sc.authJWTSvc.Verify(sc.ctx, sign(t, key, map[string]any{"my-str": "bar", "my-number": 123}, nil))
 		require.Error(t, err)
 
-		_, err = sc.authJWTSvc.Verify(sc.ctx, sign(t, key, map[string]interface{}{"my-str": "foo", "my-number": 100}, nil))
+		_, err = sc.authJWTSvc.Verify(sc.ctx, sign(t, key, map[string]any{"my-str": "foo", "my-number": 100}, nil))
 		require.Error(t, err)
 
-		_, err = sc.authJWTSvc.Verify(sc.ctx, sign(t, key, map[string]interface{}{"my-str": "foo"}, nil))
+		_, err = sc.authJWTSvc.Verify(sc.ctx, sign(t, key, map[string]any{"my-str": "foo"}, nil))
 		require.Error(t, err)
 
-		_, err = sc.authJWTSvc.Verify(sc.ctx, sign(t, key, map[string]interface{}{"my-number": 123}, nil))
+		_, err = sc.authJWTSvc.Verify(sc.ctx, sign(t, key, map[string]any{"my-number": 123}, nil))
 		require.Error(t, err)
 	}, configurePKIXPublicKeyFile, func(t *testing.T, cfg *setting.Cfg) {
 		cfg.JWTAuthExpectClaims = `{"my-str": "foo", "my-number": 123}`

pkg/services/auth/jwt/jwt.go

@@ -4,7 +4,7 @@ import (
 	"context"
 )
 
-type JWTClaims map[string]interface{}
+type JWTClaims map[string]any
 
 type JWTService interface {
 	Verify(ctx context.Context, strToken string) (JWTClaims, error)

pkg/services/auth/jwt/key_sets.go

@@ -97,7 +97,7 @@ func (s *AuthService) initKeySet() error {
 			return ErrFailedToParsePemFile
 		}
 
-		var key interface{}
+		var key any
 		switch block.Type {
 		case "PUBLIC KEY":
 			if key, err = x509.ParsePKIXPublicKey(block.Bytes); err != nil {

pkg/services/auth/jwt/signing_test.go

@@ -10,7 +10,7 @@ import (
 
 type noneSigner struct{}
 
-func sign(t *testing.T, key interface{}, claims interface{}, opts *jose.SignerOptions) string {
+func sign(t *testing.T, key any, claims any, opts *jose.SignerOptions) string {
 	t.Helper()
 
 	if opts == nil {
@@ -35,7 +35,7 @@ func (s noneSigner) SignPayload(payload []byte, alg jose.SignatureAlgorithm) ([]
 	return nil, nil
 }
 
-func signNone(t *testing.T, claims interface{}) string {
+func signNone(t *testing.T, claims any) string {
 	t.Helper()
 
 	sig, err := jose.NewSigner(jose.SigningKey{Algorithm: "none", Key: noneSigner{}}, (&jose.SignerOptions{}).WithType("JWT"))

pkg/services/auth/jwt/validation.go

@@ -32,7 +32,7 @@ func (s *AuthService) initClaimExpectations() error {
 			delete(s.expect, key)
 		case "aud":
 			switch value := value.(type) {
-			case []interface{}:
+			case []any:
 				for _, val := range value {
 					if v, ok := val.(string); ok {
 						s.expectRegistered.Audience = append(s.expectRegistered.Audience, v)
@@ -70,7 +70,7 @@ func (s *AuthService) validateClaims(claims JWTClaims) error {
 			}
 		case "aud":
 			switch value := value.(type) {
-			case []interface{}:
+			case []any:
 				for _, val := range value {
 					if v, ok := val.(string); ok {
 						registeredClaims.Audience = append(registeredClaims.Audience, v)