More standard Go project directory structure

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() {

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"

internal/invite/invite.go

@@ -5,8 +5,7 @@ import (
 	"database/sql"
 	"errors"
 	"math/big"
-
+	"whitelistmanager/internal/store"
-	"whitelistmanager/store"
 )
 
 const NotOwnerofServer = "user is not owner of server"

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) {

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 (

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 {

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 {

mocks/invite/invite.go

@@ -6,8 +6,7 @@ package mock_invite
 
 import (
 	reflect "reflect"
-
+	"whitelistmanager/internal/store"
-	store "whitelistmanager/store"
 
 	gomock "github.com/golang/mock/gomock"
 )

mocks/minecraft/minecraft.go

@@ -6,8 +6,7 @@ package mock_minecraft
 
 import (
 	reflect "reflect"
-
+	"whitelistmanager/internal/store"
-	store "whitelistmanager/store"
 
 	gomock "github.com/golang/mock/gomock"
 )

mocks/store/database.go

@@ -6,8 +6,7 @@ package mock_store
 
 import (
 	reflect "reflect"
-
+	"whitelistmanager/internal/store"
-	store "whitelistmanager/store"
 
 	gomock "github.com/golang/mock/gomock"
 )