pkg/hostagent/api -> pkg/hostagent/events

Signed-off-by: Akihiro Suda <[email protected]>

Author: AkihiroSuda

cmd/limactl/stop.go

@@ -10,8 +10,8 @@ import (
 	"syscall"
 	"time"
 
-	hostagentapi "github.com/lima-vm/lima/pkg/hostagent/api"
-	"github.com/lima-vm/lima/pkg/networks/reconcile"
+	hostagentevents "github.com/lima-vm/lima/pkg/hostagent/events"
+	networks "github.com/lima-vm/lima/pkg/networks/reconcile"
 	"github.com/lima-vm/lima/pkg/store"
 	"github.com/lima-vm/lima/pkg/store/filenames"
 	"github.com/sirupsen/logrus"
@@ -78,7 +78,7 @@ func waitForHostAgentTermination(ctx context.Context, inst *store.Instance, begi
 	defer cancel()
 
 	var receivedExitingEvent bool
-	onEvent := func(ev hostagentapi.Event) bool {
+	onEvent := func(ev hostagentevents.Event) bool {
 		if len(ev.Status.Errors) > 0 {
 			logrus.Errorf("%+v", ev.Status.Errors)
 		}
@@ -92,7 +92,7 @@ func waitForHostAgentTermination(ctx context.Context, inst *store.Instance, begi
 	haStdoutPath := filepath.Join(inst.Dir, filenames.HostAgentStdoutLog)
 	haStderrPath := filepath.Join(inst.Dir, filenames.HostAgentStderrLog)
 
-	if err := hostagentapi.WatchEvents(ctx2, haStdoutPath, haStderrPath, begin, onEvent); err != nil {
+	if err := hostagentevents.Watch(ctx2, haStdoutPath, haStderrPath, begin, onEvent); err != nil {
 		return err
 	}
 

docs/internal.md

@@ -50,7 +50,7 @@ Guest agent:
 
 Host agent:
 - `ha.pid`: hostagent PID
-- `ha.stdout.log`: hostagent stdout (JSON lines, see `pkg/hostagent/api.Events`)
+- `ha.stdout.log`: hostagent stdout (JSON lines, see `pkg/hostagent/events.Event`)
 - `ha.stderr.log`: hostagent stderr (human-readable messages)
 
 ## Lima cache directory (`~/Library/Caches/lima`)

pkg/hostagent/api/api.go renamed to pkg/hostagent/events/events.go

@@ -1,4 +1,4 @@
-package api
+package events
 
 import (
 	"time"

pkg/hostagent/api/eventwatcher.go renamed to pkg/hostagent/events/watcher.go

@@ -1,4 +1,4 @@
-package api
+package events
 
 import (
 	"context"
@@ -10,7 +10,7 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-func WatchEvents(ctx context.Context, haStdoutPath, haStderrPath string, begin time.Time, onEvent func(Event) bool) error {
+func Watch(ctx context.Context, haStdoutPath, haStderrPath string, begin time.Time, onEvent func(Event) bool) error {
 	haStdoutTail, err := tail.TailFile(haStdoutPath,
 		tail.Config{
 			Follow:    true,

pkg/hostagent/hostagent.go

@@ -19,7 +19,7 @@ import (
 	"github.com/hashicorp/go-multierror"
 	guestagentapi "github.com/lima-vm/lima/pkg/guestagent/api"
 	guestagentclient "github.com/lima-vm/lima/pkg/guestagent/api/client"
-	hostagentapi "github.com/lima-vm/lima/pkg/hostagent/api"
+	"github.com/lima-vm/lima/pkg/hostagent/events"
 	"github.com/lima-vm/lima/pkg/limayaml"
 	"github.com/lima-vm/lima/pkg/qemu"
 	"github.com/lima-vm/lima/pkg/sshutil"
@@ -114,7 +114,7 @@ func New(instName string, stdout, stderr io.Writer, sigintCh chan os.Signal) (*H
 	return a, nil
 }
 
-func (a *HostAgent) emitEvent(ctx context.Context, ev hostagentapi.Event) {
+func (a *HostAgent) emitEvent(ctx context.Context, ev events.Event) {
 	a.eventEncMu.Lock()
 	defer a.eventEncMu.Unlock()
 	if ev.Time.IsZero() {
@@ -135,8 +135,8 @@ func logPipeRoutine(l *logrus.Logger, r io.Reader, header string) {
 
 func (a *HostAgent) Run(ctx context.Context) error {
 	defer func() {
-		exitingEv := hostagentapi.Event{
-			Status: hostagentapi.Status{
+		exitingEv := events.Event{
+			Status: events.Status{
 				Exiting: true,
 			},
 		}
@@ -177,11 +177,11 @@ func (a *HostAgent) Run(ctx context.Context) error {
 	if sshLocalPort < 0 {
 		return fmt.Errorf("invalid ssh local port %d", sshLocalPort)
 	}
-	stBase := hostagentapi.Status{
+	stBase := events.Status{
 		SSHLocalPort: sshLocalPort,
 	}
 	stBooting := stBase
-	a.emitEvent(ctx, hostagentapi.Event{Status: stBooting})
+	a.emitEvent(ctx, events.Event{Status: stBooting})
 
 	go func() {
 		stRunning := stBase
@@ -190,7 +190,7 @@ func (a *HostAgent) Run(ctx context.Context) error {
 			stRunning.Errors = append(stRunning.Errors, haErr.Error())
 		}
 		stRunning.Running = true
-		a.emitEvent(ctx, hostagentapi.Event{Status: stRunning})
+		a.emitEvent(ctx, events.Event{Status: stRunning})
 	}()
 
 	for {

pkg/start/start.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/lima-vm/lima/pkg/cidata"
-	hostagentapi "github.com/lima-vm/lima/pkg/hostagent/api"
+	hostagentevents "github.com/lima-vm/lima/pkg/hostagent/events"
 	"github.com/lima-vm/lima/pkg/limayaml"
 	"github.com/lima-vm/lima/pkg/qemu"
 	"github.com/lima-vm/lima/pkg/store"
@@ -134,7 +134,7 @@ func watchHostAgentEvents(ctx context.Context, instName, haStdoutPath, haStderrP
 		receivedRunningEvent bool
 		err                  error
 	)
-	onEvent := func(ev hostagentapi.Event) bool {
+	onEvent := func(ev hostagentevents.Event) bool {
 		if !printedSSHLocalPort && ev.Status.SSHLocalPort != 0 {
 			logrus.Infof("SSH Local Port: %d", ev.Status.SSHLocalPort)
 			printedSSHLocalPort = true
@@ -161,7 +161,7 @@ func watchHostAgentEvents(ctx context.Context, instName, haStdoutPath, haStderrP
 		return false
 	}
 
-	if xerr := hostagentapi.WatchEvents(ctx2, haStdoutPath, haStderrPath, begin, onEvent); xerr != nil {
+	if xerr := hostagentevents.Watch(ctx2, haStdoutPath, haStderrPath, begin, onEvent); xerr != nil {
 		return xerr
 	}