Upgrade lint

Author: technicallyjosh

.github/workflows/lint.yaml

@@ -40,4 +40,4 @@ jobs:
           check-latest: true
       - uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.54.2
+          version: v2.2.1

.golangci.yaml

@@ -1,5 +1,47 @@
-issues:
-  exclude-rules:
-    - linters:
-        - staticcheck
-      text: 'SA1019:'
+# yaml-language-server: $schema=https://golangci-lint.run/jsonschema/golangci.jsonschema.json
+
+version: "2"
+run:
+  concurrency: 2
+  build-tags:
+    - integration_tests
+  tests: true
+  allow-parallel-runners: true
+output:
+  formats:
+    text:
+      path: stdout
+linters:
+  enable:
+    - errname
+    - nlreturn
+    - revive
+  settings:
+    revive:
+      rules:
+        - name: exported
+          disabled: true
+  exclusions:
+    generated: strict
+    rules:
+      - linters:
+          - staticcheck
+        text: "SA1019:"
+      - linters:
+          - staticcheck
+        text: "QF1008:"
+    paths:
+      - vendor
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofumpt
+  exclusions:
+    generated: lax
+    paths:
+      - vendor
+      - third_party$
+      - builtin$
+      - examples$

internal/generator/description.go

@@ -8,10 +8,8 @@ import (
 	"google.golang.org/protobuf/compiler/protogen"
 )
 
-var (
-	// exampleRegexp is for breaking apart a comment with an example.
-	exampleRegexp = regexp.MustCompile(`(?is)(.*)Example:(.*)`)
-)
+// exampleRegexp is for breaking apart a comment with an example.
+var exampleRegexp = regexp.MustCompile(`(?is)(.*)Example:(.*)`)
 
 // parsedComments holds the data parsed and extracted from a comment.
 type parsedComments struct {

internal/generator/generator.go

@@ -100,6 +100,7 @@ func (g *Generator) Run() error {
 	}
 
 	_, err = outFile.Write(patchedBytes)
+
 	return err
 }
 
@@ -144,6 +145,7 @@ func (g *Generator) patchRemovedSecurity(fileBytes []byte) ([]byte, error) {
 					for key := range obj {
 						if key == "___remove" {
 							m.Set(securityPath, make([]string, 0))
+
 							break outer
 						}
 					}
@@ -161,6 +163,7 @@ func (g *Generator) patchRemovedSecurity(fileBytes []byte) ([]byte, error) {
 	encoder.SetIndent(2)
 
 	err = encoder.Encode(m)
+
 	return buffer.Bytes(), err
 }
 
@@ -223,6 +226,7 @@ func (g *Generator) patchEmptySchemas(fileBytes []byte) ([]byte, error) {
 	encoder.SetIndent(2)
 
 	err = encoder.Encode(m)
+
 	return buffer.Bytes(), err
 }
 

internal/generator/message.go

@@ -1,16 +1,15 @@
 package generator
 
 import (
-	"github.com/technicallyjosh/protoc-gen-openapi/internal/generator/util"
 	"google.golang.org/protobuf/compiler/protogen"
-)
 
-var (
-	// allMessages holds all messages with their full paths for reference whenever we need to look
-	// for a message to build out.
-	allMessages = make(messageMap)
+	"github.com/technicallyjosh/protoc-gen-openapi/internal/generator/util"
 )
 
+// allMessages holds all messages with their full paths for reference whenever we need to look
+// for a message to build out.
+var allMessages = make(messageMap)
+
 type messageMap map[string]*protogen.Message
 
 // Set adds the specified message to the map.

internal/generator/path.go

@@ -8,9 +8,10 @@ import (
 	"strings"
 
 	"github.com/getkin/kin-openapi/openapi3"
-	oapiv1 "github.com/technicallyjosh/protoc-gen-openapi/api/oapi/v1"
 	"google.golang.org/protobuf/compiler/protogen"
 	"google.golang.org/protobuf/proto"
+
+	oapiv1 "github.com/technicallyjosh/protoc-gen-openapi/api/oapi/v1"
 )
 
 func NewServer(host string) (*openapi3.Server, error) {
@@ -121,6 +122,7 @@ func (g *Generator) addPathsToDoc(doc *openapi3.T, services []*protogen.Service)
 				// e.g. security: {}
 				if s.Name == "" {
 					security = make([]*oapiv1.Security, 0)
+
 					break
 				}
 
@@ -356,6 +358,7 @@ func (g *Generator) addOperation(p addOperationParams) error {
 						Name: "___remove",
 					},
 				}
+
 				break
 			}
 

internal/generator/schema.go

@@ -193,6 +193,7 @@ func addSchema(doc *openapi3.T, key string, value *openapi3.SchemaRef) {
 // schemaExists returns whether a schema exists or not on the doc.
 func schemaExists(doc *openapi3.T, name string) bool {
 	_, ok := doc.Components.Schemas[name]
+
 	return ok
 }
 
@@ -225,6 +226,7 @@ func newFieldSchema(field protoreflect.FieldDescriptor) *openapi3.Schema {
 
 	if field.IsList() {
 		schema.Type = openapi3.TypeArray
+
 		return newArraySchema(kind)
 	}
 

main_test.go

@@ -147,5 +147,6 @@ func TestSuites(t *testing.T) {
 
 func readFile(name string) string {
 	data, _ := os.ReadFile("test/" + name)
+
 	return string(data)
 }