fix(vmconfig): invalid vmconfig sometimes causes the virtual machine fail to start (#88)

This PR remove the `mc.KrunKitBin && mc.VFKitBin && mc.GVProxyBin`,
change to dynamically calculated when needed.

Author: ihexon

cmd/main.go

@@ -105,7 +105,7 @@ func loggerSetup(outType string, f string) {
 			return
 		}
 
-		fd, err := os.OpenFile(logFile.GetPath(), os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
+		fd, err := os.OpenFile(logFile.GetPath(), os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666) //nolint:mnd
 		if err != nil && !errors.Is(err, os.ErrNotExist) {
 			logrus.Warnf("failed to open log file: %q", err)
 			return

pkg/machine/gvproxy/gvproxy.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"os"
 	"os/exec"
-	"path/filepath"
 	"syscall"
 	"time"
 
@@ -29,16 +28,11 @@ func Start(ctx context.Context, mc *vmconfig.MachineConfig) error {
 		logrus.Warnf("kill old gvproxy from pid process failed: %v", err)
 	}
 
-	execPath, err := os.Executable()
+	gvpBin, err := mc.GetGVProxyBin()
 	if err != nil {
-		return fmt.Errorf("unable to get executable path: %w", err)
+		return fmt.Errorf("unable to get gvproxy binary path: %w", err)
 	}
-	execPath, err = filepath.EvalSymlinks(execPath)
-	if err != nil {
-		return fmt.Errorf("unable to eval symlinks: %w", err)
-	}
-
-	gvpBin := filepath.Join(filepath.Dir(filepath.Dir(execPath)), define.Libexec, define.GvProxyBinaryName)
+	
 	gvpCmd := gvproxyTypes.NewGvproxyCommand()
 	gvpCmd.SSHPort = mc.SSH.Port
 	// gvproxy listen a local socks file as Podman API socks (PodmanSocks.InHost)

pkg/machine/krunkit/stubber.go

@@ -84,14 +84,19 @@ func startKrunKit(ctx context.Context, mc *vmconfig.MachineConfig) error {
 		return fmt.Errorf("failed to create dynamic machine configure: %w", err)
 	}
 
-	cmd, err := vmc.Cmd(mc.KrunKitBin)
+	krunkitBin, err := mc.GetKrunkitBin()
+	if err != nil {
+		return fmt.Errorf("failed to get krunkit binary: %w", err)
+	}
+
+	cmd, err := vmc.Cmd(krunkitBin)
 	if err != nil {
 		return fmt.Errorf("failed to create krunkit command: %w", err)
 	}
 
 	cmd.Args = append(cmd.Args, "--krun-log-level", "3")
 
-	cmd = exec.CommandContext(ctx, mc.KrunKitBin, cmd.Args[1:]...)
+	cmd = exec.CommandContext(ctx, krunkitBin, cmd.Args[1:]...)
 
 	logrus.Infof("full cmdline: %q", cmd.Args)
 

pkg/machine/machine_common.go

@@ -7,7 +7,6 @@ import (
 	"context"
 	"fmt"
 	"os"
-	"path/filepath"
 	"time"
 
 	"bauklotze/pkg/decompress"
@@ -82,19 +81,6 @@ func InitializeVM(opts *vmconfig.VMOpts) (*vmconfig.MachineConfig, error) {
 		return nil, fmt.Errorf("failed to get ssh port: %w", err)
 	}
 
-	execPath, err := os.Executable()
-	if err != nil {
-		return nil, fmt.Errorf("unable to get executable path: %w", err)
-	}
-	execPath, err = filepath.EvalSymlinks(execPath)
-	if err != nil {
-		return nil, fmt.Errorf("unable to eval symlinks: %w", err)
-	}
-
-	mc.KrunKitBin = filepath.Join(filepath.Dir(filepath.Dir(execPath)), define.Libexec, define.KrunkitBinaryName)
-	mc.VFKitBin = filepath.Join(filepath.Dir(filepath.Dir(execPath)), define.Libexec, define.VfkitBinaryName)
-	mc.GVProxyBin = filepath.Join(filepath.Dir(filepath.Dir(execPath)), define.Libexec, define.GvProxyBinaryName)
-
 	if err := mc.MakeDirs(); err != nil {
 		return nil, fmt.Errorf("make work space err: %w", err)
 	}
@@ -178,7 +164,7 @@ func CreateDynamicConfigure(mc *vmconfig.MachineConfig) (*vfConfig.VirtualMachin
 }
 
 // SyncTimeOnWake start Sleep Notifier and dispatch tasks
-func SyncTimeOnWake(ctx context.Context, mc *vmconfig.MachineConfig) error {
+func SyncTimeOnWake(ctx context.Context, mc *vmconfig.MachineConfig) error { //nolint: staticcheck
 	notifierCh := notifier.GetInstance().Start()
 	for {
 		select {

pkg/machine/vfkit/stubber.go

@@ -83,15 +83,19 @@ func startVFkit(ctx context.Context, mc *vmconfig.MachineConfig) error {
 		return fmt.Errorf("failed to create dynamic machine configure: %w", err)
 	}
 
-	cmd, err := vmc.Cmd(mc.VFKitBin)
+	vfkitBin, err := mc.GetVfkitBin()
+	if err != nil {
+		return fmt.Errorf("failed to get vfkit binary: %w", err)
+	}
+	cmd, err := vmc.Cmd(vfkitBin)
 	if err != nil {
 		return fmt.Errorf("failed to create krunkit command: %w", err)
 	}
 
 	cmd.Args = append(cmd.Args, "--log-level", "info")
 	cmd.Args = append(cmd.Args, "--device", "virtio-serial,stdio")
 
-	cmd = exec.CommandContext(ctx, mc.VFKitBin, cmd.Args[1:]...)
+	cmd = exec.CommandContext(ctx, vfkitBin, cmd.Args[1:]...)
 
 	logrus.Infof("full cmdline: %q", cmd.Args)
 

pkg/machine/vmconfig/vmconfig.go

@@ -11,6 +11,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"sync"
 
 	"bauklotze/pkg/machine/define"
 	"bauklotze/pkg/machine/fs"
@@ -29,7 +30,9 @@ type VMState struct {
 }
 
 var (
-	Workspace string
+	Workspace    string
+	binDir       string
+	binDirLocker sync.Mutex
 )
 
 type VMProvider interface { //nolint:interfacebloat
@@ -131,9 +134,6 @@ type MachineConfig struct {
 	// RestAPISocks is the socks for rest api, it is used by appliance to connect to query the status of vm
 	// exec cmdline in vm etc...
 	RestAPISocks string `json:"restAPISocks" validate:"required"`
-	KrunKitBin   string `json:"krunKitBin"   validate:"required"`
-	VFKitBin     string `json:"vfKitBin"     validate:"required"`
-	GVProxyBin   string `json:"gvProxyBin"   validate:"required"`
 }
 
 type SSHAuthSocks struct {
@@ -267,3 +267,53 @@ func (mc *MachineConfig) Write() error {
 	}
 	return ioutils.AtomicWriteFile(mc.ConfigFile, b, define.DefaultFilePerm) //nolint:wrapcheck
 }
+
+// GetLocationDir return the installation dir of ovm
+func (mc *MachineConfig) getBinDir() (string, error) {
+	binDirLocker.Lock()
+	defer binDirLocker.Unlock()
+
+	if binDir != "" {
+		return binDir, nil
+	}
+	
+	execPath, err := os.Executable()
+	if err != nil {
+		return "", fmt.Errorf("unable to get executable path: %w", err)
+	}
+
+	execPath, err = filepath.EvalSymlinks(execPath)
+	if err != nil {
+		return "", fmt.Errorf("unable to eval symlinks: %w", err)
+	}
+	binDir = filepath.Dir(filepath.Dir(execPath))
+
+	return binDir, nil
+}
+
+func (mc *MachineConfig) GetKrunkitBin() (string, error) {
+	dir, err := mc.getBinDir()
+	if err != nil {
+		return "", fmt.Errorf("get bin dir err: %w", err)
+	}
+
+	return filepath.Join(dir, define.Libexec, define.KrunkitBinaryName), nil
+}
+
+func (mc *MachineConfig) GetVfkitBin() (string, error) {
+	dir, err := mc.getBinDir()
+	if err != nil {
+		return "", fmt.Errorf("get bin dir err: %w", err)
+	}
+
+	return filepath.Join(dir, define.Libexec, define.VfkitBinaryName), nil
+}
+
+func (mc *MachineConfig) GetGVProxyBin() (string, error) {
+	dir, err := mc.getBinDir()
+	if err != nil {
+		return "", fmt.Errorf("get bin dir err: %w", err)
+	}
+
+	return filepath.Join(dir, define.Libexec, define.GvProxyBinaryName), nil
+}