feat: add golangci-lint into lint target

* replace empty interface with any
* run fmt via golangci-lint

related to #1432

Signed-off-by: ferhat elmas <elmas.ferhat@gmail.com>

Author: ferhatelmas

.gitignore

@@ -28,7 +28,7 @@ vendor/
 /answer-data/
 /answer
 /new_answer
-
+build/tools/
 dist/
 
 # Lint setup generated file

.golangci.yaml

@@ -0,0 +1,30 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+version: "2"
+linters:
+  default: none
+
+formatters:
+  enable:
+    - gofmt
+  settings:
+    gofmt:
+      simplify: true
+      rewrite-rules:
+        - pattern: 'interface{}'
+          replacement: 'any'

Makefile

@@ -10,6 +10,15 @@ Revision=$(shell git rev-parse --short HEAD 2>/dev/null || echo "")
 GO_FLAGS=-ldflags="-X github.com/apache/answer/cmd.Version=$(VERSION) -X 'github.com/apache/answer/cmd.Revision=$(Revision)' -X 'github.com/apache/answer/cmd.Time=`date +%s`' -extldflags -static"
 GO=$(GO_ENV) "$(shell which go)"
 
+GOLANGCI_VERSION ?= v2.6.2
+TOOLS_BIN := $(shell mkdir -p build/tools && realpath build/tools)
+
+GOLANGCI = $(TOOLS_BIN)/golangci-lint-$(GOLANGCI_VERSION)
+$(GOLANGCI):
+	rm -f $(TOOLS_BIN)/golangci-lint*
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/$(GOLANGCI_VERSION)/install.sh | sh -s -- -b $(TOOLS_BIN) $(GOLANGCI_VERSION)
+	mv $(TOOLS_BIN)/golangci-lint $(TOOLS_BIN)/golangci-lint-$(GOLANGCI_VERSION)
+
 build: generate
 	@$(GO) build $(GO_FLAGS) -o $(BIN) $(DIR_SRC)
 
@@ -50,8 +59,12 @@ install-ui-packages:
 ui:
 	@cd ui && pnpm pre-install && pnpm build && cd -
 
-lint: generate
+lint: generate $(GOLANGCI)
+	@bash ./script/check-asf-header.sh
+	$(GOLANGCI) run
+
+lint-fix: generate $(GOLANGCI)
 	@bash ./script/check-asf-header.sh
-	@gofmt -w -l .
+	$(GOLANGCI) run --fix
 
 all: clean build

docs/docs.go

@@ -8080,9 +8080,6 @@ const docTemplate = `{
                 "id": {
                     "type": "string"
                 },
-                "question_id": {
-                    "type": "string"
-                },
                 "title": {
                     "type": "string"
                 }
@@ -10920,7 +10917,7 @@ const docTemplate = `{
                 },
                 "theme_config": {
                     "type": "object",
-                    "additionalProperties": true
+                    "additionalProperties": {}
                 }
             }
         },
@@ -10935,7 +10932,7 @@ const docTemplate = `{
                 },
                 "theme_config": {
                     "type": "object",
-                    "additionalProperties": true
+                    "additionalProperties": {}
                 },
                 "theme_options": {
                     "type": "array",

docs/swagger.json

@@ -8053,9 +8053,6 @@
                 "id": {
                     "type": "string"
                 },
-                "question_id": {
-                    "type": "string"
-                },
                 "title": {
                     "type": "string"
                 }
@@ -10893,7 +10890,7 @@
                 },
                 "theme_config": {
                     "type": "object",
-                    "additionalProperties": true
+                    "additionalProperties": {}
                 }
             }
         },
@@ -10908,7 +10905,7 @@
                 },
                 "theme_config": {
                     "type": "object",
-                    "additionalProperties": true
+                    "additionalProperties": {}
                 },
                 "theme_options": {
                     "type": "array",

docs/swagger.yaml

@@ -399,8 +399,6 @@ definitions:
         type: string
       id:
         type: string
-      question_id:
-        type: string
       title:
         type: string
     required:
@@ -2364,7 +2362,7 @@ definitions:
         maxLength: 255
         type: string
       theme_config:
-        additionalProperties: true
+        additionalProperties: {}
         type: object
     required:
     - theme
@@ -2376,7 +2374,7 @@ definitions:
       theme:
         type: string
       theme_config:
-        additionalProperties: true
+        additionalProperties: {}
         type: object
       theme_options:
         items:

internal/base/handler/handler.go

@@ -31,7 +31,7 @@ import (
 )
 
 // HandleResponse Handle response body
-func HandleResponse(ctx *gin.Context, err error, data interface{}) {
+func HandleResponse(ctx *gin.Context, err error, data any) {
 	lang := GetLang(ctx)
 	// no error
 	if err == nil {
@@ -61,7 +61,7 @@ func HandleResponse(ctx *gin.Context, err error, data interface{}) {
 }
 
 // BindAndCheck bind request and check
-func BindAndCheck(ctx *gin.Context, data interface{}) bool {
+func BindAndCheck(ctx *gin.Context, data any) bool {
 	lang := GetLang(ctx)
 	ctx.Set(constant.AcceptLanguageFlag, lang)
 	if err := ctx.ShouldBind(data); err != nil {
@@ -79,7 +79,7 @@ func BindAndCheck(ctx *gin.Context, data interface{}) bool {
 }
 
 // BindAndCheckReturnErr bind request and check
-func BindAndCheckReturnErr(ctx *gin.Context, data interface{}) (errFields []*validator.FormErrorField) {
+func BindAndCheckReturnErr(ctx *gin.Context, data any) (errFields []*validator.FormErrorField) {
 	lang := GetLang(ctx)
 	if err := ctx.ShouldBind(data); err != nil {
 		log.Errorf("http_handle BindAndCheck fail, %s", err.Error())

internal/base/handler/response.go

@@ -34,7 +34,7 @@ type RespBody struct {
 	// response message
 	Message string `json:"msg"`
 	// response data
-	Data interface{} `json:"data"`
+	Data any `json:"data"`
 }
 
 // TrMsg translate the reason cause as a message
@@ -63,7 +63,7 @@ func NewRespBodyFromError(e *errors.Error) *RespBody {
 }
 
 // NewRespBodyData new response body with data
-func NewRespBodyData(code int, reason string, data interface{}) *RespBody {
+func NewRespBodyData(code int, reason string, data any) *RespBody {
 	return &RespBody{
 		Code:   code,
 		Reason: reason,

internal/base/pager/pager.go

@@ -27,7 +27,7 @@ import (
 )
 
 // Help xorm page helper
-func Help(page, pageSize int, rowsSlicePtr interface{}, rowElement interface{}, session *xorm.Session) (total int64, err error) {
+func Help(page, pageSize int, rowsSlicePtr any, rowElement any, session *xorm.Session) (total int64, err error) {
 	page, pageSize = ValPageAndPageSize(page, pageSize)
 
 	sliceValue := reflect.Indirect(reflect.ValueOf(rowsSlicePtr))

internal/base/pager/pagination.go

@@ -25,8 +25,8 @@ import (
 
 // PageModel page model
 type PageModel struct {
-	Count int64       `json:"count"`
-	List  interface{} `json:"list"`
+	Count int64 `json:"count"`
+	List  any   `json:"list"`
 }
 
 // PageCond page condition
@@ -36,7 +36,7 @@ type PageCond struct {
 }
 
 // NewPageModel new page model
-func NewPageModel(totalRecords int64, records interface{}) *PageModel {
+func NewPageModel(totalRecords int64, records any) *PageModel {
 	sliceValue := reflect.Indirect(reflect.ValueOf(records))
 	if sliceValue.Kind() != reflect.Slice {
 		panic("not a slice")