From 2a6433a542025fc0671f4aacd2f018547ea67f03 Mon Sep 17 00:00:00 2001 From: Sotirios Mantziaris Date: Sun, 13 Oct 2024 14:23:54 +0300 Subject: [PATCH] Refactor seeding --- seed/seed.go | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/seed/seed.go b/seed/seed.go index 45548b0..0559c02 100644 --- a/seed/seed.go +++ b/seed/seed.go @@ -58,23 +58,18 @@ func (s *Seeder) Seed(cfg *config.Config) error { var flagInfos []*flagInfo for _, f := range cfg.Fields { seedMap[f] = false - ss := f.Sources() - val, ok := ss[config.SourceSeed] - if ok { - err := f.Set(val, 0) - if err != nil { - return err - } - slog.Debug("seed applied", "value", f, "name", f.Name()) - seedMap[f] = true + + err := processSeedField(f, seedMap) + if err != nil { + return err } - err := processEnvField(f, seedMap) + err = processEnvField(f, seedMap) if err != nil { return err } - key, ok := ss[config.SourceFlag] + key, ok := f.Sources()[config.SourceFlag] if ok { var val string flagSet.StringVar(&val, key, "", "") @@ -149,6 +144,20 @@ func (s *Seeder) Seed(cfg *config.Config) error { return nil } +func processSeedField(f *config.Field, seedMap map[*config.Field]bool) error { + val, ok := f.Sources()[config.SourceSeed] + if !ok { + return nil + } + err := f.Set(val, 0) + if err != nil { + return err + } + slog.Debug("seed applied", "value", f, "name", f.Name()) + seedMap[f] = true + return nil +} + func processEnvField(f *config.Field, seedMap map[*config.Field]bool) error { key, ok := f.Sources()[config.SourceEnv] if !ok {