syonad/two
2
0
Fork 0
Code Issues 6 Pull requests 1 Projects Releases 9 Packages Wiki Activity Actions

f-21: code: swap from interface only to full conf

Browse source 
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
GnomeZworc 2026-04-21 21:32:59 +02:00
commit 8724570c81
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632
4 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmd/agent/main.go
View file

@ -36,7 +36,7 @@ func main() {
apiAddr := fmt.Sprintf("%s:%d", cfg.Api.Address, cfg.Api.Port) apiAddr := fmt.Sprintf("%s:%d", cfg.Api.Address, cfg.Api.Port)
promAddr := fmt.Sprintf("%s:%d", cfg.Prometheus.Address, cfg.Prometheus.Port) promAddr := fmt.Sprintf("%s:%d", cfg.Prometheus.Address, cfg.Prometheus.Port)
d := dispatcher.New(q, db, cfg.Interfaces) d := dispatcher.New(q, db, cfg)
go agentapi.New(d, db).Start(apiAddr) go agentapi.New(d, db).Start(apiAddr)
go promserver.Start(promAddr, registry) go promserver.Start(promAddr, registry)

15
internal/dispatcher/dispatcher.go
View file

@ -3,27 +3,28 @@ package dispatcher
import ( import (
"log" "log"
configuration "git.g3e.fr/syonad/two/internal/config/agent"
"git.g3e.fr/syonad/two/pkg/worker" "git.g3e.fr/syonad/two/pkg/worker"
"github.com/dgraph-io/badger/v4" "github.com/dgraph-io/badger/v4"
) )
type Command interface { type Command interface {
Execute(db *badger.DB, interfaces map[string]string) error Execute(db *badger.DB, cfg *configuration.Config) error
} }
type Dispatcher struct { type Dispatcher struct {
queue *worker.Queue queue *worker.Queue
db *badger.DB db *badger.DB
interfaces map[string]string cfg *configuration.Config
} }
func New(queue *worker.Queue, db *badger.DB, interfaces map[string]string) *Dispatcher { func New(queue *worker.Queue, db *badger.DB, cfg *configuration.Config) *Dispatcher {
return &Dispatcher{queue: queue, db: db, interfaces: interfaces} return &Dispatcher{queue: queue, db: db, cfg: cfg}
} }
func (d *Dispatcher) Dispatch(cmd Command) { func (d *Dispatcher) Dispatch(cmd Command) {
d.queue.Submit(func() { d.queue.Submit(func() {
if err := cmd.Execute(d.db, d.interfaces); err != nil { if err := cmd.Execute(d.db, d.cfg); err != nil {
log.Printf("command error (%T): %v", cmd, err) log.Printf("command error (%T): %v", cmd, err)
} }
}) })

7
internal/dispatcher/subnet_commands.go
View file

@ -5,6 +5,7 @@ import (
"os" "os"
"strconv" "strconv"
configuration "git.g3e.fr/syonad/two/internal/config/agent"
"git.g3e.fr/syonad/two/internal/subnet" "git.g3e.fr/syonad/two/internal/subnet"
"git.g3e.fr/syonad/two/pkg/db/kv" "git.g3e.fr/syonad/two/pkg/db/kv"
"github.com/dgraph-io/badger/v4" "github.com/dgraph-io/badger/v4"
@ -19,8 +20,8 @@ type CreateSubnetCommand struct {
CIDR string CIDR string
} }
func (c CreateSubnetCommand) Execute(db *badger.DB, interfaces map[string]string) error { func (c CreateSubnetCommand) Execute(db *badger.DB, cfg *configuration.Config) error {
localIface, ok := interfaces[c.IfaceType] localIface, ok := cfg.Interfaces[c.IfaceType]
if !ok { if !ok {
return fmt.Errorf("unknown iface_type %q: not found in config", c.IfaceType) return fmt.Errorf("unknown iface_type %q: not found in config", c.IfaceType)
} }
@ -37,7 +38,7 @@ type DeleteSubnetCommand struct {
Name string Name string
} }
func (c DeleteSubnetCommand) Execute(db *badger.DB, _ map[string]string) error { func (c DeleteSubnetCommand) Execute(db *badger.DB, _ *configuration.Config) error {
kv.AddInDB(db, "subnet/"+c.Name+"/state", "deleting") kv.AddInDB(db, "subnet/"+c.Name+"/state", "deleting")
if err := subnet.DeleteSubnet(db, c.Name); err != nil { if err := subnet.DeleteSubnet(db, c.Name); err != nil {
fmt.Println(err) fmt.Println(err)

5
internal/dispatcher/vpc_commands.go
View file

@ -1,6 +1,7 @@
package dispatcher package dispatcher
import ( import (
configuration "git.g3e.fr/syonad/two/internal/config/agent"
"git.g3e.fr/syonad/two/internal/vpc" "git.g3e.fr/syonad/two/internal/vpc"
"git.g3e.fr/syonad/two/pkg/db/kv" "git.g3e.fr/syonad/two/pkg/db/kv"
"github.com/dgraph-io/badger/v4" "github.com/dgraph-io/badger/v4"
@ -10,7 +11,7 @@ type CreateVPCCommand struct {
Name string Name string
} }
func (c CreateVPCCommand) Execute(db *badger.DB, _ map[string]string) error { func (c CreateVPCCommand) Execute(db *badger.DB, _ *configuration.Config) error {
kv.AddInDB(db, "vpc/"+c.Name+"/state", "creating") kv.AddInDB(db, "vpc/"+c.Name+"/state", "creating")
return vpc.CreateVPC(db, c.Name) return vpc.CreateVPC(db, c.Name)
} }
@ -19,7 +20,7 @@ type DeleteVPCCommand struct {
Name string Name string
} }
func (c DeleteVPCCommand) Execute(db *badger.DB, _ map[string]string) error { func (c DeleteVPCCommand) Execute(db *badger.DB, _ *configuration.Config) error {
kv.AddInDB(db, "vpc/"+c.Name+"/state", "deleting") kv.AddInDB(db, "vpc/"+c.Name+"/state", "deleting")
if err := vpc.DeleteVPC(db, c.Name); err != nil { if err := vpc.DeleteVPC(db, c.Name); err != nil {
return err return err