Move reconciler from networks → networks/reconcile

This allows limayaml to call networks.Config() to validate managed
network names.

Signed-off-by: Jan Dubois <[email protected]>

Author: jandubois

cmd/limactl/delete.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/lima-vm/lima/pkg/networks"
+	"github.com/lima-vm/lima/pkg/networks/reconcile"
 	"github.com/lima-vm/lima/pkg/store"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"

cmd/limactl/start.go

@@ -12,7 +12,7 @@ import (
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/containerd/containerd/identifiers"
 	"github.com/lima-vm/lima/pkg/limayaml"
-	"github.com/lima-vm/lima/pkg/networks"
+	"github.com/lima-vm/lima/pkg/networks/reconcile"
 	"github.com/lima-vm/lima/pkg/osutil"
 	"github.com/lima-vm/lima/pkg/start"
 	"github.com/lima-vm/lima/pkg/store"
@@ -217,6 +217,9 @@ func startAction(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
+	if len(inst.Errors) > 0 {
+		return fmt.Errorf("errors inspecting instance: %+v", inst.Errors)
+	}
 	switch inst.Status {
 	case store.StatusRunning:
 		logrus.Infof("The instance %q is already running. Run `%s` to open the shell.",

cmd/limactl/stop.go

@@ -11,7 +11,7 @@ import (
 	"time"
 
 	hostagentapi "github.com/lima-vm/lima/pkg/hostagent/api"
-	"github.com/lima-vm/lima/pkg/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"

pkg/limayaml/validate.go

@@ -2,6 +2,7 @@ package limayaml
 
 import (
 	"fmt"
+	"github.com/lima-vm/lima/pkg/networks"
 	"net"
 	"os"
 	"path/filepath"
@@ -188,7 +189,13 @@ func validateNetwork(y LimaYAML) error {
 			if nw.SwitchPort != 0 {
 				return fmt.Errorf("field `%s.switchPort` cannot be used with field `%s.lima`", field, field)
 			}
-			// TODO: validate network name (we can't use networks and store packages right now)
+			config, err := networks.Config()
+			if err != nil {
+				return err
+			}
+			if config.Check(nw.Lima) != nil {
+				return fmt.Errorf("field `%s.lima` references network %q which is not defined in networks.yaml", field, nw.Lima)
+			}
 		} else {
 			if nw.VNL == "" {
 				return fmt.Errorf("field `%s.lima` or field `%s.vnl` must be set", field, field)

pkg/networks/reconcile.go renamed to pkg/networks/reconcile/reconcile.go

@@ -10,6 +10,7 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/lima-vm/lima/pkg/networks"
 	"github.com/lima-vm/lima/pkg/store"
 	"github.com/lima-vm/lima/pkg/store/dirnames"
 	"github.com/sirupsen/logrus"
@@ -19,7 +20,7 @@ func Reconcile(ctx context.Context, newInst string) error {
 	if runtime.GOOS != "darwin" {
 		return nil
 	}
-	config, err := Config()
+	config, err := networks.Config()
 	if err != nil {
 		return err
 	}
@@ -53,9 +54,9 @@ func Reconcile(ctx context.Context, newInst string) error {
 	for name := range config.Networks {
 		var err error
 		if activeNetwork[name] {
-			err = config.startNetwork(ctx, name)
+			err = startNetwork(&config, ctx, name)
 		} else {
-			err = config.stopNetwork(name)
+			err = stopNetwork(&config, name)
 		}
 		if err != nil {
 			return err
@@ -79,7 +80,7 @@ func sudo(user, group, command string) error {
 	return nil
 }
 
-func (config *NetworksConfig) startDaemon(ctx context.Context, name, daemon string) error {
+func startDaemon(config *networks.NetworksConfig, ctx context.Context, name, daemon string) error {
 	err := sudo("root", "wheel", config.MkdirCmd())
 	if err != nil {
 		return err
@@ -126,39 +127,39 @@ var sudoersCheck struct {
 	err error
 }
 
-func (config *NetworksConfig) checkSudoers() error {
+func checkSudoers(config *networks.NetworksConfig) error {
 	sudoersCheck.Do(func() {
 		if config.Paths.Sudoers != "" {
-			sudoersCheck.err = CheckSudoers(config.Paths.Sudoers)
+			sudoersCheck.err = networks.CheckSudoers(config.Paths.Sudoers)
 		}
 	})
 	return sudoersCheck.err
 }
 
-func (config *NetworksConfig) startNetwork(ctx context.Context, name string) error {
+func startNetwork(config *networks.NetworksConfig, ctx context.Context, name string) error {
 	logrus.Debugf("Make sure %q network is running", name)
-	for _, daemon := range []string{Switch, VMNet} {
+	for _, daemon := range []string{networks.Switch, networks.VMNet} {
 		pid, _ := store.ReadPIDFile(config.PIDFile(name, daemon))
 		if pid == 0 {
 			logrus.Infof("Starting %s daemon for %q network", daemon, name)
-			if err := config.checkSudoers(); err != nil {
+			if err := checkSudoers(config); err != nil {
 				return err
 			}
-			if err := config.startDaemon(ctx, name, daemon); err != nil {
+			if err := startDaemon(config, ctx, name, daemon); err != nil {
 				return err
 			}
 		}
 	}
 	return nil
 }
 
-func (config *NetworksConfig) stopNetwork(name string) error {
+func stopNetwork(config *networks.NetworksConfig, name string) error {
 	logrus.Debugf("Make sure %q network is stopped", name)
-	for _, daemon := range []string{VMNet, Switch} {
+	for _, daemon := range []string{networks.VMNet, networks.Switch} {
 		pid, _ := store.ReadPIDFile(config.PIDFile(name, daemon))
 		if pid != 0 {
 			logrus.Infof("Stopping %s daemon for %q network", daemon, name)
-			if err := config.checkSudoers(); err != nil {
+			if err := checkSudoers(config); err != nil {
 				return err
 			}
 			err := sudo(config.DaemonUser(daemon), config.DaemonGroup(daemon), config.StopCmd(name, daemon))