Bump golangci/golangci-lint-action from 6 to 7 (#23)

Bumps golangci/golangci-lint-action from 6 to 7. This moves the repo to
golangci-lint v2.


Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Andrew Kroh <[email protected]>

Author: dependabot[bot]

.github/workflows/lint.yml

@@ -22,12 +22,12 @@ jobs:
           cache: false
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
           version: latest
 
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
           version: latest
           working-directory: ./internal/generator

.golangci.yml

@@ -1,45 +1,52 @@
----
-
+version: "2"
 run:
-  issues-exit-code: 1
   modules-download-mode: readonly
-
+  issues-exit-code: 1
 linters:
-  disable-all: true
+  default: none
   enable:
     - errcheck
-    - gosimple
+    - errorlint
     - govet
     - ineffassign
-    - staticcheck
-    - stylecheck
-    - typecheck
-    - unused
-    - errorlint
-    - gofumpt
-    - goimports
     - misspell
     - prealloc
+    - revive
+    - staticcheck
     - unconvert
     - unused
-    - revive
-  fast: false
-
-linters-settings:
-  goimports:
-    local-prefixes: github.com/andrewkroh/go-ingest-node
-  gofumpt:
-    extra-rules: true
-  stylecheck:
-    checks:
-      - all
-  staticcheck:
-    checks:
-      - '-SA1019' #  strings.Title is deprecated.
-
-issues:
-  include:
-   # If you're going to write a comment, follow the conventions.
-   # https://go.dev/doc/effective_go#commentary.
-   # comment on exported (.+) should be of the form "(.+)..."
-   - EXC0014
+  settings:
+    staticcheck:
+      checks:
+        - all
+  exclusions:
+    generated: lax
+    presets:
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+    rules:
+      - path: internal/generator/internal/spec/types.go
+        linters:
+          - revive
+        text: "should have comment or be unexported"
+formatters:
+  enable:
+    - gofumpt
+    - goimports
+  settings:
+    gofumpt:
+      extra-rules: true
+    goimports:
+      local-prefixes:
+        - github.com/andrewkroh/go-ingest-node
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

internal/generator/internal/codegen/generator.go

@@ -15,6 +15,8 @@
 // specific language governing permissions and limitations
 // under the License.
 
+// Package codegen generates Go code from the elasticsearch-specification.
+// It is used to generate the data model for the Ingest Node pipelines.
 package codegen
 
 import (
@@ -96,10 +98,12 @@ func init() {
 	licenseHeader = sb.String()
 }
 
+// Generator generates Go code from the elasticsearch-specification.
 type Generator struct {
 	allTypes map[spec.TypeName]*spec.TypeDefinition
 }
 
+// New creates a new code generator.
 func New(model *spec.Model) *Generator {
 	b := &Generator{
 		allTypes: map[spec.TypeName]*spec.TypeDefinition{},
@@ -117,6 +121,10 @@ func New(model *spec.Model) *Generator {
 	return b
 }
 
+// BuildCode generates Go code based on the provided typeSelector.
+// The typeSelector function is used to filter the types that will be
+// included in the generated code. The output is written to the provided
+// io.Writer.
 func (b *Generator) BuildCode(w io.Writer, typeSelector func(name, inherits spec.TypeName) bool) error {
 	// Mark the overrides as visited dependencies so that those types and
 	// their dependencies are not included in the generated code.
@@ -327,8 +335,8 @@ func (b *Generator) goStruct(ifc *spec.Interface, f *jen.File) error {
 
 	var err error
 	f.Type().Id(ifc.TypeName.Name).StructFunc(func(g *jen.Group) {
-		if ifc.Inherits.TypeName.Name != "" {
-			g.Id(ifc.Inherits.TypeName.Name)
+		if ifc.Inherits.Name != "" {
+			g.Id(ifc.Inherits.Name)
 		}
 		b.addProperties(g, ifc.Properties)
 	})
@@ -343,7 +351,7 @@ func (b *Generator) depsOfType(t *spec.TypeDefinition, deps map[spec.TypeName]bo
 
 	switch v := t.Value.(type) {
 	case spec.Interface:
-		if v.Inherits.TypeName.Name != "" {
+		if v.Inherits.Name != "" {
 			deps[v.Inherits.TypeName] = true
 			if parent, found := b.allTypes[v.Inherits.TypeName]; found {
 				b.depsOfType(parent, deps)
@@ -361,17 +369,17 @@ func (b *Generator) depsOfType(t *spec.TypeDefinition, deps map[spec.TypeName]bo
 func (b *Generator) depsOfValue(v *spec.ValueOf, deps map[spec.TypeName]bool) {
 	switch {
 	case v.InstanceOf != nil:
-		if _, visited := deps[v.InstanceOf.TypeName]; !visited {
-			deps[v.InstanceOf.TypeName] = true
-			b.depsOfType(b.allTypes[v.InstanceOf.TypeName], deps)
+		if _, visited := deps[v.TypeName]; !visited {
+			deps[v.TypeName] = true
+			b.depsOfType(b.allTypes[v.TypeName], deps)
 		}
 	case v.ArrayOf != nil:
 		b.depsOfValue(v.ArrayOf.Value, deps)
 	case v.DictionaryOf != nil:
-		b.depsOfValue(v.DictionaryOf.Key, deps)
+		b.depsOfValue(v.Key, deps)
 		b.depsOfValue(v.DictionaryOf.Value, deps)
 	case v.UnionOf != nil:
-		for _, item := range v.UnionOf.Items {
+		for _, item := range v.Items {
 			b.depsOfValue(item, deps)
 		}
 	}
@@ -380,10 +388,10 @@ func (b *Generator) depsOfValue(v *spec.ValueOf, deps map[spec.TypeName]bool) {
 func identifier(v *spec.ValueOf) string {
 	switch {
 	case v.InstanceOf != nil:
-		if o := overrides[qualifiedName(v.InstanceOf.Namespace, v.InstanceOf.TypeName.Name)]; o != "" {
+		if o := overrides[qualifiedName(v.Namespace, v.Name)]; o != "" {
 			return o
 		}
-		return v.InstanceOf.TypeName.Name
+		return v.Name
 	case v.ArrayOf != nil:
 		return identifier(v.ArrayOf.Value)
 	case v.UnionOf != nil:
@@ -395,7 +403,7 @@ func identifier(v *spec.ValueOf) string {
 	case v.LiteralValue != nil:
 		return fmt.Sprintf("%s", v.LiteralValue.Value)
 	case v.DictionaryOf != nil:
-		return fmt.Sprintf("map[%s]%s", identifier(v.DictionaryOf.Key), identifier(v.DictionaryOf.Value))
+		return fmt.Sprintf("map[%s]%s", identifier(v.Key), identifier(v.DictionaryOf.Value))
 	}
 	return ""
 }
@@ -421,7 +429,7 @@ func goIDName(name string) string {
 			continue
 		}
 
-		allParts[i] = strings.Title(p)
+		allParts[i] = strings.Title(p) //nolint:staticcheck // strings.Title seems sufficient for capitalizing identifiers.
 	}
 
 	return strings.Join(allParts, "")

internal/generator/internal/spec/types.go

@@ -25,6 +25,7 @@ import (
 	"reflect"
 )
 
+// Model represents the top-level structure of the elasticsearch-specification schema.
 type Model struct {
 	Types []TypeDefinition `json:"types,omitempty"`
 }

internal/generator/main.go

@@ -15,6 +15,9 @@
 // specific language governing permissions and limitations
 // under the License.
 
+// The generator command line tool generates Go code for representing
+// Elasticsearch Ingest Node data types. It generates code based on the
+// elasticsearch-specification.
 package main
 
 import (