Merge main branch and restore user's linter config

Author: coolwednesday

.github/workflows/cicd.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout code into go module directory
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
@@ -48,21 +48,21 @@ jobs:
           echo $codeCoverage:
 
   code_quality:
-    name: 🎖Code Quality️
+    name: 🎖 Code Quality
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Set up Go 1.22
         uses: actions/setup-go@v5
         with:
           go-version: 1.22
 
       - name: Install golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v9
         with:
-          version: v1.59.1
+          version: v2.4.0
           args: --timeout=9m --verbose
         env:
           GOFLAGS: "-buildvcs=false" # Fix Go 1.22 VCS warnings

.golangci.yml

@@ -150,4 +150,4 @@ issues:
       linters:
         - gomnd
         - dupl
-        - goconst
+        - goconst

README.md

@@ -8,6 +8,8 @@
 
 
 <div align="center">
+<a href="https://pkg.go.dev/gofr.dev/cli/gofr"><img src="https://img.shields.io/badge/GoDoc-Read%20Documentation-blue?style=for-the-badge" alt="godoc"></a>
+<a href="https://gofr.dev/docs/references/gofrcli"><img src="https://img.shields.io/badge/GoFr-Docs-orange?style=for-the-badge" alt="gofr-docs"></a>
 <a href="https://opensource.org/licenses/Apache-2.0"><img src="https://img.shields.io/badge/License-Apache_2.0-blue?style=for-the-badge" alt="Apache 2.0 License"></a>
 <a href="https://discord.gg/wsaSkQTdgq"><img src="https://img.shields.io/badge/discord-join-us?style=for-the-badge&logo=discord&color=7289DA" alt="discord" /></a>
 </div>
@@ -69,4 +71,4 @@ If your PR is merged, or if you contribute by writing articles or promoting GoFr
 
 ### Partners
 
-<img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jetbrains.png" alt="JetBrains logo" width="200">
+<img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jetbrains.png" alt="JetBrains logo" width="200">

bootstrap/init.go

@@ -24,7 +24,7 @@ import (
 func main() {
 	app := gofr.New()
 
-	app.GET("/hello", func(ctx *gofr.Context) (interface{}, error) {
+	app.GET("/hello", func(ctx *gofr.Context) (any, error) {
 		return "Hello World!", nil
 	})
 
@@ -39,7 +39,7 @@ type modInfo struct {
 	GofrVersion string
 }
 
-func Create(ctx *gofr.Context) (interface{}, error) {
+func Create(ctx *gofr.Context) (any, error) {
 	name := ctx.Param("name")
 	gofrVersion := ctx.Param("gofr")
 

main.go

@@ -14,7 +14,7 @@ func main() {
 	cli.SubCommand("init", bootstrap.Create)
 
 	cli.SubCommand("version",
-		func(*gofr.Context) (interface{}, error) {
+		func(*gofr.Context) (any, error) {
 			return CLIVersion, nil
 		},
 	)

main_test.go

@@ -5,7 +5,6 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-
 	"gofr.dev/pkg/gofr/testutil"
 )
 

migration/migrate.go

@@ -100,7 +100,9 @@ func createMigrationFile(ctx *gofr.Context, migrationName string) error {
 		return err
 	}
 
-	defer func() { _ = file.Close() }()
+	defer func() {
+		_ = file.Close()
+	}()
 
 	err = migrationTemplate.Execute(file, migrationName)
 	if err != nil {
@@ -123,7 +125,9 @@ func createAllMigration(ctx *gofr.Context) error {
 		return err
 	}
 
-	defer func() { _ = f.Close() }()
+	defer func() {
+		_ = f.Close()
+	}()
 
 	d, err := os.ReadDir("./")
 	if err != nil {
@@ -154,7 +158,9 @@ func getAllExistingMigrations(ctx *gofr.Context, existing map[string]string) (ma
 			return nil, err
 		}
 
-		defer func() { _ = file.Close() }()
+		defer func() {
+			_ = file.Close()
+		}()
 
 		scanner := bufio.NewScanner(file)
 		for scanner.Scan() {

wrap/grpc.go

@@ -33,7 +33,7 @@ var (
 
 // googleProtobufType returns the Go package type for a given Google Protobuf type.
 //
-//nolint:gocyclo // This function uses a large switch statement for type mapping, which is expected.
+//nolint:gocyclo,funlen // This function uses a large switch statement for type mapping, which is expected.
 func googleProtobufType(tpe string) (string, bool) {
 	switch tpe {
 	case "google.protobuf.Any":
@@ -146,6 +146,7 @@ func googleProtobufType(tpe string) (string, bool) {
 		return "", false
 	}
 }
+
 // ServiceMethod represents a method in a proto service.
 type ServiceMethod struct {
 	Name            string
@@ -212,8 +213,8 @@ func generateWrapper(ctx *gofr.Context, options ...FileType) (interface{}, error
 	protoPath := ctx.Param("proto")
 	if protoPath == "" {
 		ctx.Error(ErrNoProtoFile)
-	return nil, ErrNoProtoFile
-}
+		return nil, ErrNoProtoFile
+	}
 
 	definition, err := parseProtoFile(ctx, protoPath)
 	if err != nil {
@@ -253,9 +254,11 @@ func parseProtoFile(ctx *gofr.Context, protoPath string) (*proto.Proto, error) {
 		ctx.Errorf("Failed to open proto file: %v", err)
 		return nil, ErrOpeningProtoFile
 	}
-	parser := proto.NewParser(file)
+
 	defer func() { _ = file.Close() }()
 
+	parser := proto.NewParser(file)
+
 	definition, err := parser.Parse()
 	if err != nil {
 		ctx.Errorf("Failed to parse proto file: %v", err)
@@ -400,6 +403,7 @@ func generateGoFrClient(ctx *gofr.Context, data *WrapperData) string {
 // getPackageAndProject extracts the package name and project path from the proto definition.
 func getPackageAndProject(ctx *gofr.Context, definition *proto.Proto, protoPath string) (projectPath, packageName string) {
 	const goPackage = "go_package"
+
 	proto.Walk(definition,
 		proto.WithOption(func(opt *proto.Option) {
 			if opt.Name == goPackage {
@@ -444,6 +448,7 @@ func getImports(ctx *gofr.Context, definition *proto.Proto, protoPath string) []
 			imports = append(imports, googleImport)
 		} else {
 			lastIndex := strings.LastIndex(protoPath, "/")
+
 			newProto, err := parseProtoFile(ctx, protoPath[:lastIndex+1]+imported.Filename)
 			if err != nil {
 				ctx.Errorf("Failed to parse imported proto file %s: %v", imported.Filename, err)
@@ -513,10 +518,12 @@ func getProperType(tpe string) string {
 	} else if strings.Contains(tpe, ".") {
 		lastIndex := strings.LastIndex(tpe, ".")
 		submoduleIndex := strings.LastIndex(tpe[:lastIndex], ".")
+
 		if submoduleIndex != -1 {
 			return fmt.Sprintf("%s.%s", tpe[submoduleIndex+1:lastIndex], tpe[lastIndex+1:])
 		}
 	}
+
 	return tpe
 }