Skip to content

Commit b11bc15

Browse files
committed
Fix: Actually validate config struct
We seem to have not linked up the validation for a few components.
1 parent 848179a commit b11bc15

File tree

2 files changed

+39
-1
lines changed

2 files changed

+39
-1
lines changed

pkg/objstore/client/config.go

Lines changed: 4 additions & 0 deletions
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

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

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

0 commit comments

Comments
 (0)