pkg/leakybucket: remove Simulated field from Leaky, keep it in config (#4285)

Author: mmetc

pkg/leakybucket/bucket.go

@@ -49,7 +49,6 @@ type Leaky struct {
 	doneOnce     sync.Once     // use to prevent double close
 	Suicide      chan bool `json:"-"`
 	Reprocess    bool
-	Simulated    bool
 	Uuid         string
 	First_ts     time.Time
 	Last_ts      time.Time
@@ -117,7 +116,6 @@ func NewLeakyFromFactory(f *BucketFactory) *Leaky {
 		scopeType:       f.Spec.ScopeType,
 		scenarioVersion: f.Spec.ScenarioVersion,
 		hash:            f.hash,
-		Simulated:       f.Simulated,
 		mutex:           &sync.Mutex{},
 		orderEvent:      f.orderEvent,
 	}

pkg/leakybucket/manager_load.go

@@ -97,13 +97,17 @@ func (f *BucketFactory) Validate() error {
 	return f.Spec.ScopeType.CompileFilter()
 }
 
+type SimulationChecker interface {
+	IsSimulated(scenario string) bool
+}
+
 func loadBucketFactoriesFromFile(
 	item *cwhub.Item,
 	hub *cwhub.Hub,
 	bucketStore *BucketStore,
 	response chan pipeline.Event,
 	orderEvent bool,
-	simulationConfig csconfig.SimulationConfig,
+	simcheck SimulationChecker,
 ) ([]BucketFactory, error) {
 	itemPath := item.State.LocalPath
 
@@ -160,8 +164,7 @@ func loadBucketFactoriesFromFile(
 		f.Filename = filepath.Clean(itemPath)
 		f.BucketName = seed.Generate()
 		f.ret = response
-
-		f.Simulated = simulationConfig.IsSimulated(f.Spec.Name)
+		f.Simulated = simcheck.IsSimulated(f.Spec.Name)
 
 		f.Spec.ScenarioVersion = item.State.LocalVersion
 		f.hash = item.State.LocalHash
@@ -192,7 +195,7 @@ func LoadBuckets(
 	for _, item := range scenarios {
 		log.Debugf("Loading '%s'", item.State.LocalPath)
 
-		factories, err := loadBucketFactoriesFromFile(item, hub, bucketStore, response, orderEvent, cscfg.SimulationConfig)
+		factories, err := loadBucketFactoriesFromFile(item, hub, bucketStore, response, orderEvent, &cscfg.SimulationConfig)
 		if err != nil {
 			return nil, nil, err
 		}

pkg/leakybucket/overflows.go

@@ -316,7 +316,7 @@ func NewAlert(leaky *Leaky, queue *pipeline.Queue) (pipeline.RuntimeAlert, error
 		Message:         new(string),
 		StartAt:         &startAt,
 		StopAt:          &stopAt,
-		Simulated:       &leaky.Simulated,
+		Simulated:       &leaky.BucketConfig.Simulated,
 	}
 
 	if leaky.BucketConfig == nil {