f-25: use file for metadata

Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>

cmd/metadata/main.go

@@ -2,26 +2,29 @@ package main
 
 import (
 	"flag"
+	"fmt"
+	"os"
 
+	configuration "git.g3e.fr/syonad/two/internal/config/agent"
 	"git.g3e.fr/syonad/two/internal/metadata"
 )
 
 var (
-	iface      = flag.String("interface", "0.0.0.0", "Interface IP à écouter")
+	confFile = flag.String("conf", "/etc/two/agent.yml", "configuration file")
-	port       = flag.Int("port", 0, "Port à utiliser")
-	netns_name = flag.String("netns", "", "Network namespace à utiliser")
-	conf_file  = flag.String("conf", "/etc/two/agent.yml", "configuration file")
 	vm_name  = flag.String("vm", "", "Name of the vm")
 )
 
 func main() {
 	flag.Parse()
 
+	cfg, err := configuration.LoadConfig(*confFile)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "failed to load config: %v\n", err)
+		os.Exit(1)
+	}
+
 	metadata.StartServer(metadata.ServerConfig{
-		Netns:    *netns_name,
-		Iface:    *iface,
-		Port:     *port,
-		ConfFile: *conf_file,
 		VmName: *vm_name,
+		RunDir: cfg.Metadata.RunDir,
 	})
 }

internal/metadata/metadata_test.go

@@ -3,10 +3,10 @@ package metadata
 import (
 	"net/http"
 	"net/http/httptest"
+	"os"
+	"path/filepath"
 	"strings"
 	"testing"
-
-	"git.g3e.fr/syonad/two/pkg/db/kv"
 )
 
 func newCfg() NoCloudConfig {
@@ -20,11 +20,9 @@ func newCfg() NoCloudConfig {
 	}
 }
 
-func newTestDB(t *testing.T) interface{ Close() error } {
+func useTestDir(t *testing.T) string {
 	t.Helper()
-	db := kv.InitDB(kv.Config{Path: t.TempDir()}, false)
+	return t.TempDir()
-	t.Cleanup(func() { db.Close() })
-	return db
 }
 
 // --- RenderConfig ---
@@ -108,78 +106,67 @@ func TestRenderConfig_SpecialCharsInName(t *testing.T) {
 
 // --- LoadNcCloudInDB / UnLoadNoCloudInDB ---
 
-func TestLoadNcCloudInDB_StoresAllKeys(t *testing.T) {
+func readTestFile(t *testing.T, dir, vmName, name string) string {
-	db := kv.InitDB(kv.Config{Path: t.TempDir()}, false)
+	t.Helper()
-	t.Cleanup(func() { db.Close() })
+	b, err := os.ReadFile(filepath.Join(dir, vmName, name))
-
-	cfg := newCfg()
-	LoadNcCloudInDB(cfg, db)
-
-	keys := []string{
-		"metadata/vm1/meta-data",
-		"metadata/vm1/user-data",
-		"metadata/vm1/network-config",
-		"metadata/vm1/vendor-data",
-		"metadata/vm1/vpc",
-		"metadata/vm1/bind_ip",
-		"metadata/vm1/bind_port",
-	}
-	for _, key := range keys {
-		val, err := kv.GetFromDB(db, key)
 	if err != nil {
-			t.Errorf("clé %q absente après LoadNcCloudInDB : %v", key, err)
+		t.Errorf("fichier %q absent après LoadNcCloudInDB : %v", name, err)
+		return ""
 	}
-		if val == "" && key != "metadata/vm1/user-data" {
+	return string(b)
-			t.Errorf("clé %q vide après LoadNcCloudInDB", key)
+}
+
+func TestLoadNcCloudInDB_StoresAllFiles(t *testing.T) {
+	dir := useTestDir(t)
+	LoadNcCloudInDB(newCfg(), dir)
+
+	files := []string{"meta-data", "user-data", "network-config", "vendor-data", "vpc", "bind_ip", "bind_port"}
+	for _, f := range files {
+		path := filepath.Join(dir, "vm1", f)
+		if _, err := os.Stat(path); err != nil {
+			t.Errorf("fichier %q absent : %v", f, err)
 		}
 	}
 }
 
 func TestLoadNcCloudInDB_VpcAndBindValues(t *testing.T) {
-	db := kv.InitDB(kv.Config{Path: t.TempDir()}, false)
+	dir := useTestDir(t)
-	t.Cleanup(func() { db.Close() })
+	LoadNcCloudInDB(newCfg(), dir)
 
-	cfg := newCfg()
+	if vpc := readTestFile(t, dir, "vm1", "vpc"); vpc != "vpc-test" {
-	LoadNcCloudInDB(cfg, db)
-
-	vpc, _ := kv.GetFromDB(db, "metadata/vm1/vpc")
-	if vpc != "vpc-test" {
 		t.Errorf("vpc attendu %q, obtenu %q", "vpc-test", vpc)
 	}
-
+	if ip := readTestFile(t, dir, "vm1", "bind_ip"); ip != "169.254.169.254" {
-	ip, _ := kv.GetFromDB(db, "metadata/vm1/bind_ip")
-	if ip != "169.254.169.254" {
 		t.Errorf("bind_ip attendu %q, obtenu %q", "169.254.169.254", ip)
 	}
-
+	if port := readTestFile(t, dir, "vm1", "bind_port"); port != "80" {
-	port, _ := kv.GetFromDB(db, "metadata/vm1/bind_port")
-	if port != "80" {
 		t.Errorf("bind_port attendu %q, obtenu %q", "80", port)
 	}
 }
 
-func TestUnLoadNoCloudInDB_RemovesAllKeys(t *testing.T) {
+func TestUnLoadNoCloudInDB_RemovesAllFiles(t *testing.T) {
-	db := kv.InitDB(kv.Config{Path: t.TempDir()}, false)
+	dir := useTestDir(t)
-	t.Cleanup(func() { db.Close() })
+	LoadNcCloudInDB(newCfg(), dir)
+	UnLoadNoCloudInDB("vm1", dir)
 
-	cfg := newCfg()
+	if _, err := os.Stat(filepath.Join(dir, "vm1")); !os.IsNotExist(err) {
-	LoadNcCloudInDB(cfg, db)
+		t.Error("répertoire vm1 devrait être supprimé après UnLoadNoCloudInDB")
-	UnLoadNoCloudInDB("vm1", db)
+	}
+}
 
-	keys := []string{
+func TestUnLoadNoCloudInDB_DoesNotAffectOtherVMs(t *testing.T) {
-		"metadata/vm1/meta-data",
+	dir := useTestDir(t)
-		"metadata/vm1/user-data",
+
-		"metadata/vm1/network-config",
+	cfg1 := newCfg()
-		"metadata/vm1/vendor-data",
+	cfg2 := newCfg()
-		"metadata/vm1/vpc",
+	cfg2.Name = "vm2"
-		"metadata/vm1/bind_ip",
+	LoadNcCloudInDB(cfg1, dir)
-		"metadata/vm1/bind_port",
+	LoadNcCloudInDB(cfg2, dir)
-	}
+
-	for _, key := range keys {
+	UnLoadNoCloudInDB("vm1", dir)
-		_, err := kv.GetFromDB(db, key)
+
-		if err == nil {
+	if _, err := os.Stat(filepath.Join(dir, "vm2", "vpc")); err != nil {
-			t.Errorf("clé %q devrait être supprimée après UnLoadNoCloudInDB", key)
+		t.Errorf("vm2 ne devrait pas être supprimée : %v", err)
-		}
 	}
 }
 
@@ -277,23 +264,3 @@ func TestRootHandler_ContentType(t *testing.T) {
 		t.Errorf("Content-Type attendu text/yaml, obtenu %q", ct)
 	}
 }
-
-// --- UnLoadNoCloudInDB_DoesNotAffectOtherVMs ---
-
-func TestUnLoadNoCloudInDB_DoesNotAffectOtherVMs(t *testing.T) {
-	db := kv.InitDB(kv.Config{Path: t.TempDir()}, false)
-	t.Cleanup(func() { db.Close() })
-
-	cfg1 := newCfg()
-	cfg2 := newCfg()
-	cfg2.Name = "vm2"
-	LoadNcCloudInDB(cfg1, db)
-	LoadNcCloudInDB(cfg2, db)
-
-	UnLoadNoCloudInDB("vm1", db)
-
-	_, err := kv.GetFromDB(db, "metadata/vm2/vpc")
-	if err != nil {
-		t.Errorf("vm2 ne devrait pas être supprimée : %v", err)
-	}
-}

internal/metadata/server.go

@@ -5,12 +5,13 @@ import (
 	"log"
 	"net"
 	"net/http"
+	"os"
+	"path/filepath"
 	"strconv"
+	"strings"
 	"time"
 
-	configuration "git.g3e.fr/syonad/two/internal/config/agent"
 	"git.g3e.fr/syonad/two/internal/netns"
-	"git.g3e.fr/syonad/two/pkg/db/kv"
 )
 
 var data NoCloudData
@@ -23,47 +24,23 @@ func getIP(r *http.Request) string {
 	return ip
 }
 
-func getFromDB(config ServerConfig) NoCloudData {
+func readFile(dir, name string) string {
-	var netns_name string
+	b, _ := os.ReadFile(filepath.Join(dir, name))
-	var port int
+	return strings.TrimRight(string(b), "\n")
-	var iface string
+}
 
-	conf_db, _ := configuration.LoadConfig(config.ConfFile)
+func getFromFiles(config ServerConfig) NoCloudData {
+	dir := filepath.Join(config.RunDir, config.VmName)
 
-	db := kv.InitDB(kv.Config{Path: conf_db.Database.Path}, true)
+	port, _ := strconv.Atoi(readFile(dir, "bind_port"))
-	defer db.Close()
-
-	metadata, _ := kv.GetFromDB(db, "metadata/"+config.VmName+"/meta-data")
-	userdata, _ := kv.GetFromDB(db, "metadata/"+config.VmName+"/user-data")
-	networkconfig, _ := kv.GetFromDB(db, "metadata/"+config.VmName+"/network-config")
-	vendordata, _ := kv.GetFromDB(db, "metadata/"+config.VmName+"/vendor-data")
-
-	if config.Netns == "" {
-		netns_name, _ = kv.GetFromDB(db, "metadata/"+config.VmName+"/vpc")
-	} else {
-		netns_name = config.Netns
-	}
-
-	if config.Iface == "" {
-		iface, _ = kv.GetFromDB(db, "metadata/"+config.VmName+"/bind_ip")
-	} else {
-		iface = config.Iface
-	}
-
-	if config.Port == 0 {
-		sport, _ := kv.GetFromDB(db, "metadata/"+config.VmName+"/bind_port")
-		port, _ = strconv.Atoi(sport)
-	} else {
-		port = config.Port
-	}
 
 	return NoCloudData{
-		MetaData:      metadata,
+		MetaData:      readFile(dir, "meta-data"),
-		UserData:      userdata,
+		UserData:      readFile(dir, "user-data"),
-		NetworkConfig: networkconfig,
+		NetworkConfig: readFile(dir, "network-config"),
-		VendorData:    vendordata,
+		VendorData:    readFile(dir, "vendor-data"),
-		NetNs:         netns_name,
+		NetNs:         readFile(dir, "vpc"),
-		Iface:         iface,
+		Iface:         readFile(dir, "bind_ip"),
 		Port:          port,
 	}
 }
@@ -93,7 +70,7 @@ func rootHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func StartServer(config ServerConfig) {
-	data = getFromDB(config)
+	data = getFromFiles(config)
 
 	if data.NetNs != "" {
 		if err := netns.Enter(data.NetNs); err != nil {

internal/metadata/struct.go

@@ -11,12 +11,8 @@ type NoCloudData struct {
 }
 
 type ServerConfig struct {
-	Netns    string
-	File     string
-	Iface    string
-	Port     int
-	ConfFile string
 	VmName string
+	RunDir string
 }
 
 type NoCloudConfig struct {