diff --git a/cmd/main.go b/cmd/main.go index ca9ba070..862aec96 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -16,13 +16,14 @@ package main import ( "context" - "github.com/echovault/sugardb/internal" - "github.com/echovault/sugardb/internal/config" - "github.com/echovault/sugardb/sugardb" "log" "os" "os/signal" "syscall" + + "github.com/echovault/sugardb/internal" + "github.com/echovault/sugardb/pkg/config" + "github.com/echovault/sugardb/sugardb" ) func main() { diff --git a/coverage/coverage.out b/coverage/coverage.out index 823bc2d9..53797b0e 100644 --- a/coverage/coverage.out +++ b/coverage/coverage.out @@ -302,51 +302,51 @@ github.com/echovault/sugardb/internal/memberlist/memberlist.go:176.16,179.3 2 0 github.com/echovault/sugardb/internal/memberlist/memberlist.go:181.2,182.16 2 0 github.com/echovault/sugardb/internal/memberlist/memberlist.go:182.16,185.3 2 0 github.com/echovault/sugardb/internal/memberlist/memberlist.go:187.2,187.49 1 0 -github.com/echovault/sugardb/internal/config/config.go:68.34,74.24 3 0 -github.com/echovault/sugardb/internal/config/config.go:74.24,76.35 2 0 -github.com/echovault/sugardb/internal/config/config.go:76.35,78.5 1 0 -github.com/echovault/sugardb/internal/config/config.go:79.4,79.22 1 0 -github.com/echovault/sugardb/internal/config/config.go:79.22,81.5 1 0 -github.com/echovault/sugardb/internal/config/config.go:82.4,83.14 2 0 -github.com/echovault/sugardb/internal/config/config.go:86.2,86.115 1 0 -github.com/echovault/sugardb/internal/config/config.go:86.115,89.3 2 0 -github.com/echovault/sugardb/internal/config/config.go:91.2,94.29 2 0 -github.com/echovault/sugardb/internal/config/config.go:94.29,95.86 1 0 -github.com/echovault/sugardb/internal/config/config.go:95.86,97.5 1 0 -github.com/echovault/sugardb/internal/config/config.go:97.7,99.5 1 0 -github.com/echovault/sugardb/internal/config/config.go:100.4,101.14 2 0 -github.com/echovault/sugardb/internal/config/config.go:104.2,107.59 2 0 -github.com/echovault/sugardb/internal/config/config.go:107.59,109.17 2 0 -github.com/echovault/sugardb/internal/config/config.go:109.17,111.4 1 0 -github.com/echovault/sugardb/internal/config/config.go:112.3,113.13 2 0 -github.com/echovault/sugardb/internal/config/config.go:116.2,125.88 2 0 -github.com/echovault/sugardb/internal/config/config.go:125.88,132.23 3 0 -github.com/echovault/sugardb/internal/config/config.go:132.23,134.5 1 0 -github.com/echovault/sugardb/internal/config/config.go:135.4,136.14 2 0 -github.com/echovault/sugardb/internal/config/config.go:139.2,143.24 2 0 -github.com/echovault/sugardb/internal/config/config.go:143.24,144.36 1 0 -github.com/echovault/sugardb/internal/config/config.go:144.36,146.5 1 0 -github.com/echovault/sugardb/internal/config/config.go:147.4,148.14 2 0 -github.com/echovault/sugardb/internal/config/config.go:151.2,195.14 26 0 -github.com/echovault/sugardb/internal/config/config.go:195.14,197.3 1 0 -github.com/echovault/sugardb/internal/config/config.go:198.2,199.14 2 0 -github.com/echovault/sugardb/internal/config/config.go:199.14,201.3 1 0 -github.com/echovault/sugardb/internal/config/config.go:203.2,236.22 2 0 -github.com/echovault/sugardb/internal/config/config.go:236.22,238.45 1 0 -github.com/echovault/sugardb/internal/config/config.go:238.45,239.14 1 0 -github.com/echovault/sugardb/internal/config/config.go:240.9,241.17 1 0 -github.com/echovault/sugardb/internal/config/config.go:241.17,242.36 1 0 -github.com/echovault/sugardb/internal/config/config.go:242.36,244.6 1 0 -github.com/echovault/sugardb/internal/config/config.go:247.4,249.22 2 0 -github.com/echovault/sugardb/internal/config/config.go:249.22,250.59 1 0 -github.com/echovault/sugardb/internal/config/config.go:250.59,252.6 1 0 -github.com/echovault/sugardb/internal/config/config.go:255.4,255.39 1 0 -github.com/echovault/sugardb/internal/config/config.go:255.39,256.59 1 0 -github.com/echovault/sugardb/internal/config/config.go:256.59,258.6 1 0 -github.com/echovault/sugardb/internal/config/config.go:264.2,266.45 2 0 -github.com/echovault/sugardb/internal/config/config.go:266.45,268.3 1 0 -github.com/echovault/sugardb/internal/config/config.go:270.2,270.18 1 0 -github.com/echovault/sugardb/internal/config/default.go:10.29,46.2 3 0 +github.com/echovault/sugardb/pkg/config/config.go:68.34,74.24 3 0 +github.com/echovault/sugardb/pkg/config/config.go:74.24,76.35 2 0 +github.com/echovault/sugardb/pkg/config/config.go:76.35,78.5 1 0 +github.com/echovault/sugardb/pkg/config/config.go:79.4,79.22 1 0 +github.com/echovault/sugardb/pkg/config/config.go:79.22,81.5 1 0 +github.com/echovault/sugardb/pkg/config/config.go:82.4,83.14 2 0 +github.com/echovault/sugardb/pkg/config/config.go:86.2,86.115 1 0 +github.com/echovault/sugardb/pkg/config/config.go:86.115,89.3 2 0 +github.com/echovault/sugardb/pkg/config/config.go:91.2,94.29 2 0 +github.com/echovault/sugardb/pkg/config/config.go:94.29,95.86 1 0 +github.com/echovault/sugardb/pkg/config/config.go:95.86,97.5 1 0 +github.com/echovault/sugardb/pkg/config/config.go:97.7,99.5 1 0 +github.com/echovault/sugardb/pkg/config/config.go:100.4,101.14 2 0 +github.com/echovault/sugardb/pkg/config/config.go:104.2,107.59 2 0 +github.com/echovault/sugardb/pkg/config/config.go:107.59,109.17 2 0 +github.com/echovault/sugardb/pkg/config/config.go:109.17,111.4 1 0 +github.com/echovault/sugardb/pkg/config/config.go:112.3,113.13 2 0 +github.com/echovault/sugardb/pkg/config/config.go:116.2,125.88 2 0 +github.com/echovault/sugardb/pkg/config/config.go:125.88,132.23 3 0 +github.com/echovault/sugardb/pkg/config/config.go:132.23,134.5 1 0 +github.com/echovault/sugardb/pkg/config/config.go:135.4,136.14 2 0 +github.com/echovault/sugardb/pkg/config/config.go:139.2,143.24 2 0 +github.com/echovault/sugardb/pkg/config/config.go:143.24,144.36 1 0 +github.com/echovault/sugardb/pkg/config/config.go:144.36,146.5 1 0 +github.com/echovault/sugardb/pkg/config/config.go:147.4,148.14 2 0 +github.com/echovault/sugardb/pkg/config/config.go:151.2,195.14 26 0 +github.com/echovault/sugardb/pkg/config/config.go:195.14,197.3 1 0 +github.com/echovault/sugardb/pkg/config/config.go:198.2,199.14 2 0 +github.com/echovault/sugardb/pkg/config/config.go:199.14,201.3 1 0 +github.com/echovault/sugardb/pkg/config/config.go:203.2,236.22 2 0 +github.com/echovault/sugardb/pkg/config/config.go:236.22,238.45 1 0 +github.com/echovault/sugardb/pkg/config/config.go:238.45,239.14 1 0 +github.com/echovault/sugardb/pkg/config/config.go:240.9,241.17 1 0 +github.com/echovault/sugardb/pkg/config/config.go:241.17,242.36 1 0 +github.com/echovault/sugardb/pkg/config/config.go:242.36,244.6 1 0 +github.com/echovault/sugardb/pkg/config/config.go:247.4,249.22 2 0 +github.com/echovault/sugardb/pkg/config/config.go:249.22,250.59 1 0 +github.com/echovault/sugardb/pkg/config/config.go:250.59,252.6 1 0 +github.com/echovault/sugardb/pkg/config/config.go:255.4,255.39 1 0 +github.com/echovault/sugardb/pkg/config/config.go:255.39,256.59 1 0 +github.com/echovault/sugardb/pkg/config/config.go:256.59,258.6 1 0 +github.com/echovault/sugardb/pkg/config/config.go:264.2,266.45 2 0 +github.com/echovault/sugardb/pkg/config/config.go:266.45,268.3 1 0 +github.com/echovault/sugardb/pkg/config/config.go:270.2,270.18 1 0 +github.com/echovault/sugardb/pkg/config/default.go:10.29,46.2 3 0 github.com/echovault/sugardb/internal/aof/log/store.go:55.54,56.28 1 1 github.com/echovault/sugardb/internal/aof/log/store.go:56.28,58.3 1 1 github.com/echovault/sugardb/internal/aof/log/store.go:61.55,62.28 1 1 diff --git a/internal/memberlist/delegate.go b/internal/memberlist/delegate.go index a9433e89..c948c49e 100644 --- a/internal/memberlist/delegate.go +++ b/internal/memberlist/delegate.go @@ -18,12 +18,13 @@ import ( "context" "encoding/json" "fmt" + "log" + "time" + "github.com/echovault/sugardb/internal" - "github.com/echovault/sugardb/internal/config" + "github.com/echovault/sugardb/pkg/config" "github.com/hashicorp/memberlist" "github.com/hashicorp/raft" - "log" - "time" ) type Delegate struct { diff --git a/internal/memberlist/memberlist.go b/internal/memberlist/memberlist.go index 861bd250..29c3926e 100644 --- a/internal/memberlist/memberlist.go +++ b/internal/memberlist/memberlist.go @@ -18,12 +18,13 @@ import ( "context" "crypto/md5" "fmt" - "github.com/echovault/sugardb/internal" - "github.com/echovault/sugardb/internal/config" "log" "sync" "time" + "github.com/echovault/sugardb/internal" + "github.com/echovault/sugardb/pkg/config" + "github.com/hashicorp/memberlist" "github.com/hashicorp/raft" "github.com/sethvargo/go-retry" diff --git a/internal/modules/acl/acl.go b/internal/modules/acl/acl.go index ba8ee831..a36cfba6 100644 --- a/internal/modules/acl/acl.go +++ b/internal/modules/acl/acl.go @@ -21,11 +21,6 @@ import ( "encoding/json" "errors" "fmt" - "github.com/echovault/sugardb/internal" - "github.com/echovault/sugardb/internal/config" - "github.com/echovault/sugardb/internal/constants" - "github.com/gobwas/glob" - "gopkg.in/yaml.v3" "log" "net" "os" @@ -35,6 +30,12 @@ import ( "strings" "sync" "time" + + "github.com/echovault/sugardb/internal" + "github.com/echovault/sugardb/internal/constants" + "github.com/echovault/sugardb/pkg/config" + "github.com/gobwas/glob" + "gopkg.in/yaml.v3" ) type Connection struct { diff --git a/internal/modules/acl/commands_test.go b/internal/modules/acl/commands_test.go index 15cffdca..78ad4827 100644 --- a/internal/modules/acl/commands_test.go +++ b/internal/modules/acl/commands_test.go @@ -18,17 +18,18 @@ import ( "crypto/sha256" "encoding/hex" "fmt" - "github.com/echovault/sugardb/internal" - "github.com/echovault/sugardb/internal/config" - "github.com/echovault/sugardb/internal/constants" - "github.com/echovault/sugardb/sugardb" - "github.com/tidwall/resp" "os" "path" "slices" "strings" "sync" "testing" + + "github.com/echovault/sugardb/internal" + "github.com/echovault/sugardb/internal/constants" + "github.com/echovault/sugardb/pkg/config" + "github.com/echovault/sugardb/sugardb" + "github.com/tidwall/resp" ) func setUpServer(port int, requirePass bool, aclConfig string) (*sugardb.SugarDB, error) { diff --git a/internal/modules/connection/commands_test.go b/internal/modules/connection/commands_test.go index 2266e72d..51f14eaa 100644 --- a/internal/modules/connection/commands_test.go +++ b/internal/modules/connection/commands_test.go @@ -21,15 +21,16 @@ import ( "encoding/hex" "errors" "fmt" - "github.com/echovault/sugardb/internal/modules/connection" "reflect" "strconv" "strings" "testing" + "github.com/echovault/sugardb/internal/modules/connection" + "github.com/echovault/sugardb/internal" - "github.com/echovault/sugardb/internal/config" "github.com/echovault/sugardb/internal/constants" + "github.com/echovault/sugardb/pkg/config" "github.com/echovault/sugardb/sugardb" "github.com/tidwall/resp" ) diff --git a/internal/modules/generic/commands_test.go b/internal/modules/generic/commands_test.go index b34fbe64..05177c2b 100644 --- a/internal/modules/generic/commands_test.go +++ b/internal/modules/generic/commands_test.go @@ -17,19 +17,19 @@ package generic_test import ( "errors" "fmt" + "reflect" + "sort" "strconv" "strings" "testing" "time" - "sort" - "reflect" "github.com/echovault/sugardb/internal" "github.com/echovault/sugardb/internal/clock" - "github.com/echovault/sugardb/internal/config" "github.com/echovault/sugardb/internal/constants" "github.com/echovault/sugardb/internal/modules/set" "github.com/echovault/sugardb/internal/modules/sorted_set" + "github.com/echovault/sugardb/pkg/config" "github.com/echovault/sugardb/sugardb" "github.com/tidwall/resp" ) @@ -3981,7 +3981,7 @@ func Test_Generic(t *testing.T) { if !strings.EqualFold(res.String(), "ok") { t.Errorf("expected FLUSHALL response to be \"ok\", got %s", res.String()) } - + // preset values if test.presetValues != nil { for k, v := range test.presetValues { diff --git a/internal/modules/hash/commands_test.go b/internal/modules/hash/commands_test.go index f67b5b7f..5a379fba 100644 --- a/internal/modules/hash/commands_test.go +++ b/internal/modules/hash/commands_test.go @@ -25,9 +25,9 @@ import ( "github.com/echovault/sugardb/internal" "github.com/echovault/sugardb/internal/clock" - "github.com/echovault/sugardb/internal/config" "github.com/echovault/sugardb/internal/constants" "github.com/echovault/sugardb/internal/modules/hash" + "github.com/echovault/sugardb/pkg/config" "github.com/echovault/sugardb/sugardb" "github.com/tidwall/resp" ) diff --git a/internal/modules/list/commands_test.go b/internal/modules/list/commands_test.go index 2efe9e6b..3435dcfb 100644 --- a/internal/modules/list/commands_test.go +++ b/internal/modules/list/commands_test.go @@ -16,16 +16,17 @@ package list_test import ( "errors" - "github.com/echovault/sugardb/internal" - "github.com/echovault/sugardb/internal/config" - "github.com/echovault/sugardb/internal/constants" - "github.com/echovault/sugardb/sugardb" - "github.com/tidwall/resp" "go/types" "slices" "strconv" "strings" "testing" + + "github.com/echovault/sugardb/internal" + "github.com/echovault/sugardb/internal/constants" + "github.com/echovault/sugardb/pkg/config" + "github.com/echovault/sugardb/sugardb" + "github.com/tidwall/resp" ) func Test_List(t *testing.T) { diff --git a/internal/modules/pubsub/commands_test.go b/internal/modules/pubsub/commands_test.go index 6b3b1dd9..7b713333 100644 --- a/internal/modules/pubsub/commands_test.go +++ b/internal/modules/pubsub/commands_test.go @@ -15,16 +15,17 @@ package pubsub_test import ( - "github.com/echovault/sugardb/internal" - "github.com/echovault/sugardb/internal/config" - "github.com/echovault/sugardb/internal/constants" - "github.com/echovault/sugardb/sugardb" - "github.com/tidwall/resp" "net" "slices" "strings" "sync" "testing" + + "github.com/echovault/sugardb/internal" + "github.com/echovault/sugardb/internal/constants" + "github.com/echovault/sugardb/pkg/config" + "github.com/echovault/sugardb/sugardb" + "github.com/tidwall/resp" ) func setUpServer(port int) (*sugardb.SugarDB, error) { diff --git a/internal/modules/set/commands_test.go b/internal/modules/set/commands_test.go index aeefd064..cc7f1c5b 100644 --- a/internal/modules/set/commands_test.go +++ b/internal/modules/set/commands_test.go @@ -16,16 +16,17 @@ package set_test import ( "errors" + "slices" + "strconv" + "strings" + "testing" + "github.com/echovault/sugardb/internal" - "github.com/echovault/sugardb/internal/config" "github.com/echovault/sugardb/internal/constants" "github.com/echovault/sugardb/internal/modules/set" + "github.com/echovault/sugardb/pkg/config" "github.com/echovault/sugardb/sugardb" "github.com/tidwall/resp" - "slices" - "strconv" - "strings" - "testing" ) func Test_Set(t *testing.T) { diff --git a/internal/modules/sorted_set/commands_test.go b/internal/modules/sorted_set/commands_test.go index b19286fb..ad53102a 100644 --- a/internal/modules/sorted_set/commands_test.go +++ b/internal/modules/sorted_set/commands_test.go @@ -23,9 +23,9 @@ import ( "testing" "github.com/echovault/sugardb/internal" - "github.com/echovault/sugardb/internal/config" "github.com/echovault/sugardb/internal/constants" "github.com/echovault/sugardb/internal/modules/sorted_set" + "github.com/echovault/sugardb/pkg/config" "github.com/echovault/sugardb/sugardb" "github.com/tidwall/resp" ) diff --git a/internal/modules/string/commands_test.go b/internal/modules/string/commands_test.go index ad8d940a..8b037917 100644 --- a/internal/modules/string/commands_test.go +++ b/internal/modules/string/commands_test.go @@ -21,8 +21,8 @@ import ( "testing" "github.com/echovault/sugardb/internal" - "github.com/echovault/sugardb/internal/config" "github.com/echovault/sugardb/internal/constants" + "github.com/echovault/sugardb/pkg/config" "github.com/echovault/sugardb/sugardb" "github.com/tidwall/resp" ) diff --git a/internal/raft/fsm.go b/internal/raft/fsm.go index d30d570d..5fc29466 100644 --- a/internal/raft/fsm.go +++ b/internal/raft/fsm.go @@ -18,14 +18,15 @@ import ( "context" "encoding/json" "fmt" - "github.com/echovault/sugardb/internal" - "github.com/echovault/sugardb/internal/config" - "github.com/hashicorp/raft" "io" "log" "net" "strings" "time" + + "github.com/echovault/sugardb/internal" + "github.com/echovault/sugardb/pkg/config" + "github.com/hashicorp/raft" ) type FSMOpts struct { diff --git a/internal/raft/fsm_snapshot.go b/internal/raft/fsm_snapshot.go index 49aee0ff..69434e42 100644 --- a/internal/raft/fsm_snapshot.go +++ b/internal/raft/fsm_snapshot.go @@ -16,12 +16,13 @@ package raft import ( "encoding/json" - "github.com/echovault/sugardb/internal" - "github.com/echovault/sugardb/internal/config" - "github.com/hashicorp/raft" "strconv" "strings" "time" + + "github.com/echovault/sugardb/internal" + "github.com/echovault/sugardb/pkg/config" + "github.com/hashicorp/raft" ) type SnapshotOpts struct { diff --git a/internal/raft/raft.go b/internal/raft/raft.go index 98e217f9..9d317b9b 100644 --- a/internal/raft/raft.go +++ b/internal/raft/raft.go @@ -25,8 +25,8 @@ import ( "time" "github.com/echovault/sugardb/internal" - "github.com/echovault/sugardb/internal/config" "github.com/echovault/sugardb/internal/memberlist" + "github.com/echovault/sugardb/pkg/config" "github.com/hashicorp/raft" raftboltdb "github.com/hashicorp/raft-boltdb" diff --git a/internal/config/config.go b/pkg/config/config.go similarity index 100% rename from internal/config/config.go rename to pkg/config/config.go diff --git a/internal/config/config_test.go b/pkg/config/config_test.go similarity index 100% rename from internal/config/config_test.go rename to pkg/config/config_test.go diff --git a/internal/config/default.go b/pkg/config/default.go similarity index 100% rename from internal/config/default.go rename to pkg/config/default.go diff --git a/internal/config/default_test.go b/pkg/config/default_test.go similarity index 100% rename from internal/config/default_test.go rename to pkg/config/default_test.go diff --git a/sugardb/api_generic_test.go b/sugardb/api_generic_test.go index 77c79b28..592b4e22 100644 --- a/sugardb/api_generic_test.go +++ b/sugardb/api_generic_test.go @@ -16,15 +16,16 @@ package sugardb import ( "context" - "github.com/echovault/sugardb/internal" - "github.com/echovault/sugardb/internal/clock" - "github.com/echovault/sugardb/internal/config" - "github.com/echovault/sugardb/internal/constants" "reflect" "slices" "strings" "testing" "time" + + "github.com/echovault/sugardb/internal" + "github.com/echovault/sugardb/internal/clock" + "github.com/echovault/sugardb/internal/constants" + "github.com/echovault/sugardb/pkg/config" ) func TestSugarDB_Generic(t *testing.T) { @@ -2221,7 +2222,7 @@ func TestSugarDB_Generic(t *testing.T) { t.Cleanup(func() { server.ShutDown() }) - + if tt.presetValues != nil { for k, v := range tt.presetValues { err := presetValue(server, context.Background(), k, v) diff --git a/sugardb/config.go b/sugardb/config.go index f79c04cf..e39098bf 100644 --- a/sugardb/config.go +++ b/sugardb/config.go @@ -19,8 +19,8 @@ import ( "time" "github.com/echovault/sugardb/internal" - "github.com/echovault/sugardb/internal/config" "github.com/echovault/sugardb/internal/constants" + "github.com/echovault/sugardb/pkg/config" ) // DefaultConfig returns the default configuration. diff --git a/sugardb/sugardb.go b/sugardb/sugardb.go index 9c5b4f47..aaecefbd 100644 --- a/sugardb/sugardb.go +++ b/sugardb/sugardb.go @@ -20,10 +20,18 @@ import ( "crypto/x509" "errors" "fmt" + "io" + "log" + "net" + "os" + "slices" + "sync" + "sync/atomic" + "time" + "github.com/echovault/sugardb/internal" "github.com/echovault/sugardb/internal/aof" "github.com/echovault/sugardb/internal/clock" - "github.com/echovault/sugardb/internal/config" "github.com/echovault/sugardb/internal/constants" "github.com/echovault/sugardb/internal/eviction" "github.com/echovault/sugardb/internal/memberlist" @@ -39,15 +47,8 @@ import ( str "github.com/echovault/sugardb/internal/modules/string" "github.com/echovault/sugardb/internal/raft" "github.com/echovault/sugardb/internal/snapshot" + "github.com/echovault/sugardb/pkg/config" lua "github.com/yuin/gopher-lua" - "io" - "log" - "net" - "os" - "slices" - "sync" - "sync/atomic" - "time" ) type SugarDB struct { diff --git a/sugardb/sugardb_test.go b/sugardb/sugardb_test.go index 5cf81d67..f507c6a6 100644 --- a/sugardb/sugardb_test.go +++ b/sugardb/sugardb_test.go @@ -20,12 +20,6 @@ import ( "crypto/tls" "crypto/x509" "fmt" - "github.com/echovault/sugardb/internal" - "github.com/echovault/sugardb/internal/clock" - "github.com/echovault/sugardb/internal/config" - "github.com/echovault/sugardb/internal/constants" - "github.com/go-test/deep" - "github.com/tidwall/resp" "io" "math" "net" @@ -35,6 +29,13 @@ import ( "sync" "testing" "time" + + "github.com/echovault/sugardb/internal" + "github.com/echovault/sugardb/internal/clock" + "github.com/echovault/sugardb/internal/constants" + "github.com/echovault/sugardb/pkg/config" + "github.com/go-test/deep" + "github.com/tidwall/resp" ) type ClientServerPair struct { diff --git a/sugardb/test_helpers.go b/sugardb/test_helpers.go index 054c41f5..6a4d7fbf 100644 --- a/sugardb/test_helpers.go +++ b/sugardb/test_helpers.go @@ -5,8 +5,8 @@ import ( "strconv" "github.com/echovault/sugardb/internal" - "github.com/echovault/sugardb/internal/config" "github.com/echovault/sugardb/internal/constants" + "github.com/echovault/sugardb/pkg/config" ) func createSugarDB() *SugarDB { @@ -40,12 +40,12 @@ func presetKeyData(server *SugarDB, ctx context.Context, key string, data intern server.setExpiry(ctx, key, data.ExpireAt, false) } -func getValue (server *SugarDB, ctx context.Context, key string, database string) (interface{}, error) { +func getValue(server *SugarDB, ctx context.Context, key string, database string) (interface{}, error) { db, err := strconv.Atoi(database) if err != nil { return nil, err } ctx = context.WithValue(ctx, "Database", db) - + return server.getValues(ctx, []string{key})[key], err -} \ No newline at end of file +}