Merge pull request #4212 from alexandear/refactor/package-directory-mismatch

AkihiroSuda · web-flow · commit 3819d5bfa1d8 · 2025-10-17T01:21:10.000+09:00
Fix revive.package-directory-mismatch lint issues
diff --git a/.golangci.yml b/.golangci.yml
@@ -102,6 +102,7 @@ linters:
       - name: indent-error-flow
       - name: package-comments
         disabled: true
+      - name: package-directory-mismatch
       - name: range
       - name: receiver-naming
       - name: redefines-builtin-id
diff --git a/cmd/limactl/clone.go b/cmd/limactl/clone.go
@@ -16,7 +16,7 @@ import (
 	"github.com/lima-vm/lima/v2/pkg/instance"
 	"github.com/lima-vm/lima/v2/pkg/limatype/filenames"
 	"github.com/lima-vm/lima/v2/pkg/limayaml"
-	networks "github.com/lima-vm/lima/v2/pkg/networks/reconcile"
+	"github.com/lima-vm/lima/v2/pkg/networks/reconcile"
 	"github.com/lima-vm/lima/v2/pkg/store"
 	"github.com/lima-vm/lima/v2/pkg/yqutil"
 )
@@ -124,7 +124,7 @@ func cloneOrRenameAction(cmd *cobra.Command, args []string) error {
 	if !startNow {
 		return nil
 	}
-	err = networks.Reconcile(ctx, newInst.Name)
+	err = reconcile.Reconcile(ctx, newInst.Name)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/limactl/delete.go b/cmd/limactl/delete.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/lima-vm/lima/v2/pkg/autostart"
 	"github.com/lima-vm/lima/v2/pkg/instance"
-	networks "github.com/lima-vm/lima/v2/pkg/networks/reconcile"
+	"github.com/lima-vm/lima/v2/pkg/networks/reconcile"
 	"github.com/lima-vm/lima/v2/pkg/store"
 )
 
@@ -60,7 +60,7 @@ func deleteAction(cmd *cobra.Command, args []string) error {
 		}
 		logrus.Infof("Deleted %q (%q)", instName, inst.Dir)
 	}
-	return networks.Reconcile(cmd.Context(), "")
+	return reconcile.Reconcile(cmd.Context(), "")
 }
 
 func deleteBashComplete(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {
diff --git a/cmd/limactl/edit.go b/cmd/limactl/edit.go
@@ -21,7 +21,7 @@ import (
 	"github.com/lima-vm/lima/v2/pkg/limatype/dirnames"
 	"github.com/lima-vm/lima/v2/pkg/limatype/filenames"
 	"github.com/lima-vm/lima/v2/pkg/limayaml"
-	networks "github.com/lima-vm/lima/v2/pkg/networks/reconcile"
+	"github.com/lima-vm/lima/v2/pkg/networks/reconcile"
 	"github.com/lima-vm/lima/v2/pkg/store"
 	"github.com/lima-vm/lima/v2/pkg/uiutil"
 	"github.com/lima-vm/lima/v2/pkg/yqutil"
@@ -155,7 +155,7 @@ func editAction(cmd *cobra.Command, args []string) error {
 	if !startNow {
 		return nil
 	}
-	err = networks.Reconcile(ctx, inst.Name)
+	err = reconcile.Reconcile(ctx, inst.Name)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/limactl/shell.go b/cmd/limactl/shell.go
@@ -24,7 +24,7 @@ import (
 	"github.com/lima-vm/lima/v2/pkg/instance"
 	"github.com/lima-vm/lima/v2/pkg/ioutilx"
 	"github.com/lima-vm/lima/v2/pkg/limatype"
-	networks "github.com/lima-vm/lima/v2/pkg/networks/reconcile"
+	"github.com/lima-vm/lima/v2/pkg/networks/reconcile"
 	"github.com/lima-vm/lima/v2/pkg/sshutil"
 	"github.com/lima-vm/lima/v2/pkg/store"
 )
@@ -101,7 +101,7 @@ func shellAction(cmd *cobra.Command, args []string) error {
 			return nil
 		}
 
-		err = networks.Reconcile(ctx, inst.Name)
+		err = reconcile.Reconcile(ctx, inst.Name)
 		if err != nil {
 			return err
 		}
diff --git a/cmd/limactl/start.go b/cmd/limactl/start.go
@@ -25,7 +25,7 @@ import (
 	"github.com/lima-vm/lima/v2/pkg/limatype/dirnames"
 	"github.com/lima-vm/lima/v2/pkg/limatype/filenames"
 	"github.com/lima-vm/lima/v2/pkg/limayaml"
-	networks "github.com/lima-vm/lima/v2/pkg/networks/reconcile"
+	"github.com/lima-vm/lima/v2/pkg/networks/reconcile"
 	"github.com/lima-vm/lima/v2/pkg/registry"
 	"github.com/lima-vm/lima/v2/pkg/store"
 	"github.com/lima-vm/lima/v2/pkg/templatestore"
@@ -580,7 +580,7 @@ func startAction(cmd *cobra.Command, args []string) error {
 		logrus.Warnf("expected status %q, got %q", limatype.StatusStopped, inst.Status)
 	}
 	ctx := cmd.Context()
-	err = networks.Reconcile(ctx, inst.Name)
+	err = reconcile.Reconcile(ctx, inst.Name)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/limactl/stop.go b/cmd/limactl/stop.go
@@ -7,7 +7,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/lima-vm/lima/v2/pkg/instance"
-	networks "github.com/lima-vm/lima/v2/pkg/networks/reconcile"
+	"github.com/lima-vm/lima/v2/pkg/networks/reconcile"
 	"github.com/lima-vm/lima/v2/pkg/store"
 )
 
@@ -48,7 +48,7 @@ func stopAction(cmd *cobra.Command, args []string) error {
 	}
 	// TODO: should we also reconcile networks if graceful stop returned an error?
 	if err == nil {
-		err = networks.Reconcile(ctx, "")
+		err = reconcile.Reconcile(ctx, "")
 	}
 	return err
 }
diff --git a/pkg/instance/restart.go b/pkg/instance/restart.go
@@ -9,7 +9,7 @@ import (
 	"github.com/sirupsen/logrus"
 
 	"github.com/lima-vm/lima/v2/pkg/limatype"
-	networks "github.com/lima-vm/lima/v2/pkg/networks/reconcile"
+	"github.com/lima-vm/lima/v2/pkg/networks/reconcile"
 )
 
 const (
@@ -21,7 +21,7 @@ func Restart(ctx context.Context, inst *limatype.Instance, showProgress bool) er
 		return err
 	}
 
-	if err := networks.Reconcile(ctx, inst.Name); err != nil {
+	if err := reconcile.Reconcile(ctx, inst.Name); err != nil {
 		return err
 	}
 
@@ -36,7 +36,7 @@ func RestartForcibly(ctx context.Context, inst *limatype.Instance, showProgress
 	logrus.Info("Restarting the instance forcibly")
 	StopForcibly(inst)
 
-	if err := networks.Reconcile(ctx, inst.Name); err != nil {
+	if err := reconcile.Reconcile(ctx, inst.Name); err != nil {
 		return err
 	}
 
diff --git a/pkg/networks/reconcile/reconcile.go b/pkg/networks/reconcile/reconcile.go
@@ -1,7 +1,7 @@
 // SPDX-FileCopyrightText: Copyright The Lima Authors
 // SPDX-License-Identifier: Apache-2.0
 
-package networks
+package reconcile
 
 import (
 	"bytes"

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`"github.com/lima-vm/lima/v2/pkg/instance"`
`17`	`17`	`"github.com/lima-vm/lima/v2/pkg/limatype/filenames"`
`18`	`18`	`"github.com/lima-vm/lima/v2/pkg/limayaml"`
`19`		`- networks "github.com/lima-vm/lima/v2/pkg/networks/reconcile"`
	`19`	`+ "github.com/lima-vm/lima/v2/pkg/networks/reconcile"`
`20`	`20`	`"github.com/lima-vm/lima/v2/pkg/store"`
`21`	`21`	`"github.com/lima-vm/lima/v2/pkg/yqutil"`
`22`	`22`	`)`
`@@ -124,7 +124,7 @@ func cloneOrRenameAction(cmd *cobra.Command, args []string) error {`
`124`	`124`	`if !startNow {`
`125`	`125`	`return nil`
`126`	`126`	`}`
`127`		`- err = networks.Reconcile(ctx, newInst.Name)`
	`127`	`+ err = reconcile.Reconcile(ctx, newInst.Name)`
`128`	`128`	`if err != nil {`
`129`	`129`	`return err`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`
`15`	`15`	`"github.com/lima-vm/lima/v2/pkg/autostart"`
`16`	`16`	`"github.com/lima-vm/lima/v2/pkg/instance"`
`17`		`- networks "github.com/lima-vm/lima/v2/pkg/networks/reconcile"`
	`17`	`+ "github.com/lima-vm/lima/v2/pkg/networks/reconcile"`
`18`	`18`	`"github.com/lima-vm/lima/v2/pkg/store"`
`19`	`19`	`)`
`20`	`20`
`@@ -60,7 +60,7 @@ func deleteAction(cmd *cobra.Command, args []string) error {`
`60`	`60`	`}`
`61`	`61`	`logrus.Infof("Deleted %q (%q)", instName, inst.Dir)`
`62`	`62`	`}`
`63`		`- return networks.Reconcile(cmd.Context(), "")`
	`63`	`+ return reconcile.Reconcile(cmd.Context(), "")`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`func deleteBashComplete(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`	`"github.com/lima-vm/lima/v2/pkg/instance"`
`25`	`25`	`"github.com/lima-vm/lima/v2/pkg/ioutilx"`
`26`	`26`	`"github.com/lima-vm/lima/v2/pkg/limatype"`
`27`		`- networks "github.com/lima-vm/lima/v2/pkg/networks/reconcile"`
	`27`	`+ "github.com/lima-vm/lima/v2/pkg/networks/reconcile"`
`28`	`28`	`"github.com/lima-vm/lima/v2/pkg/sshutil"`
`29`	`29`	`"github.com/lima-vm/lima/v2/pkg/store"`
`30`	`30`	`)`
`@@ -101,7 +101,7 @@ func shellAction(cmd *cobra.Command, args []string) error {`
`101`	`101`	`return nil`
`102`	`102`	`}`
`103`	`103`
`104`		`- err = networks.Reconcile(ctx, inst.Name)`
	`104`	`+ err = reconcile.Reconcile(ctx, inst.Name)`
`105`	`105`	`if err != nil {`
`106`	`106`	`return err`
`107`	`107`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"github.com/spf13/cobra"`
`8`	`8`
`9`	`9`	`"github.com/lima-vm/lima/v2/pkg/instance"`
`10`		`- networks "github.com/lima-vm/lima/v2/pkg/networks/reconcile"`
	`10`	`+ "github.com/lima-vm/lima/v2/pkg/networks/reconcile"`
`11`	`11`	`"github.com/lima-vm/lima/v2/pkg/store"`
`12`	`12`	`)`
`13`	`13`
`@@ -48,7 +48,7 @@ func stopAction(cmd *cobra.Command, args []string) error {`
`48`	`48`	`}`
`49`	`49`	`// TODO: should we also reconcile networks if graceful stop returned an error?`
`50`	`50`	`if err == nil {`
`51`		`- err = networks.Reconcile(ctx, "")`
	`51`	`+ err = reconcile.Reconcile(ctx, "")`
`52`	`52`	`}`
`53`	`53`	`return err`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"github.com/sirupsen/logrus"`
`10`	`10`
`11`	`11`	`"github.com/lima-vm/lima/v2/pkg/limatype"`
`12`		`- networks "github.com/lima-vm/lima/v2/pkg/networks/reconcile"`
	`12`	`+ "github.com/lima-vm/lima/v2/pkg/networks/reconcile"`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`const (`
`@@ -21,7 +21,7 @@ func Restart(ctx context.Context, inst *limatype.Instance, showProgress bool) er`
`21`	`21`	`return err`
`22`	`22`	`}`
`23`	`23`
`24`		`- if err := networks.Reconcile(ctx, inst.Name); err != nil {`
	`24`	`+ if err := reconcile.Reconcile(ctx, inst.Name); err != nil {`
`25`	`25`	`return err`
`26`	`26`	`}`
`27`	`27`
`@@ -36,7 +36,7 @@ func RestartForcibly(ctx context.Context, inst *limatype.Instance, showProgress`
`36`	`36`	`logrus.Info("Restarting the instance forcibly")`
`37`	`37`	`StopForcibly(inst)`
`38`	`38`
`39`		`- if err := networks.Reconcile(ctx, inst.Name); err != nil {`
	`39`	`+ if err := reconcile.Reconcile(ctx, inst.Name); err != nil {`
`40`	`40`	`return err`
`41`	`41`	`}`
`42`	`42`