driver(external): some tweaks around server and client code

Signed-off-by: Ansuman Sahoo <[email protected]>

Author: unsuman

cmd/limactl/main.go

@@ -16,7 +16,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/lima-vm/lima/pkg/debugutil"
-	_ "github.com/lima-vm/lima/pkg/driver/qemu" // register qemu driver for all platforms
+	// _ "github.com/lima-vm/lima/pkg/driver/qemu" // register qemu driver for all platforms
 	"github.com/lima-vm/lima/pkg/fsutil"
 	"github.com/lima-vm/lima/pkg/osutil"
 	"github.com/lima-vm/lima/pkg/store/dirnames"

pkg/driver/external/client/client.go

@@ -26,11 +26,7 @@ type DriverClient struct {
 }
 
 func NewDriverClient(stdin io.WriteCloser, stdout io.ReadCloser, logger *logrus.Logger) (*DriverClient, error) {
-	pipeConn := &PipeConn{
-		Reader: stdout,
-		Writer: stdin,
-	}
-
+	pipeConn := newPipeConn(stdin, stdout)
 	opts := []grpc.DialOption{
 		grpc.WithDefaultCallOptions(
 			grpc.MaxCallRecvMsgSize(math.MaxInt64),
@@ -47,9 +43,15 @@ func NewDriverClient(stdin io.WriteCloser, stdout io.ReadCloser, logger *logrus.
 		}),
 	}
 
-	conn, err := grpc.NewClient("pipe://", opts...)
+	// conn, err := grpc.NewClient("pipe", opts...)
+	// if err != nil {
+	// 	logger.Errorf("failed to create gRPC driver client connection: %v", err)
+	// 	return nil, err
+	// }
+
+	conn, err := grpc.Dial("pipe", opts...)
 	if err != nil {
-		logger.Errorf("failed to create gRPC driver client connection: %v", err)
+		logger.Errorf("failed to dial gRPC driver client connection: %v", err)
 		return nil, err
 	}
 

pkg/driver/external/client/methods.go

@@ -51,9 +51,7 @@ func (d *DriverClient) Initialize(ctx context.Context) error {
 func (d *DriverClient) CreateDisk(ctx context.Context) error {
 	d.logger.Debug("Creating disk for the instance")
 
-	connCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
-	defer cancel()
-	_, err := d.DriverSvc.CreateDisk(connCtx, &emptypb.Empty{})
+	_, err := d.DriverSvc.CreateDisk(ctx, &emptypb.Empty{})
 	if err != nil {
 		d.logger.Errorf("Disk creation failed: %v", err)
 		return err
@@ -66,7 +64,7 @@ func (d *DriverClient) CreateDisk(ctx context.Context) error {
 func (d *DriverClient) Start(ctx context.Context) (chan error, error) {
 	d.logger.Debug("Starting driver instance")
 
-	connCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
+	connCtx, cancel := context.WithTimeout(ctx, time.Minute)
 	defer cancel()
 	stream, err := d.DriverSvc.Start(connCtx, &emptypb.Empty{})
 	if err != nil {

pkg/driver/external/client/pipe.go

@@ -14,6 +14,13 @@ type PipeConn struct {
 	Writer io.Writer
 }
 
+func newPipeConn(writer io.WriteCloser, reader io.ReadCloser) *PipeConn {
+	return &PipeConn{
+		Reader: reader,
+		Writer: writer,
+	}
+}
+
 func (p *PipeConn) Read(b []byte) (n int, err error) {
 	return p.Reader.Read(b)
 }

pkg/driver/external/server/methods.go

@@ -51,14 +51,14 @@ func (s *DriverServer) Start(empty *emptypb.Empty, stream pb.Driver_StartServer)
 
 func (s *DriverServer) SetConfig(ctx context.Context, req *pb.SetConfigRequest) (*emptypb.Empty, error) {
 	s.logger.Debugf("Received SetConfig request")
-	var inst *store.Instance
+	var inst store.Instance
 
-	if err := json.Unmarshal(req.InstanceConfigJson, inst); err != nil {
+	if err := json.Unmarshal(req.InstanceConfigJson, &inst); err != nil {
 		s.logger.Errorf("Failed to unmarshal InstanceConfigJson: %v", err)
 		return &emptypb.Empty{}, err
 	}
 
-	s.driver.SetConfig(inst, int(req.SshLocalPort))
+	s.driver.SetConfig(&inst, int(req.SshLocalPort))
 
 	return &emptypb.Empty{}, nil
 }

pkg/driver/external/server/server.go

@@ -26,9 +26,6 @@ type DriverServer struct {
 func Serve(driver driver.Driver) {
 	logger := logrus.New()
 	logger.SetLevel(logrus.DebugLevel)
-	logger.SetFormatter(&logrus.TextFormatter{
-		FullTimestamp: true,
-	})
 	logger.Infof("Starting external driver server for %s", driver.GetInfo().DriverName)
 
 	pipeConn := &PipeConn{

pkg/driver/qemu/cmd/main.go

@@ -8,6 +8,7 @@ import (
 	"github.com/lima-vm/lima/pkg/driver/qemu"
 )
 
+// To be used as an external driver for Lima.
 func main() {
 	driver := qemu.New()
 	server.Serve(driver)

pkg/driverutil/instance.go

@@ -21,9 +21,5 @@ func CreateTargetDriverInstance(inst *store.Instance, sshLocalPort int) (driver.
 
 	driver.SetConfig(inst, sshLocalPort)
 
-	if err := driver.Validate(); err != nil {
-		return nil, fmt.Errorf("driver validation failed: %w", err)
-	}
-
 	return driver, nil
 }