Merge pull request #32 from EchoVault/refactor/handler-params

Refactor HandlerFunc to accept a params struct containing all values & functions instead of an instance of EchoVault interface

Makefile

@@ -7,7 +7,7 @@ build:
 run:
 	make build && docker-compose up --build
 
-test:
+test-unit:
 	go clean -testcache && go test ./... -coverprofile coverage/coverage.out
 
 test-race:

cmd/main.go

@@ -18,7 +18,6 @@ import (
 	"context"
 	"github.com/echovault/echovault/internal"
 	"github.com/echovault/echovault/internal/config"
-	"github.com/echovault/echovault/pkg/commands"
 	"github.com/echovault/echovault/pkg/echovault"
 	"log"
 	"os"
@@ -49,7 +48,6 @@ func main() {
 	server, err := echovault.NewEchoVault(
 		echovault.WithContext(ctx),
 		echovault.WithConfig(conf),
-		echovault.WithCommands(commands.All()),
 	)
 
 	if err != nil {

internal/acl/acl.go → internal/modules/acl/acl.go

@@ -20,9 +20,9 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/echovault/echovault/internal"
 	"github.com/echovault/echovault/internal/config"
 	"github.com/echovault/echovault/pkg/constants"
-	"github.com/echovault/echovault/pkg/types"
 	"github.com/gobwas/glob"
 	"gopkg.in/yaml.v3"
 	"log"
@@ -286,7 +286,7 @@ func (acl *ACL) AuthenticateConnection(_ context.Context, conn *net.Conn, cmd []
 	return errors.New("could not authenticate user")
 }
 
-func (acl *ACL) AuthorizeConnection(conn *net.Conn, cmd []string, command types.Command, subCommand types.SubCommand) error {
+func (acl *ACL) AuthorizeConnection(conn *net.Conn, cmd []string, command internal.Command, subCommand internal.SubCommand) error {
 	acl.RLockUsers()
 	defer acl.RUnlockUsers()
 
@@ -303,7 +303,7 @@ func (acl *ACL) AuthorizeConnection(conn *net.Conn, cmd []string, command types.
 	readKeys := keys.ReadKeys
 	writeKeys := keys.WriteKeys
 
-	if !reflect.DeepEqual(subCommand, types.SubCommand{}) {
+	if !reflect.DeepEqual(subCommand, internal.SubCommand{}) {
 		comm = fmt.Sprintf("%s|%s", comm, subCommand.Command)
 		categories = append(categories, subCommand.Categories...)
 		keys, err = subCommand.KeyExtractionFunc(cmd)