From 49db323e81962d13cf7e4313e9a500fa0285abd2 Mon Sep 17 00:00:00 2001 From: imterah Date: Sat, 28 Dec 2024 15:37:32 -0500 Subject: [PATCH] chore: Prepare for frontend support by moving the Go module files. This moves the Go module files to the root of the project and fixes all of the imports. --- backend/api/backendruntime/runtime.go | 4 ++-- backend/api/backup.go | 2 +- backend/api/controllers/v1/backends/create.go | 10 +++++----- backend/api/controllers/v1/backends/lookup.go | 8 ++++---- backend/api/controllers/v1/backends/remove.go | 8 ++++---- backend/api/controllers/v1/proxies/connections.go | 10 +++++----- backend/api/controllers/v1/proxies/create.go | 10 +++++----- backend/api/controllers/v1/proxies/lookup.go | 6 +++--- backend/api/controllers/v1/proxies/remove.go | 10 +++++----- backend/api/controllers/v1/proxies/start.go | 10 +++++----- backend/api/controllers/v1/proxies/stop.go | 10 +++++----- backend/api/controllers/v1/users/create.go | 6 +++--- backend/api/controllers/v1/users/login.go | 4 ++-- backend/api/controllers/v1/users/lookup.go | 6 +++--- backend/api/controllers/v1/users/refresh.go | 4 ++-- backend/api/controllers/v1/users/remove.go | 6 +++--- backend/api/jwtcore/jwt.go | 2 +- backend/api/main.go | 14 +++++++------- backend/api/permissions/permission_nodes.go | 2 +- backend/backendutil/application.go | 2 +- backend/backendutil/structure.go | 2 +- backend/dummybackend/main.go | 4 ++-- backend/externalbackendlauncher/main.go | 4 ++-- backend/sshbackend/main.go | 4 ++-- backend/go.mod => go.mod | 0 backend/go.sum => go.sum | 0 migration-entrypoint.sh | 2 +- 27 files changed, 75 insertions(+), 75 deletions(-) rename backend/go.mod => go.mod (100%) rename backend/go.sum => go.sum (100%) diff --git a/backend/api/backendruntime/runtime.go b/backend/api/backendruntime/runtime.go index 0f871f8..df9ceb6 100644 --- a/backend/api/backendruntime/runtime.go +++ b/backend/api/backendruntime/runtime.go @@ -8,8 +8,8 @@ import ( "os/exec" "time" - "git.terah.dev/imterah/hermes/backendlauncher" - "git.terah.dev/imterah/hermes/commonbackend" + "git.terah.dev/imterah/hermes/backend/backendlauncher" + "git.terah.dev/imterah/hermes/backend/commonbackend" "github.com/charmbracelet/log" ) diff --git a/backend/api/backup.go b/backend/api/backup.go index 1d4ebd8..98b83ec 100644 --- a/backend/api/backup.go +++ b/backend/api/backup.go @@ -9,7 +9,7 @@ import ( "os" "strings" - "git.terah.dev/imterah/hermes/api/dbcore" + "git.terah.dev/imterah/hermes/backend/api/dbcore" "github.com/charmbracelet/log" "github.com/go-playground/validator/v10" "github.com/urfave/cli/v2" diff --git a/backend/api/controllers/v1/backends/create.go b/backend/api/controllers/v1/backends/create.go index 2650fb5..03c3509 100644 --- a/backend/api/controllers/v1/backends/create.go +++ b/backend/api/controllers/v1/backends/create.go @@ -6,11 +6,11 @@ import ( "fmt" "net/http" - "git.terah.dev/imterah/hermes/api/backendruntime" - "git.terah.dev/imterah/hermes/api/dbcore" - "git.terah.dev/imterah/hermes/api/jwtcore" - "git.terah.dev/imterah/hermes/api/permissions" - "git.terah.dev/imterah/hermes/commonbackend" + "git.terah.dev/imterah/hermes/backend/api/backendruntime" + "git.terah.dev/imterah/hermes/backend/api/dbcore" + "git.terah.dev/imterah/hermes/backend/api/jwtcore" + "git.terah.dev/imterah/hermes/backend/api/permissions" + "git.terah.dev/imterah/hermes/backend/commonbackend" "github.com/charmbracelet/log" "github.com/gin-gonic/gin" "github.com/go-playground/validator/v10" diff --git a/backend/api/controllers/v1/backends/lookup.go b/backend/api/controllers/v1/backends/lookup.go index a68e183..9819df7 100644 --- a/backend/api/controllers/v1/backends/lookup.go +++ b/backend/api/controllers/v1/backends/lookup.go @@ -6,10 +6,10 @@ import ( "net/http" "strings" - "git.terah.dev/imterah/hermes/api/backendruntime" - "git.terah.dev/imterah/hermes/api/dbcore" - "git.terah.dev/imterah/hermes/api/jwtcore" - "git.terah.dev/imterah/hermes/api/permissions" + "git.terah.dev/imterah/hermes/backend/api/backendruntime" + "git.terah.dev/imterah/hermes/backend/api/dbcore" + "git.terah.dev/imterah/hermes/backend/api/jwtcore" + "git.terah.dev/imterah/hermes/backend/api/permissions" "github.com/charmbracelet/log" "github.com/gin-gonic/gin" "github.com/go-playground/validator/v10" diff --git a/backend/api/controllers/v1/backends/remove.go b/backend/api/controllers/v1/backends/remove.go index e1ea599..f9dbd8c 100644 --- a/backend/api/controllers/v1/backends/remove.go +++ b/backend/api/controllers/v1/backends/remove.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "git.terah.dev/imterah/hermes/api/backendruntime" - "git.terah.dev/imterah/hermes/api/dbcore" - "git.terah.dev/imterah/hermes/api/jwtcore" - "git.terah.dev/imterah/hermes/api/permissions" + "git.terah.dev/imterah/hermes/backend/api/backendruntime" + "git.terah.dev/imterah/hermes/backend/api/dbcore" + "git.terah.dev/imterah/hermes/backend/api/jwtcore" + "git.terah.dev/imterah/hermes/backend/api/permissions" "github.com/charmbracelet/log" "github.com/gin-gonic/gin" "github.com/go-playground/validator/v10" diff --git a/backend/api/controllers/v1/proxies/connections.go b/backend/api/controllers/v1/proxies/connections.go index 68e3639..9f1affa 100644 --- a/backend/api/controllers/v1/proxies/connections.go +++ b/backend/api/controllers/v1/proxies/connections.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "git.terah.dev/imterah/hermes/api/backendruntime" - "git.terah.dev/imterah/hermes/api/dbcore" - "git.terah.dev/imterah/hermes/api/jwtcore" - "git.terah.dev/imterah/hermes/api/permissions" - "git.terah.dev/imterah/hermes/commonbackend" + "git.terah.dev/imterah/hermes/backend/api/backendruntime" + "git.terah.dev/imterah/hermes/backend/api/dbcore" + "git.terah.dev/imterah/hermes/backend/api/jwtcore" + "git.terah.dev/imterah/hermes/backend/api/permissions" + "git.terah.dev/imterah/hermes/backend/commonbackend" "github.com/charmbracelet/log" "github.com/gin-gonic/gin" "github.com/go-playground/validator/v10" diff --git a/backend/api/controllers/v1/proxies/create.go b/backend/api/controllers/v1/proxies/create.go index 40cea76..1ac0bbc 100644 --- a/backend/api/controllers/v1/proxies/create.go +++ b/backend/api/controllers/v1/proxies/create.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "git.terah.dev/imterah/hermes/api/backendruntime" - "git.terah.dev/imterah/hermes/api/dbcore" - "git.terah.dev/imterah/hermes/api/jwtcore" - "git.terah.dev/imterah/hermes/api/permissions" - "git.terah.dev/imterah/hermes/commonbackend" + "git.terah.dev/imterah/hermes/backend/api/backendruntime" + "git.terah.dev/imterah/hermes/backend/api/dbcore" + "git.terah.dev/imterah/hermes/backend/api/jwtcore" + "git.terah.dev/imterah/hermes/backend/api/permissions" + "git.terah.dev/imterah/hermes/backend/commonbackend" "github.com/charmbracelet/log" "github.com/gin-gonic/gin" "github.com/go-playground/validator/v10" diff --git a/backend/api/controllers/v1/proxies/lookup.go b/backend/api/controllers/v1/proxies/lookup.go index f370e79..5f40698 100644 --- a/backend/api/controllers/v1/proxies/lookup.go +++ b/backend/api/controllers/v1/proxies/lookup.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "git.terah.dev/imterah/hermes/api/dbcore" - "git.terah.dev/imterah/hermes/api/jwtcore" - "git.terah.dev/imterah/hermes/api/permissions" + "git.terah.dev/imterah/hermes/backend/api/dbcore" + "git.terah.dev/imterah/hermes/backend/api/jwtcore" + "git.terah.dev/imterah/hermes/backend/api/permissions" "github.com/charmbracelet/log" "github.com/gin-gonic/gin" "github.com/go-playground/validator/v10" diff --git a/backend/api/controllers/v1/proxies/remove.go b/backend/api/controllers/v1/proxies/remove.go index c1b68f3..4e476dd 100644 --- a/backend/api/controllers/v1/proxies/remove.go +++ b/backend/api/controllers/v1/proxies/remove.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "git.terah.dev/imterah/hermes/api/backendruntime" - "git.terah.dev/imterah/hermes/api/dbcore" - "git.terah.dev/imterah/hermes/api/jwtcore" - "git.terah.dev/imterah/hermes/api/permissions" - "git.terah.dev/imterah/hermes/commonbackend" + "git.terah.dev/imterah/hermes/backend/api/backendruntime" + "git.terah.dev/imterah/hermes/backend/api/dbcore" + "git.terah.dev/imterah/hermes/backend/api/jwtcore" + "git.terah.dev/imterah/hermes/backend/api/permissions" + "git.terah.dev/imterah/hermes/backend/commonbackend" "github.com/charmbracelet/log" "github.com/gin-gonic/gin" "github.com/go-playground/validator/v10" diff --git a/backend/api/controllers/v1/proxies/start.go b/backend/api/controllers/v1/proxies/start.go index ff3e65c..2647277 100644 --- a/backend/api/controllers/v1/proxies/start.go +++ b/backend/api/controllers/v1/proxies/start.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "git.terah.dev/imterah/hermes/api/backendruntime" - "git.terah.dev/imterah/hermes/api/dbcore" - "git.terah.dev/imterah/hermes/api/jwtcore" - "git.terah.dev/imterah/hermes/api/permissions" - "git.terah.dev/imterah/hermes/commonbackend" + "git.terah.dev/imterah/hermes/backend/api/backendruntime" + "git.terah.dev/imterah/hermes/backend/api/dbcore" + "git.terah.dev/imterah/hermes/backend/api/jwtcore" + "git.terah.dev/imterah/hermes/backend/api/permissions" + "git.terah.dev/imterah/hermes/backend/commonbackend" "github.com/charmbracelet/log" "github.com/gin-gonic/gin" "github.com/go-playground/validator/v10" diff --git a/backend/api/controllers/v1/proxies/stop.go b/backend/api/controllers/v1/proxies/stop.go index c3562a5..474228a 100644 --- a/backend/api/controllers/v1/proxies/stop.go +++ b/backend/api/controllers/v1/proxies/stop.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "git.terah.dev/imterah/hermes/api/backendruntime" - "git.terah.dev/imterah/hermes/api/dbcore" - "git.terah.dev/imterah/hermes/api/jwtcore" - "git.terah.dev/imterah/hermes/api/permissions" - "git.terah.dev/imterah/hermes/commonbackend" + "git.terah.dev/imterah/hermes/backend/api/backendruntime" + "git.terah.dev/imterah/hermes/backend/api/dbcore" + "git.terah.dev/imterah/hermes/backend/api/jwtcore" + "git.terah.dev/imterah/hermes/backend/api/permissions" + "git.terah.dev/imterah/hermes/backend/commonbackend" "github.com/charmbracelet/log" "github.com/gin-gonic/gin" "github.com/go-playground/validator/v10" diff --git a/backend/api/controllers/v1/users/create.go b/backend/api/controllers/v1/users/create.go index 92cb543..e92858a 100644 --- a/backend/api/controllers/v1/users/create.go +++ b/backend/api/controllers/v1/users/create.go @@ -9,9 +9,9 @@ import ( "github.com/go-playground/validator/v10" - "git.terah.dev/imterah/hermes/api/dbcore" - "git.terah.dev/imterah/hermes/api/jwtcore" - permissionHelper "git.terah.dev/imterah/hermes/api/permissions" + "git.terah.dev/imterah/hermes/backend/api/dbcore" + "git.terah.dev/imterah/hermes/backend/api/jwtcore" + permissionHelper "git.terah.dev/imterah/hermes/backend/api/permissions" "github.com/charmbracelet/log" "github.com/gin-gonic/gin" "golang.org/x/crypto/bcrypt" diff --git a/backend/api/controllers/v1/users/login.go b/backend/api/controllers/v1/users/login.go index 1db7a81..b6fd586 100644 --- a/backend/api/controllers/v1/users/login.go +++ b/backend/api/controllers/v1/users/login.go @@ -6,8 +6,8 @@ import ( "fmt" "net/http" - "git.terah.dev/imterah/hermes/api/dbcore" - "git.terah.dev/imterah/hermes/api/jwtcore" + "git.terah.dev/imterah/hermes/backend/api/dbcore" + "git.terah.dev/imterah/hermes/backend/api/jwtcore" "github.com/charmbracelet/log" "github.com/gin-gonic/gin" "github.com/go-playground/validator/v10" diff --git a/backend/api/controllers/v1/users/lookup.go b/backend/api/controllers/v1/users/lookup.go index 2432470..04782e5 100644 --- a/backend/api/controllers/v1/users/lookup.go +++ b/backend/api/controllers/v1/users/lookup.go @@ -5,9 +5,9 @@ import ( "net/http" "strings" - "git.terah.dev/imterah/hermes/api/dbcore" - "git.terah.dev/imterah/hermes/api/jwtcore" - "git.terah.dev/imterah/hermes/api/permissions" + "git.terah.dev/imterah/hermes/backend/api/dbcore" + "git.terah.dev/imterah/hermes/backend/api/jwtcore" + "git.terah.dev/imterah/hermes/backend/api/permissions" "github.com/charmbracelet/log" "github.com/gin-gonic/gin" "github.com/go-playground/validator/v10" diff --git a/backend/api/controllers/v1/users/refresh.go b/backend/api/controllers/v1/users/refresh.go index 1bb9c1f..59fcf80 100644 --- a/backend/api/controllers/v1/users/refresh.go +++ b/backend/api/controllers/v1/users/refresh.go @@ -5,8 +5,8 @@ import ( "net/http" "time" - "git.terah.dev/imterah/hermes/api/dbcore" - "git.terah.dev/imterah/hermes/api/jwtcore" + "git.terah.dev/imterah/hermes/backend/api/dbcore" + "git.terah.dev/imterah/hermes/backend/api/jwtcore" "github.com/charmbracelet/log" "github.com/gin-gonic/gin" "github.com/go-playground/validator/v10" diff --git a/backend/api/controllers/v1/users/remove.go b/backend/api/controllers/v1/users/remove.go index 7edcf81..5446755 100644 --- a/backend/api/controllers/v1/users/remove.go +++ b/backend/api/controllers/v1/users/remove.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "git.terah.dev/imterah/hermes/api/dbcore" - "git.terah.dev/imterah/hermes/api/jwtcore" - "git.terah.dev/imterah/hermes/api/permissions" + "git.terah.dev/imterah/hermes/backend/api/dbcore" + "git.terah.dev/imterah/hermes/backend/api/jwtcore" + "git.terah.dev/imterah/hermes/backend/api/permissions" "github.com/charmbracelet/log" "github.com/gin-gonic/gin" "github.com/go-playground/validator/v10" diff --git a/backend/api/jwtcore/jwt.go b/backend/api/jwtcore/jwt.go index 44c0f05..ed2ec56 100644 --- a/backend/api/jwtcore/jwt.go +++ b/backend/api/jwtcore/jwt.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "git.terah.dev/imterah/hermes/api/dbcore" + "git.terah.dev/imterah/hermes/backend/api/dbcore" "github.com/golang-jwt/jwt/v5" ) diff --git a/backend/api/main.go b/backend/api/main.go index 54e83d5..c233d06 100644 --- a/backend/api/main.go +++ b/backend/api/main.go @@ -9,13 +9,13 @@ import ( "path/filepath" "strings" - "git.terah.dev/imterah/hermes/api/backendruntime" - "git.terah.dev/imterah/hermes/api/controllers/v1/backends" - "git.terah.dev/imterah/hermes/api/controllers/v1/proxies" - "git.terah.dev/imterah/hermes/api/controllers/v1/users" - "git.terah.dev/imterah/hermes/api/dbcore" - "git.terah.dev/imterah/hermes/api/jwtcore" - "git.terah.dev/imterah/hermes/commonbackend" + "git.terah.dev/imterah/hermes/backend/api/backendruntime" + "git.terah.dev/imterah/hermes/backend/api/controllers/v1/backends" + "git.terah.dev/imterah/hermes/backend/api/controllers/v1/proxies" + "git.terah.dev/imterah/hermes/backend/api/controllers/v1/users" + "git.terah.dev/imterah/hermes/backend/api/dbcore" + "git.terah.dev/imterah/hermes/backend/api/jwtcore" + "git.terah.dev/imterah/hermes/backend/commonbackend" "github.com/charmbracelet/log" "github.com/gin-gonic/gin" "github.com/urfave/cli/v2" diff --git a/backend/api/permissions/permission_nodes.go b/backend/api/permissions/permission_nodes.go index 812fafa..d682d69 100644 --- a/backend/api/permissions/permission_nodes.go +++ b/backend/api/permissions/permission_nodes.go @@ -1,6 +1,6 @@ package permissions -import "git.terah.dev/imterah/hermes/api/dbcore" +import "git.terah.dev/imterah/hermes/backend/api/dbcore" var DefaultPermissionNodes []string = []string{ "routes.add", diff --git a/backend/backendutil/application.go b/backend/backendutil/application.go index 2631209..5b99b2d 100644 --- a/backend/backendutil/application.go +++ b/backend/backendutil/application.go @@ -5,7 +5,7 @@ import ( "net" "os" - "git.terah.dev/imterah/hermes/commonbackend" + "git.terah.dev/imterah/hermes/backend/commonbackend" "github.com/charmbracelet/log" ) diff --git a/backend/backendutil/structure.go b/backend/backendutil/structure.go index 5bdcfa4..3b97466 100644 --- a/backend/backendutil/structure.go +++ b/backend/backendutil/structure.go @@ -1,6 +1,6 @@ package backendutil -import "git.terah.dev/imterah/hermes/commonbackend" +import "git.terah.dev/imterah/hermes/backend/commonbackend" type BackendInterface interface { StartBackend(arguments []byte) (bool, error) diff --git a/backend/dummybackend/main.go b/backend/dummybackend/main.go index 893944d..92d88f5 100644 --- a/backend/dummybackend/main.go +++ b/backend/dummybackend/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "git.terah.dev/imterah/hermes/backendutil" - "git.terah.dev/imterah/hermes/commonbackend" + "git.terah.dev/imterah/hermes/backend/backendutil" + "git.terah.dev/imterah/hermes/backend/commonbackend" "github.com/charmbracelet/log" ) diff --git a/backend/externalbackendlauncher/main.go b/backend/externalbackendlauncher/main.go index aa5e8ad..4c66c6a 100644 --- a/backend/externalbackendlauncher/main.go +++ b/backend/externalbackendlauncher/main.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "git.terah.dev/imterah/hermes/backendlauncher" - "git.terah.dev/imterah/hermes/commonbackend" + "git.terah.dev/imterah/hermes/backend/backendlauncher" + "git.terah.dev/imterah/hermes/backend/commonbackend" "github.com/charmbracelet/log" "github.com/urfave/cli/v2" ) diff --git a/backend/sshbackend/main.go b/backend/sshbackend/main.go index 963c1bd..e96ed5e 100644 --- a/backend/sshbackend/main.go +++ b/backend/sshbackend/main.go @@ -9,8 +9,8 @@ import ( "strings" "sync" - "git.terah.dev/imterah/hermes/backendutil" - "git.terah.dev/imterah/hermes/commonbackend" + "git.terah.dev/imterah/hermes/backend/backendutil" + "git.terah.dev/imterah/hermes/backend/commonbackend" "github.com/charmbracelet/log" "github.com/go-playground/validator/v10" "golang.org/x/crypto/ssh" diff --git a/backend/go.mod b/go.mod similarity index 100% rename from backend/go.mod rename to go.mod diff --git a/backend/go.sum b/go.sum similarity index 100% rename from backend/go.sum rename to go.sum diff --git a/migration-entrypoint.sh b/migration-entrypoint.sh index c1eb766..a00c408 100755 --- a/migration-entrypoint.sh +++ b/migration-entrypoint.sh @@ -40,7 +40,7 @@ echo "Restored backup. If this restore fails after the database has wiped, get a echo "copy the backup contents into the container (base64 decoded) at '/tmp/db.json.gz'," echo "and rerun /app/entrypoint.sh." echo "" -echo "If further issues continue, open an issue at 'https://git.terah.dev/imterah/hermes'." +echo "If further issues continue, open an issue at 'https://git.terah.dev/imterah/hermes/backend'." echo "If the migration succeeded, congratulations!" sleep 10000