Skip to content

Commit 68c28f5

Browse files
authored
Fix: Actually validate config struct (#3837)
We seem to have not linked up the validation for a few components.
1 parent 0584b60 commit 68c28f5

File tree

2 files changed

+39
-1
lines changed

2 files changed

+39
-1
lines changed

pkg/objstore/client/config.go

+4
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@ func (cfg *StorageBackendConfig) RegisterFlagsWithPrefix(prefix string, f *flag.
8989
}
9090

9191
func (cfg *StorageBackendConfig) Validate() error {
92+
if cfg.Backend == None {
93+
return nil
94+
}
95+
9296
if !lo.Contains(cfg.supportedBackends(), cfg.Backend) {
9397
return ErrUnsupportedStorageBackend
9498
}

pkg/phlare/phlare.go

+35-1
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,44 @@ func (c *Config) Validate() error {
235235
if len(c.Target) == 0 {
236236
return errors.New("no modules specified")
237237
}
238+
239+
if err := c.Frontend.Validate(); err != nil {
240+
return err
241+
}
242+
243+
if err := c.Worker.Validate(util.Logger); err != nil {
244+
return err
245+
}
246+
247+
if err := c.LimitsConfig.Validate(); err != nil {
248+
return err
249+
}
250+
251+
if err := c.QueryScheduler.Validate(); err != nil {
252+
return err
253+
}
254+
255+
if err := c.Ingester.Validate(); err != nil {
256+
return err
257+
}
258+
259+
if err := c.StoreGateway.Validate(c.LimitsConfig); err != nil {
260+
return err
261+
}
262+
263+
if err := c.OverridesExporter.Validate(); err != nil {
264+
return err
265+
}
266+
238267
if err := c.Compactor.Validate(c.PhlareDB.MaxBlockDuration); err != nil {
239268
return err
240269
}
241-
return c.Ingester.Validate()
270+
271+
if err := c.Storage.Bucket.Validate(); err != nil {
272+
return err
273+
}
274+
275+
return nil
242276
}
243277

244278
func (c *Config) ApplyDynamicConfig() cfg.Source {

0 commit comments

Comments
 (0)