Skip to content

Drops Chi #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ufukty wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Drops Chi #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d59e36e
be/int/web/registration/reception: moves down.
ufukty Jun 11, 2026
79ed237
be/int/web/registration: moves up the registration agent, splitting f…
ufukty Jun 11, 2026
b585d63
be/int/web/registration: removes unused.
ufukty Jun 11, 2026
e3b43e2
int/web/register: renames package.
ufukty Jun 12, 2026
2ade27c
be/int/web/register: refactors for clarity. breaks down the dependenc…
ufukty Jun 12, 2026
82b86cb
be/int/web/register: renames registerers for import symbol clarity.
ufukty Jun 12, 2026
7a57657
be/cmd/int: fixes ignored error value.
ufukty Jun 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions backend/cmd/api/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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),
Expand All @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions backend/cmd/groups/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
}
Expand All @@ -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,
Expand Down
19 changes: 9 additions & 10 deletions backend/cmd/internal/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
}
Expand Down
8 changes: 4 additions & 4 deletions backend/cmd/objectives/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ import (
"context"
"fmt"
"log"

"logbook/cmd/objectives/app"
"logbook/cmd/objectives/endpoints"
"logbook/cmd/objectives/service"
registry "logbook/cmd/registry/client"
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"
Expand Down Expand Up @@ -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)
}
Expand All @@ -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,
Expand Down
10 changes: 5 additions & 5 deletions backend/cmd/pdp/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,20 @@ package main
import (
"fmt"
"log"
"os"

groups "logbook/cmd/groups/client"
objectives "logbook/cmd/objectives/client"
"logbook/cmd/pdp/decider"
"logbook/cmd/pdp/endpoints"
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 {
Expand Down Expand Up @@ -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)
}
Expand All @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions backend/cmd/profiles/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
}
Expand All @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions backend/cmd/registration/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"fmt"
"log"

objectives "logbook/cmd/objectives/client"
profiles "logbook/cmd/profiles/client"
"logbook/cmd/registration/app"
Expand All @@ -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"
Expand Down Expand Up @@ -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)
}
Expand All @@ -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,
Expand Down
16 changes: 8 additions & 8 deletions backend/cmd/registry/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions backend/cmd/sessions/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
}
Expand All @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions backend/cmd/tags/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@ import (
"context"
"fmt"
"log"

registry "logbook/cmd/registry/client"
sessions "logbook/cmd/sessions/client"
"logbook/cmd/tags/app"
"logbook/cmd/tags/endpoints"
"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"
Expand Down Expand Up @@ -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)
}
Expand All @@ -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)
Expand Down
Loading
Loading