remove CommandOutput, new impl.

Signed-off-by: Songpon Srisawai <[email protected]>

Author: songponssw

pkg/guestagent/api/client/client.go

@@ -76,3 +76,10 @@ func (c *GuestAgentClient) Tunnel(ctx context.Context) (api.GuestService_TunnelC
 	}
 	return stream, nil
 }
+
+func (c *GuestAgentClient) GetIP(ctx context.Context, req *api.GetIPRequest) (*api.GetIPRespond, error) {
+	return c.cli.GetIP(ctx, req)
+}
+
+
+

pkg/guestagent/api/guestservice.pb.desc

@@ -1,5 +1,5 @@
 
-�
+�
 guestservice.protogoogle/protobuf/empty.protogoogle/protobuf/timestamp.proto"0
 Info(
 local_ports
 (2.IPPortR
@@ -23,9 +23,15 @@ mount_path
 
(	R	mountPath.
 data 
(Rdata
 
 guest_addr 
(	R	guestAddr&
-udp_target_addr 
(	RudpTargetAddr2�

+udp_target_addr 
(	RudpTargetAddr"-
+GetIPRequest
+
+ip_version
 
(	R	ipVersion"
+GetIPRespond
+ip
 
(	Rip2�

 GuestService(
 GetInfo.google.protobuf.Empty.Info-
 	GetEvents.google.protobuf.Empty.Event0
1
 PostInotify.Inotify.google.protobuf.Empty(
,
-Tunnel.TunnelMessage.TunnelMessage(
0
B/Z-github.com/lima-vm/lima/v2/pkg/guestagent/apibproto3
+Tunnel.TunnelMessage.TunnelMessage(
0
%
+GetIP.GetIPRequest.GetIPRespondB/Z-github.com/lima-vm/lima/v2/pkg/guestagent/apibproto3

pkg/guestagent/api/guestservice.pb.go

@@ -11,12 +11,12 @@ service GuestService {
   rpc PostInotify(stream Inotify) returns (google.protobuf.Empty);
 
   rpc Tunnel(stream TunnelMessage) returns (stream TunnelMessage);
-}
 
-message Info {
-  repeated IPPort local_ports = 1;
+  rpc GetIP(GetIPRequest) returns (GetIPRespond);
 }
 
+message Info { repeated IPPort local_ports = 1; }
+
 message Event {
   google.protobuf.Timestamp time = 1;
   repeated IPPort added_local_ports = 2;
@@ -42,3 +42,6 @@ message TunnelMessage {
   string guest_addr = 4;
   string udp_target_addr = 5;
 }
+
+message GetIPRequest { string ip_version = 1; }
+message GetIPRespond { string ip = 1; }

pkg/guestagent/api/guestservice.proto

@@ -56,3 +56,8 @@ func (s *GuestServer) PostInotify(server api.GuestService_PostInotifyServer) err
 func (s *GuestServer) Tunnel(stream api.GuestService_TunnelServer) error {
 	return s.TunnelS.Start(stream)
 }
+
+func (s *GuestServer) GetIP(ctx context.Context, req *api.GetIPRequest) (*api.GetIPRespond, error) {
+	return s.Agent.IP(ctx, req.IpVersion)
+	// return s.Agent.IP(ctx, "4")
+}

pkg/guestagent/api/guestservice_grpc.pb.go

@@ -14,4 +14,5 @@ type Agent interface {
 	Events(ctx context.Context, ch chan *api.Event)
 	LocalPorts(ctx context.Context) ([]*api.IPPort, error)
 	HandleInotify(event *api.Inotify)
+	IP(ctx context.Context, ipVersion string)(*api.GetIPRespond, error)
 }

pkg/guestagent/api/server/server.go

@@ -20,6 +20,7 @@ import (
 	"github.com/lima-vm/lima/v2/pkg/guestagent/api"
 	"github.com/lima-vm/lima/v2/pkg/guestagent/iptables"
 	"github.com/lima-vm/lima/v2/pkg/guestagent/kubernetesservice"
+	"github.com/lima-vm/lima/v2/pkg/guestagent/metricutil"
 	"github.com/lima-vm/lima/v2/pkg/guestagent/procnettcp"
 	"github.com/lima-vm/lima/v2/pkg/guestagent/ticker"
 	"github.com/lima-vm/lima/v2/pkg/guestagent/timesync"
@@ -45,8 +46,7 @@ func New(ctx context.Context, ticker ticker.Ticker, iptablesIdle time.Duration)
 
 	auditStatus, err := auditClient.GetStatus()
 	if err != nil {
-		// syscall.EPERM is returned when using audit from a non-initial namespace
-		// https://github.com/torvalds/linux/blob/633b47cb009d09dc8f4ba9cdb3a0ca138809c7c7/kernel/audit.c#L1054-L1057
+		// syscall.EPERM is returned when using audit from a non-initial namespace https://github.com/torvalds/linux/blob/633b47cb009d09dc8f4ba9cdb3a0ca138809c7c7/kernel/audit.c#L1054-L1057
 		if !errors.Is(err, syscall.EPERM) {
 			return nil, err
 		}
@@ -371,3 +371,8 @@ func (a *agent) HandleInotify(event *api.Inotify) {
 		}
 	}
 }
+
+func (a *agent) IP(ctx context.Context, ipVersion string)(*api.GetIPRespond, error) {
+	out, err := metricutil.GetDefaultIP(ipVersion)
+	return &api.GetIPRespond{Ip: out}, err
+}