Skip to content

refactor: Move config package to pkg directory and update imports #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: Move config package to pkg directory and update imports #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
90 changes: 45 additions & 45 deletions coverage/coverage.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions internal/memberlist/delegate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 3 additions & 2 deletions internal/memberlist/memberlist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
11 changes: 6 additions & 5 deletions internal/modules/acl/acl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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 {
Expand Down
11 changes: 6 additions & 5 deletions internal/modules/acl/commands_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
5 changes: 3 additions & 2 deletions internal/modules/connection/commands_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
8 changes: 4 additions & 4 deletions internal/modules/generic/commands_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion internal/modules/hash/commands_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
11 changes: 6 additions & 5 deletions internal/modules/list/commands_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
11 changes: 6 additions & 5 deletions internal/modules/pubsub/commands_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
11 changes: 6 additions & 5 deletions internal/modules/set/commands_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion internal/modules/sorted_set/commands_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/modules/string/commands_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
7 changes: 4 additions & 3 deletions internal/raft/fsm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
7 changes: 4 additions & 3 deletions internal/raft/fsm_snapshot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion internal/raft/raft.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
0 internal/config/config.go → pkg/config/config.go
View file
Open in desktop
File renamed without changes.
0 internal/config/config_test.go → pkg/config/config_test.go
View file
Open in desktop
File renamed without changes.
0 internal/config/default.go → pkg/config/default.go
View file
Open in desktop
File renamed without changes.
0 internal/config/default_test.go → pkg/config/default_test.go
View file
Open in desktop
File renamed without changes.
Loading