refactoring getAppStatus

Author: mirkoCrobu

internal/orchestrator/app_status.go

@@ -86,11 +86,6 @@ func parseDockerStatusEvent(ctx context.Context, cfg config.Configuration, docke
 		if err != nil {
 			return AppInfo{}, err
 		}
-
-		if appStatus == nil {
-			return AppInfo{}, fmt.Errorf("app containers not found for: %s", pathLabel)
-		}
-
 		defaultApp, err := GetDefaultApp(cfg)
 		if err != nil {
 			slog.Warn("unable to get default app", slog.String("error", err.Error()))

internal/orchestrator/helpers.go

@@ -23,7 +23,6 @@ import (
 	"strings"
 
 	"github.com/arduino/go-paths-helper"
-	"github.com/docker/cli/cli/command"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
 	dockerClient "github.com/docker/docker/client"
@@ -163,19 +162,6 @@ func getAppStatusByPath(
 	return &app[0], nil
 }
 
-func getAppStatus(
-	ctx context.Context,
-	docker command.Cli,
-	app app.ArduinoApp,
-) (AppStatusInfo, error) {
-	statusInfo, err := getAppStatusByPath(ctx, docker.Client(), app.FullPath.String())
-
-	if err != nil {
-		return AppStatusInfo{}, fmt.Errorf("failed to get app status: %w", err)
-	}
-	return *statusInfo, nil
-}
-
 func getRunningApp(
 	ctx context.Context,
 	docker dockerClient.APIClient,

internal/orchestrator/orchestrator.go

@@ -420,7 +420,7 @@ func stopAppWithCmd(ctx context.Context, docker command.Cli, app app.ArduinoApp,
 
 		if _, ok := app.GetSketchPath(); ok {
 			// Before stopping the microcontroller we want to make sure that the app was running.
-			appStatus, err := getAppStatus(ctx, docker, app)
+			appStatus, err := getAppStatusByPath(ctx, docker.Client(), app.FullPath.String())
 			if err != nil {
 				yield(StreamMessage{error: err})
 				return
@@ -761,7 +761,7 @@ func AppDetails(
 	var status Status
 	go func() {
 		defer wg.Done()
-		app, err := getAppStatus(ctx, docker, userApp)
+		app, err := getAppStatusByPath(ctx, docker.Client(), userApp.FullPath.String())
 		if err != nil {
 			slog.Warn("unable to get app status", slog.String("error", err.Error()), slog.String("path", userApp.FullPath.String()))
 			status = StatusStopped