f-42: api: ressource /nat-gateways, état, métrique et watchdog #42

Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
GnomeZworc 2026-10-29 20:25:52 +01:00
commit 2737b61bc4
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632
16 changed files with 841 additions and 11 deletions

View file

@ -0,0 +1,125 @@
package dispatcher
import (
"fmt"
"net"
"strings"
configuration "git.g3e.fr/syonad/two/internal/config/agent"
"git.g3e.fr/syonad/two/internal/natgw"
"git.g3e.fr/syonad/two/internal/state"
"git.g3e.fr/syonad/two/pkg/db/kv"
"github.com/dgraph-io/badger/v4"
)
const natGatewayPrefix = "nat-gateway/"
type CreateNATGatewayCommand struct {
Name string
VPC string
IP string
Gateway string
}
func (c CreateNATGatewayCommand) Key() string { return natGatewayPrefix + c.Name }
func (c CreateNATGatewayCommand) Prepare(db *badger.DB, _ *configuration.Config) error {
if _, err := kv.GetFromDB(db, c.Key()+"/state"); err == nil {
return fmt.Errorf("nat gateway %q already exists", c.Name)
}
if _, _, err := parseNATGateway(c.IP, c.Gateway); err != nil {
return err
}
vpcState, err := state.Get(db, "vpc/"+c.VPC)
if err != nil {
return fmt.Errorf("vpc %q not found", c.VPC)
}
if vpcState != state.Running {
return fmt.Errorf("vpc %q is %s", c.VPC, vpcState)
}
if _, err := kv.GetFromDB(db, "vpc/"+c.VPC+"/l3vni"); err != nil {
return fmt.Errorf("vpc %q has no l3vni", c.VPC)
}
other, err := natGatewayOf(db, c.VPC)
if err != nil {
return err
}
if other != "" {
return fmt.Errorf("vpc %q already has nat gateway %q", c.VPC, other)
}
for key, value := range map[string]string{"vpc": c.VPC, "ip": c.IP, "gateway": c.Gateway} {
if err := kv.AddInDB(db, c.Key()+"/"+key, value); err != nil {
return err
}
}
return state.Set(db, c.Key(), state.Creating)
}
func (c CreateNATGatewayCommand) Execute(db *badger.DB, _ *configuration.Config) error {
ip, gw, err := parseNATGateway(c.IP, c.Gateway)
if err != nil {
return err
}
if err := natgw.Create(db, c.VPC, ip, gw); err != nil {
return err
}
return state.Set(db, c.Key(), state.Running)
}
type DeleteNATGatewayCommand struct {
Name string
}
func (c DeleteNATGatewayCommand) Key() string { return natGatewayPrefix + c.Name }
func (c DeleteNATGatewayCommand) Prepare(db *badger.DB, _ *configuration.Config) error {
current, err := state.Get(db, c.Key())
if err != nil {
return fmt.Errorf("nat gateway %q not found", c.Name)
}
if !state.CanDelete(current) {
return fmt.Errorf("nat gateway %q cannot be deleted while %s", c.Name, current)
}
return state.Set(db, c.Key(), state.Deleting)
}
func (c DeleteNATGatewayCommand) Execute(db *badger.DB, _ *configuration.Config) error {
vpcName, err := kv.GetFromDB(db, c.Key()+"/vpc")
if err != nil {
return fmt.Errorf("nat gateway %q: reading vpc: %w", c.Name, err)
}
if err := natgw.Delete(db, vpcName); err != nil {
return err
}
if err := state.Set(db, c.Key(), state.Deleted); err != nil {
return err
}
return kv.DeleteInDB(db, c.Key())
}
func parseNATGateway(ip, gateway string) (*net.IPNet, net.IP, error) {
addr, prefix, err := net.ParseCIDR(ip)
if err != nil || addr.To4() == nil {
return nil, nil, fmt.Errorf("invalid ip %q: an IPv4 address with its prefix length is expected", ip)
}
prefix.IP = addr.To4()
gw := net.ParseIP(gateway).To4()
if gw == nil {
return nil, nil, fmt.Errorf("invalid gateway %q: an IPv4 address is expected", gateway)
}
return prefix, gw, nil
}
func natGatewayOf(db *badger.DB, vpcName string) (string, error) {
entries, err := kv.ListByPrefix(db, natGatewayPrefix)
if err != nil {
return "", fmt.Errorf("failed to list nat gateways: %w", err)
}
for key, value := range entries {
name, ok := strings.CutSuffix(strings.TrimPrefix(key, natGatewayPrefix), "/vpc")
if ok && !strings.Contains(name, "/") && value == vpcName {
return name, nil
}
}
return "", nil
}

View file

@ -0,0 +1,143 @@
package dispatcher
import (
"strings"
"testing"
"git.g3e.fr/syonad/two/pkg/db/kv"
"github.com/dgraph-io/badger/v4"
)
func seedRoutedVPC(t *testing.T, db *badger.DB, name, st string) {
t.Helper()
kv.AddInDB(db, "vpc/"+name+"/state", st)
kv.AddInDB(db, "vpc/"+name+"/cidr", "10.241.0.0/16")
kv.AddInDB(db, "vpc/"+name+"/l3vni", "2700")
}
func validNATGateway() CreateNATGatewayCommand {
return CreateNATGatewayCommand{Name: "ng-1", VPC: "vp-s7", IP: "198.51.100.50/24", Gateway: "198.51.100.1"}
}
func TestCreateNATGatewayCommand_Prepare_WritesTheGateway(t *testing.T) {
_, db := newTestDispatcher(t)
seedRoutedVPC(t, db, "vp-s7", "running")
if err := validNATGateway().Prepare(db, nil); err != nil {
t.Fatalf("Prepare a échoué : %v", err)
}
for key, want := range map[string]string{
"nat-gateway/ng-1/state": "creating",
"nat-gateway/ng-1/vpc": "vp-s7",
"nat-gateway/ng-1/ip": "198.51.100.50/24",
"nat-gateway/ng-1/gateway": "198.51.100.1",
} {
got, err := kv.GetFromDB(db, key)
if err != nil || got != want {
t.Errorf("%s : %q (%v), %q attendu", key, got, err, want)
}
}
}
func TestCreateNATGatewayCommand_Prepare_Refuses(t *testing.T) {
cases := []struct {
label string
seed func(*badger.DB)
mutate func(*CreateNATGatewayCommand)
msg string
}{
{"passerelle existante", func(db *badger.DB) { kv.AddInDB(db, "nat-gateway/ng-1/state", "running") }, nil, `nat gateway "ng-1" already exists`},
{"VPC absent", nil, func(c *CreateNATGatewayCommand) { c.VPC = "vp-absent" }, `vpc "vp-absent" not found`},
{"VPC en création", func(db *badger.DB) { seedRoutedVPC(t, db, "vp-new", "creating") }, func(c *CreateNATGatewayCommand) { c.VPC = "vp-new" }, `vpc "vp-new" is creating`},
{"VPC sans l3vni", func(db *badger.DB) {
kv.AddInDB(db, "vpc/vp-flat/state", "running")
kv.AddInDB(db, "vpc/vp-flat/cidr", "10.242.0.0/16")
}, func(c *CreateNATGatewayCommand) { c.VPC = "vp-flat" }, `vpc "vp-flat" has no l3vni`},
{"VPC qui a déjà une passerelle", func(db *badger.DB) {
kv.AddInDB(db, "nat-gateway/ng-0/state", "error")
kv.AddInDB(db, "nat-gateway/ng-0/vpc", "vp-s7")
}, nil, `vpc "vp-s7" already has nat gateway "ng-0"`},
{"ip sans longueur de préfixe", nil, func(c *CreateNATGatewayCommand) { c.IP = "198.51.100.50" }, `invalid ip "198.51.100.50"`},
{"ip IPv6", nil, func(c *CreateNATGatewayCommand) { c.IP = "2001:db8::50/64" }, `invalid ip "2001:db8::50/64"`},
{"gateway invalide", nil, func(c *CreateNATGatewayCommand) { c.Gateway = "bordure" }, `invalid gateway "bordure"`},
}
for _, c := range cases {
_, db := newTestDispatcher(t)
seedRoutedVPC(t, db, "vp-s7", "running")
if c.seed != nil {
c.seed(db)
}
cmd := validNATGateway()
if c.mutate != nil {
c.mutate(&cmd)
}
err := cmd.Prepare(db, nil)
if err == nil || !strings.Contains(err.Error(), c.msg) {
t.Errorf("%s : erreur %v, « %s » attendu", c.label, err, c.msg)
continue
}
if c.label != "passerelle existante" {
if _, err := kv.GetFromDB(db, "nat-gateway/ng-1/state"); err == nil {
t.Errorf("%s : état écrit malgré le refus", c.label)
}
}
}
}
func TestCreateNATGatewayCommand_Prepare_IgnoresTheGatewayOfAnotherVPC(t *testing.T) {
_, db := newTestDispatcher(t)
seedRoutedVPC(t, db, "vp-s7", "running")
kv.AddInDB(db, "nat-gateway/ng-0/state", "running")
kv.AddInDB(db, "nat-gateway/ng-0/vpc", "vp-s70")
if err := validNATGateway().Prepare(db, nil); err != nil {
t.Errorf("Prepare a échoué : %v", err)
}
}
func TestDeleteNATGatewayCommand_Prepare(t *testing.T) {
for st, ok := range map[string]bool{"running": true, "error": true, "creating": false, "deleting": false} {
_, db := newTestDispatcher(t)
kv.AddInDB(db, "nat-gateway/ng-1/state", st)
err := DeleteNATGatewayCommand{Name: "ng-1"}.Prepare(db, nil)
if ok != (err == nil) {
t.Errorf("état %s : erreur %v", st, err)
}
got, _ := kv.GetFromDB(db, "nat-gateway/ng-1/state")
if ok && got != "deleting" {
t.Errorf("état %s : %q après Prepare, deleting attendu", st, got)
}
}
}
func TestDeleteNATGatewayCommand_Prepare_Unknown(t *testing.T) {
_, db := newTestDispatcher(t)
err := DeleteNATGatewayCommand{Name: "ng-x"}.Prepare(db, nil)
if err == nil || !strings.Contains(err.Error(), `nat gateway "ng-x" not found`) {
t.Errorf("erreur %v", err)
}
}
func TestDeleteVPCCommand_Prepare_RefusesWhileANATGatewayExists(t *testing.T) {
for _, st := range []string{"running", "error", "creating", "deleting"} {
_, db := newTestDispatcher(t)
kv.AddInDB(db, "vpc/vp-s7/state", "running")
kv.AddInDB(db, "nat-gateway/ng-1/state", st)
kv.AddInDB(db, "nat-gateway/ng-1/vpc", "vp-s7")
err := DeleteVPCCommand{Name: "vp-s7"}.Prepare(db, nil)
if err == nil || !strings.Contains(err.Error(), `nat gateway "ng-1" must be deleted before deleting vpc "vp-s7"`) {
t.Errorf("passerelle %s : erreur %v", st, err)
}
if got, _ := kv.GetFromDB(db, "vpc/vp-s7/state"); got != "running" {
t.Errorf("passerelle %s : VPC passé en %q malgré le refus", st, got)
}
}
}
func TestParseNATGatewayKeepsTheHostAddress(t *testing.T) {
ip, gw, err := parseNATGateway("198.51.100.50/24", "198.51.100.1")
if err != nil {
t.Fatal(err)
}
if ip.String() != "198.51.100.50/24" || gw.String() != "198.51.100.1" {
t.Errorf("ip %s, gateway %s", ip, gw)
}
}

View file

@ -126,6 +126,13 @@ func (c DeleteVPCCommand) Prepare(db *badger.DB, _ *configuration.Config) error
return fmt.Errorf("subnet %q must be deleted before deleting vpc %q", subnetName, c.Name)
}
}
gateway, err := natGatewayOf(db, c.Name)
if err != nil {
return err
}
if gateway != "" {
return fmt.Errorf("nat gateway %q must be deleted before deleting vpc %q", gateway, c.Name)
}
return state.Set(db, c.Key(), state.Deleting)
}