refactor: use 'any' instead of 'interface{}' for consistency (#3090)

Author: alexandear

.golangci.yml

@@ -11,6 +11,7 @@ linters-settings:
     enable-all-rules: false
     rules:
       - name: empty-lines
+      - name: use-any
   testifylint:
     disable-all: true
     enable:
@@ -52,3 +53,10 @@ issues:
       linters:
         - dupl
         - errcheck
+    # Disable revive.use-any for backwards compatibility
+    - path: graphql/map.go
+      text: "use-any: since GO 1.18 'interface{}' can be replaced by 'any'"
+    - path: codegen/testserver/followschema/resolver.go
+      text: "use-any: since GO 1.18 'interface{}' can be replaced by 'any'"
+    - path: codegen/testserver/singlefile/resolver.go
+      text: "use-any: since GO 1.18 'interface{}' can be replaced by 'any'"

_examples/chat/chat_test.go

@@ -44,7 +44,7 @@ func TestChatSubscriptions(t *testing.T) {
 			require.Equal(t, "system", msg.resp.MessageAdded.CreatedBy)
 
 			go func() {
-				var resp interface{}
+				var resp any
 				err := c.Post(fmt.Sprintf(`mutation {
 					a:post(text:"Hello!", roomName:"#gophers%d", username:"vektah") { id }
 					b:post(text:"Hello Vektah!", roomName:"#gophers%d", username:"andrey") { id }

_examples/chat/resolvers.go

@@ -35,7 +35,7 @@ func New() Config {
 			Rooms: sync.Map{},
 		},
 		Directives: DirectiveRoot{
-			User: func(ctx context.Context, obj interface{}, next graphql.Resolver, username string) (res interface{}, err error) {
+			User: func(ctx context.Context, obj any, next graphql.Resolver, username string) (res any, err error) {
 				return next(context.WithValue(ctx, ckey("username"), username))
 			},
 		},
@@ -73,7 +73,7 @@ func (r *mutationResolver) Post(ctx context.Context, text string, username strin
 	}
 
 	room.Messages = append(room.Messages, *message)
-	room.Observers.Range(func(_, v interface{}) bool {
+	room.Observers.Range(func(_, v any) bool {
 		observer := v.(*Observer)
 		if observer.Username == "" || observer.Username == message.CreatedBy {
 			observer.Message <- message

_examples/dataloader/dataloader_test.go

@@ -14,7 +14,7 @@ func TestTodo(t *testing.T) {
 	c := client.New(LoaderMiddleware(handler.NewDefaultServer(NewExecutableSchema(Config{Resolvers: &Resolver{}}))))
 
 	t.Run("create a new todo", func(t *testing.T) {
-		var resp interface{}
+		var resp any
 		c.MustPost(`{
 		  customers {
 			name
@@ -73,7 +73,7 @@ func TestTodo(t *testing.T) {
 
 	t.Run("introspection", func(t *testing.T) {
 		// Make sure we can run the graphiql introspection query without errors
-		var resp interface{}
+		var resp any
 		c.MustPost(introspection.Query, &resp)
 	})
 

_examples/fileupload/fileupload_test.go

@@ -99,7 +99,7 @@ func TestFileUpload(t *testing.T) {
 			SingleUploadWithPayload *model.File
 		}
 
-		err := gql.Post(mutation, &result, gqlclient.Var("req", map[string]interface{}{"id": 1, "file": aTxtFile}), gqlclient.WithFiles())
+		err := gql.Post(mutation, &result, gqlclient.Var("req", map[string]any{"id": 1, "file": aTxtFile}), gqlclient.WithFiles())
 		require.NoError(t, err)
 		require.Equal(t, 1, result.SingleUploadWithPayload.ID)
 		require.Contains(t, result.SingleUploadWithPayload.Name, "a.txt")
@@ -192,7 +192,7 @@ func TestFileUpload(t *testing.T) {
 			MultipleUploadWithPayload []*model.File
 		}
 
-		err := gql.Post(mutation, &result, gqlclient.Var("req", []map[string]interface{}{
+		err := gql.Post(mutation, &result, gqlclient.Var("req", []map[string]any{
 			{"id": 1, "file": a1TxtFile},
 			{"id": 2, "file": b1TxtFile},
 		}), gqlclient.WithFiles())
@@ -267,7 +267,7 @@ func TestFileUpload(t *testing.T) {
 				MultipleUploadWithPayload []*model.File
 			}
 
-			err := gql.Post(mutation, &result, gqlclient.Var("req", []map[string]interface{}{
+			err := gql.Post(mutation, &result, gqlclient.Var("req", []map[string]any{
 				{"id": 1, "file": a1TxtFile},
 				{"id": 2, "file": a1TxtFile},
 			}), gqlclient.WithFiles())

_examples/scalars/model/model.go

@@ -22,7 +22,7 @@ func (b Banned) MarshalGQL(w io.Writer) {
 	}
 }
 
-func (b *Banned) UnmarshalGQL(v interface{}) error {
+func (b *Banned) UnmarshalGQL(v any) error {
 	switch v := v.(type) {
 	case string:
 		*b = strings.ToLower(v) == "true"
@@ -53,7 +53,7 @@ type Point struct {
 	Y int
 }
 
-func (p *Point) UnmarshalGQL(v interface{}) error {
+func (p *Point) UnmarshalGQL(v any) error {
 	pointStr, ok := v.(string)
 	if !ok {
 		return fmt.Errorf("points must be strings")
@@ -90,7 +90,7 @@ func MarshalTimestamp(t time.Time) graphql.Marshaler {
 
 // Unmarshal{Typename} is only required if the scalar appears as an input. The raw values have already been decoded
 // from json into int/float64/bool/nil/map[string]interface/[]interface
-func UnmarshalTimestamp(v interface{}) (time.Time, error) {
+func UnmarshalTimestamp(v any) (time.Time, error) {
 	if tmpStr, ok := v.(int64); ok {
 		return time.Unix(tmpStr, 0), nil
 	}
@@ -105,7 +105,7 @@ func MarshalID(id external.ObjectID) graphql.Marshaler {
 }
 
 // And the same for the unmarshaler
-func UnmarshalID(v interface{}) (external.ObjectID, error) {
+func UnmarshalID(v any) (external.ObjectID, error) {
 	str, ok := v.(string)
 	if !ok {
 		return 0, fmt.Errorf("ids must be strings")
@@ -163,7 +163,7 @@ func (e Tier) String() string {
 	}
 }
 
-func (e *Tier) UnmarshalGQL(v interface{}) error {
+func (e *Tier) UnmarshalGQL(v any) error {
 	str, ok := v.(string)
 	if !ok {
 		return fmt.Errorf("enums must be strings")
@@ -186,7 +186,7 @@ func MarshalPreferences(p *Prefs) graphql.Marshaler {
 	return graphql.MarshalBoolean(p.DarkMode)
 }
 
-func UnmarshalPreferences(v interface{}) (*Prefs, error) {
+func UnmarshalPreferences(v any) (*Prefs, error) {
 	tmp, err := graphql.UnmarshalBoolean(v)
 	if err != nil {
 		return nil, err

_examples/scalars/scalar_test.go

@@ -73,7 +73,7 @@ func TestScalars(t *testing.T) {
 
 	t.Run("introspection", func(t *testing.T) {
 		// Make sure we can run the graphiql introspection query without errors
-		var resp interface{}
+		var resp any
 		c.MustPost(introspection.Query, &resp)
 	})
 }

_examples/starwars/server/server.go

@@ -15,7 +15,7 @@ import (
 
 func main() {
 	srv := handler.NewDefaultServer(generated.NewExecutableSchema(starwars.NewResolver()))
-	srv.AroundFields(func(ctx context.Context, next graphql.Resolver) (res interface{}, err error) {
+	srv.AroundFields(func(ctx context.Context, next graphql.Resolver) (res any, err error) {
 		rc := graphql.GetFieldContext(ctx)
 		fmt.Println("Entered", rc.Object, rc.Field.Name)
 		res, err = next(ctx)

_examples/starwars/starwars_test.go

@@ -220,7 +220,7 @@ func TestStarwars(t *testing.T) {
 
 	t.Run("introspection", func(t *testing.T) {
 		// Make sure we can run the graphiql introspection query without errors
-		var resp interface{}
+		var resp any
 		c.MustPost(introspection.Query, &resp)
 	})
 

_examples/todo/server/server.go

@@ -14,7 +14,7 @@ import (
 
 func main() {
 	srv := handler.NewDefaultServer(todo.NewExecutableSchema(todo.New()))
-	srv.SetRecoverFunc(func(ctx context.Context, err interface{}) (userMessage error) {
+	srv.SetRecoverFunc(func(ctx context.Context, err any) (userMessage error) {
 		// send this panic somewhere
 		log.Print(err)
 		debug.PrintStack()