Parse cache settings manually for friendly errors (#93)

Just like it's done for all the other configuration options that are based off of time durations. Signed-off-by: Douglas Camata <[email protected]
bwplotka · Jul 18, 2022 · 6a6aac7 · 6a6aac7
1 parent 25b9abc
commit 6a6aac7
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 8 deletions.
diff --git a/pkg/mdformatter/linktransformer/config.go b/pkg/mdformatter/linktransformer/config.go
@@ -36,9 +36,11 @@ type Config struct {
 }
 
 type CacheConfig struct {
-	Type     string        `yaml:"type"`
-	Validity time.Duration `yaml:"validity"`
-	Jitter   time.Duration `yaml:"jitter"`
+	Type     string `yaml:"type"`
+	Validity string `yaml:"validity"`
+	Jitter   string `yaml:"jitter"`
+	validity time.Duration
+	jitter   time.Duration
 }
 
 type ValidatorConfig struct {
@@ -81,16 +83,16 @@ const (
 	none   = "None"
 	sqlite = "SQLite"
 
-	timeDay         = 24 * time.Hour
-	defaultValidity = 5 * timeDay
+	timeDay              = 24 * time.Hour
+	defaultCacheValidity = 5 * timeDay
 )
 
 type GitHubResponse struct {
 	Number int `json:"number"`
 }
 
 func ParseConfig(c []byte) (Config, error) {
-	cfg := Config{Cache: CacheConfig{Validity: defaultValidity}}
+	cfg := Config{Cache: CacheConfig{Validity: defaultCacheValidity.String()}}
 	dec := yaml.NewDecoder(bytes.NewReader(c))
 	dec.KnownFields(true)
 	if err := dec.Decode(&cfg); err != nil {
@@ -118,7 +120,23 @@ func ParseConfig(c []byte) (Config, error) {
 	}
 
 	switch cfg.Cache.Type {
-	case none, sqlite, "":
+	case sqlite:
+		if cfg.Cache.Validity != "" {
+			var err error
+			cfg.Cache.validity, err = time.ParseDuration(cfg.Cache.Validity)
+			if err != nil {
+				return Config{}, errors.Wrap(err, "parsing cache validity duration")
+			}
+		}
+
+		if cfg.Cache.Jitter != "" {
+			var err error
+			cfg.Cache.jitter, err = time.ParseDuration(cfg.Cache.Jitter)
+			if err != nil {
+				return Config{}, errors.Wrap(err, "parsing cache jitter duration")
+			}
+		}
+	case none, "":
 	default:
 		return Config{}, errors.New("unsupported cache type")
 	}

diff --git a/pkg/mdformatter/linktransformer/link.go b/pkg/mdformatter/linktransformer/link.go
@@ -265,7 +265,7 @@ func NewValidator(ctx context.Context, logger log.Logger, linksValidateConfig []
 
 	if v.validateConfig.Cache.Type != none && storage != nil {
 		v.storage = storage
-		if err = v.storage.Init(v.validateConfig.Cache.Validity, v.validateConfig.Cache.Jitter); err != nil {
+		if err = v.storage.Init(v.validateConfig.Cache.validity, v.validateConfig.Cache.jitter); err != nil {
 			return nil, err
 		}
 	}