Merge pull request #2505 from rancher-sandbox/refactor-start-instance

Move pkg/start/* → pkg/instance

Author: AkihiroSuda

cmd/limactl/edit.go

@@ -9,9 +9,9 @@ import (
 
 	"github.com/lima-vm/lima/cmd/limactl/editflags"
 	"github.com/lima-vm/lima/pkg/editutil"
+	"github.com/lima-vm/lima/pkg/instance"
 	"github.com/lima-vm/lima/pkg/limayaml"
 	networks "github.com/lima-vm/lima/pkg/networks/reconcile"
-	"github.com/lima-vm/lima/pkg/start"
 	"github.com/lima-vm/lima/pkg/store"
 	"github.com/lima-vm/lima/pkg/store/filenames"
 	"github.com/lima-vm/lima/pkg/uiutil"
@@ -42,13 +42,13 @@ func editAction(cmd *cobra.Command, args []string) error {
 	inst, err := store.Inspect(instName)
 	if err != nil {
 		if errors.Is(err, os.ErrNotExist) {
-			return fmt.Errorf("Instance %q not found", instName)
+			return fmt.Errorf("instance %q not found", instName)
 		}
 		return err
 	}
 
 	if inst.Status == store.StatusRunning {
-		return errors.New("Cannot edit a running instance")
+		return errors.New("cannot edit a running instance")
 	}
 
 	filePath := filepath.Join(inst.Dir, filenames.LimaYAML)
@@ -123,7 +123,7 @@ func editAction(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	return start.Start(ctx, inst, false)
+	return instance.Start(ctx, inst, false)
 }
 
 func askWhetherToStart() (bool, error) {

cmd/limactl/start.go

@@ -18,7 +18,6 @@ import (
 	"github.com/lima-vm/lima/pkg/ioutilx"
 	"github.com/lima-vm/lima/pkg/limayaml"
 	networks "github.com/lima-vm/lima/pkg/networks/reconcile"
-	"github.com/lima-vm/lima/pkg/start"
 	"github.com/lima-vm/lima/pkg/store"
 	"github.com/lima-vm/lima/pkg/store/filenames"
 	"github.com/lima-vm/lima/pkg/templatestore"
@@ -96,7 +95,7 @@ See the examples in 'limactl create --help'.
 	if runtime.GOOS != "windows" {
 		startCommand.Flags().Bool("foreground", false, "run the hostagent in the foreground")
 	}
-	startCommand.Flags().Duration("timeout", start.DefaultWatchHostAgentEventsTimeout, "duration to wait for the instance to be running before timing out")
+	startCommand.Flags().Duration("timeout", instance.DefaultWatchHostAgentEventsTimeout, "duration to wait for the instance to be running before timing out")
 	return startCommand
 }
 
@@ -449,7 +448,7 @@ func createAction(cmd *cobra.Command, args []string) error {
 	if len(inst.Errors) > 0 {
 		return fmt.Errorf("errors inspecting instance: %+v", inst.Errors)
 	}
-	if _, err = start.Prepare(cmd.Context(), inst); err != nil {
+	if _, err = instance.Prepare(cmd.Context(), inst); err != nil {
 		return err
 	}
 	logrus.Infof("Run `limactl start %s` to start the instance.", inst.Name)
@@ -472,7 +471,7 @@ func startAction(cmd *cobra.Command, args []string) error {
 	switch inst.Status {
 	case store.StatusRunning:
 		logrus.Infof("The instance %q is already running. Run `%s` to open the shell.",
-			inst.Name, start.LimactlShellCmd(inst.Name))
+			inst.Name, instance.LimactlShellCmd(inst.Name))
 		// Not an error
 		return nil
 	case store.StatusStopped:
@@ -499,10 +498,10 @@ func startAction(cmd *cobra.Command, args []string) error {
 		return err
 	}
 	if timeout > 0 {
-		ctx = start.WithWatchHostAgentTimeout(ctx, timeout)
+		ctx = instance.WithWatchHostAgentTimeout(ctx, timeout)
 	}
 
-	return start.Start(ctx, inst, launchHostAgentForeground)
+	return instance.Start(ctx, inst, launchHostAgentForeground)
 }
 
 func createBashComplete(cmd *cobra.Command, _ []string, _ string) ([]string, cobra.ShellCompDirective) {

pkg/start/ansible.go renamed to pkg/instance/ansible.go

@@ -1,4 +1,4 @@
-package start
+package instance
 
 import (
 	"context"

pkg/start/ha_cmd_opts_others.go renamed to pkg/instance/ha_cmd_opts_others.go

@@ -1,6 +1,6 @@
 //go:build !windows
 
-package start
+package instance
 
 import (
 	"syscall"

pkg/start/ha_cmd_opts_windows.go renamed to pkg/instance/ha_cmd_opts_windows.go

@@ -1,4 +1,4 @@
-package start
+package instance
 
 import (
 	"syscall"

pkg/start/start.go renamed to pkg/instance/start.go

@@ -1,4 +1,4 @@
-package start
+package instance
 
 import (
 	"bufio"