diff --git a/main.go b/cmd/wlm/main.go similarity index 90% rename from main.go rename to cmd/wlm/main.go index b9f1a6a..f1da3b8 100644 --- a/main.go +++ b/cmd/wlm/main.go @@ -3,13 +3,12 @@ package main import ( "log" "net/http" + "whitelistmanager/internal/invite" + "whitelistmanager/internal/minecraft" + "whitelistmanager/internal/store" + "whitelistmanager/internal/transport" "github.com/alexedwards/flow" - - "whitelistmanager/invite" - "whitelistmanager/minecraft" - "whitelistmanager/store" - "whitelistmanager/transport" ) func main() { diff --git a/auth/auth.go b/internal/auth/auth.go similarity index 99% rename from auth/auth.go rename to internal/auth/auth.go index f99145d..9398c50 100644 --- a/auth/auth.go +++ b/internal/auth/auth.go @@ -11,11 +11,10 @@ import ( "net/http" "os" "time" + "whitelistmanager/internal/store" "golang.org/x/oauth2" "golang.org/x/oauth2/endpoints" - - "whitelistmanager/store" ) const NoMinecraftOwnership = "minecraft is not owned" diff --git a/invite/invite.go b/internal/invite/invite.go similarity index 97% rename from invite/invite.go rename to internal/invite/invite.go index 62f22bf..09b6244 100644 --- a/invite/invite.go +++ b/internal/invite/invite.go @@ -5,8 +5,7 @@ import ( "database/sql" "errors" "math/big" - - "whitelistmanager/store" + "whitelistmanager/internal/store" ) const NotOwnerofServer = "user is not owner of server" diff --git a/invite/invite_test.go b/internal/invite/invite_test.go similarity index 96% rename from invite/invite_test.go rename to internal/invite/invite_test.go index d217874..c9a4e01 100644 --- a/invite/invite_test.go +++ b/internal/invite/invite_test.go @@ -3,12 +3,12 @@ package invite_test import ( "database/sql" "testing" + "whitelistmanager/internal/invite" + "whitelistmanager/internal/store" "github.com/golang/mock/gomock" - "whitelistmanager/invite" mock_store "whitelistmanager/mocks/store" - "whitelistmanager/store" ) func TestInvite(t *testing.T) { diff --git a/minecraft/minecraft.go b/internal/minecraft/minecraft.go similarity index 96% rename from minecraft/minecraft.go rename to internal/minecraft/minecraft.go index ed21e5d..53babd1 100644 --- a/minecraft/minecraft.go +++ b/internal/minecraft/minecraft.go @@ -3,10 +3,9 @@ package minecraft import ( "errors" "fmt" + "whitelistmanager/internal/store" mcrcon "github.com/Kelwing/mc-rcon" - - "whitelistmanager/store" ) const ( diff --git a/store/database.go b/internal/store/database.go similarity index 100% rename from store/database.go rename to internal/store/database.go diff --git a/store/database.sql b/internal/store/database.sql similarity index 100% rename from store/database.sql rename to internal/store/database.sql diff --git a/transport/http.go b/internal/transport/http.go similarity index 98% rename from transport/http.go rename to internal/transport/http.go index 3e89b38..9ed3e52 100644 --- a/transport/http.go +++ b/internal/transport/http.go @@ -10,14 +10,13 @@ import ( "fmt" "log" "net/http" + "whitelistmanager/internal/auth" + "whitelistmanager/internal/invite" + "whitelistmanager/internal/minecraft" + "whitelistmanager/internal/store" "github.com/alexedwards/flow" "github.com/google/uuid" - - "whitelistmanager/auth" - "whitelistmanager/invite" - "whitelistmanager/minecraft" - "whitelistmanager/store" ) type Handler struct { diff --git a/transport/http_test.go b/internal/transport/http_test.go similarity index 99% rename from transport/http_test.go rename to internal/transport/http_test.go index 0d753dc..23c933e 100644 --- a/transport/http_test.go +++ b/internal/transport/http_test.go @@ -12,16 +12,16 @@ import ( "strings" "testing" "time" + "whitelistmanager/internal/invite" + "whitelistmanager/internal/store" + "whitelistmanager/internal/transport" "github.com/alexedwards/flow" "github.com/golang/mock/gomock" - "whitelistmanager/invite" mock_invite "whitelistmanager/mocks/invite" mock_minecraft "whitelistmanager/mocks/minecraft" mock_store "whitelistmanager/mocks/store" - "whitelistmanager/store" - "whitelistmanager/transport" ) type invitePayload struct { diff --git a/mocks/invite/invite.go b/mocks/invite/invite.go index a96bed5..c64f51d 100644 --- a/mocks/invite/invite.go +++ b/mocks/invite/invite.go @@ -6,8 +6,7 @@ package mock_invite import ( reflect "reflect" - - store "whitelistmanager/store" + "whitelistmanager/internal/store" gomock "github.com/golang/mock/gomock" ) diff --git a/mocks/minecraft/minecraft.go b/mocks/minecraft/minecraft.go index 2f2556c..f39da15 100644 --- a/mocks/minecraft/minecraft.go +++ b/mocks/minecraft/minecraft.go @@ -6,8 +6,7 @@ package mock_minecraft import ( reflect "reflect" - - store "whitelistmanager/store" + "whitelistmanager/internal/store" gomock "github.com/golang/mock/gomock" ) diff --git a/mocks/store/database.go b/mocks/store/database.go index f21b362..d4b9843 100644 --- a/mocks/store/database.go +++ b/mocks/store/database.go @@ -6,8 +6,7 @@ package mock_store import ( reflect "reflect" - - store "whitelistmanager/store" + "whitelistmanager/internal/store" gomock "github.com/golang/mock/gomock" )