From dbb4a53e845b10b07284b707f929b345c74aede2 Mon Sep 17 00:00:00 2001 From: Jacob McSwain Date: Fri, 24 Feb 2023 18:47:13 -0600 Subject: [PATCH] Move internal/dmrconst -> internal/dmr/dmrconst --- internal/db/models/packet.go | 2 +- internal/db/models/packet_test.go | 2 +- internal/db/models/talkgroup.go | 2 +- internal/db/models/user.go | 2 +- internal/dmr/calltracker/call_tracker.go | 2 +- internal/{ => dmr}/dmrconst/const.go | 0 internal/{ => dmr}/dmrconst/const_test.go | 0 internal/dmr/servers/hbrp/packet_handlers.go | 2 +- internal/dmr/servers/hbrp/server.go | 2 +- internal/dmr/utils/utils.go | 2 +- internal/http/api/controllers/v1/users/users.go | 2 +- internal/http/api/controllers/v1/users/users_test.go | 2 +- internal/http/api/middleware/auth.go | 2 +- 13 files changed, 11 insertions(+), 11 deletions(-) rename internal/{ => dmr}/dmrconst/const.go (100%) rename internal/{ => dmr}/dmrconst/const_test.go (100%) diff --git a/internal/db/models/packet.go b/internal/db/models/packet.go index 90b1d2bed..4757fccc6 100644 --- a/internal/db/models/packet.go +++ b/internal/db/models/packet.go @@ -22,7 +22,7 @@ package models import ( "fmt" - "github.com/USA-RedDragon/DMRHub/internal/dmrconst" + "github.com/USA-RedDragon/DMRHub/internal/dmr/dmrconst" ) // Packet is a DMR packet diff --git a/internal/db/models/packet_test.go b/internal/db/models/packet_test.go index e23fbbdb4..0dce613a0 100644 --- a/internal/db/models/packet_test.go +++ b/internal/db/models/packet_test.go @@ -23,7 +23,7 @@ import ( "testing" "github.com/USA-RedDragon/DMRHub/internal/db/models" - "github.com/USA-RedDragon/DMRHub/internal/dmrconst" + "github.com/USA-RedDragon/DMRHub/internal/dmr/dmrconst" "github.com/google/go-cmp/cmp" ) diff --git a/internal/db/models/talkgroup.go b/internal/db/models/talkgroup.go index c69c9f292..e1ad3fdaf 100644 --- a/internal/db/models/talkgroup.go +++ b/internal/db/models/talkgroup.go @@ -23,7 +23,7 @@ package models import ( "time" - "github.com/USA-RedDragon/DMRHub/internal/dmrconst" + "github.com/USA-RedDragon/DMRHub/internal/dmr/dmrconst" "github.com/USA-RedDragon/DMRHub/internal/logging" gorm_seeder "github.com/kachit/gorm-seeder" "gorm.io/gorm" diff --git a/internal/db/models/user.go b/internal/db/models/user.go index e7f4a1894..30ecfea9c 100644 --- a/internal/db/models/user.go +++ b/internal/db/models/user.go @@ -24,7 +24,7 @@ import ( "time" "github.com/USA-RedDragon/DMRHub/internal/config" - "github.com/USA-RedDragon/DMRHub/internal/dmrconst" + "github.com/USA-RedDragon/DMRHub/internal/dmr/dmrconst" "github.com/USA-RedDragon/DMRHub/internal/http/api/utils" gorm_seeder "github.com/kachit/gorm-seeder" "gorm.io/gorm" diff --git a/internal/dmr/calltracker/call_tracker.go b/internal/dmr/calltracker/call_tracker.go index 9a53816e8..3061302c0 100644 --- a/internal/dmr/calltracker/call_tracker.go +++ b/internal/dmr/calltracker/call_tracker.go @@ -26,7 +26,7 @@ import ( "github.com/USA-RedDragon/DMRHub/internal/config" "github.com/USA-RedDragon/DMRHub/internal/db/models" - dmrconst "github.com/USA-RedDragon/DMRHub/internal/dmrconst" + dmrconst "github.com/USA-RedDragon/DMRHub/internal/dmr/dmrconst" "github.com/USA-RedDragon/DMRHub/internal/http/api/apimodels" "github.com/USA-RedDragon/DMRHub/internal/logging" "github.com/mitchellh/hashstructure/v2" diff --git a/internal/dmrconst/const.go b/internal/dmr/dmrconst/const.go similarity index 100% rename from internal/dmrconst/const.go rename to internal/dmr/dmrconst/const.go diff --git a/internal/dmrconst/const_test.go b/internal/dmr/dmrconst/const_test.go similarity index 100% rename from internal/dmrconst/const_test.go rename to internal/dmr/dmrconst/const_test.go diff --git a/internal/dmr/servers/hbrp/packet_handlers.go b/internal/dmr/servers/hbrp/packet_handlers.go index 42ddfd7dd..262bcbdb1 100644 --- a/internal/dmr/servers/hbrp/packet_handlers.go +++ b/internal/dmr/servers/hbrp/packet_handlers.go @@ -33,8 +33,8 @@ import ( "github.com/USA-RedDragon/DMRHub/internal/config" "github.com/USA-RedDragon/DMRHub/internal/db/models" + "github.com/USA-RedDragon/DMRHub/internal/dmr/dmrconst" "github.com/USA-RedDragon/DMRHub/internal/dmr/utils" - "github.com/USA-RedDragon/DMRHub/internal/dmrconst" "github.com/USA-RedDragon/DMRHub/internal/logging" "github.com/USA-RedDragon/DMRHub/internal/sdk" "go.opentelemetry.io/otel" diff --git a/internal/dmr/servers/hbrp/server.go b/internal/dmr/servers/hbrp/server.go index ed77d3359..393a93930 100644 --- a/internal/dmr/servers/hbrp/server.go +++ b/internal/dmr/servers/hbrp/server.go @@ -27,8 +27,8 @@ import ( "github.com/USA-RedDragon/DMRHub/internal/config" "github.com/USA-RedDragon/DMRHub/internal/db/models" "github.com/USA-RedDragon/DMRHub/internal/dmr/calltracker" + "github.com/USA-RedDragon/DMRHub/internal/dmr/dmrconst" "github.com/USA-RedDragon/DMRHub/internal/dmr/parrot" - "github.com/USA-RedDragon/DMRHub/internal/dmrconst" "github.com/USA-RedDragon/DMRHub/internal/logging" "github.com/redis/go-redis/v9" "go.opentelemetry.io/otel" diff --git a/internal/dmr/utils/utils.go b/internal/dmr/utils/utils.go index 61ca9dde9..e8551d269 100644 --- a/internal/dmr/utils/utils.go +++ b/internal/dmr/utils/utils.go @@ -22,7 +22,7 @@ package utils import ( "github.com/USA-RedDragon/DMRHub/internal/config" "github.com/USA-RedDragon/DMRHub/internal/db/models" - "github.com/USA-RedDragon/DMRHub/internal/dmrconst" + "github.com/USA-RedDragon/DMRHub/internal/dmr/dmrconst" "github.com/USA-RedDragon/DMRHub/internal/logging" ) diff --git a/internal/http/api/controllers/v1/users/users.go b/internal/http/api/controllers/v1/users/users.go index 3e7ce0541..58b21ea5c 100644 --- a/internal/http/api/controllers/v1/users/users.go +++ b/internal/http/api/controllers/v1/users/users.go @@ -28,7 +28,7 @@ import ( "github.com/USA-RedDragon/DMRHub/internal/config" "github.com/USA-RedDragon/DMRHub/internal/db/models" - "github.com/USA-RedDragon/DMRHub/internal/dmrconst" + "github.com/USA-RedDragon/DMRHub/internal/dmr/dmrconst" "github.com/USA-RedDragon/DMRHub/internal/http/api/apimodels" "github.com/USA-RedDragon/DMRHub/internal/http/api/utils" "github.com/USA-RedDragon/DMRHub/internal/userdb" diff --git a/internal/http/api/controllers/v1/users/users_test.go b/internal/http/api/controllers/v1/users/users_test.go index 35251d94d..4c162d1a7 100644 --- a/internal/http/api/controllers/v1/users/users_test.go +++ b/internal/http/api/controllers/v1/users/users_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/USA-RedDragon/DMRHub/internal/dmrconst" + "github.com/USA-RedDragon/DMRHub/internal/dmr/dmrconst" "github.com/USA-RedDragon/DMRHub/internal/http/api/apimodels" "github.com/USA-RedDragon/DMRHub/internal/testutils" "github.com/stretchr/testify/assert" diff --git a/internal/http/api/middleware/auth.go b/internal/http/api/middleware/auth.go index 9cf9c1f63..0701a2484 100644 --- a/internal/http/api/middleware/auth.go +++ b/internal/http/api/middleware/auth.go @@ -25,7 +25,7 @@ import ( "github.com/USA-RedDragon/DMRHub/internal/config" "github.com/USA-RedDragon/DMRHub/internal/db/models" - "github.com/USA-RedDragon/DMRHub/internal/dmrconst" + "github.com/USA-RedDragon/DMRHub/internal/dmr/dmrconst" "github.com/gin-contrib/sessions" "github.com/gin-gonic/gin" "go.opentelemetry.io/otel/attribute"