golangci-lint: enable revive

AkihiroSuda · AkihiroSuda · commit e5a79f13f048 · 2022-09-26T10:10:28.000+09:00
The `revive` linter was failing with the following errors:

```
pkg/osutil/user.go:19:2: var-naming: struct field Uid should be UID (revive)
        Uid   uint32
        ^
pkg/osutil/user.go:79:2: var-naming: const fallbackUid should be fallbackUID (revive)
        fallbackUid  = 1000
        ^
pkg/osutil/osutil_others.go:16:2: var-naming: struct field Uid should be UID (revive)
        Uid uint32
        ^
cmd/limactl/start.go:178:10: indent-error-flow: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) (revive)
                } else {
                        if !errors.Is(err, os.ErrNotExist) {
                                return nil, err
                        }
                        if arg != "" &amp;&amp; arg != DefaultInstanceName {
                                logrus.Infof("Creating an instance %q from template://default (Not from template://%s)", st.instName, st.instName)
                                logrus.Warnf("This form is deprecated. Use `limactl start --name=%s template://default` instead", st.instName)
                        }
                        // Read the default template for creating a new instance
                        st.yBytes, err = readDefaultTemplate()
                        if err != nil {
                                return nil, err
                        }
                }
pkg/hostagent/dns/dns_test.go:70:5: var-naming: don't use underscores in Go names; var regex_match should be regexMatch (revive)
                                regex_match := func(value string, pattern string) cmp.Comparison {
                                ^
pkg/networks/reconcile/reconcile.go:112:51: context-as-argument: context.Context should be the first parameter of a function (revive)
func startDaemon(config *networks.NetworksConfig, ctx context.Context, name, daemon string) error {
                                                  ^
pkg/networks/reconcile/reconcile.go:176:52: context-as-argument: context.Context should be the first parameter of a function (revive)
func startNetwork(config *networks.NetworksConfig, ctx context.Context, name string) error {
                                                   ^
pkg/networks/networks.go:5:6: exported: type name will be used as networks.NetworksConfig by other packages, and that stutters; consider calling this Config (revive)
type NetworksConfig struct {
     ^
pkg/networks/sudoers.go:84:10: indent-error-flow: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) (revive)
                } else {
                        return fmt.Errorf("passwordLessSudo error: %w", err)
                }
pkg/networks/sudoers.go:96:11: indent-error-flow: if block ends with a return statement, so drop this else and outdent its block (move short variable declaration to its own line if necessary) (revive)
                        } else {
                                logrus.Debugf("%q does not exist; passwordLessSudo error: %s", sudoersFile, err)
                        }
```

Signed-off-by: Akihiro Suda &lt;akihiro.suda.cz@hco.ntt.co.jp&gt;
diff --git a/.golangci.yml b/.golangci.yml
@@ -73,6 +73,7 @@ linters:
   # - stylecheck
   # - testpackage
   # - tparallel
+  - revive
   # - unconvert
   # - unparam
   - unused
diff --git a/cmd/limactl/start.go b/cmd/limactl/start.go
@@ -177,19 +177,18 @@ func loadOrCreateInstance(cmd *cobra.Command, args []string) (*store.Instance, e
 				logrus.Infof("Hint: To create another instance, run the following command: limactl start --name=NAME template://default")
 			}
 			return inst, nil
-		} else {
-			if !errors.Is(err, os.ErrNotExist) {
-				return nil, err
-			}
-			if arg != "" && arg != DefaultInstanceName {
-				logrus.Infof("Creating an instance %q from template://default (Not from template://%s)", st.instName, st.instName)
-				logrus.Warnf("This form is deprecated. Use `limactl start --name=%s template://default` instead", st.instName)
-			}
-			// Read the default template for creating a new instance
-			st.yBytes, err = readDefaultTemplate()
-			if err != nil {
-				return nil, err
-			}
+		}
+		if !errors.Is(err, os.ErrNotExist) {
+			return nil, err
+		}
+		if arg != "" && arg != DefaultInstanceName {
+			logrus.Infof("Creating an instance %q from template://default (Not from template://%s)", st.instName, st.instName)
+			logrus.Warnf("This form is deprecated. Use `limactl start --name=%s template://default` instead", st.instName)
+		}
+		// Read the default template for creating a new instance
+		st.yBytes, err = readDefaultTemplate()
+		if err != nil {
+			return nil, err
 		}
 	}
 
diff --git a/pkg/cidata/cidata.go b/pkg/cidata/cidata.go
@@ -240,15 +240,15 @@ func GenerateISO9660(instDir, name string, y *limayaml.LimaYAML, udpDNSLocalPort
 		}
 	}
 
-	if guestAgentBinary, err := GuestAgentBinary(*y.Arch); err != nil {
+	guestAgentBinary, err := GuestAgentBinary(*y.Arch)
+	if err != nil {
 		return err
-	} else {
-		defer guestAgentBinary.Close()
-		layout = append(layout, iso9660util.Entry{
-			Path:   "lima-guestagent",
-			Reader: guestAgentBinary,
-		})
 	}
+	defer guestAgentBinary.Close()
+	layout = append(layout, iso9660util.Entry{
+		Path:   "lima-guestagent",
+		Reader: guestAgentBinary,
+	})
 
 	if nerdctlArchive != "" {
 		nftgzR, err := os.Open(nerdctlArchive)
diff --git a/pkg/hostagent/dns/dns_test.go b/pkg/hostagent/dns/dns_test.go
@@ -67,7 +67,7 @@ func TestTXTRecords(t *testing.T) {
 				req := new(dns.Msg)
 				req.SetQuestion(dns.Fqdn(testDomains[i]), dns.TypeTXT)
 				h.ServeDNS(w, req)
-				regex_match := func(value string, pattern string) cmp.Comparison {
+				regexMatch := func(value string, pattern string) cmp.Comparison {
 					return func() cmp.Result {
 						re := regexp.MustCompile(pattern)
 						if re.MatchString(value) {
@@ -77,7 +77,7 @@ func TestTXTRecords(t *testing.T) {
 							fmt.Sprintf("%q did not match pattern %q", value, pattern))
 					}
 				}
-				assert.Assert(t, regex_match(dnsResult.String(), expectedResults[i]))
+				assert.Assert(t, regexMatch(dnsResult.String(), expectedResults[i]))
 			}
 		}
 	})
diff --git a/pkg/networks/commands.go b/pkg/networks/commands.go
@@ -21,15 +21,15 @@ const (
 // Commands in `sudoers` cannot use quotes, so all arguments are printed via "%s"
 // and not "%q". config.Paths.* entries must not include any whitespace!
 
-func (config *NetworksConfig) Check(name string) error {
+func (config *YAML) Check(name string) error {
 	if _, ok := config.Networks[name]; ok {
 		return nil
 	}
 	return fmt.Errorf("network %q is not defined", name)
 }
 
 // DaemonPath returns the daemon path.
-func (config *NetworksConfig) DaemonPath(daemon string) (string, error) {
+func (config *YAML) DaemonPath(daemon string) (string, error) {
 	switch daemon {
 	case VDESwitch:
 		return config.Paths.VDESwitch, nil
@@ -43,7 +43,7 @@ func (config *NetworksConfig) DaemonPath(daemon string) (string, error) {
 }
 
 // IsDaemonInstalled checks whether the daemon is installed.
-func (config *NetworksConfig) IsDaemonInstalled(daemon string) (bool, error) {
+func (config *YAML) IsDaemonInstalled(daemon string) (bool, error) {
 	p, err := config.DaemonPath(daemon)
 	if err != nil {
 		return false, err
@@ -61,29 +61,29 @@ func (config *NetworksConfig) IsDaemonInstalled(daemon string) (bool, error) {
 }
 
 // Sock returns a socket_vmnet socket.
-func (config *NetworksConfig) Sock(name string) string {
+func (config *YAML) Sock(name string) string {
 	return filepath.Join(config.Paths.VarRun, fmt.Sprintf("socket_vmnet.%s", name))
 }
 
 // VDESock returns a vde socket.
 //
 // Deprecated. Use Sock.
-func (config *NetworksConfig) VDESock(name string) string {
+func (config *YAML) VDESock(name string) string {
 	return filepath.Join(config.Paths.VarRun, fmt.Sprintf("%s.ctl", name))
 }
 
-func (config *NetworksConfig) PIDFile(name, daemon string) string {
+func (config *YAML) PIDFile(name, daemon string) string {
 	daemonTrimmed := strings.TrimPrefix(daemon, "vde_") // for compatibility
 	return filepath.Join(config.Paths.VarRun, fmt.Sprintf("%s_%s.pid", name, daemonTrimmed))
 }
 
-func (config *NetworksConfig) LogFile(name, daemon, stream string) string {
+func (config *YAML) LogFile(name, daemon, stream string) string {
 	networksDir, _ := dirnames.LimaNetworksDir()
 	daemonTrimmed := strings.TrimPrefix(daemon, "vde_") // for compatibility
 	return filepath.Join(networksDir, fmt.Sprintf("%s_%s.%s.log", name, daemonTrimmed, stream))
 }
 
-func (config *NetworksConfig) User(daemon string) (osutil.User, error) {
+func (config *YAML) User(daemon string) (osutil.User, error) {
 	if ok, _ := config.IsDaemonInstalled(daemon); !ok {
 		daemonPath, _ := config.DaemonPath(daemon)
 		return osutil.User{}, fmt.Errorf("daemon %q (path=%q) is not available", daemon, daemonPath)
@@ -104,11 +104,11 @@ func (config *NetworksConfig) User(daemon string) (osutil.User, error) {
 	return osutil.User{}, fmt.Errorf("daemon %q not defined", daemon)
 }
 
-func (config *NetworksConfig) MkdirCmd() string {
+func (config *YAML) MkdirCmd() string {
 	return fmt.Sprintf("/bin/mkdir -m 775 -p %s", config.Paths.VarRun)
 }
 
-func (config *NetworksConfig) StartCmd(name, daemon string) string {
+func (config *YAML) StartCmd(name, daemon string) string {
 	if ok, _ := config.IsDaemonInstalled(daemon); !ok {
 		panic(fmt.Errorf("daemon %q is not available", daemon))
 	}
@@ -154,6 +154,6 @@ func (config *NetworksConfig) StartCmd(name, daemon string) string {
 	return cmd
 }
 
-func (config *NetworksConfig) StopCmd(name, daemon string) string {
+func (config *YAML) StopCmd(name, daemon string) string {
 	return fmt.Sprintf("/usr/bin/pkill -F %s", config.PIDFile(name, daemon))
 }
diff --git a/pkg/networks/config.go b/pkg/networks/config.go
@@ -17,15 +17,15 @@ import (
 //go:embed networks.yaml
 var defaultConfig []byte
 
-func DefaultConfig() (NetworksConfig, error) {
-	var config NetworksConfig
+func DefaultConfig() (YAML, error) {
+	var config YAML
 	err := yaml.UnmarshalWithOptions(defaultConfig, &config, yaml.Strict())
 	return config, err
 }
 
 var cache struct {
 	sync.Once
-	config NetworksConfig
+	config YAML
 	err    error
 }
 
@@ -74,9 +74,9 @@ func loadCache() {
 }
 
 // Config returns the network config from the _config/networks.yaml file.
-func Config() (NetworksConfig, error) {
+func Config() (YAML, error) {
 	if runtime.GOOS != "darwin" {
-		return NetworksConfig{}, errors.New("networks.yaml configuration is only supported on macOS right now")
+		return YAML{}, errors.New("networks.yaml configuration is only supported on macOS right now")
 	}
 	loadCache()
 	return cache.config, cache.err
diff --git a/pkg/networks/networks.go b/pkg/networks/networks.go
@@ -2,7 +2,7 @@ package networks
 
 import "net"
 
-type NetworksConfig struct {
+type YAML struct {
 	Paths    Paths              `yaml:"paths"`
 	Group    string             `yaml:"group,omitempty"` // default: "everyone"
 	Networks map[string]Network `yaml:"networks"`
diff --git a/pkg/networks/reconcile/reconcile.go b/pkg/networks/reconcile/reconcile.go
@@ -54,7 +54,7 @@ func Reconcile(ctx context.Context, newInst string) error {
 	for name := range config.Networks {
 		var err error
 		if activeNetwork[name] {
-			err = startNetwork(&config, ctx, name)
+			err = startNetwork(ctx, &config, name)
 		} else {
 			err = stopNetwork(&config, name)
 		}
@@ -80,7 +80,7 @@ func sudo(user, group, command string) error {
 	return nil
 }
 
-func makeVarRun(config *networks.NetworksConfig) error {
+func makeVarRun(config *networks.YAML) error {
 	err := sudo("root", "wheel", config.MkdirCmd())
 	if err != nil {
 		return err
@@ -109,7 +109,7 @@ func makeVarRun(config *networks.NetworksConfig) error {
 	return nil
 }
 
-func startDaemon(config *networks.NetworksConfig, ctx context.Context, name, daemon string) error {
+func startDaemon(ctx context.Context, config *networks.YAML, name, daemon string) error {
 	if err := makeVarRun(config); err != nil {
 		return err
 	}
@@ -162,7 +162,7 @@ var validation struct {
 	err error
 }
 
-func validateConfig(config *networks.NetworksConfig) error {
+func validateConfig(config *networks.YAML) error {
 	validation.Do(func() {
 		// make sure all config.Paths.* are secure
 		validation.err = config.Validate()
@@ -173,7 +173,7 @@ func validateConfig(config *networks.NetworksConfig) error {
 	return validation.err
 }
 
-func startNetwork(config *networks.NetworksConfig, ctx context.Context, name string) error {
+func startNetwork(ctx context.Context, config *networks.YAML, name string) error {
 	logrus.Debugf("Make sure %q network is running", name)
 	if err := validateConfig(config); err != nil {
 		return err
@@ -195,15 +195,15 @@ func startNetwork(config *networks.NetworksConfig, ctx context.Context, name str
 		pid, _ := store.ReadPIDFile(config.PIDFile(name, daemon))
 		if pid == 0 {
 			logrus.Infof("Starting %s daemon for %q network", daemon, name)
-			if err := startDaemon(config, ctx, name, daemon); err != nil {
+			if err := startDaemon(ctx, config, name, daemon); err != nil {
 				return err
 			}
 		}
 	}
 	return nil
 }
 
-func stopNetwork(config *networks.NetworksConfig, name string) error {
+func stopNetwork(config *networks.YAML, name string) error {
 	logrus.Debugf("Make sure %q network is stopped", name)
 	// Don't call validateConfig() until we actually need to stop a daemon because
 	// stopNetwork() may be called even when the vde daemons are not installed.
diff --git a/pkg/networks/sudoers.go b/pkg/networks/sudoers.go
@@ -50,7 +50,7 @@ func Sudoers() (string, error) {
 	return sb.String(), nil
 }
 
-func (config *NetworksConfig) passwordLessSudo() error {
+func (config *YAML) passwordLessSudo() error {
 	// Flush cached sudo password
 	cmd := exec.Command("sudo", "-k")
 	if err := cmd.Run(); err != nil {
@@ -76,26 +76,26 @@ func (config *NetworksConfig) passwordLessSudo() error {
 	return nil
 }
 
-func (config *NetworksConfig) VerifySudoAccess(sudoersFile string) error {
+func (config *YAML) VerifySudoAccess(sudoersFile string) error {
 	if sudoersFile == "" {
-		if err := config.passwordLessSudo(); err == nil {
+		err := config.passwordLessSudo()
+		if err == nil {
 			logrus.Debug("sudo doesn't seem to require a password")
 			return nil
-		} else {
-			return fmt.Errorf("passwordLessSudo error: %w", err)
 		}
+		return fmt.Errorf("passwordLessSudo error: %w", err)
 	}
 	b, err := os.ReadFile(sudoersFile)
 	if err != nil {
 		// Default networks.yaml specifies /etc/sudoers.d/lima file. Don't throw an error when the
 		// file doesn't exist, as long as password-less sudo still works.
 		if errors.Is(err, os.ErrNotExist) {
-			if err := config.passwordLessSudo(); err == nil {
+			err = config.passwordLessSudo()
+			if err == nil {
 				logrus.Debugf("%q does not exist, but sudo doesn't seem to require a password", sudoersFile)
 				return nil
-			} else {
-				logrus.Debugf("%q does not exist; passwordLessSudo error: %s", sudoersFile, err)
 			}
+			logrus.Debugf("%q does not exist; passwordLessSudo error: %s", sudoersFile, err)
 		}
 		return fmt.Errorf("can't read %q: %s", sudoersFile, err)
 	}
diff --git a/pkg/networks/validate.go b/pkg/networks/validate.go
@@ -12,7 +12,7 @@ import (
 	"github.com/lima-vm/lima/pkg/osutil"
 )
 
-func (config *NetworksConfig) Validate() error {
+func (config *YAML) Validate() error {
 	// validate all paths.* values
 	paths := reflect.ValueOf(&config.Paths).Elem()
 	pathsMap := make(map[string]string, paths.NumField())
diff --git a/pkg/osutil/osutil_linux.go b/pkg/osutil/osutil_linux.go
@@ -10,8 +10,8 @@ const UnixPathMax = 108
 
 // Stat is a selection of syscall.Stat_t
 type Stat struct {
-	Uid uint32
-	Gid uint32
+	Uid uint32 //nolint:revive
+	Gid uint32 //nolint:revive
 }
 
 func SysStat(fi fs.FileInfo) (Stat, bool) {
diff --git a/pkg/osutil/osutil_others.go b/pkg/osutil/osutil_others.go
@@ -13,8 +13,8 @@ const UnixPathMax = 104
 
 // Stat is a selection of syscall.Stat_t
 type Stat struct {
-	Uid uint32
-	Gid uint32
+	Uid uint32 //nolint:revive
+	Gid uint32 //nolint:revive
 }
 
 func SysStat(fi fs.FileInfo) (Stat, bool) {
diff --git a/pkg/osutil/osutil_windows.go b/pkg/osutil/osutil_windows.go
@@ -10,8 +10,8 @@ const UnixPathMax = 108
 
 // Stat is a selection of syscall.Stat_t
 type Stat struct {
-	Uid uint32
-	Gid uint32
+	Uid uint32 //nolint:revive
+	Gid uint32 //nolint:revive
 }
 
 func SysStat(fi fs.FileInfo) (Stat, bool) {
diff --git a/pkg/osutil/user.go b/pkg/osutil/user.go
@@ -16,15 +16,15 @@ import (
 
 type User struct {
 	User  string
-	Uid   uint32
+	Uid   uint32 //nolint:revive
 	Group string
-	Gid   uint32
+	Gid   uint32 //nolint:revive
 	Home  string
 }
 
 type Group struct {
 	Name string
-	Gid  uint32
+	Gid  uint32 //nolint:revive
 }
 
 var users map[string]User
@@ -76,8 +76,8 @@ func LookupGroup(name string) (Group, error) {
 
 const (
 	fallbackUser = "lima"
-	fallbackUid  = 1000
-	fallbackGid  = 1000
+	fallbackUid  = 1000 //nolint:revive
+	fallbackGid  = 1000 //nolint:revive
 )
 
 var cache struct {

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ func TestTXTRecords(t *testing.T) {`
`67`	`67`	`req := new(dns.Msg)`
`68`	`68`	`req.SetQuestion(dns.Fqdn(testDomains[i]), dns.TypeTXT)`
`69`	`69`	`h.ServeDNS(w, req)`
`70`		`- regex_match := func(value string, pattern string) cmp.Comparison {`
	`70`	`+ regexMatch := func(value string, pattern string) cmp.Comparison {`
`71`	`71`	`return func() cmp.Result {`
`72`	`72`	`re := regexp.MustCompile(pattern)`
`73`	`73`	`if re.MatchString(value) {`
`@@ -77,7 +77,7 @@ func TestTXTRecords(t *testing.T) {`
`77`	`77`	`fmt.Sprintf("%q did not match pattern %q", value, pattern))`
`78`	`78`	`}`
`79`	`79`	`}`
`80`		`- assert.Assert(t, regex_match(dnsResult.String(), expectedResults[i]))`
	`80`	`+ assert.Assert(t, regexMatch(dnsResult.String(), expectedResults[i]))`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`	`})`
Original file line number	Diff line number	Diff line change
`@@ -21,15 +21,15 @@ const (`
`21`	`21`	// Commands in `sudoers` cannot use quotes, so all arguments are printed via "%s"
`22`	`22`	`// and not "%q". config.Paths.* entries must not include any whitespace!`
`23`	`23`
`24`		`-func (config *NetworksConfig) Check(name string) error {`
	`24`	`+func (config *YAML) Check(name string) error {`
`25`	`25`	`if _, ok := config.Networks[name]; ok {`
`26`	`26`	`return nil`
`27`	`27`	`}`
`28`	`28`	`return fmt.Errorf("network %q is not defined", name)`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`// DaemonPath returns the daemon path.`
`32`		`-func (config *NetworksConfig) DaemonPath(daemon string) (string, error) {`
	`32`	`+func (config *YAML) DaemonPath(daemon string) (string, error) {`
`33`	`33`	`switch daemon {`
`34`	`34`	`case VDESwitch:`
`35`	`35`	`return config.Paths.VDESwitch, nil`
`@@ -43,7 +43,7 @@ func (config *NetworksConfig) DaemonPath(daemon string) (string, error) {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`// IsDaemonInstalled checks whether the daemon is installed.`
`46`		`-func (config *NetworksConfig) IsDaemonInstalled(daemon string) (bool, error) {`
	`46`	`+func (config *YAML) IsDaemonInstalled(daemon string) (bool, error) {`
`47`	`47`	`p, err := config.DaemonPath(daemon)`
`48`	`48`	`if err != nil {`
`49`	`49`	`return false, err`
`@@ -61,29 +61,29 @@ func (config *NetworksConfig) IsDaemonInstalled(daemon string) (bool, error) {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`// Sock returns a socket_vmnet socket.`
`64`		`-func (config *NetworksConfig) Sock(name string) string {`
	`64`	`+func (config *YAML) Sock(name string) string {`
`65`	`65`	`return filepath.Join(config.Paths.VarRun, fmt.Sprintf("socket_vmnet.%s", name))`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`// VDESock returns a vde socket.`
`69`	`69`	`//`
`70`	`70`	`// Deprecated. Use Sock.`
`71`		`-func (config *NetworksConfig) VDESock(name string) string {`
	`71`	`+func (config *YAML) VDESock(name string) string {`
`72`	`72`	`return filepath.Join(config.Paths.VarRun, fmt.Sprintf("%s.ctl", name))`
`73`	`73`	`}`
`74`	`74`
`75`		`-func (config *NetworksConfig) PIDFile(name, daemon string) string {`
	`75`	`+func (config *YAML) PIDFile(name, daemon string) string {`
`76`	`76`	`daemonTrimmed := strings.TrimPrefix(daemon, "vde_") // for compatibility`
`77`	`77`	`return filepath.Join(config.Paths.VarRun, fmt.Sprintf("%s_%s.pid", name, daemonTrimmed))`
`78`	`78`	`}`
`79`	`79`
`80`		`-func (config *NetworksConfig) LogFile(name, daemon, stream string) string {`
	`80`	`+func (config *YAML) LogFile(name, daemon, stream string) string {`
`81`	`81`	`networksDir, _ := dirnames.LimaNetworksDir()`
`82`	`82`	`daemonTrimmed := strings.TrimPrefix(daemon, "vde_") // for compatibility`
`83`	`83`	`return filepath.Join(networksDir, fmt.Sprintf("%s_%s.%s.log", name, daemonTrimmed, stream))`
`84`	`84`	`}`
`85`	`85`
`86`		`-func (config *NetworksConfig) User(daemon string) (osutil.User, error) {`
	`86`	`+func (config *YAML) User(daemon string) (osutil.User, error) {`
`87`	`87`	`if ok, _ := config.IsDaemonInstalled(daemon); !ok {`
`88`	`88`	`daemonPath, _ := config.DaemonPath(daemon)`
`89`	`89`	`return osutil.User{}, fmt.Errorf("daemon %q (path=%q) is not available", daemon, daemonPath)`
`@@ -104,11 +104,11 @@ func (config *NetworksConfig) User(daemon string) (osutil.User, error) {`
`104`	`104`	`return osutil.User{}, fmt.Errorf("daemon %q not defined", daemon)`
`105`	`105`	`}`
`106`	`106`
`107`		`-func (config *NetworksConfig) MkdirCmd() string {`
	`107`	`+func (config *YAML) MkdirCmd() string {`
`108`	`108`	`return fmt.Sprintf("/bin/mkdir -m 775 -p %s", config.Paths.VarRun)`
`109`	`109`	`}`
`110`	`110`
`111`		`-func (config *NetworksConfig) StartCmd(name, daemon string) string {`
	`111`	`+func (config *YAML) StartCmd(name, daemon string) string {`
`112`	`112`	`if ok, _ := config.IsDaemonInstalled(daemon); !ok {`
`113`	`113`	`panic(fmt.Errorf("daemon %q is not available", daemon))`
`114`	`114`	`}`
`@@ -154,6 +154,6 @@ func (config *NetworksConfig) StartCmd(name, daemon string) string {`
`154`	`154`	`return cmd`
`155`	`155`	`}`
`156`	`156`
`157`		`-func (config *NetworksConfig) StopCmd(name, daemon string) string {`
	`157`	`+func (config *YAML) StopCmd(name, daemon string) string {`
`158`	`158`	`return fmt.Sprintf("/usr/bin/pkill -F %s", config.PIDFile(name, daemon))`
`159`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ func Reconcile(ctx context.Context, newInst string) error {`
`54`	`54`	`for name := range config.Networks {`
`55`	`55`	`var err error`
`56`	`56`	`if activeNetwork[name] {`
`57`		`- err = startNetwork(&config, ctx, name)`
	`57`	`+ err = startNetwork(ctx, &config, name)`
`58`	`58`	`} else {`
`59`	`59`	`err = stopNetwork(&config, name)`
`60`	`60`	`}`
`@@ -80,7 +80,7 @@ func sudo(user, group, command string) error {`
`80`	`80`	`return nil`
`81`	`81`	`}`
`82`	`82`
`83`		`-func makeVarRun(config *networks.NetworksConfig) error {`
	`83`	`+func makeVarRun(config *networks.YAML) error {`
`84`	`84`	`err := sudo("root", "wheel", config.MkdirCmd())`
`85`	`85`	`if err != nil {`
`86`	`86`	`return err`
`@@ -109,7 +109,7 @@ func makeVarRun(config *networks.NetworksConfig) error {`
`109`	`109`	`return nil`
`110`	`110`	`}`
`111`	`111`
`112`		`-func startDaemon(config *networks.NetworksConfig, ctx context.Context, name, daemon string) error {`
	`112`	`+func startDaemon(ctx context.Context, config *networks.YAML, name, daemon string) error {`
`113`	`113`	`if err := makeVarRun(config); err != nil {`
`114`	`114`	`return err`
`115`	`115`	`}`
`@@ -162,7 +162,7 @@ var validation struct {`
`162`	`162`	`err error`
`163`	`163`	`}`
`164`	`164`
`165`		`-func validateConfig(config *networks.NetworksConfig) error {`
	`165`	`+func validateConfig(config *networks.YAML) error {`
`166`	`166`	`validation.Do(func() {`
`167`	`167`	`// make sure all config.Paths.* are secure`
`168`	`168`	`validation.err = config.Validate()`
`@@ -173,7 +173,7 @@ func validateConfig(config *networks.NetworksConfig) error {`
`173`	`173`	`return validation.err`
`174`	`174`	`}`
`175`	`175`
`176`		`-func startNetwork(config *networks.NetworksConfig, ctx context.Context, name string) error {`
	`176`	`+func startNetwork(ctx context.Context, config *networks.YAML, name string) error {`
`177`	`177`	`logrus.Debugf("Make sure %q network is running", name)`
`178`	`178`	`if err := validateConfig(config); err != nil {`
`179`	`179`	`return err`
`@@ -195,15 +195,15 @@ func startNetwork(config *networks.NetworksConfig, ctx context.Context, name str`
`195`	`195`	`pid, _ := store.ReadPIDFile(config.PIDFile(name, daemon))`
`196`	`196`	`if pid == 0 {`
`197`	`197`	`logrus.Infof("Starting %s daemon for %q network", daemon, name)`
`198`		`- if err := startDaemon(config, ctx, name, daemon); err != nil {`
	`198`	`+ if err := startDaemon(ctx, config, name, daemon); err != nil {`
`199`	`199`	`return err`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`	`}`
`203`	`203`	`return nil`
`204`	`204`	`}`
`205`	`205`
`206`		`-func stopNetwork(config *networks.NetworksConfig, name string) error {`
	`206`	`+func stopNetwork(config *networks.YAML, name string) error {`
`207`	`207`	`logrus.Debugf("Make sure %q network is stopped", name)`
`208`	`208`	`// Don't call validateConfig() until we actually need to stop a daemon because`
`209`	`209`	`// stopNetwork() may be called even when the vde daemons are not installed.`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import (`
`12`	`12`	`"github.com/lima-vm/lima/pkg/osutil"`
`13`	`13`	`)`
`14`	`14`
`15`		`-func (config *NetworksConfig) Validate() error {`
	`15`	`+func (config *YAML) Validate() error {`
`16`	`16`	`// validate all paths.* values`
`17`	`17`	`paths := reflect.ValueOf(&config.Paths).Elem()`
`18`	`18`	`pathsMap := make(map[string]string, paths.NumField())`