refact: remove unused struct fields / 2 (#3946)

Author: mmetc

cmd/crowdsec-cli/cliexplain/explain.go

@@ -46,7 +46,6 @@ func getLineCountForFile(pth string) (int, error) {
 type configGetter func() *csconfig.Config
 
 type cliExplain struct {
-	cfg            configGetter
 	configFilePath string
 	flags          struct {
 		logFile               string
@@ -64,7 +63,6 @@ type cliExplain struct {
 
 func New(cfg configGetter, configFilePath string) *cliExplain {
 	return &cliExplain{
-		cfg:            cfg,
 		configFilePath: configFilePath,
 	}
 }

cmd/crowdsec-cli/dashboard.go

@@ -9,14 +9,10 @@ import (
 	"github.com/spf13/cobra"
 )
 
-type cliDashboard struct {
-	cfg configGetter
-}
+type cliDashboard struct {}
 
 func NewCLIDashboard(cfg configGetter) *cliDashboard {
-	return &cliDashboard{
-		cfg: cfg,
-	}
+	return &cliDashboard{}
 }
 
 var ErrDashboardDeprecated = errors.New("command 'dashboard' has been removed, please read https://docs.crowdsec.net/blog/cscli_dashboard_deprecation/")

pkg/apiserver/apiserver.go

@@ -45,7 +45,6 @@ type APIServer struct {
 	apic           *apic
 	papi           *Papi
 	httpServerTomb tomb.Tomb
-	consoleConfig  *csconfig.ConsoleConfig
 }
 
 func isBrokenConnection(maybeError any) bool {
@@ -292,7 +291,6 @@ func NewServer(ctx context.Context, config *csconfig.LocalApiServerCfg) (*APISer
 		apic:           apiClient,
 		papi:           papiClient,
 		httpServerTomb: tomb.Tomb{},
-		consoleConfig:  config.ConsoleConfig,
 	}, nil
 }
 

pkg/csplugin/hclog_adapter.go

@@ -28,7 +28,7 @@ import (
 // NewHCLogAdapter takes an instance of a Logrus logger and returns an hclog
 // logger in the form of an HCLogAdapter.
 func NewHCLogAdapter(l *logrus.Logger, name string) hclog.Logger {
-	return &HCLogAdapter{l, name, nil}
+	return &HCLogAdapter{l, name}
 }
 
 // HCLogAdapter implements the hclog interface.  Plugins use hclog to send
@@ -38,7 +38,7 @@ type HCLogAdapter struct {
 	log  *logrus.Logger
 	name string
 
-	impliedArgs []interface{}
+	// impliedArgs []interface{}
 }
 
 func (h HCLogAdapter) Log(level hclog.Level, msg string, args ...interface{}) {

pkg/leakybucket/manager_load.go

@@ -65,7 +65,6 @@ type BucketFactory struct {
 	duration            time.Duration          // internal representation of `Duration`
 	ret                 chan types.Event       // the bucket-specific output chan for overflows
 	processors          []Processor            // processors is the list of hooks for pour/overflow/create (cf. uniq, blackhole etc.)
-	output              bool                   // ??
 	ScenarioVersion     string                 `yaml:"version,omitempty"`
 	hash                string
 	Simulated           bool `yaml:"simulated"` // Set to true if the scenario instantiating the bucket was in the exclusion list
@@ -485,7 +484,6 @@ func LoadBucket(bucketFactory *BucketFactory, tomb *tomb.Tomb) error {
 		}
 	}
 
-	bucketFactory.output = false
 	if err := ValidateFactory(bucketFactory); err != nil {
 		return fmt.Errorf("invalid bucket from %s: %w", bucketFactory.Filename, err)
 	}

pkg/leakybucket/manager_run.go

@@ -33,16 +33,12 @@ func GarbageCollectBuckets(deadline time.Time, buckets *Buckets) error {
 	buckets.wgDumpState.Add(1)
 	defer buckets.wgDumpState.Done()
 
-	total := 0
-	discard := 0
 	toflush := []string{}
 	buckets.Bucket_map.Range(func(rkey, rvalue interface{}) bool {
 		key := rkey.(string)
 		val := rvalue.(*Leaky)
-		total += 1
 		//bucket already overflowed, we can kill it
 		if !val.Ovflw_ts.IsZero() {
-			discard += 1
 			val.logger.Debugf("overflowed at %s.", val.Ovflw_ts)
 			toflush = append(toflush, key)
 			val.tomb.Kill(nil)