Merge pull request #159 from Karthik-K-N/small-changes

k8s-ci-robot · web-flow · commit 4699749b53e6 · 2025-10-29T03:02:03.000-07:00
Minor changes to function definition for consitency
diff --git a/pkg/analysis/arrayofstruct/analyzer.go b/pkg/analysis/arrayofstruct/analyzer.go
@@ -45,7 +45,7 @@ func run(pass *analysis.Pass) (any, error) {
 		return nil, kalerrors.ErrCouldNotGetInspector
 	}
 
-	inspect.InspectFields(func(field *ast.Field, stack []ast.Node, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markershelper.Markers) {
+	inspect.InspectFields(func(field *ast.Field, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markershelper.Markers) {
 		checkField(pass, field, markersAccess)
 	})
 
diff --git a/pkg/analysis/commentstart/analyzer.go b/pkg/analysis/commentstart/analyzer.go
@@ -47,7 +47,7 @@ func run(pass *analysis.Pass) (any, error) {
 		return nil, kalerrors.ErrCouldNotGetInspector
 	}
 
-	inspect.InspectFields(func(field *ast.Field, stack []ast.Node, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markers.Markers) {
+	inspect.InspectFields(func(field *ast.Field, jsonTagInfo extractjsontags.FieldTagInfo, _ markers.Markers) {
 		checkField(pass, field, jsonTagInfo)
 	})
 
diff --git a/pkg/analysis/conflictingmarkers/analyzer.go b/pkg/analysis/conflictingmarkers/analyzer.go
@@ -67,7 +67,7 @@ func (a *analyzer) run(pass *analysis.Pass) (any, error) {
 		return nil, kalerrors.ErrCouldNotGetInspector
 	}
 
-	inspect.InspectFields(func(field *ast.Field, _ []ast.Node, _ extractjsontags.FieldTagInfo, markersAccess markers.Markers) {
+	inspect.InspectFields(func(field *ast.Field, _ extractjsontags.FieldTagInfo, markersAccess markers.Markers) {
 		checkField(pass, field, markersAccess, a.conflictSets)
 	})
 
@@ -119,7 +119,7 @@ func reportConflict(pass *analysis.Pass, field *ast.Field, conflictSet ConflictS
 		setDescriptions = append(setDescriptions, fmt.Sprintf("%v", markersList))
 	}
 
-	fieldName := field.Names[0].Name
+	fieldName := utils.FieldName(field)
 	structName := utils.GetStructNameForField(pass, field)
 
 	if structName != "" {
diff --git a/pkg/analysis/duplicatemarkers/analyzer.go b/pkg/analysis/duplicatemarkers/analyzer.go
@@ -48,7 +48,7 @@ func run(pass *analysis.Pass) (any, error) {
 		return nil, kalerrors.ErrCouldNotGetInspector
 	}
 
-	inspect.InspectFields(func(field *ast.Field, _ []ast.Node, _ extractjsontags.FieldTagInfo, markersAccess markers.Markers) {
+	inspect.InspectFields(func(field *ast.Field, _ extractjsontags.FieldTagInfo, markersAccess markers.Markers) {
 		checkField(pass, field, markersAccess)
 	})
 
diff --git a/pkg/analysis/forbiddenmarkers/analyzer.go b/pkg/analysis/forbiddenmarkers/analyzer.go
@@ -61,7 +61,7 @@ func (a *analyzer) run(pass *analysis.Pass) (any, error) {
 		return nil, kalerrors.ErrCouldNotGetInspector
 	}
 
-	inspect.InspectFields(func(field *ast.Field, stack []ast.Node, _ extractjsontags.FieldTagInfo, markersAccess markers.Markers) {
+	inspect.InspectFields(func(field *ast.Field, _ extractjsontags.FieldTagInfo, markersAccess markers.Markers) {
 		checkField(pass, field, markersAccess, a.forbiddenMarkers)
 	})
 
diff --git a/pkg/analysis/helpers/inspector/analyzer_test.go b/pkg/analysis/helpers/inspector/analyzer_test.go
@@ -49,7 +49,7 @@ func run(pass *analysis.Pass) (any, error) {
 		return nil, errCouldNotGetInspector
 	}
 
-	inspect.InspectFields(func(field *ast.Field, stack []ast.Node, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markers.Markers) {
+	inspect.InspectFields(func(field *ast.Field, jsonTagInfo extractjsontags.FieldTagInfo, _ markers.Markers) {
 		pass.Reportf(field.Pos(), "field: %v", utils.FieldName(field))
 
 		if jsonTagInfo.Name != "" {
diff --git a/pkg/analysis/helpers/inspector/inspector.go b/pkg/analysis/helpers/inspector/inspector.go
@@ -30,7 +30,7 @@ import (
 // Inspector is an interface that allows for the inspection of fields in structs.
 type Inspector interface {
 	// InspectFields is a function that iterates over fields in structs.
-	InspectFields(func(field *ast.Field, stack []ast.Node, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markers.Markers))
+	InspectFields(func(field *ast.Field, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markers.Markers))
 
 	// InspectTypeSpec is a function that inspects the type spec and calls the provided inspectTypeSpec function.
 	InspectTypeSpec(func(typeSpec *ast.TypeSpec, markersAccess markers.Markers))
@@ -55,7 +55,7 @@ func newInspector(astinspector *astinspector.Inspector, jsonTags extractjsontags
 // InspectFields iterates over fields in structs, ignoring any struct that is not a type declaration, and any field that is ignored and
 // therefore would not be included in the CRD spec.
 // For the remaining fields, it calls the provided inspectField function to apply analysis logic.
-func (i *inspector) InspectFields(inspectField func(field *ast.Field, stack []ast.Node, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markers.Markers)) {
+func (i *inspector) InspectFields(inspectField func(field *ast.Field, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markers.Markers)) {
 	// Filter to fields so that we can iterate over fields in a struct.
 	nodeFilter := []ast.Node{
 		(*ast.Field)(nil),
@@ -75,7 +75,7 @@ func (i *inspector) InspectFields(inspectField func(field *ast.Field, stack []as
 			return false
 		}
 
-		i.processFieldWithRecovery(field, stack, inspectField)
+		i.processFieldWithRecovery(field, inspectField)
 
 		return true
 	})
@@ -117,7 +117,7 @@ func (i *inspector) shouldSkipField(field *ast.Field) bool {
 }
 
 // processFieldWithRecovery processes a field with panic recovery.
-func (i *inspector) processFieldWithRecovery(field *ast.Field, stack []ast.Node, inspectField func(field *ast.Field, stack []ast.Node, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markers.Markers)) {
+func (i *inspector) processFieldWithRecovery(field *ast.Field, inspectField func(field *ast.Field, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markers.Markers)) {
 	tagInfo := i.jsonTags.FieldTags(field)
 
 	defer func() {
@@ -128,7 +128,7 @@ func (i *inspector) processFieldWithRecovery(field *ast.Field, stack []ast.Node,
 		}
 	}()
 
-	inspectField(field, stack, tagInfo, i.markers)
+	inspectField(field, tagInfo, i.markers)
 }
 
 // InspectTypeSpec inspects the type spec and calls the provided inspectTypeSpec function.
diff --git a/pkg/analysis/jsontags/analyzer.go b/pkg/analysis/jsontags/analyzer.go
@@ -71,7 +71,7 @@ func (a *analyzer) run(pass *analysis.Pass) (any, error) {
 		return nil, kalerrors.ErrCouldNotGetInspector
 	}
 
-	inspect.InspectFields(func(field *ast.Field, stack []ast.Node, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markers.Markers) {
+	inspect.InspectFields(func(field *ast.Field, jsonTagInfo extractjsontags.FieldTagInfo, _ markers.Markers) {
 		a.checkField(pass, field, jsonTagInfo)
 	})
 
diff --git a/pkg/analysis/maxlength/analyzer.go b/pkg/analysis/maxlength/analyzer.go
@@ -47,7 +47,7 @@ func run(pass *analysis.Pass) (any, error) {
 		return nil, kalerrors.ErrCouldNotGetInspector
 	}
 
-	inspect.InspectFields(func(field *ast.Field, stack []ast.Node, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markershelper.Markers) {
+	inspect.InspectFields(func(field *ast.Field, _ extractjsontags.FieldTagInfo, markersAccess markershelper.Markers) {
 		checkField(pass, field, markersAccess)
 	})
 
diff --git a/pkg/analysis/namingconventions/analyzer.go b/pkg/analysis/namingconventions/analyzer.go
@@ -59,7 +59,7 @@ func (a *analyzer) run(pass *analysis.Pass) (any, error) {
 		return nil, kalerrors.ErrCouldNotGetInspector
 	}
 
-	inspect.InspectFields(func(field *ast.Field, stack []ast.Node, jsonTags extractjsontags.FieldTagInfo, markersAccess markers.Markers) {
+	inspect.InspectFields(func(field *ast.Field, jsonTags extractjsontags.FieldTagInfo, _ markers.Markers) {
 		checkField(pass, field, jsonTags, a.conventions...)
 	})
 
diff --git a/pkg/analysis/nodurations/analyzer.go b/pkg/analysis/nodurations/analyzer.go
@@ -45,7 +45,7 @@ func run(pass *analysis.Pass) (any, error) {
 		return nil, kalerrors.ErrCouldNotGetInspector
 	}
 
-	inspect.InspectFields(func(field *ast.Field, _ []ast.Node, _ extractjsontags.FieldTagInfo, markersAccess markers.Markers) {
+	inspect.InspectFields(func(field *ast.Field, _ extractjsontags.FieldTagInfo, markersAccess markers.Markers) {
 		checkField(pass, field)
 	})
 
diff --git a/pkg/analysis/nomaps/analyzer.go b/pkg/analysis/nomaps/analyzer.go
@@ -63,7 +63,7 @@ func (a *analyzer) run(pass *analysis.Pass) (any, error) {
 		return nil, kalerrors.ErrCouldNotGetInspector
 	}
 
-	inspect.InspectFields(func(field *ast.Field, stack []ast.Node, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markers.Markers) {
+	inspect.InspectFields(func(field *ast.Field, _ extractjsontags.FieldTagInfo, _ markers.Markers) {
 		a.checkField(pass, field)
 	})
 
diff --git a/pkg/analysis/optionalfields/analyzer.go b/pkg/analysis/optionalfields/analyzer.go
@@ -93,7 +93,7 @@ func (a *analyzer) run(pass *analysis.Pass) (any, error) {
 		return nil, kalerrors.ErrCouldNotGetInspector
 	}
 
-	inspect.InspectFields(func(field *ast.Field, stack []ast.Node, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markershelper.Markers) {
+	inspect.InspectFields(func(field *ast.Field, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markershelper.Markers) {
 		a.checkField(pass, field, markersAccess, jsonTagInfo)
 	})
 
diff --git a/pkg/analysis/optionalorrequired/analyzer.go b/pkg/analysis/optionalorrequired/analyzer.go
@@ -93,7 +93,7 @@ func (a *analyzer) run(pass *analysis.Pass) (any, error) {
 		return nil, kalerrors.ErrCouldNotGetInspector
 	}
 
-	inspect.InspectFields(func(field *ast.Field, stack []ast.Node, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markershelper.Markers) {
+	inspect.InspectFields(func(field *ast.Field, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markershelper.Markers) {
 		a.checkField(pass, field, markersAccess.FieldMarkers(field), jsonTagInfo)
 	})
 
diff --git a/pkg/analysis/requiredfields/analyzer.go b/pkg/analysis/requiredfields/analyzer.go
@@ -92,7 +92,7 @@ func (a *analyzer) run(pass *analysis.Pass) (any, error) {
 		return nil, kalerrors.ErrCouldNotGetInspector
 	}
 
-	inspect.InspectFields(func(field *ast.Field, stack []ast.Node, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markershelper.Markers) {
+	inspect.InspectFields(func(field *ast.Field, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markershelper.Markers) {
 		a.checkField(pass, field, markersAccess, jsonTagInfo)
 	})
 
diff --git a/pkg/analysis/ssatags/analyzer.go b/pkg/analysis/ssatags/analyzer.go
@@ -66,7 +66,7 @@ func (a *analyzer) run(pass *analysis.Pass) (any, error) {
 		return nil, kalerrors.ErrCouldNotGetInspector
 	}
 
-	inspect.InspectFields(func(field *ast.Field, stack []ast.Node, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markers.Markers) {
+	inspect.InspectFields(func(field *ast.Field, _ extractjsontags.FieldTagInfo, markersAccess markers.Markers) {
 		a.checkField(pass, field, markersAccess)
 	})
 
diff --git a/pkg/analysis/statusoptional/analyzer.go b/pkg/analysis/statusoptional/analyzer.go
@@ -79,7 +79,7 @@ func (a *analyzer) run(pass *analysis.Pass) (any, error) {
 		return nil, kalerrors.ErrCouldNotGetJSONTags
 	}
 
-	inspect.InspectFields(func(field *ast.Field, stack []ast.Node, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markershelper.Markers) {
+	inspect.InspectFields(func(field *ast.Field, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markershelper.Markers) {
 		if jsonTagInfo.Name != statusJSONTag {
 			return
 		}
diff --git a/pkg/analysis/uniquemarkers/analyzer.go b/pkg/analysis/uniquemarkers/analyzer.go
@@ -65,7 +65,7 @@ func (a *analyzer) run(pass *analysis.Pass) (any, error) {
 		return nil, kalerrors.ErrCouldNotGetInspector
 	}
 
-	inspect.InspectFields(func(field *ast.Field, stack []ast.Node, _ extractjsontags.FieldTagInfo, markersAccess markers.Markers) {
+	inspect.InspectFields(func(field *ast.Field, _ extractjsontags.FieldTagInfo, markersAccess markers.Markers) {
 		checkField(pass, field, markersAccess, a.uniqueMarkers)
 	})
 
diff --git a/pkg/analysis/utils/serialization/serialization_check_test.go b/pkg/analysis/utils/serialization/serialization_check_test.go
@@ -107,7 +107,7 @@ func testSerializationAnalyzer(cfg *serialization.Config) *analysis.Analyzer {
 				return nil, errCouldNotGetInspector
 			}
 
-			inspect.InspectFields(func(field *ast.Field, stack []ast.Node, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markershelper.Markers) {
+			inspect.InspectFields(func(field *ast.Field, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markershelper.Markers) {
 				serialization.New(cfg).Check(pass, field, markersAccess, jsonTagInfo)
 			})
 

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ func run(pass *analysis.Pass) (any, error) {`
`45`	`45`	`return nil, kalerrors.ErrCouldNotGetInspector`
`46`	`46`	`}`
`47`	`47`
`48`		`- inspect.InspectFields(func(field *ast.Field, stack []ast.Node, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markershelper.Markers) {`
	`48`	`+ inspect.InspectFields(func(field *ast.Field, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markershelper.Markers) {`
`49`	`49`	`checkField(pass, field, markersAccess)`
`50`	`50`	`})`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func run(pass *analysis.Pass) (any, error) {`
`47`	`47`	`return nil, kalerrors.ErrCouldNotGetInspector`
`48`	`48`	`}`
`49`	`49`
`50`		`- inspect.InspectFields(func(field *ast.Field, stack []ast.Node, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markers.Markers) {`
	`50`	`+ inspect.InspectFields(func(field *ast.Field, jsonTagInfo extractjsontags.FieldTagInfo, _ markers.Markers) {`
`51`	`51`	`checkField(pass, field, jsonTagInfo)`
`52`	`52`	`})`
`53`	`53`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ func (a analyzer) run(pass analysis.Pass) (any, error) {`
`67`	`67`	`return nil, kalerrors.ErrCouldNotGetInspector`
`68`	`68`	`}`
`69`	`69`
`70`		`- inspect.InspectFields(func(field *ast.Field, _ []ast.Node, _ extractjsontags.FieldTagInfo, markersAccess markers.Markers) {`
	`70`	`+ inspect.InspectFields(func(field *ast.Field, _ extractjsontags.FieldTagInfo, markersAccess markers.Markers) {`
`71`	`71`	`checkField(pass, field, markersAccess, a.conflictSets)`
`72`	`72`	`})`
`73`	`73`
`@@ -119,7 +119,7 @@ func reportConflict(pass analysis.Pass, field ast.Field, conflictSet ConflictS`
`119`	`119`	`setDescriptions = append(setDescriptions, fmt.Sprintf("%v", markersList))`
`120`	`120`	`}`
`121`	`121`
`122`		`- fieldName := field.Names[0].Name`
	`122`	`+ fieldName := utils.FieldName(field)`
`123`	`123`	`structName := utils.GetStructNameForField(pass, field)`
`124`	`124`
`125`	`125`	`if structName != "" {`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ func run(pass *analysis.Pass) (any, error) {`
`48`	`48`	`return nil, kalerrors.ErrCouldNotGetInspector`
`49`	`49`	`}`
`50`	`50`
`51`		`- inspect.InspectFields(func(field *ast.Field, _ []ast.Node, _ extractjsontags.FieldTagInfo, markersAccess markers.Markers) {`
	`51`	`+ inspect.InspectFields(func(field *ast.Field, _ extractjsontags.FieldTagInfo, markersAccess markers.Markers) {`
`52`	`52`	`checkField(pass, field, markersAccess)`
`53`	`53`	`})`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ func (a analyzer) run(pass analysis.Pass) (any, error) {`
`61`	`61`	`return nil, kalerrors.ErrCouldNotGetInspector`
`62`	`62`	`}`
`63`	`63`
`64`		`- inspect.InspectFields(func(field *ast.Field, stack []ast.Node, _ extractjsontags.FieldTagInfo, markersAccess markers.Markers) {`
	`64`	`+ inspect.InspectFields(func(field *ast.Field, _ extractjsontags.FieldTagInfo, markersAccess markers.Markers) {`
`65`	`65`	`checkField(pass, field, markersAccess, a.forbiddenMarkers)`
`66`	`66`	`})`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ func run(pass *analysis.Pass) (any, error) {`
`49`	`49`	`return nil, errCouldNotGetInspector`
`50`	`50`	`}`
`51`	`51`
`52`		`- inspect.InspectFields(func(field *ast.Field, stack []ast.Node, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markers.Markers) {`
	`52`	`+ inspect.InspectFields(func(field *ast.Field, jsonTagInfo extractjsontags.FieldTagInfo, _ markers.Markers) {`
`53`	`53`	`pass.Reportf(field.Pos(), "field: %v", utils.FieldName(field))`
`54`	`54`
`55`	`55`	`if jsonTagInfo.Name != "" {`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func (a analyzer) run(pass analysis.Pass) (any, error) {`
`71`	`71`	`return nil, kalerrors.ErrCouldNotGetInspector`
`72`	`72`	`}`
`73`	`73`
`74`		`- inspect.InspectFields(func(field *ast.Field, stack []ast.Node, jsonTagInfo extractjsontags.FieldTagInfo, markersAccess markers.Markers) {`
	`74`	`+ inspect.InspectFields(func(field *ast.Field, jsonTagInfo extractjsontags.FieldTagInfo, _ markers.Markers) {`
`75`	`75`	`a.checkField(pass, field, jsonTagInfo)`
`76`	`76`	`})`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ func (a analyzer) run(pass analysis.Pass) (any, error) {`
`59`	`59`	`return nil, kalerrors.ErrCouldNotGetInspector`
`60`	`60`	`}`
`61`	`61`
`62`		`- inspect.InspectFields(func(field *ast.Field, stack []ast.Node, jsonTags extractjsontags.FieldTagInfo, markersAccess markers.Markers) {`
	`62`	`+ inspect.InspectFields(func(field *ast.Field, jsonTags extractjsontags.FieldTagInfo, _ markers.Markers) {`
`63`	`63`	`checkField(pass, field, jsonTags, a.conventions...)`
`64`	`64`	`})`
`65`	`65`