From f5707c343c4251c3e162200675d4982205ae11c7 Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Wed, 29 Apr 2026 00:41:43 +0200 Subject: [PATCH] f-25: add load files Signed-off-by: GnomeZworc --- internal/metadata/handle.go | 14 +++++++------- internal/metadata/render.go | 29 ++++++++++++++++------------- internal/vm/create.go | 2 +- internal/vm/delete.go | 2 +- 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/internal/metadata/handle.go b/internal/metadata/handle.go index 9ec5486..d34dd20 100644 --- a/internal/metadata/handle.go +++ b/internal/metadata/handle.go @@ -3,18 +3,18 @@ package metadata import ( "fmt" + configuration "git.g3e.fr/syonad/two/internal/config/agent" "git.g3e.fr/syonad/two/pkg/systemd" - "github.com/dgraph-io/badger/v4" ) -func StartMetadata(config NoCloudConfig, db *badger.DB, dryrun bool) error { +func StartMetadata(config NoCloudConfig, cfg *configuration.Config, dryrun bool) error { service, err := systemd.New() if err != nil { return fmt.Errorf("failed to connect to systemd: %w", err) } defer service.Close() - LoadNcCloudInDB(config, db) + LoadNcCloudInDB(config, cfg.Metadata.RunDir) if !dryrun { if err := service.Start("metadata@" + config.Name + ".service"); err != nil { return fmt.Errorf("failed to start metadata@%s: %w", config.Name, err) @@ -23,17 +23,17 @@ func StartMetadata(config NoCloudConfig, db *badger.DB, dryrun bool) error { return nil } -func StopMetadata(vm_name string, db *badger.DB, dryrun bool) error { +func StopMetadata(vmName string, cfg *configuration.Config, dryrun bool) error { service, err := systemd.New() if err != nil { return fmt.Errorf("failed to connect to systemd: %w", err) } defer service.Close() - UnLoadNoCloudInDB(vm_name, db) + UnLoadNoCloudInDB(vmName, cfg.Metadata.RunDir) if !dryrun { - if err := service.Stop("metadata@" + vm_name + ".service"); err != nil { - return fmt.Errorf("failed to stop metadata@%s: %w", vm_name, err) + if err := service.Stop("metadata@" + vmName + ".service"); err != nil { + return fmt.Errorf("failed to stop metadata@%s: %w", vmName, err) } } return nil diff --git a/internal/metadata/render.go b/internal/metadata/render.go index f6c3cae..0d4fd59 100644 --- a/internal/metadata/render.go +++ b/internal/metadata/render.go @@ -3,10 +3,9 @@ package metadata import ( "bytes" "embed" + "os" + "path/filepath" "text/template" - - "git.g3e.fr/syonad/two/pkg/db/kv" - "github.com/dgraph-io/badger/v4" ) //go:embed templates/*.tmpl @@ -26,21 +25,25 @@ func RenderConfig(path string, cfg NoCloudConfig) (string, error) { return buf.String(), nil } -func LoadNcCloudInDB(config NoCloudConfig, db *badger.DB) { +func LoadNcCloudInDB(config NoCloudConfig, runDir string) { meta_data, _ := RenderConfig("templates/meta-data.tmpl", config) user_data, _ := RenderConfig("templates/user-data.tmpl", config) network_config, _ := RenderConfig("templates/network-config.tmpl", config) vendor_data, _ := RenderConfig("templates/vendor-data.tmpl", config) - kv.AddInDB(db, "metadata/"+config.Name+"/meta-data", meta_data) - kv.AddInDB(db, "metadata/"+config.Name+"/user-data", user_data) - kv.AddInDB(db, "metadata/"+config.Name+"/network-config", network_config) - kv.AddInDB(db, "metadata/"+config.Name+"/vendor-data", vendor_data) - kv.AddInDB(db, "metadata/"+config.Name+"/vpc", config.VpcName) - kv.AddInDB(db, "metadata/"+config.Name+"/bind_ip", config.BindIP) - kv.AddInDB(db, "metadata/"+config.Name+"/bind_port", config.BindPort) + dir := filepath.Join(runDir, config.Name) + if err := os.MkdirAll(dir, 0755); err != nil { + return + } + os.WriteFile(filepath.Join(dir, "meta-data"), []byte(meta_data), 0644) + os.WriteFile(filepath.Join(dir, "user-data"), []byte(user_data), 0644) + os.WriteFile(filepath.Join(dir, "network-config"), []byte(network_config), 0644) + os.WriteFile(filepath.Join(dir, "vendor-data"), []byte(vendor_data), 0644) + os.WriteFile(filepath.Join(dir, "vpc"), []byte(config.VpcName), 0644) + os.WriteFile(filepath.Join(dir, "bind_ip"), []byte(config.BindIP), 0644) + os.WriteFile(filepath.Join(dir, "bind_port"), []byte(config.BindPort), 0644) } -func UnLoadNoCloudInDB(vm_name string, db *badger.DB) { - kv.DeleteInDB(db, "metadata/"+vm_name) +func UnLoadNoCloudInDB(vmName string, runDir string) { + os.RemoveAll(filepath.Join(runDir, vmName)) } diff --git a/internal/vm/create.go b/internal/vm/create.go index b24fa80..53e2e96 100644 --- a/internal/vm/create.go +++ b/internal/vm/create.go @@ -45,7 +45,7 @@ func StartVM(db *badger.DB, name string, cfg *configuration.Config) error { BindPort: d.metadataPort, Password: d.password, SSHKEY: d.sshkey, - }, db, false); err != nil { + }, cfg, false); err != nil { return fmt.Errorf("start metadata: %w", err) } diff --git a/internal/vm/delete.go b/internal/vm/delete.go index faadb4b..5030339 100644 --- a/internal/vm/delete.go +++ b/internal/vm/delete.go @@ -57,7 +57,7 @@ func StopVM(db *badger.DB, name string, cfg *configuration.Config) error { return fmt.Errorf("delete metadata redirect: %w", err) } - if err := metadata.StopMetadata(name, db, false); err != nil { + if err := metadata.StopMetadata(name, cfg, false); err != nil { return fmt.Errorf("stop metadata: %w", err) }