diff --git a/backend/cmd/api/main.go b/backend/cmd/api/main.go index 94a991cd..39df4ef2 100644 --- a/backend/cmd/api/main.go +++ b/backend/cmd/api/main.go @@ -3,11 +3,12 @@ package main import ( "fmt" "log" + registry "logbook/cmd/registry/client" "logbook/internal/startup" "logbook/internal/web/balancer" "logbook/internal/web/forwarder" - "logbook/internal/web/reception" + "logbook/internal/web/register" "logbook/internal/web/registryfile" "logbook/internal/web/router" "logbook/internal/web/sidecar" @@ -36,8 +37,7 @@ func Main() error { }, l) defer sc.Stop() - agent := reception.NewAgent(deplcfg, l) - err = agent.RegisterForwarders(map[models.Service]*forwarder.LoadBalancedReverseProxy{ + r, err := register.Forwarders(deplcfg, l, map[models.Service]*forwarder.LoadBalancedReverseProxy{ models.Users: forwarder.New(sc.InstanceSource(models.Users), deplcfg, l), models.Objectives: forwarder.New(sc.InstanceSource(models.Objectives), deplcfg, l), models.Profiles: forwarder.New(sc.InstanceSource(models.Profiles), deplcfg, l), @@ -50,7 +50,7 @@ func Main() error { err = router.StartServer(router.ServerParameters{ Port: deplcfg.Ports.Gateway, Router: deplcfg.Router, - ServeMux: agent.Mux(), + ServeMux: r, TlsCrt: args.TlsCertificate, TlsKey: args.TlsKey, }, l) diff --git a/backend/cmd/groups/main.go b/backend/cmd/groups/main.go index 83324d85..94f9d2ef 100644 --- a/backend/cmd/groups/main.go +++ b/backend/cmd/groups/main.go @@ -3,13 +3,14 @@ package main import ( "context" "fmt" + "logbook/cmd/groups/app" "logbook/cmd/groups/endpoints" "logbook/cmd/groups/service" registry "logbook/cmd/registry/client" "logbook/internal/startup" "logbook/internal/web/balancer" - "logbook/internal/web/reception" + "logbook/internal/web/register" "logbook/internal/web/registryfile" "logbook/internal/web/router" "logbook/internal/web/sidecar" @@ -45,8 +46,7 @@ func Main() error { pub := endpoints.NewPublic(a, l) pri := endpoints.NewPrivate(a, l) - agent := reception.NewAgent(deplcfg, l) - err = agent.RegisterEndpoints(pub, pri) + r, err := register.Endpoints(deplcfg, l, pub, pri) if err != nil { return fmt.Errorf("agent.RegisterEndpoints: %w", err) } @@ -55,7 +55,7 @@ func Main() error { Address: args.PrivateNetworkIp, Port: deplcfg.Ports.Objectives, Router: deplcfg.Router, - ServeMux: agent.Mux(), + ServeMux: r, Service: models.Groups, Sidecar: sc, TlsCrt: args.TlsCertificate, diff --git a/backend/cmd/internal/main.go b/backend/cmd/internal/main.go index 9fd6c974..5511f6b7 100644 --- a/backend/cmd/internal/main.go +++ b/backend/cmd/internal/main.go @@ -3,9 +3,10 @@ package main import ( "fmt" "log" + "logbook/internal/startup" "logbook/internal/web/forwarder" - "logbook/internal/web/reception" + "logbook/internal/web/register" "logbook/internal/web/registryfile" "logbook/internal/web/router" "logbook/models" @@ -23,25 +24,23 @@ func Main() error { }, l) defer registrysd.Stop() - agent := reception.NewAgent(deplcfg, l) - err = agent.RegisterForwarders(map[models.Service]*forwarder.LoadBalancedReverseProxy{ + r, err := register.Forwarders(deplcfg, l, map[models.Service]*forwarder.LoadBalancedReverseProxy{ models.Registry: forwarder.New(registrysd, deplcfg, l), }) if err != nil { - return fmt.Errorf("agent.RegisterForwarders: %w", err) + return fmt.Errorf("registering forwarders: %w", err) } - // err = agent.RegisterCommonalities() - // if err != nil { - // return fmt.Errorf("agent.RegisterCommonalities: %w", err) - // } - router.StartServer(router.ServerParameters{ + err = router.StartServer(router.ServerParameters{ Router: deplcfg.Router, Port: deplcfg.Ports.Internal, - ServeMux: agent.Mux(), + ServeMux: r, TlsCrt: args.TlsCertificate, TlsKey: args.TlsKey, }, l) + if err != nil { + return fmt.Errorf("starting server: %w", err) + } return nil } diff --git a/backend/cmd/objectives/main.go b/backend/cmd/objectives/main.go index c91671fd..50234d74 100644 --- a/backend/cmd/objectives/main.go +++ b/backend/cmd/objectives/main.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "log" + "logbook/cmd/objectives/app" "logbook/cmd/objectives/endpoints" "logbook/cmd/objectives/service" @@ -11,7 +12,7 @@ import ( sessions "logbook/cmd/sessions/client" "logbook/internal/startup" "logbook/internal/web/balancer" - "logbook/internal/web/reception" + "logbook/internal/web/register" "logbook/internal/web/registryfile" "logbook/internal/web/router" "logbook/internal/web/sidecar" @@ -47,8 +48,7 @@ func Main() error { pub := endpoints.NewPublic(a, sessions.NewClient(balancer.New(sc.InstanceSource(models.Sessions))), l) priv := endpoints.NewPrivate(a, l) - agent := reception.NewAgent(deplcfg, l) - err = agent.RegisterEndpoints(pub, priv) + r, err := register.Endpoints(deplcfg, l, pub, priv) if err != nil { return fmt.Errorf("agent.RegisterEndpoints: %w", err) } @@ -57,7 +57,7 @@ func Main() error { Address: args.PrivateNetworkIp, Port: deplcfg.Ports.Objectives, Router: deplcfg.Router, - ServeMux: agent.Mux(), + ServeMux: r, Service: models.Objectives, Sidecar: sc, TlsCrt: args.TlsCertificate, diff --git a/backend/cmd/pdp/main.go b/backend/cmd/pdp/main.go index 5faeb485..cf04ef2e 100644 --- a/backend/cmd/pdp/main.go +++ b/backend/cmd/pdp/main.go @@ -3,6 +3,8 @@ package main import ( "fmt" "log" + "os" + groups "logbook/cmd/groups/client" objectives "logbook/cmd/objectives/client" "logbook/cmd/pdp/decider" @@ -10,12 +12,11 @@ import ( registry "logbook/cmd/registry/client" "logbook/internal/startup" "logbook/internal/web/balancer" - "logbook/internal/web/reception" + "logbook/internal/web/register" "logbook/internal/web/registryfile" "logbook/internal/web/router" "logbook/internal/web/sidecar" "logbook/models" - "os" ) func Main() error { @@ -43,8 +44,7 @@ func Main() error { objectives.NewClient(balancer.New(sc.InstanceSource(models.Objectives))), ) eps := endpoints.NewPrivate(d, l) - agent := reception.NewAgent(deplcfg, l) - err = agent.RegisterEndpoints(nil, eps) + r, err := register.Endpoints(deplcfg, l, nil, eps) if err != nil { return fmt.Errorf("agent.RegisterEndpoints: %w", err) } @@ -55,7 +55,7 @@ func Main() error { Port: deplcfg.Ports.Pdp, Router: deplcfg.Router, Service: models.Pdp, - ServeMux: agent.Mux(), + ServeMux: r, Sidecar: sc, TlsCrt: args.TlsCertificate, TlsKey: args.TlsKey, diff --git a/backend/cmd/profiles/main.go b/backend/cmd/profiles/main.go index b0235f8a..28b4c759 100644 --- a/backend/cmd/profiles/main.go +++ b/backend/cmd/profiles/main.go @@ -4,13 +4,14 @@ import ( "context" "fmt" "log" + "logbook/cmd/profiles/app" "logbook/cmd/profiles/endpoints" "logbook/cmd/profiles/service" registry "logbook/cmd/registry/client" "logbook/internal/startup" "logbook/internal/web/balancer" - "logbook/internal/web/reception" + "logbook/internal/web/register" "logbook/internal/web/registryfile" "logbook/internal/web/router" "logbook/internal/web/sidecar" @@ -45,8 +46,7 @@ func Main() error { pri := endpoints.NewPrivate(a, l) - agent := reception.NewAgent(deplcfg, l) - err = agent.RegisterEndpoints(nil, pri) + r, err := register.Endpoints(deplcfg, l, nil, pri) if err != nil { return fmt.Errorf("agent.RegisterEndpoints: %w", err) } @@ -57,7 +57,7 @@ func Main() error { Port: deplcfg.Ports.Profiles, Router: deplcfg.Router, Service: models.Profiles, - ServeMux: agent.Mux(), + ServeMux: r, Sidecar: sc, TlsCrt: args.TlsCertificate, TlsKey: args.TlsKey, diff --git a/backend/cmd/registration/main.go b/backend/cmd/registration/main.go index ec032ea0..745fb88f 100644 --- a/backend/cmd/registration/main.go +++ b/backend/cmd/registration/main.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "log" + objectives "logbook/cmd/objectives/client" profiles "logbook/cmd/profiles/client" "logbook/cmd/registration/app" @@ -13,7 +14,7 @@ import ( sessions "logbook/cmd/sessions/client" "logbook/internal/startup" "logbook/internal/web/balancer" - "logbook/internal/web/reception" + "logbook/internal/web/register" "logbook/internal/web/registryfile" "logbook/internal/web/router" "logbook/internal/web/sidecar" @@ -50,8 +51,7 @@ func Main() error { Profiles: profiles.NewClient(balancer.New(sc.InstanceSource(models.Profiles))), } pub := endpoints.NewPublic(a, l) - agent := reception.NewAgent(deplcfg, l) - err = agent.RegisterEndpoints(pub, nil) + r, err := register.Endpoints(deplcfg, l, pub, nil) if err != nil { return fmt.Errorf("agent.RegisterEndpoints: %w", err) } @@ -62,7 +62,7 @@ func Main() error { Port: deplcfg.Ports.Registration, Router: deplcfg.Router, Service: models.Registration, - ServeMux: agent.Mux(), + ServeMux: r, Sidecar: sc, TlsCrt: args.TlsCertificate, TlsKey: args.TlsKey, diff --git a/backend/cmd/registry/main.go b/backend/cmd/registry/main.go index 443a49b3..5136f37e 100644 --- a/backend/cmd/registry/main.go +++ b/backend/cmd/registry/main.go @@ -3,33 +3,33 @@ package main import ( "fmt" "log" + "logbook/cmd/registry/app" "logbook/cmd/registry/endpoints" "logbook/internal/startup" - "logbook/internal/web/reception" + "logbook/internal/web/register" "logbook/internal/web/router" ) func Main() error { - l, args, deplycfg, err := startup.Service("registry") + l, args, deplcfg, err := startup.Service("registry") if err != nil { return fmt.Errorf("reading config: %w", err) } - a := app.New(deplycfg, l) + a := app.New(deplcfg, l) defer a.Stop() e := endpoints.New(a, l) - agent := reception.NewAgent(deplycfg, l) - err = agent.RegisterEndpoints(nil, e) + r, err := register.Endpoints(deplcfg, l, nil, e) if err != nil { return fmt.Errorf("agent.RegisterEndpoints: %w", err) } err = router.StartServer(router.ServerParameters{ - Port: deplycfg.Ports.Registry, - Router: deplycfg.Router, - ServeMux: agent.Mux(), + Port: deplcfg.Ports.Registry, + Router: deplcfg.Router, + ServeMux: r, TlsCrt: args.TlsCertificate, TlsKey: args.TlsKey, }, l) diff --git a/backend/cmd/sessions/main.go b/backend/cmd/sessions/main.go index 2de16b96..da6c63ec 100644 --- a/backend/cmd/sessions/main.go +++ b/backend/cmd/sessions/main.go @@ -4,13 +4,14 @@ import ( "context" "fmt" "log" + registry "logbook/cmd/registry/client" "logbook/cmd/sessions/app" "logbook/cmd/sessions/endpoints" "logbook/cmd/sessions/service" "logbook/internal/startup" "logbook/internal/web/balancer" - "logbook/internal/web/reception" + "logbook/internal/web/register" "logbook/internal/web/registryfile" "logbook/internal/web/router" "logbook/internal/web/sidecar" @@ -46,8 +47,7 @@ func Main() error { pub := endpoints.NewPublic(a, l) pri := endpoints.NewPrivate(a, l) - agent := reception.NewAgent(deplcfg, l) - err = agent.RegisterEndpoints(pub, pri) + r, err := register.Endpoints(deplcfg, l, pub, pri) if err != nil { return fmt.Errorf("agent.RegisterEndpoints: %w", err) } @@ -58,7 +58,7 @@ func Main() error { Port: deplcfg.Ports.Sessions, Router: deplcfg.Router, Service: models.Sessions, - ServeMux: agent.Mux(), + ServeMux: r, Sidecar: sc, TlsCrt: args.TlsCertificate, TlsKey: args.TlsKey, diff --git a/backend/cmd/tags/main.go b/backend/cmd/tags/main.go index 93a4efe6..226ce8bd 100644 --- a/backend/cmd/tags/main.go +++ b/backend/cmd/tags/main.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "log" + registry "logbook/cmd/registry/client" sessions "logbook/cmd/sessions/client" "logbook/cmd/tags/app" @@ -11,7 +12,7 @@ import ( "logbook/cmd/tags/service" "logbook/internal/startup" "logbook/internal/web/balancer" - "logbook/internal/web/reception" + "logbook/internal/web/register" "logbook/internal/web/registryfile" "logbook/internal/web/router" "logbook/internal/web/sidecar" @@ -49,8 +50,7 @@ func Main() error { a := app.New(pool, internalsd) e := endpoints.New(a, sessions, l) - agent := reception.NewAgent(deplcfg, l) - err = agent.RegisterEndpoints(e, nil) + r, err := register.Endpoints(deplcfg, l, e, nil) if err != nil { return fmt.Errorf("agent.RegisterEndpoints: %w", err) } @@ -64,7 +64,7 @@ func Main() error { Sidecar: sc, TlsCrt: args.TlsCertificate, TlsKey: args.TlsKey, - ServeMux: agent.Mux(), + ServeMux: r, }, l) if err != nil { return fmt.Errorf("router.StartServer: %w", err) diff --git a/backend/cmd/users/main.go b/backend/cmd/users/main.go index c4e35253..128ffe22 100644 --- a/backend/cmd/users/main.go +++ b/backend/cmd/users/main.go @@ -4,13 +4,14 @@ import ( "context" "fmt" "log" + "logbook/cmd/profiles/app" "logbook/cmd/profiles/endpoints" "logbook/cmd/profiles/service" registry "logbook/cmd/registry/client" "logbook/internal/startup" "logbook/internal/web/balancer" - "logbook/internal/web/reception" + "logbook/internal/web/register" "logbook/internal/web/registryfile" "logbook/internal/web/router" "logbook/internal/web/sidecar" @@ -45,8 +46,7 @@ func Main() error { pri := endpoints.NewPrivate(a, l) - agent := reception.NewAgent(deplcfg, l) - err = agent.RegisterEndpoints(nil, pri) + r, err := register.Endpoints(deplcfg, l, nil, pri) if err != nil { return fmt.Errorf("agent.RegisterEndpoints: %w", err) } @@ -57,7 +57,7 @@ func Main() error { Port: deplcfg.Ports.Users, Router: deplcfg.Router, Service: models.Users, - ServeMux: agent.Mux(), + ServeMux: r, Sidecar: sc, TlsCrt: args.TlsCertificate, TlsKey: args.TlsKey, diff --git a/backend/internal/web/reception/agent.go b/backend/internal/web/reception/agent.go deleted file mode 100644 index 12f5a440..00000000 --- a/backend/internal/web/reception/agent.go +++ /dev/null @@ -1,91 +0,0 @@ -package reception - -import ( - "fmt" - "logbook/config/deployment" - "logbook/internal/logger" - "logbook/internal/web/forwarder" - "logbook/models" - "net/http" - "net/url" - - "go.ufukty.com/gohandlers/pkg/gohandlers" -) - -// [Agent] is the registration Agent which helps services, and gateways to register their handlers and forwarders appropriately -type Agent struct { - deplcfg *deployment.Config - r *http.ServeMux - l *logger.Logger -} - -func NewAgent(deplcfg *deployment.Config, l *logger.Logger) *Agent { - return &Agent{ - deplcfg: deplcfg, - r: http.NewServeMux(), - l: l.Sub("agent"), - } -} - -func (a *Agent) Mux() *http.ServeMux { - return a.r -} - -type HandlerInfo struct { - Method string - Path string - Ref http.HandlerFunc -} - -type Lister interface { - ListHandlers() map[string]gohandlers.HandlerInfo -} - -func (ag *Agent) RegisterEndpoints(public, private Lister) error { - origin, err := url.JoinPath(ag.deplcfg.Router.Cors.AllowOrigin) - if err != nil { - return fmt.Errorf("url.JoinPath: %w", err) - } - - corsheaders := []string{"Authorization", "Content-Type"} - - if public != nil { - for hn, info := range public.ListHandlers() { - c := newCors(info.Ref, origin, []string{info.Method}, corsheaders) - pl := newReceptionist(ag.deplcfg, ag.l.Sub(info.Path), c) - - ag.l.Printf("registering: %s (%s, OPTIONS %s) -> %p\n", hn, info.Method, info.Path, pl) - for _, method := range []string{info.Method, "OPTIONS"} { - pattern := fmt.Sprintf("%s %s", method, info.Path) - ag.r.Handle(pattern, pl) - } - } - } - - if private != nil { - for hn, info := range private.ListHandlers() { - pl := newReceptionist(ag.deplcfg, ag.l.Sub(info.Path), info.Ref) - pattern := fmt.Sprintf("%s %s", info.Method, info.Path) - ag.l.Printf("registering: %s (%s) -> %p\n", hn, pattern, pl) - ag.r.Handle(pattern, pl) - } - } - - ag.r.Handle("GET /ping", newReceptionist(ag.deplcfg, ag.l.Sub("ping"), http.HandlerFunc(pong))) - ag.r.Handle("GET /", newReceptionist(ag.deplcfg, ag.l.Sub("not-found"), http.HandlerFunc(http.NotFound))) - - return nil -} - -func (ag *Agent) RegisterForwarders(fwds map[models.Service]*forwarder.LoadBalancedReverseProxy) error { - for addr, fwd := range fwds { - ag.l.Printf("registering forwarder for: %s -> %p\n", addr, fwd) - l := ag.l.Sub(fmt.Sprintf("strip-prefix(%s)", addr)) - ag.r.Handle(string(addr)+"/", newReceptionist(ag.deplcfg, l, http.StripPrefix(string(addr), fwd))) - } - - ag.r.Handle("/ping", newReceptionist(ag.deplcfg, ag.l.Sub("ping"), http.HandlerFunc(pong))) - ag.r.Handle("/", newReceptionist(ag.deplcfg, ag.l.Sub("not-found"), http.HandlerFunc(http.NotFound))) - - return nil -} diff --git a/backend/internal/web/register/agent.go b/backend/internal/web/register/agent.go new file mode 100644 index 00000000..2185afa6 --- /dev/null +++ b/backend/internal/web/register/agent.go @@ -0,0 +1,78 @@ +package register + +import ( + "fmt" + "net/http" + "net/url" + + "logbook/config/deployment" + "logbook/internal/logger" + "logbook/internal/web/forwarder" + "logbook/internal/web/registration/reception" + "logbook/models" + + "go.ufukty.com/gohandlers/pkg/gohandlers" +) + +type Lister interface { + ListHandlers() map[string]gohandlers.HandlerInfo +} + +func debug(c *deployment.Config, l *logger.Logger, r *http.ServeMux) { + r.Handle("GET /ping", reception.New(c, l.Sub("ping"), http.HandlerFunc(reception.Pong))) + r.Handle("GET /", reception.New(c, l.Sub("not-found"), http.HandlerFunc(http.NotFound))) +} + +// For non-gateway services +func Endpoints(c *deployment.Config, l *logger.Logger, public, private Lister) (*http.ServeMux, error) { + r := http.NewServeMux() + l = l.Sub("register") + + origin, err := url.JoinPath(c.Router.Cors.AllowOrigin) + if err != nil { + return nil, fmt.Errorf("url.JoinPath: %w", err) + } + + corsheaders := []string{"Authorization", "Content-Type"} + + if public != nil { + for hn, info := range public.ListHandlers() { + cors := reception.NewCors(info.Ref, origin, []string{info.Method}, corsheaders) + pl := reception.New(c, l.Sub(info.Path), cors) + + l.Printf("registering: %s (%s, OPTIONS %s) -> %p\n", hn, info.Method, info.Path, pl) + for _, method := range []string{info.Method, "OPTIONS"} { + pattern := fmt.Sprintf("%s %s", method, info.Path) + r.Handle(pattern, pl) + } + } + } + + if private != nil { + for hn, info := range private.ListHandlers() { + pl := reception.New(c, l.Sub(info.Path), info.Ref) + pattern := fmt.Sprintf("%s %s", info.Method, info.Path) + l.Printf("registering: %s (%s) -> %p\n", hn, pattern, pl) + r.Handle(pattern, pl) + } + } + + debug(c, l, r) + + return r, nil +} + +func Forwarders(c *deployment.Config, l *logger.Logger, fwds map[models.Service]*forwarder.LoadBalancedReverseProxy) (*http.ServeMux, error) { + r := http.NewServeMux() + l = l.Sub("register") + + for addr, fwd := range fwds { + l.Printf("registering forwarder for: %s -> %p\n", addr, fwd) + l := l.Sub(fmt.Sprintf("strip-prefix(%s)", addr)) + r.Handle(string(addr)+"/", reception.New(c, l, http.StripPrefix(string(addr), fwd))) + } + + debug(c, l, r) + + return r, nil +} diff --git a/backend/internal/web/reception/captured/rw.go b/backend/internal/web/registration/reception/captured/rw.go similarity index 100% rename from backend/internal/web/reception/captured/rw.go rename to backend/internal/web/registration/reception/captured/rw.go diff --git a/backend/internal/web/reception/captured/rw_test.go b/backend/internal/web/registration/reception/captured/rw_test.go similarity index 100% rename from backend/internal/web/reception/captured/rw_test.go rename to backend/internal/web/registration/reception/captured/rw_test.go diff --git a/backend/internal/web/reception/middlewares.go b/backend/internal/web/registration/reception/middlewares.go similarity index 87% rename from backend/internal/web/reception/middlewares.go rename to backend/internal/web/registration/reception/middlewares.go index 53c8c7ec..829d448e 100644 --- a/backend/internal/web/reception/middlewares.go +++ b/backend/internal/web/registration/reception/middlewares.go @@ -13,7 +13,7 @@ type cors struct { next http.HandlerFunc } -func newCors(next http.HandlerFunc, origin string, methods, headers []string) *cors { +func NewCors(next http.HandlerFunc, origin string, methods, headers []string) *cors { methods = append(methods, "OPTIONS") return &cors{ origin: origin, @@ -38,7 +38,7 @@ func (c *cors) ServeHTTP(w http.ResponseWriter, r *http.Request) { c.next(w, r) } -func pong(w http.ResponseWriter, r *http.Request) { +func Pong(w http.ResponseWriter, r *http.Request) { fmt.Fprintf(w, "pong") w.WriteHeader(http.StatusOK) } diff --git a/backend/internal/web/reception/receptionist.go b/backend/internal/web/registration/reception/receptionist.go similarity index 92% rename from backend/internal/web/reception/receptionist.go rename to backend/internal/web/registration/reception/receptionist.go index 59e1c116..44519fa3 100644 --- a/backend/internal/web/reception/receptionist.go +++ b/backend/internal/web/registration/reception/receptionist.go @@ -18,8 +18,8 @@ import ( "logbook/config/deployment" "logbook/internal/logger" - "logbook/internal/web/reception/captured" - "logbook/internal/web/reception/summarizer" + "logbook/internal/web/registration/reception/captured" + "logbook/internal/web/registration/reception/summarizer" "logbook/models/columns" ) @@ -50,7 +50,7 @@ type receptionist struct { h http.Handler } -func newReceptionist(c *deployment.Config, l *logger.Logger, h http.Handler) *receptionist { +func New(c *deployment.Config, l *logger.Logger, h http.Handler) *receptionist { return &receptionist{ c: c, s: summarizer.New(c.Environment == "local"), diff --git a/backend/internal/web/reception/summarizer/summarizer.go b/backend/internal/web/registration/reception/summarizer/summarizer.go similarity index 96% rename from backend/internal/web/reception/summarizer/summarizer.go rename to backend/internal/web/registration/reception/summarizer/summarizer.go index 7a3f6c58..d811b398 100644 --- a/backend/internal/web/reception/summarizer/summarizer.go +++ b/backend/internal/web/registration/reception/summarizer/summarizer.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "logbook/internal/web/reception/captured" + "logbook/internal/web/registration/reception/captured" ) type colorizer interface { diff --git a/backend/internal/web/reception/summarizer/summarizer_test.go b/backend/internal/web/registration/reception/summarizer/summarizer_test.go similarity index 84% rename from backend/internal/web/reception/summarizer/summarizer_test.go rename to backend/internal/web/registration/reception/summarizer/summarizer_test.go index 489e27f4..063c9f39 100644 --- a/backend/internal/web/reception/summarizer/summarizer_test.go +++ b/backend/internal/web/registration/reception/summarizer/summarizer_test.go @@ -5,7 +5,7 @@ import ( "net/http/httptest" "time" - "logbook/internal/web/reception/captured" + "logbook/internal/web/registration/reception/captured" ) func ExampleSummarizer_post() {