Merge pull request #3922 from AkihiroSuda/split-name-driver-features

driver: move back DriverName from DriverFeatures to Info

Author: AkihiroSuda

pkg/driver/driver.go

@@ -92,15 +92,15 @@ type ConfiguredDriver struct {
 }
 
 type Info struct {
+	Name        string         `json:"name"`
 	VsockPort   int            `json:"vsockPort"`
 	VirtioPort  string         `json:"virtioPort"`
 	InstanceDir string         `json:"instanceDir,omitempty"`
 	Features    DriverFeatures `json:"features"`
 }
 
 type DriverFeatures struct {
-	DriverName           string `json:"driverName"`
-	CanRunGUI            bool   `json:"canRunGui,omitempty"`
-	DynamicSSHAddress    bool   `json:"dynamicSSHAddress"`
-	SkipSocketForwarding bool   `json:"skipSocketForwarding"`
+	CanRunGUI            bool `json:"canRunGui,omitempty"`
+	DynamicSSHAddress    bool `json:"dynamicSSHAddress"`
+	SkipSocketForwarding bool `json:"skipSocketForwarding"`
 }

pkg/driver/external/server/server.go

@@ -68,7 +68,7 @@ func Serve(ctx context.Context, driver driver.Driver) {
 	logger := logrus.New()
 	logger.SetLevel(logrus.DebugLevel)
 
-	socketPath := filepath.Join(os.TempDir(), fmt.Sprintf("lima-driver-%s-%d.sock", driver.Info().Features.DriverName, os.Getpid()))
+	socketPath := filepath.Join(os.TempDir(), fmt.Sprintf("lima-driver-%s-%d.sock", driver.Info().Name, os.Getpid()))
 
 	defer func() {
 		if err := os.Remove(socketPath); err != nil && !os.IsNotExist(err) {
@@ -146,7 +146,7 @@ func Serve(ctx context.Context, driver driver.Driver) {
 	}()
 
 	go func() {
-		logger.Infof("Starting external driver server for %s", driver.Info().Features.DriverName)
+		logger.Infof("Starting external driver server for %s", driver.Info().Name)
 		logger.Infof("Server starting on Unix socket: %s", socketPath)
 		if err := server.Serve(tListener); err != nil {
 			if errors.Is(err, grpc.ErrServerStopped) {

pkg/driver/qemu/qemu_driver.go

@@ -674,6 +674,7 @@ func (a *qArgTemplateApplier) applyTemplate(qArg string) (string, error) {
 
 func (l *LimaQemuDriver) Info() driver.Info {
 	var info driver.Info
+	info.Name = "qemu"
 	if l.Instance != nil && l.Instance.Dir != "" {
 		info.InstanceDir = l.Instance.Dir
 	}
@@ -683,7 +684,6 @@ func (l *LimaQemuDriver) Info() driver.Info {
 	info.Features = driver.DriverFeatures{
 		DynamicSSHAddress:    false,
 		SkipSocketForwarding: false,
-		DriverName:           "qemu",
 		CanRunGUI:            false,
 	}
 	return info

pkg/driver/vz/vz_driver_darwin.go

@@ -372,7 +372,7 @@ func (l *LimaVzDriver) GuestAgentConn(_ context.Context) (net.Conn, string, erro
 func (l *LimaVzDriver) Info() driver.Info {
 	var info driver.Info
 
-	info.Features.DriverName = "vz"
+	info.Name = "vz"
 	info.VsockPort = l.vSockPort
 	info.VirtioPort = l.virtioPort
 	if l.Instance != nil {
@@ -386,7 +386,6 @@ func (l *LimaVzDriver) Info() driver.Info {
 	info.Features = driver.DriverFeatures{
 		DynamicSSHAddress:    false,
 		SkipSocketForwarding: false,
-		DriverName:           "vz",
 		CanRunGUI:            guiFlag,
 	}
 	return info

pkg/driver/wsl2/wsl_driver_windows.go

@@ -306,6 +306,7 @@ func (l *LimaWslDriver) GuestAgentConn(ctx context.Context) (net.Conn, string, e
 
 func (l *LimaWslDriver) Info() driver.Info {
 	var info driver.Info
+	info.Name = "wsl2"
 	if l.Instance != nil {
 		info.InstanceDir = l.Instance.Dir
 	}
@@ -315,7 +316,6 @@ func (l *LimaWslDriver) Info() driver.Info {
 	info.Features = driver.DriverFeatures{
 		DynamicSSHAddress:    true,
 		SkipSocketForwarding: true,
-		DriverName:           "wsl2",
 		CanRunGUI:            l.canRunGUI(),
 	}
 	return info

pkg/driverutil/instance.go

@@ -39,6 +39,6 @@ func CreateConfiguredDriver(inst *limatype.Instance, sshLocalPort int) (*driver.
 		return extDriver.Client.Configure(inst), nil
 	}
 
-	logrus.Debugf("Using internal driver %q", intDriver.Info().Features.DriverName)
+	logrus.Debugf("Using internal driver %q", intDriver.Info().Name)
 	return intDriver.Configure(inst), nil
 }

pkg/registry/registry.go

@@ -195,7 +195,7 @@ func isExecutable(mode os.FileMode) bool {
 }
 
 func Register(driver driver.Driver) {
-	name := driver.Info().Features.DriverName
+	name := driver.Info().Name
 	if _, exists := internalDrivers[name]; exists {
 		return
 	}

pkg/registry/registry_test.go

@@ -45,7 +45,7 @@ func (m *mockDriver) Unregister(_ context.Context) error
 func (m *mockDriver) ForwardGuestAgent() bool                                    { return false }
 func (m *mockDriver) GuestAgentConn(_ context.Context) (net.Conn, string, error) { return nil, "", nil }
 func (m *mockDriver) Info() driver.Info {
-	return driver.Info{Features: driver.DriverFeatures{DriverName: m.Name}}
+	return driver.Info{Name: m.Name}
 }
 func (m *mockDriver) Configure(_ *limatype.Instance) *driver.ConfiguredDriver      { return nil }
 func (m *mockDriver) AcceptConfig(_ *limatype.LimaYAML, _ string) error            { return nil }
@@ -80,7 +80,7 @@ func TestRegister(t *testing.T) {
 	assert.Equal(t, exists, true)
 	assert.Assert(t, extDriver == nil)
 	assert.Assert(t, intDriver != nil)
-	assert.Equal(t, intDriver.Info().Features.DriverName, "test-driver")
+	assert.Equal(t, intDriver.Info().Name, "test-driver")
 
 	vmTypes := List()
 	assert.Equal(t, vmTypes["test-driver-2"], Internal)