refactor: improve stubber code (#48)

Signed-off-by: Kevin Cui <bh@bugs.cc>

Author: BlackHole1

pkg/machine/krunkit/stubber.go

@@ -8,7 +8,6 @@ package krunkit
 import (
 	"fmt"
 	"os/exec"
-	"strconv"
 
 	"bauklotze/pkg/machine/apple/hvhelper"
 	"bauklotze/pkg/machine/define"
@@ -52,15 +51,18 @@ const (
 func (l LibKrunStubber) CreateVM(opts define.CreateVMOpts, mc *vmconfigs.MachineConfig) error {
 	mc.AppleKrunkitHypervisor = new(vmconfigs.AppleKrunkitConfig)
 	mc.AppleKrunkitHypervisor.Krunkit = hvhelper.Helper{}
+
 	bl := vfConfig.NewEFIBootloader(fmt.Sprintf("%s/efi-bl-%s", opts.Dirs.DataDir.GetPath(), opts.Name), true)
 	mc.AppleKrunkitHypervisor.Krunkit.VirtualMachine = vfConfig.NewVirtualMachine(uint(mc.Resources.CPUs), uint64(mc.Resources.Memory), bl)
+
 	randPort, err := port.GetFree(0)
 	if err != nil {
 		return fmt.Errorf("failed to get random port: %w", err)
 	}
-	// Endpoint is a string: http://127.0.0.1/[random_port]
-	mc.AppleKrunkitHypervisor.Krunkit.Endpoint = localhostURI + ":" + strconv.Itoa(randPort)
+
+	mc.AppleKrunkitHypervisor.Krunkit.Endpoint = fmt.Sprintf("%s:%d", localhostURI, randPort)
 	mc.AppleKrunkitHypervisor.Krunkit.LogLevel = logrus.InfoLevel
+
 	return nil
 }
 

pkg/machine/vfkit/stubber.go

@@ -8,7 +8,6 @@ package vfkit
 import (
 	"fmt"
 	"os/exec"
-	"strconv"
 
 	"bauklotze/pkg/machine/apple/hvhelper"
 	"bauklotze/pkg/machine/define"
@@ -52,14 +51,16 @@ const (
 func (l VFkitStubber) CreateVM(opts define.CreateVMOpts, mc *vmconfigs.MachineConfig) error {
 	mc.AppleVFkitHypervisor = new(vmconfigs.AppleVFkitConfig)
 	mc.AppleVFkitHypervisor.Vfkit = hvhelper.Helper{}
+
 	bl := vfConfig.NewEFIBootloader(fmt.Sprintf("%s/efi-bl-%s", opts.Dirs.DataDir.GetPath(), opts.Name), true)
 	mc.AppleVFkitHypervisor.Vfkit.VirtualMachine = vfConfig.NewVirtualMachine(uint(mc.Resources.CPUs), uint64(mc.Resources.Memory), bl)
+
 	randPort, err := port.GetFree(0)
 	if err != nil {
 		return fmt.Errorf("failed to get random port: %w", err)
 	}
-	// Endpoint is a string: http://127.0.0.1/[random_port]
-	mc.AppleVFkitHypervisor.Vfkit.Endpoint = localhostURI + ":" + strconv.Itoa(randPort)
+
+	mc.AppleVFkitHypervisor.Vfkit.Endpoint = fmt.Sprintf("%s:%d", localhostURI, randPort)
 	mc.AppleVFkitHypervisor.Vfkit.LogLevel = logrus.InfoLevel
 
 	return nil