feat: improve ENV variable overrides, introduce Node struct, refactoring

pkg/system/dbus.go

@@ -1,23 +0,0 @@
-package system
-
-import (
-	"log"
-
-	"github.com/godbus/dbus/v5"
-)
-
-// WithDbus executes the given function with a D-Bus system connection
-// and handles any connection errors
-func WithDbus(fn func(*dbus.Conn) error) error {
-	conn, err := dbus.SystemBus()
-	if err != nil {
-		log.Printf("[ERROR] Failed to connect to system bus: %v", err)
-		return err
-	}
-	if err := fn(conn); err != nil {
-		log.Printf("[ERROR] Failed to execute D-Bus function: %s", err)
-		return err
-	}
-	conn.Close()
-	return nil
-}

pkg/system/init.go

@@ -0,0 +1,47 @@
+package system
+
+import (
+	"log"
+
+	"github.com/0x1d/rcond/pkg/config"
+	"github.com/0x1d/rcond/pkg/network"
+	"github.com/0x1d/rcond/pkg/util"
+	"github.com/godbus/dbus/v5"
+)
+
+func Configure(appConfig *config.Config) error {
+	log.Print("[INFO] Configure system")
+	// configure hostname
+	if err := network.SetHostname(appConfig.Hostname); err != nil {
+		log.Printf("[ERROR] setting hostname failed: %s", err)
+	}
+	// configure network connections
+	for _, connection := range appConfig.Network.Connections {
+		err := util.WithConnection(func(conn *dbus.Conn) error {
+			_, err := network.AddConnectionWithConfig(conn, &network.ConnectionConfig{
+				Type:        connection.Type,
+				UUID:        connection.UUID,
+				ID:          connection.ID,
+				AutoConnect: connection.AutoConnect,
+				SSID:        connection.SSID,
+				Mode:        connection.Mode,
+				Band:        connection.Band,
+				Channel:     connection.Channel,
+				KeyMgmt:     connection.KeyMgmt,
+				PSK:         connection.PSK,
+				IPv4Method:  connection.IPv4Method,
+				IPv6Method:  connection.IPv6Method,
+			})
+			if err != nil {
+				return err
+			}
+			return nil
+		})
+		if err != nil {
+			log.Printf("[ERROR] configuring connections failed: %s", err)
+		}
+
+	}
+	log.Print("[INFO] System configured")
+	return nil
+}

pkg/system/state.go

@@ -3,12 +3,13 @@ package system
 import (
 	"log"
 
+	"github.com/0x1d/rcond/pkg/util"
 	"github.com/godbus/dbus/v5"
 )
 
 // Restart restarts the system.
 func Restart() error {
-	return WithDbus(func(conn *dbus.Conn) error {
+	return util.WithConnection(func(conn *dbus.Conn) error {
 		obj := conn.Object("org.freedesktop.systemd1", "/org/freedesktop/systemd1")
 		log.Println("Rebooting system...")
 		call := obj.Call("org.freedesktop.systemd1.Manager.Reboot", 0)
@@ -21,7 +22,7 @@ func Restart() error {
 
 // Shutdown shuts down the system.
 func Shutdown() error {
-	return WithDbus(func(conn *dbus.Conn) error {
+	return util.WithConnection(func(conn *dbus.Conn) error {
 		obj := conn.Object("org.freedesktop.systemd1", "/org/freedesktop/systemd1")
 		log.Println("Shutting down system...")
 		call := obj.Call("org.freedesktop.systemd1.Manager.PowerOff", 0)