From 1ced35ea7d847ef0f613800fed9b97ac778189c8 Mon Sep 17 00:00:00 2001 From: Valery Piashchynski Date: Fri, 22 Nov 2024 22:48:04 +0100 Subject: [PATCH] chore: do not try to parse config Signed-off-by: Valery Piashchynski --- memorykv/config.go | 14 -------------- memorykv/{kv.go => driver.go} | 25 ++----------------------- plugin.go | 4 ++-- 3 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 memorykv/config.go rename memorykv/{kv.go => driver.go} (93%) diff --git a/memorykv/config.go b/memorykv/config.go deleted file mode 100644 index a8a8993..0000000 --- a/memorykv/config.go +++ /dev/null @@ -1,14 +0,0 @@ -package memorykv - -// Config is default config for the in-memory driver -type Config struct { - // Interval for the check - Interval int -} - -// InitDefaults by default driver is turned off -func (c *Config) InitDefaults() { - if c.Interval == 0 { - c.Interval = 60 // seconds - } -} diff --git a/memorykv/kv.go b/memorykv/driver.go similarity index 93% rename from memorykv/kv.go rename to memorykv/driver.go index dc66172..f524b72 100644 --- a/memorykv/kv.go +++ b/memorykv/driver.go @@ -29,19 +29,9 @@ type Driver struct { tracer *sdktrace.TracerProvider log *zap.Logger - cfg *Config } -type Configurer interface { - // UnmarshalKey takes a single key and unmarshal it into a Struct. - UnmarshalKey(name string, out any) error - // Has checks if config section exists. - Has(name string) bool -} - -func NewInMemoryDriver(key string, log *zap.Logger, cfgPlugin Configurer, tracer *sdktrace.TracerProvider) (*Driver, error) { - const op = errors.Op("new_in_memory_driver") - +func NewInMemoryDriver(log *zap.Logger, tracer *sdktrace.TracerProvider) *Driver { if tracer == nil { tracer = sdktrace.NewTracerProvider() } @@ -56,18 +46,7 @@ func NewInMemoryDriver(key string, log *zap.Logger, cfgPlugin Configurer, tracer ch := make(chan struct{}) d.broadcastStopCh.Store(&ch) - err := cfgPlugin.UnmarshalKey(key, &d.cfg) - if err != nil { - return nil, errors.E(op, err) - } - - if d.cfg == nil { - return nil, errors.E(op, errors.Errorf("config not found by provided key: %s", key)) - } - - d.cfg.InitDefaults() - - return d, nil + return d } func (d *Driver) Has(keys ...string) (map[string]bool, error) { diff --git a/plugin.go b/plugin.go index 9ae0306..0b2553a 100644 --- a/plugin.go +++ b/plugin.go @@ -53,8 +53,8 @@ func (p *Plugin) Collects() []*dep.In { // Drivers implementation -func (p *Plugin) KvFromConfig(key string) (kv.Storage, error) { - return memorykv.NewInMemoryDriver(key, p.log, p.cfg, p.tracer) +func (p *Plugin) KvFromConfig(_ string) (kv.Storage, error) { + return memorykv.NewInMemoryDriver(p.log, p.tracer), nil } // DriverFromConfig constructs a memory driver from the .rr.yaml configuration