Merge pull request kubernetes#126759 from mcluseau/fix-err-fg-linter

k8s-ci-robot · web-flow · commit 8486ed06200f · 2024-08-28T03:16:56.000+01:00
feategates_linter: take versioned into account in the error message
diff --git a/test/featuregates_linter/cmd/feature_gates.go b/test/featuregates_linter/cmd/feature_gates.go
@@ -167,7 +167,11 @@ func verifyOrUpdateFeatureList(rootPath, featureListFile string, update, version
 	}
 
 	if diff := cmp.Diff(featureList, baseFeatureList); diff != "" {
-		return fmt.Errorf("detected diff in unversioned feature list, diff: \n%s", diff)
+		if versioned {
+			return fmt.Errorf("detected diff in versioned feature list (%s), diff: \n%s", versionedFeatureListFile, diff)
+		} else {
+			return fmt.Errorf("detected diff in unversioned feature list (%s), diff: \n%s", unversionedFeatureListFile, diff)
+		}
 	}
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -167,7 +167,11 @@ func verifyOrUpdateFeatureList(rootPath, featureListFile string, update, version`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`if diff := cmp.Diff(featureList, baseFeatureList); diff != "" {`
`170`		`- return fmt.Errorf("detected diff in unversioned feature list, diff: \n%s", diff)`
	`170`	`+ if versioned {`
	`171`	`+ return fmt.Errorf("detected diff in versioned feature list (%s), diff: \n%s", versionedFeatureListFile, diff)`
	`172`	`+ } else {`
	`173`	`+ return fmt.Errorf("detected diff in unversioned feature list (%s), diff: \n%s", unversionedFeatureListFile, diff)`
	`174`	`+ }`
`171`	`175`	`}`
`172`	`176`	`return nil`
`173`	`177`	`}`