Drop IsConfigurable from initializer interface

Author: JoelSpeed

pkg/analysis/initializer/initializer.go

@@ -35,10 +35,6 @@ type AnalyzerInitializer interface {
 	// It will be passed the complete LintersConfig and is expected to rely only on its own configuration.
 	Init(any) (*analysis.Analyzer, error)
 
-	// IsConfigurable determines whether or not the initializer expects to be provided a config.
-	// When true, the initializer should also match the ConfigurableAnalyzerInitializer interface.
-	IsConfigurable() bool
-
 	// Default determines whether the inializer intializes an analyzer that should be
 	// on by default, or not.
 	Default() bool
@@ -96,12 +92,6 @@ func (i initializer) Init(_ any) (*analysis.Analyzer, error) {
 	return i.initFunc(nil)
 }
 
-// IsConfigurable determines whether or not to expect this initializer to
-// be able to be configured with custom configuration.
-func (i initializer) IsConfigurable() bool {
-	return false
-}
-
 // Default determines whether this initializer should be enabled by default or not.
 func (i initializer) Default() bool {
 	return i.isDefault
@@ -119,12 +109,6 @@ func (i configurableInitializer) Init(cfg any) (*analysis.Analyzer, error) {
 	return i.initFunc(cfg)
 }
 
-// IsConfigurable determines whether or not to expect this initializer to
-// be able to be configured with custom configuration.
-func (i configurableInitializer) IsConfigurable() bool {
-	return true
-}
-
 // ConfigType returns the type of the config for the linter.
 func (i configurableInitializer) ConfigType() any {
 	return i.configTypeFunc()

pkg/analysis/registry.go

@@ -126,10 +126,10 @@ func (r *registry) InitializeLinters(cfg config.Linters, lintersCfg config.Linte
 	for _, init := range r.getEnabledInitializers(cfg) {
 		var linterConfig any
 
-		if init.IsConfigurable() {
+		if ci, ok := isConfigurable(init); ok {
 			var err error
 
-			linterConfig, err = getLinterTypedConfig(init, lintersCfg)
+			linterConfig, err = getLinterTypedConfig(ci, lintersCfg)
 			if err != nil {
 				errs = append(errs, fmt.Errorf("failed to get linter config: %w", err))
 			}
@@ -154,18 +154,13 @@ func (r *registry) validateLintersConfig(cfg config.Linters, lintersCfg config.L
 	validatedLinters := sets.New[string]()
 
 	for _, init := range r.getEnabledInitializers(cfg) {
-		if init.IsConfigurable() {
-			linterConfig, err := getLinterTypedConfig(init, lintersCfg)
+		if ci, ok := isConfigurable(init); ok {
+			linterConfig, err := getLinterTypedConfig(ci, lintersCfg)
 			if err != nil {
 				fieldErrors = append(fieldErrors, field.Invalid(fieldPath.Child(init.Name()), linterConfig, err.Error()))
 				continue
 			}
 
-			ci, ok := init.(initializer.ConfigurableAnalyzerInitializer)
-			if !ok {
-				panic(fmt.Sprintf("Analyzer %s claims to be configurable but does not implement the ConfigurableAnalyzerInitializer interface", init.Name()))
-			}
-
 			fieldErrors = append(fieldErrors, ci.ValidateConfig(linterConfig, fieldPath.Child(init.Name()))...)
 
 			validatedLinters.Insert(init.Name())
@@ -198,13 +193,8 @@ func (r *registry) getEnabledInitializers(cfg config.Linters) []initializer.Anal
 }
 
 // getLinterTypedConfig returns the typed config for a linter.
-func getLinterTypedConfig(init initializer.AnalyzerInitializer, lintersCfg config.LintersConfig) (any, error) {
-	ci, ok := init.(initializer.ConfigurableAnalyzerInitializer)
-	if !ok {
-		panic(fmt.Sprintf("Analyzer %s claims to be configurable but does not implement the ConfigurableAnalyzerInitializer interface", init.Name()))
-	}
-
-	rawConfig, ok := getConfigByName(init.Name(), lintersCfg)
+func getLinterTypedConfig(ci initializer.ConfigurableAnalyzerInitializer, lintersCfg config.LintersConfig) (any, error) {
+	rawConfig, ok := getConfigByName(ci.Name(), lintersCfg)
 	if !ok {
 		return ci.ConfigType(), nil
 	}
@@ -257,3 +247,10 @@ func validateUnusedLinters(lintersCfg config.LintersConfig, validatedLinters set
 
 	return fieldErrors
 }
+
+// isConfigurable determines whether or not the initializer expects to be provided a config.
+// When true, the initializer should also match the ConfigurableAnalyzerInitializer interface.
+func isConfigurable(init initializer.AnalyzerInitializer) (initializer.ConfigurableAnalyzerInitializer, bool) {
+	ci, ok := init.(initializer.ConfigurableAnalyzerInitializer)
+	return ci, ok
+}