refacoring destroy func

Author: mirkoCrobu

cmd/arduino-app-cli/app/destroy.go

@@ -22,6 +22,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/arduino/arduino-app-cli/cmd/arduino-app-cli/completion"
+	"github.com/arduino/arduino-app-cli/cmd/arduino-app-cli/internal/servicelocator"
 	"github.com/arduino/arduino-app-cli/cmd/feedback"
 	"github.com/arduino/arduino-app-cli/internal/orchestrator"
 	"github.com/arduino/arduino-app-cli/internal/orchestrator/app"
@@ -52,7 +53,7 @@ func newDestroyCmd(cfg config.Configuration) *cobra.Command {
 func destroyHandler(ctx context.Context, app app.ArduinoApp) error {
 	out, _, getResult := feedback.OutputStreams()
 
-	for message := range orchestrator.DestroyAndCleanApp(ctx, app) {
+	for message := range orchestrator.StopAndDestroyApp(ctx, servicelocator.GetDockerClient(), app) {
 		switch message.GetType() {
 		case orchestrator.ProgressType:
 			fmt.Fprintf(out, "Progress[%s]: %.0f%%\n", message.GetProgress().Name, message.GetProgress().Progress)

internal/api/docs/openapi.yaml

@@ -1686,6 +1686,7 @@ components:
       - stopping
       - stopped
       - failed
+      - uninitialized
       type: string
       uniqueItems: true
     UpdateCheckResult:

internal/e2e/client/client.gen.go

@@ -204,7 +204,7 @@ func TestCreateAndVerifyAppDetails(t *testing.T) {
 
 	require.False(t, *retrievedApp.Example, "A new app should not be an 'example'")
 	require.False(t, *retrievedApp.Default, "A new app should not be 'default'")
-	require.Equal(t, client.Stopped, retrievedApp.Status, "The initial status of a new app should be 'stopped'")
+	require.Equal(t, client.Uninitialized, retrievedApp.Status, "The initial status of a new app should be 'initialized'")
 	require.Empty(t, retrievedApp.Bricks, "A new app should not have 'bricks'")
 	require.NotEmpty(t, retrievedApp.Path, "The app path should not be empty")
 }
@@ -764,7 +764,7 @@ func TestAppDetails(t *testing.T) {
 		)
 		require.False(t, *detailsResp.JSON200.Example)
 		require.False(t, *detailsResp.JSON200.Default)
-		require.Equal(t, client.Stopped, detailsResp.JSON200.Status)
+		require.Equal(t, client.Uninitialized, detailsResp.JSON200.Status)
 		require.NotEmpty(t, detailsResp.JSON200.Path)
 	})
 }

internal/e2e/daemon/app_test.go

@@ -384,12 +384,27 @@ func getVideoDevices() map[int]string {
 	return deviceMap
 }
 
-func stopAppWithCmd(ctx context.Context, docker command.Cli, app app.ArduinoApp, cmd string) iter.Seq[StreamMessage] {
+type StopOptions struct {
+	Command        string
+	RequireRunning bool
+	RemoveVolumes  bool
+	RemoveOrphans  bool
+}
+
+func stopAppWithCmd(ctx context.Context, docker command.Cli, app app.ArduinoApp, opts StopOptions) iter.Seq[StreamMessage] {
 	return func(yield func(StreamMessage) bool) {
 		ctx, cancel := context.WithCancel(ctx)
 		defer cancel()
 
-		if !yield(StreamMessage{data: fmt.Sprintf("Stopping app %q", app.Name)}) {
+		var message string
+		switch opts.Command {
+		case "stop":
+			message = fmt.Sprintf("Stopping app %q", app.Name)
+		case "down":
+			message = fmt.Sprintf("destroying app %q", app.Name)
+		}
+
+		if !yield(StreamMessage{data: message}) {
 			return
 		}
 		if err := setStatusLeds(LedTriggerDefault); err != nil {
@@ -410,7 +425,7 @@ func stopAppWithCmd(ctx context.Context, docker command.Cli, app app.ArduinoApp,
 				yield(StreamMessage{error: err})
 				return
 			}
-			if appStatus.Status != StatusStarting && appStatus.Status != StatusRunning {
+			if opts.RequireRunning && appStatus.Status != StatusStarting && appStatus.Status != StatusRunning {
 				yield(StreamMessage{data: fmt.Sprintf("app %q is not running", app.Name)})
 				return
 			}
@@ -425,11 +440,26 @@ func stopAppWithCmd(ctx context.Context, docker command.Cli, app app.ArduinoApp,
 			mainCompose := app.AppComposeFilePath()
 			// In case the app was never started
 			if mainCompose.Exist() {
-				process, err := paths.NewProcess(nil, "docker", "compose", "-f", mainCompose.String(), cmd, fmt.Sprintf("--timeout=%d", DefaultDockerStopTimeoutSeconds))
+				cmd := "docker"
+				args := []string{
+					"compose",
+					"-f", mainCompose.String(),
+					opts.Command,
+					fmt.Sprintf("--timeout=%d", DefaultDockerStopTimeoutSeconds),
+				}
+				if opts.RemoveVolumes {
+					args = append(args, "--volumes")
+				}
+				if opts.RemoveOrphans {
+					args = append(args, "--remove-orphans")
+				}
+				fullCommand := append([]string{cmd}, args...)
+				process, err := paths.NewProcess(nil, fullCommand...)
 				if err != nil {
 					yield(StreamMessage{error: err})
 					return
 				}
+
 				process.RedirectStderrTo(callbackWriter)
 				process.RedirectStdoutTo(callbackWriter)
 				if err := process.RunWithinContext(ctx); err != nil {
@@ -443,17 +473,20 @@ func stopAppWithCmd(ctx context.Context, docker command.Cli, app app.ArduinoApp,
 }
 
 func StopApp(ctx context.Context, dockerClient command.Cli, app app.ArduinoApp) iter.Seq[StreamMessage] {
-	return stopAppWithCmd(ctx, dockerClient, app, "stop")
+	return stopAppWithCmd(ctx, dockerClient, app, StopOptions{
+		Command:        "stop",
+		RequireRunning: true,
+	})
 }
 
 func StopAndDestroyApp(ctx context.Context, dockerClient command.Cli, app app.ArduinoApp) iter.Seq[StreamMessage] {
-	return stopAppWithCmd(ctx, dockerClient, app, "down")
-}
-
-func DestroyAndCleanApp(ctx context.Context, app app.ArduinoApp) iter.Seq[StreamMessage] {
 	return func(yield func(StreamMessage) bool) {
-
-		for msg := range destroyAppContainers(ctx, app) {
+		for msg := range stopAppWithCmd(ctx, dockerClient, app, StopOptions{
+			Command:        "down",
+			RemoveVolumes:  true,
+			RemoveOrphans:  true,
+			RequireRunning: false,
+		}) {
 			if !yield(msg) {
 				return
 			}
@@ -466,55 +499,6 @@ func DestroyAndCleanApp(ctx context.Context, app app.ArduinoApp) iter.Seq[Stream
 	}
 }
 
-func destroyAppContainers(ctx context.Context, app app.ArduinoApp) iter.Seq[StreamMessage] {
-	return func(yield func(StreamMessage) bool) {
-		ctx, cancel := context.WithCancel(ctx)
-		defer cancel()
-
-		if !yield(StreamMessage{data: fmt.Sprintf("Destroying app %q containers and data...", app.Name)}) {
-			return
-		}
-		callbackWriter := NewCallbackWriter(func(line string) {
-			if !yield(StreamMessage{data: line}) {
-				cancel()
-				return
-			}
-		})
-		if _, ok := app.GetSketchPath(); ok {
-			if err := micro.Disable(); err != nil {
-				slog.Debug("unable to disable micro (might be already stopped)", slog.String("error", err.Error()))
-			}
-		}
-		if app.MainPythonFile != nil {
-			mainCompose := app.AppComposeFilePath()
-			if mainCompose.Exist() {
-				process, err := paths.NewProcess(
-					nil,
-					"docker", "compose",
-					"-f", mainCompose.String(),
-					"down",
-					"--volumes",
-					"--remove-orphans",
-					fmt.Sprintf("--timeout=%d", DefaultDockerStopTimeoutSeconds),
-				)
-
-				if err != nil {
-					yield(StreamMessage{error: err})
-					return
-				}
-
-				process.RedirectStderrTo(callbackWriter)
-				process.RedirectStdoutTo(callbackWriter)
-				if err := process.RunWithinContext(ctx); err != nil {
-					yield(StreamMessage{error: fmt.Errorf("failed to destroy containers: %w", err)})
-					return
-				}
-			}
-		}
-		yield(StreamMessage{data: "App containers and volumes removed."})
-	}
-}
-
 func cleanAppCacheFiles(app app.ArduinoApp) iter.Seq[StreamMessage] {
 	return func(yield func(StreamMessage) bool) {
 		cachePath := app.FullPath.Join(".cache")