diff --git a/backend/services/http/README.md b/backend/cmd/http/README.md similarity index 100% rename from backend/services/http/README.md rename to backend/cmd/http/README.md diff --git a/backend/services/http/main.go b/backend/cmd/http/main.go similarity index 81% rename from backend/services/http/main.go rename to backend/cmd/http/main.go index d0e97d137..a7c1a4498 100644 --- a/backend/services/http/main.go +++ b/backend/cmd/http/main.go @@ -2,6 +2,7 @@ package main import ( "log" + "openreplay/backend/internal/http" "openreplay/backend/pkg/db/cache" "openreplay/backend/pkg/db/postgres" "openreplay/backend/pkg/pprof" @@ -16,7 +17,7 @@ func main() { pprof.StartProfilingServer() // Load configuration - cfg := NewConfig() + cfg := http.NewConfig() // Connect to queue producer := queue.NewProducer() @@ -27,16 +28,16 @@ func main() { defer dbConn.Close() // Build all services - services := NewServiceBuilder(cfg, producer, dbConn) + services := http.NewServiceBuilder(cfg, producer, dbConn) // Init server's routes - router, err := NewRouter(cfg, services) + router, err := http.NewRouter(cfg, services) if err != nil { log.Fatalf("failed while creating engine: %s", err) } // Init server - server, err := NewServer(router.GetHandler(), cfg.HTTPHost, cfg.HTTPPort, cfg.HTTPTimeout) + server, err := http.NewServer(router.GetHandler(), cfg.HTTPHost, cfg.HTTPPort, cfg.HTTPTimeout) if err != nil { log.Fatalf("failed while creating server: %s", err) } diff --git a/backend/services/http/assets.go b/backend/internal/http/assets.go similarity index 98% rename from backend/services/http/assets.go rename to backend/internal/http/assets.go index 0948984b0..f77c911f0 100644 --- a/backend/services/http/assets.go +++ b/backend/internal/http/assets.go @@ -1,4 +1,4 @@ -package main +package http import ( "openreplay/backend/pkg/messages" diff --git a/backend/services/http/config.go b/backend/internal/http/config.go similarity index 99% rename from backend/services/http/config.go rename to backend/internal/http/config.go index 4b29afb9d..56ca62067 100644 --- a/backend/services/http/config.go +++ b/backend/internal/http/config.go @@ -1,4 +1,4 @@ -package main +package http import ( "openreplay/backend/pkg/env" diff --git a/backend/services/http/geoip/geoip.go b/backend/internal/http/geoip/geoip.go similarity index 100% rename from backend/services/http/geoip/geoip.go rename to backend/internal/http/geoip/geoip.go diff --git a/backend/services/http/geoip/http.go b/backend/internal/http/geoip/http.go similarity index 100% rename from backend/services/http/geoip/http.go rename to backend/internal/http/geoip/http.go diff --git a/backend/services/http/handlers-ios.go b/backend/internal/http/handlers-ios.go similarity index 99% rename from backend/services/http/handlers-ios.go rename to backend/internal/http/handlers-ios.go index 4591a7d72..e92973f5f 100644 --- a/backend/services/http/handlers-ios.go +++ b/backend/internal/http/handlers-ios.go @@ -1,4 +1,4 @@ -package main +package http import ( "encoding/json" diff --git a/backend/services/http/handlers-web.go b/backend/internal/http/handlers-web.go similarity index 99% rename from backend/services/http/handlers-web.go rename to backend/internal/http/handlers-web.go index e9fc135b0..38ca89fb2 100644 --- a/backend/services/http/handlers-web.go +++ b/backend/internal/http/handlers-web.go @@ -1,4 +1,4 @@ -package main +package http import ( "bytes" diff --git a/backend/services/http/handlers.go b/backend/internal/http/handlers.go similarity index 98% rename from backend/services/http/handlers.go rename to backend/internal/http/handlers.go index 8f8979a4c..1854786fc 100644 --- a/backend/services/http/handlers.go +++ b/backend/internal/http/handlers.go @@ -1,4 +1,4 @@ -package main +package http import ( "io" diff --git a/backend/services/http/ios-device.go b/backend/internal/http/ios-device.go similarity index 99% rename from backend/services/http/ios-device.go rename to backend/internal/http/ios-device.go index 6a09e5e07..b5156d6dc 100644 --- a/backend/services/http/ios-device.go +++ b/backend/internal/http/ios-device.go @@ -1,4 +1,4 @@ -package main +package http import ( "strings" diff --git a/backend/services/http/model.go b/backend/internal/http/model.go similarity index 98% rename from backend/services/http/model.go rename to backend/internal/http/model.go index 5a7dd28bc..969bafe9c 100644 --- a/backend/services/http/model.go +++ b/backend/internal/http/model.go @@ -1,4 +1,4 @@ -package main +package http type startSessionRequest struct { Token string `json:"token"` diff --git a/backend/services/http/response.go b/backend/internal/http/response.go similarity index 97% rename from backend/services/http/response.go rename to backend/internal/http/response.go index 11d9b328d..2a3f14bea 100644 --- a/backend/services/http/response.go +++ b/backend/internal/http/response.go @@ -1,4 +1,4 @@ -package main +package http import ( "encoding/json" diff --git a/backend/services/http/router.go b/backend/internal/http/router.go similarity index 99% rename from backend/services/http/router.go rename to backend/internal/http/router.go index af624e32c..2fe1433a8 100644 --- a/backend/services/http/router.go +++ b/backend/internal/http/router.go @@ -1,4 +1,4 @@ -package main +package http import ( "github.com/gorilla/mux" diff --git a/backend/services/http/server.go b/backend/internal/http/server.go similarity index 98% rename from backend/services/http/server.go rename to backend/internal/http/server.go index 2b6056c20..ea7b08841 100644 --- a/backend/services/http/server.go +++ b/backend/internal/http/server.go @@ -1,4 +1,4 @@ -package main +package http import ( "context" diff --git a/backend/services/http/service.go b/backend/internal/http/service.go similarity index 90% rename from backend/services/http/service.go rename to backend/internal/http/service.go index d7eda7720..2bf46315b 100644 --- a/backend/services/http/service.go +++ b/backend/internal/http/service.go @@ -1,14 +1,14 @@ -package main +package http import ( + "openreplay/backend/internal/http/geoip" + "openreplay/backend/internal/http/uaparser" "openreplay/backend/pkg/db/cache" "openreplay/backend/pkg/flakeid" "openreplay/backend/pkg/queue/types" "openreplay/backend/pkg/storage" "openreplay/backend/pkg/token" "openreplay/backend/pkg/url/assets" - "openreplay/backend/services/http/geoip" - "openreplay/backend/services/http/uaparser" ) type ServiceBuilder struct { diff --git a/backend/services/http/uaparser/http.go b/backend/internal/http/uaparser/http.go similarity index 100% rename from backend/services/http/uaparser/http.go rename to backend/internal/http/uaparser/http.go diff --git a/backend/services/http/uaparser/uaparser.go b/backend/internal/http/uaparser/uaparser.go similarity index 100% rename from backend/services/http/uaparser/uaparser.go rename to backend/internal/http/uaparser/uaparser.go diff --git a/backend/services/http/uuid.go b/backend/internal/http/uuid.go similarity index 93% rename from backend/services/http/uuid.go rename to backend/internal/http/uuid.go index 87704d740..6ce1611a9 100644 --- a/backend/services/http/uuid.go +++ b/backend/internal/http/uuid.go @@ -1,4 +1,4 @@ -package main +package http import ( "github.com/google/uuid"