Move registry into a dedicated package

JoelSpeed · JoelSpeed · commit 8fbe44b5163d · 2025-07-09T15:39:15.000+01:00
diff --git a/docs/new-linter.md b/docs/new-linter.md
@@ -31,7 +31,7 @@ It is expected that each linter package contain a file `initializer.go`, the con
 ```go
 func init() {
     // Register the linter with the registry when the package is imported.
-    kalanalysis.DefaultRegistry().RegisterLinter(Initializer())
+    registry.DefaultRegistry().RegisterLinter(Initializer())
 }
 
 // Initializer returns the AnalyzerInitializer for this
diff --git a/pkg/analysis/commentstart/initializer.go b/pkg/analysis/commentstart/initializer.go
@@ -16,12 +16,12 @@ limitations under the License.
 package commentstart
 
 import (
-	kalanalysis "sigs.k8s.io/kube-api-linter/pkg/analysis"
 	"sigs.k8s.io/kube-api-linter/pkg/analysis/initializer"
+	"sigs.k8s.io/kube-api-linter/pkg/analysis/registry"
 )
 
 func init() {
-	kalanalysis.DefaultRegistry().RegisterLinter(Initializer())
+	registry.DefaultRegistry().RegisterLinter(Initializer())
 }
 
 // Initializer returns the AnalyzerInitializer for this
diff --git a/pkg/analysis/conditions/initializer.go b/pkg/analysis/conditions/initializer.go
@@ -20,12 +20,12 @@ import (
 
 	"golang.org/x/tools/go/analysis"
 	"k8s.io/apimachinery/pkg/util/validation/field"
-	kalanalysis "sigs.k8s.io/kube-api-linter/pkg/analysis"
 	"sigs.k8s.io/kube-api-linter/pkg/analysis/initializer"
+	"sigs.k8s.io/kube-api-linter/pkg/analysis/registry"
 )
 
 func init() {
-	kalanalysis.DefaultRegistry().RegisterLinter(Initializer())
+	registry.DefaultRegistry().RegisterLinter(Initializer())
 }
 
 // Initializer returns the AnalyzerInitializer for this
diff --git a/pkg/analysis/doc.go b/pkg/analysis/doc.go
@@ -24,10 +24,10 @@ the linters within, by passing the required configuration.
 
 Example:
 
-	registry := analysis.NewRegistry()
+	r := registry.NewRegistry()
 
 	// Initialize the linters
-	linters, err := registry.InitLinters(
+	linters, err := r.InitLinters(
 		config.Linters{
 			Enabled: []string{
 				"commentstart"
diff --git a/pkg/analysis/duplicatemarkers/initializer.go b/pkg/analysis/duplicatemarkers/initializer.go
@@ -16,12 +16,12 @@ limitations under the License.
 package duplicatemarkers
 
 import (
-	kalanalysis "sigs.k8s.io/kube-api-linter/pkg/analysis"
 	"sigs.k8s.io/kube-api-linter/pkg/analysis/initializer"
+	"sigs.k8s.io/kube-api-linter/pkg/analysis/registry"
 )
 
 func init() {
-	kalanalysis.DefaultRegistry().RegisterLinter(Initializer())
+	registry.DefaultRegistry().RegisterLinter(Initializer())
 }
 
 // Initializer returns the AnalyzerInitializer for this
diff --git a/pkg/analysis/integers/initializer.go b/pkg/analysis/integers/initializer.go
@@ -16,12 +16,12 @@ limitations under the License.
 package integers
 
 import (
-	kalanalysis "sigs.k8s.io/kube-api-linter/pkg/analysis"
 	"sigs.k8s.io/kube-api-linter/pkg/analysis/initializer"
+	"sigs.k8s.io/kube-api-linter/pkg/analysis/registry"
 )
 
 func init() {
-	kalanalysis.DefaultRegistry().RegisterLinter(Initializer())
+	registry.DefaultRegistry().RegisterLinter(Initializer())
 }
 
 // Initializer returns the AnalyzerInitializer for this
diff --git a/pkg/analysis/jsontags/initializer.go b/pkg/analysis/jsontags/initializer.go
@@ -21,12 +21,12 @@ import (
 
 	"golang.org/x/tools/go/analysis"
 	"k8s.io/apimachinery/pkg/util/validation/field"
-	kalanalysis "sigs.k8s.io/kube-api-linter/pkg/analysis"
 	"sigs.k8s.io/kube-api-linter/pkg/analysis/initializer"
+	"sigs.k8s.io/kube-api-linter/pkg/analysis/registry"
 )
 
 func init() {
-	kalanalysis.DefaultRegistry().RegisterLinter(Initializer())
+	registry.DefaultRegistry().RegisterLinter(Initializer())
 }
 
 // Initializer returns the AnalyzerInitializer for this
diff --git a/pkg/analysis/maxlength/initializer.go b/pkg/analysis/maxlength/initializer.go
@@ -16,12 +16,12 @@ limitations under the License.
 package maxlength
 
 import (
-	kalanalysis "sigs.k8s.io/kube-api-linter/pkg/analysis"
 	"sigs.k8s.io/kube-api-linter/pkg/analysis/initializer"
+	"sigs.k8s.io/kube-api-linter/pkg/analysis/registry"
 )
 
 func init() {
-	kalanalysis.DefaultRegistry().RegisterLinter(Initializer())
+	registry.DefaultRegistry().RegisterLinter(Initializer())
 }
 
 // Initializer returns the AnalyzerInitializer for this
diff --git a/pkg/analysis/nobools/initializer.go b/pkg/analysis/nobools/initializer.go
@@ -16,12 +16,12 @@ limitations under the License.
 package nobools
 
 import (
-	kalanalysis "sigs.k8s.io/kube-api-linter/pkg/analysis"
 	"sigs.k8s.io/kube-api-linter/pkg/analysis/initializer"
+	"sigs.k8s.io/kube-api-linter/pkg/analysis/registry"
 )
 
 func init() {
-	kalanalysis.DefaultRegistry().RegisterLinter(Initializer())
+	registry.DefaultRegistry().RegisterLinter(Initializer())
 }
 
 // Initializer returns the AnalyzerInitializer for this
diff --git a/pkg/analysis/nofloats/initializer.go b/pkg/analysis/nofloats/initializer.go
@@ -16,12 +16,12 @@ limitations under the License.
 package nofloats
 
 import (
-	kalanalysis "sigs.k8s.io/kube-api-linter/pkg/analysis"
 	"sigs.k8s.io/kube-api-linter/pkg/analysis/initializer"
+	"sigs.k8s.io/kube-api-linter/pkg/analysis/registry"
 )
 
 func init() {
-	kalanalysis.DefaultRegistry().RegisterLinter(Initializer())
+	registry.DefaultRegistry().RegisterLinter(Initializer())
 }
 
 // Initializer returns the AnalyzerInitializer for this
diff --git a/pkg/analysis/nomaps/initializer.go b/pkg/analysis/nomaps/initializer.go
@@ -20,12 +20,12 @@ import (
 
 	"golang.org/x/tools/go/analysis"
 	"k8s.io/apimachinery/pkg/util/validation/field"
-	kalanalysis "sigs.k8s.io/kube-api-linter/pkg/analysis"
 	"sigs.k8s.io/kube-api-linter/pkg/analysis/initializer"
+	"sigs.k8s.io/kube-api-linter/pkg/analysis/registry"
 )
 
 func init() {
-	kalanalysis.DefaultRegistry().RegisterLinter(Initializer())
+	registry.DefaultRegistry().RegisterLinter(Initializer())
 }
 
 // Initializer returns the AnalyzerInitializer for this
diff --git a/pkg/analysis/nophase/initializer.go b/pkg/analysis/nophase/initializer.go
@@ -16,12 +16,12 @@ limitations under the License.
 package nophase
 
 import (
-	kalanalysis "sigs.k8s.io/kube-api-linter/pkg/analysis"
 	"sigs.k8s.io/kube-api-linter/pkg/analysis/initializer"
+	"sigs.k8s.io/kube-api-linter/pkg/analysis/registry"
 )
 
 func init() {
-	kalanalysis.DefaultRegistry().RegisterLinter(Initializer())
+	registry.DefaultRegistry().RegisterLinter(Initializer())
 }
 
 // Initializer returns the AnalyzerInitializer for this
diff --git a/pkg/analysis/optionalfields/initializer.go b/pkg/analysis/optionalfields/initializer.go
@@ -20,12 +20,12 @@ import (
 
 	"golang.org/x/tools/go/analysis"
 	"k8s.io/apimachinery/pkg/util/validation/field"
-	kalanalysis "sigs.k8s.io/kube-api-linter/pkg/analysis"
 	"sigs.k8s.io/kube-api-linter/pkg/analysis/initializer"
+	"sigs.k8s.io/kube-api-linter/pkg/analysis/registry"
 )
 
 func init() {
-	kalanalysis.DefaultRegistry().RegisterLinter(Initializer())
+	registry.DefaultRegistry().RegisterLinter(Initializer())
 }
 
 // Initializer returns the AnalyzerInitializer for this
diff --git a/pkg/analysis/optionalorrequired/initializer.go b/pkg/analysis/optionalorrequired/initializer.go
@@ -20,13 +20,13 @@ import (
 
 	"golang.org/x/tools/go/analysis"
 	"k8s.io/apimachinery/pkg/util/validation/field"
-	kalanalysis "sigs.k8s.io/kube-api-linter/pkg/analysis"
 	"sigs.k8s.io/kube-api-linter/pkg/analysis/initializer"
+	"sigs.k8s.io/kube-api-linter/pkg/analysis/registry"
 	"sigs.k8s.io/kube-api-linter/pkg/markers"
 )
 
 func init() {
-	kalanalysis.DefaultRegistry().RegisterLinter(Initializer())
+	registry.DefaultRegistry().RegisterLinter(Initializer())
 }
 
 // Initializer returns the AnalyzerInitializer for this
diff --git a/pkg/analysis/registry/analysis_suite_test.go b/pkg/analysis/registry/analysis_suite_test.go
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package analysis_test
+package registry_test
 
 import (
 	"testing"
diff --git a/pkg/analysis/registry/registry.go b/pkg/analysis/registry/registry.go
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package analysis
+package registry
 
 import (
 	"fmt"
diff --git a/pkg/analysis/registry/registry_test.go b/pkg/analysis/registry/registry_test.go
@@ -13,28 +13,28 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package analysis_test
+package registry_test
 
 import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	goanalysis "golang.org/x/tools/go/analysis"
+	"golang.org/x/tools/go/analysis"
 
-	"sigs.k8s.io/kube-api-linter/pkg/analysis"
 	"sigs.k8s.io/kube-api-linter/pkg/analysis/conditions"
 	"sigs.k8s.io/kube-api-linter/pkg/analysis/jsontags"
 	"sigs.k8s.io/kube-api-linter/pkg/analysis/nobools"
 	"sigs.k8s.io/kube-api-linter/pkg/analysis/optionalorrequired"
+	"sigs.k8s.io/kube-api-linter/pkg/analysis/registry"
 	"sigs.k8s.io/kube-api-linter/pkg/config"
 	"sigs.k8s.io/kube-api-linter/pkg/markers"
 )
 
 var _ = Describe("Registry", func() {
-	var r analysis.Registry
+	var r registry.Registry
 
 	BeforeEach(func() {
-		r = analysis.NewRegistry()
+		r = registry.NewRegistry()
 
 		// Register a selection of linters to test the registry functionality.
 		r.RegisterLinter(conditions.Initializer())
@@ -76,7 +76,7 @@ var _ = Describe("Registry", func() {
 			linters, err := r.InitializeLinters(in.config, in.lintersConfig)
 			Expect(err).NotTo(HaveOccurred())
 
-			toLinterNames := func(a []*goanalysis.Analyzer) []string {
+			toLinterNames := func(a []*analysis.Analyzer) []string {
 				names := []string{}
 
 				for _, linter := range a {
diff --git a/pkg/analysis/requiredfields/initializer.go b/pkg/analysis/requiredfields/initializer.go
@@ -20,12 +20,12 @@ import (
 
 	"golang.org/x/tools/go/analysis"
 	"k8s.io/apimachinery/pkg/util/validation/field"
-	kalanalysis "sigs.k8s.io/kube-api-linter/pkg/analysis"
 	"sigs.k8s.io/kube-api-linter/pkg/analysis/initializer"
+	"sigs.k8s.io/kube-api-linter/pkg/analysis/registry"
 )
 
 func init() {
-	kalanalysis.DefaultRegistry().RegisterLinter(Initializer())
+	registry.DefaultRegistry().RegisterLinter(Initializer())
 }
 
 // Initializer returns the AnalyzerInitializer for this
diff --git a/pkg/analysis/ssatags/initializer.go b/pkg/analysis/ssatags/initializer.go
@@ -20,12 +20,12 @@ import (
 
 	"golang.org/x/tools/go/analysis"
 	"k8s.io/apimachinery/pkg/util/validation/field"
-	kalanalysis "sigs.k8s.io/kube-api-linter/pkg/analysis"
 	"sigs.k8s.io/kube-api-linter/pkg/analysis/initializer"
+	"sigs.k8s.io/kube-api-linter/pkg/analysis/registry"
 )
 
 func init() {
-	kalanalysis.DefaultRegistry().RegisterLinter(Initializer())
+	registry.DefaultRegistry().RegisterLinter(Initializer())
 }
 
 // Initializer returns the AnalyzerInitializer for this
diff --git a/pkg/analysis/statusoptional/initializer.go b/pkg/analysis/statusoptional/initializer.go
@@ -20,13 +20,13 @@ import (
 
 	"golang.org/x/tools/go/analysis"
 	"k8s.io/apimachinery/pkg/util/validation/field"
-	kalanalysis "sigs.k8s.io/kube-api-linter/pkg/analysis"
 	"sigs.k8s.io/kube-api-linter/pkg/analysis/initializer"
+	"sigs.k8s.io/kube-api-linter/pkg/analysis/registry"
 	"sigs.k8s.io/kube-api-linter/pkg/markers"
 )
 
 func init() {
-	kalanalysis.DefaultRegistry().RegisterLinter(Initializer())
+	registry.DefaultRegistry().RegisterLinter(Initializer())
 }
 
 // Initializer returns the AnalyzerInitializer for this
diff --git a/pkg/analysis/statussubresource/initializer.go b/pkg/analysis/statussubresource/initializer.go
@@ -16,12 +16,12 @@ limitations under the License.
 package statussubresource
 
 import (
-	kalanalysis "sigs.k8s.io/kube-api-linter/pkg/analysis"
 	"sigs.k8s.io/kube-api-linter/pkg/analysis/initializer"
+	"sigs.k8s.io/kube-api-linter/pkg/analysis/registry"
 )
 
 func init() {
-	kalanalysis.DefaultRegistry().RegisterLinter(Initializer())
+	registry.DefaultRegistry().RegisterLinter(Initializer())
 }
 
 // Initializer returns the AnalyzerInitializer for this
diff --git a/pkg/analysis/uniquemarkers/initializer.go b/pkg/analysis/uniquemarkers/initializer.go
@@ -19,12 +19,12 @@ import (
 	"golang.org/x/tools/go/analysis"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/validation/field"
-	kalanalysis "sigs.k8s.io/kube-api-linter/pkg/analysis"
 	"sigs.k8s.io/kube-api-linter/pkg/analysis/initializer"
+	"sigs.k8s.io/kube-api-linter/pkg/analysis/registry"
 )
 
 func init() {
-	kalanalysis.DefaultRegistry().RegisterLinter(Initializer())
+	registry.DefaultRegistry().RegisterLinter(Initializer())
 }
 
 // Initializer returns the AnalyzerInitializer for this
diff --git a/pkg/plugin/base/base.go b/pkg/plugin/base/base.go
@@ -21,7 +21,7 @@ import (
 	"github.com/golangci/plugin-module-register/register"
 	"golang.org/x/tools/go/analysis"
 	"k8s.io/apimachinery/pkg/util/validation/field"
-	kalanalysis "sigs.k8s.io/kube-api-linter/pkg/analysis"
+	"sigs.k8s.io/kube-api-linter/pkg/analysis/registry"
 	"sigs.k8s.io/kube-api-linter/pkg/config"
 	"sigs.k8s.io/kube-api-linter/pkg/validation"
 )
@@ -54,7 +54,7 @@ func (f *GolangCIPlugin) BuildAnalyzers() ([]*analysis.Analyzer, error) {
 		return nil, fmt.Errorf("error in KAL configuration: %w", err)
 	}
 
-	analyzers, err := kalanalysis.DefaultRegistry().InitializeLinters(f.config.Linters, f.config.LintersConfig)
+	analyzers, err := registry.DefaultRegistry().InitializeLinters(f.config.Linters, f.config.LintersConfig)
 	if err != nil {
 		return nil, fmt.Errorf("error initializing analyzers: %w", err)
 	}
diff --git a/pkg/validation/linters.go b/pkg/validation/linters.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"strings"
 
-	"sigs.k8s.io/kube-api-linter/pkg/analysis"
+	"sigs.k8s.io/kube-api-linter/pkg/analysis/registry"
 	"sigs.k8s.io/kube-api-linter/pkg/config"
 
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -40,8 +40,8 @@ func ValidateLinters(l config.Linters, fldPath *field.Path) field.ErrorList {
 		fieldErrors = append(fieldErrors, field.Invalid(enablePath, l.Enable, "values in 'enable' must be unique"))
 	case enable.Has(config.Wildcard) && enable.Len() != 1:
 		fieldErrors = append(fieldErrors, field.Invalid(enablePath, l.Enable, "wildcard ('*') must not be specified with other values"))
-	case !enable.Has(config.Wildcard) && enable.Difference(analysis.DefaultRegistry().AllLinters()).Len() > 0:
-		fieldErrors = append(fieldErrors, field.Invalid(enablePath, l.Enable, fmt.Sprintf("unknown linters: %s", strings.Join(enable.Difference(analysis.DefaultRegistry().AllLinters()).UnsortedList(), ","))))
+	case !enable.Has(config.Wildcard) && enable.Difference(registry.DefaultRegistry().AllLinters()).Len() > 0:
+		fieldErrors = append(fieldErrors, field.Invalid(enablePath, l.Enable, fmt.Sprintf("unknown linters: %s", strings.Join(enable.Difference(registry.DefaultRegistry().AllLinters()).UnsortedList(), ","))))
 	}
 
 	disable := sets.New(l.Disable...)
@@ -52,8 +52,8 @@ func ValidateLinters(l config.Linters, fldPath *field.Path) field.ErrorList {
 		fieldErrors = append(fieldErrors, field.Invalid(disablePath, l.Disable, "values in 'disable' must be unique"))
 	case disable.Has(config.Wildcard) && disable.Len() != 1:
 		fieldErrors = append(fieldErrors, field.Invalid(disablePath, l.Disable, "wildcard ('*') must not be specified with other values"))
-	case !disable.Has(config.Wildcard) && disable.Difference(analysis.DefaultRegistry().AllLinters()).Len() > 0:
-		fieldErrors = append(fieldErrors, field.Invalid(disablePath, l.Disable, fmt.Sprintf("unknown linters: %s", strings.Join(disable.Difference(analysis.DefaultRegistry().AllLinters()).UnsortedList(), ","))))
+	case !disable.Has(config.Wildcard) && disable.Difference(registry.DefaultRegistry().AllLinters()).Len() > 0:
+		fieldErrors = append(fieldErrors, field.Invalid(disablePath, l.Disable, fmt.Sprintf("unknown linters: %s", strings.Join(disable.Difference(registry.DefaultRegistry().AllLinters()).UnsortedList(), ","))))
 	}
 
 	if enable.Intersection(disable).Len() > 0 {

Original file line number	Diff line number	Diff line change
@@ -31,7 +31,7 @@ It is expected that each linter package contain a file `initializer.go`, the con
`31`	`31`	```go
`32`	`32`	`func init() {`
`33`	`33`	`// Register the linter with the registry when the package is imported.`
`34`		`- kalanalysis.DefaultRegistry().RegisterLinter(Initializer())`
	`34`	`+ registry.DefaultRegistry().RegisterLinter(Initializer())`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`// Initializer returns the AnalyzerInitializer for this`
Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,12 @@ limitations under the License.`
`16`	`16`	`package commentstart`
`17`	`17`
`18`	`18`	`import (`
`19`		`- kalanalysis "sigs.k8s.io/kube-api-linter/pkg/analysis"`
`20`	`19`	`"sigs.k8s.io/kube-api-linter/pkg/analysis/initializer"`
	`20`	`+ "sigs.k8s.io/kube-api-linter/pkg/analysis/registry"`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`func init() {`
`24`		`- kalanalysis.DefaultRegistry().RegisterLinter(Initializer())`
	`24`	`+ registry.DefaultRegistry().RegisterLinter(Initializer())`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`// Initializer returns the AnalyzerInitializer for this`
Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,12 @@ import (`
`20`	`20`
`21`	`21`	`"golang.org/x/tools/go/analysis"`
`22`	`22`	`"k8s.io/apimachinery/pkg/util/validation/field"`
`23`		`- kalanalysis "sigs.k8s.io/kube-api-linter/pkg/analysis"`
`24`	`23`	`"sigs.k8s.io/kube-api-linter/pkg/analysis/initializer"`
	`24`	`+ "sigs.k8s.io/kube-api-linter/pkg/analysis/registry"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`func init() {`
`28`		`- kalanalysis.DefaultRegistry().RegisterLinter(Initializer())`
	`28`	`+ registry.DefaultRegistry().RegisterLinter(Initializer())`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`// Initializer returns the AnalyzerInitializer for this`
Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,12 @@ import (`
`21`	`21`
`22`	`22`	`"golang.org/x/tools/go/analysis"`
`23`	`23`	`"k8s.io/apimachinery/pkg/util/validation/field"`
`24`		`- kalanalysis "sigs.k8s.io/kube-api-linter/pkg/analysis"`
`25`	`24`	`"sigs.k8s.io/kube-api-linter/pkg/analysis/initializer"`
	`25`	`+ "sigs.k8s.io/kube-api-linter/pkg/analysis/registry"`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`func init() {`
`29`		`- kalanalysis.DefaultRegistry().RegisterLinter(Initializer())`
	`29`	`+ registry.DefaultRegistry().RegisterLinter(Initializer())`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`// Initializer returns the AnalyzerInitializer for this`