Merge pull request #91 from shiftstack/statusoptional-crash

k8s-ci-robot · web-flow · commit f86bf7bd4b19 · 2025-05-31T02:42:18.000-07:00
statusoptional: Embed nil check in checkStatusStruct
diff --git a/pkg/analysis/statusoptional/analyzer.go b/pkg/analysis/statusoptional/analyzer.go
@@ -85,18 +85,14 @@ func (a *analyzer) run(pass *analysis.Pass) (any, error) {
 		}
 
 		statusStructType := getStructFromField(pass, field)
-		if statusStructType == nil {
-			return
-		}
-
 		a.checkStatusStruct(pass, statusStructType, markersAccess, jsonTags)
 	})
 
 	return nil, nil //nolint:nilnil
 }
 
 func (a *analyzer) checkStatusStruct(pass *analysis.Pass, statusType *ast.StructType, markersAccess markershelper.Markers, jsonTags extractjsontags.StructFieldTags) {
-	if statusType.Fields == nil || statusType.Fields.List == nil {
+	if statusType == nil || statusType.Fields == nil || statusType.Fields.List == nil {
 		return
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -85,18 +85,14 @@ func (a analyzer) run(pass analysis.Pass) (any, error) {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`statusStructType := getStructFromField(pass, field)`
`88`		`- if statusStructType == nil {`
`89`		`- return`
`90`		`- }`
`91`		`-`
`92`	`88`	`a.checkStatusStruct(pass, statusStructType, markersAccess, jsonTags)`
`93`	`89`	`})`
`94`	`90`
`95`	`91`	`return nil, nil //nolint:nilnil`
`96`	`92`	`}`
`97`	`93`
`98`	`94`	`func (a analyzer) checkStatusStruct(pass analysis.Pass, statusType *ast.StructType, markersAccess markershelper.Markers, jsonTags extractjsontags.StructFieldTags) {`
`99`		`- if statusType.Fields == nil \|\| statusType.Fields.List == nil {`
	`95`	`+ if statusType == nil \|\| statusType.Fields == nil \|\| statusType.Fields.List == nil {`
`100`	`96`	`return`
`101`	`97`	`}`
`102`	`98`