diff --git a/cmd/meta_cli/main.go b/cmd/meta_cli/main.go index ce97286..9fec4db 100644 --- a/cmd/meta_cli/main.go +++ b/cmd/meta_cli/main.go @@ -1,54 +1,17 @@ package main import ( - "flag" "fmt" "os" - "strings" - - configuration "git.g3e.fr/syonad/two/internal/config/agent" - "git.g3e.fr/syonad/two/pkg/db/kv" - "github.com/dgraph-io/badger/v4" ) -var DB *badger.DB - -func AddInDB(dbName string, line string) error { - // ID = partie avant le premier ';' - id := strings.Split(line, ";")[0] + "/bash" - key := []byte(dbName + "/" + id) - - return DB.Update(func(txn *badger.Txn) error { - return txn.Set(key, []byte(line)) - }) -} +var ( + bin_name = os.Args[0] +) func main() { - conf_file := flag.String("conf", "/etc/two/agent.yml", "configuration file") - vm_name := flag.String("vm_name", "", "Nom de la vm") - vpc := flag.String("vpc_name", "", "vpc name") - bind_ip := flag.String("ip", "", "bind ip") - bind_port := flag.String("port", "", "bind port") - ssh_key := flag.String("key", "", "Clef ssh") - password := flag.String("pass", "", "password user") - start := flag.Bool("start", false, "start metadata server") - stop := flag.Bool("stop", false, "stop metadata server") - flag.Parse() - - conf, err := configuration.LoadConfig(*conf_file) - if err != nil { - fmt.Println(err) - return - } - fmt.Print(conf) - - DB = kv.InitDB(kv.Config{ - Path: conf.Database.Path, - }) - defer DB.Close() - - fmt.Printf("conf metadata for %s\n - this key %s\n - this password %s\n", *vm_name, *ssh_key, *password) + fmt.Printf("Start %s conf\n", bin_name) os.Exit(0) } diff --git a/conf/agent/config.dev.yml b/conf/agent/config.dev.yml deleted file mode 100644 index 62cb624..0000000 --- a/conf/agent/config.dev.yml +++ /dev/null @@ -1,2 +0,0 @@ -database: - path: "./data/" \ No newline at end of file diff --git a/conf/agent/config.exemple.yml b/exemple/agent/config.exemple.yml similarity index 100% rename from conf/agent/config.exemple.yml rename to exemple/agent/config.exemple.yml diff --git a/internal/config/agent/struct.go b/internal/config/agent/struct.go index c9537bf..12a46d3 100644 --- a/internal/config/agent/struct.go +++ b/internal/config/agent/struct.go @@ -17,7 +17,9 @@ func LoadConfig(path string) (*Config, error) { v.SetDefault("database.path", "/var/lib/two/data/") - v.ReadInConfig() + if err := v.ReadInConfig(); err != nil { + return nil, err + } var cfg Config if err := v.Unmarshal(&cfg); err != nil {