refactor cli (#479)

Author: alessio-perugini

cmd/arduino-app-cli/app.go

@@ -0,0 +1,38 @@
+package app
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+
+	"github.com/bcmi-labs/orchestrator/internal/orchestrator"
+	"github.com/bcmi-labs/orchestrator/internal/orchestrator/app"
+)
+
+func NewAppCmd() *cobra.Command {
+	appCmd := &cobra.Command{
+		Use:   "app",
+		Short: "Manage Arduino Apps",
+		Long:  "A CLI tool to manage Arduino Apps, including starting, stopping, logging, and provisioning.",
+	}
+
+	appCmd.AddCommand(newCreateCmd())
+	appCmd.AddCommand(newStartCmd())
+	appCmd.AddCommand(newStopCmd())
+	appCmd.AddCommand(newRestartCmd())
+	appCmd.AddCommand(newLogsCmd())
+	appCmd.AddCommand(newListCmd())
+	appCmd.AddCommand(newPsCmd())
+	appCmd.AddCommand(newMonitorCmd())
+
+	return appCmd
+}
+
+func Load(idOrPath string) (app.ArduinoApp, error) {
+	id, err := orchestrator.ParseID(idOrPath)
+	if err != nil {
+		return app.ArduinoApp{}, fmt.Errorf("invalid app path: %s", idOrPath)
+	}
+
+	return app.Load(id.ToPath().String())
+}

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

@@ -0,0 +1,46 @@
+package app
+
+import (
+	"context"
+
+	"github.com/spf13/cobra"
+
+	"github.com/bcmi-labs/orchestrator/cmd/arduino-app-cli/internal/servicelocator"
+	"github.com/bcmi-labs/orchestrator/cmd/arduino-app-cli/results"
+	"github.com/bcmi-labs/orchestrator/cmd/feedback"
+	"github.com/bcmi-labs/orchestrator/internal/orchestrator"
+)
+
+func newListCmd() *cobra.Command {
+	var jsonFormat bool
+
+	cmd := &cobra.Command{
+		Use:   "list",
+		Short: "List all running Python apps",
+		Run: func(cmd *cobra.Command, args []string) {
+			listHandler(cmd.Context())
+		},
+	}
+
+	cmd.Flags().BoolVarP(&jsonFormat, "json", "", false, "Output the list in json format")
+	return cmd
+}
+
+func listHandler(ctx context.Context) {
+	res, err := orchestrator.ListApps(ctx,
+		servicelocator.GetDockerClient(),
+		orchestrator.ListAppRequest{
+			ShowExamples:                   true,
+			ShowApps:                       true,
+			IncludeNonStandardLocationApps: true,
+		},
+	)
+	if err != nil {
+		feedback.Fatal(err.Error(), feedback.ErrGeneric)
+	}
+
+	feedback.PrintResult(results.AppListResult{
+		Apps:       res.Apps,
+		BrokenApps: res.BrokenApps,
+	})
+}

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

@@ -0,0 +1,61 @@
+package app
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/spf13/cobra"
+
+	"github.com/bcmi-labs/orchestrator/cmd/arduino-app-cli/completion"
+	"github.com/bcmi-labs/orchestrator/cmd/feedback"
+	"github.com/bcmi-labs/orchestrator/internal/orchestrator"
+	"github.com/bcmi-labs/orchestrator/internal/orchestrator/app"
+)
+
+func newLogsCmd() *cobra.Command {
+	var tail uint64
+	cmd := &cobra.Command{
+		Use:   "logs app_path",
+		Short: "Show the logs of the Python app",
+		Args:  cobra.MaximumNArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if len(args) == 0 {
+				return cmd.Help()
+			}
+			app, err := Load(args[0])
+			if err != nil {
+				return err
+			}
+			return logsHandler(cmd.Context(), app, &tail)
+		},
+		ValidArgsFunction: completion.ApplicationNames(),
+	}
+	cmd.Flags().Uint64Var(&tail, "tail", 100, "Tail the last N logs")
+	return cmd
+}
+
+func logsHandler(ctx context.Context, app app.ArduinoApp, tail *uint64) error {
+	stdout, _, err := feedback.DirectStreams()
+	if err != nil {
+		feedback.Fatal(err.Error(), feedback.ErrBadArgument)
+		return nil
+	}
+
+	logsIter, err := orchestrator.AppLogs(
+		ctx,
+		app,
+		orchestrator.AppLogsRequest{
+			ShowAppLogs: true,
+			Follow:      true,
+			Tail:        tail,
+		},
+	)
+	if err != nil {
+		feedback.Fatal(err.Error(), feedback.ErrGeneric)
+		return nil
+	}
+	for msg := range logsIter {
+		fmt.Fprintf(stdout, "[%s] %s\n", msg.Name, msg.Content)
+	}
+	return nil
+}

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

@@ -0,0 +1,18 @@
+package app
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/bcmi-labs/orchestrator/cmd/arduino-app-cli/completion"
+)
+
+func newMonitorCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "monitor",
+		Short: "Monitor the Python app",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			panic("not implemented")
+		},
+		ValidArgsFunction: completion.ApplicationNames(),
+	}
+}

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

@@ -0,0 +1,96 @@
+package app
+
+import (
+	"context"
+
+	"github.com/arduino/go-paths-helper"
+	"github.com/spf13/cobra"
+
+	"github.com/bcmi-labs/orchestrator/cmd/arduino-app-cli/results"
+	"github.com/bcmi-labs/orchestrator/cmd/feedback"
+	"github.com/bcmi-labs/orchestrator/internal/orchestrator"
+)
+
+func newCreateCmd() *cobra.Command {
+	var (
+		icon     string
+		bricks   []string
+		noPyton  bool
+		noSketch bool
+		fromApp  string
+	)
+
+	cmd := &cobra.Command{
+		Use:   "new name",
+		Short: "Creates a new app",
+		Args:  cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			cobra.MinimumNArgs(1)
+			name := args[0]
+			return createHandler(cmd.Context(), name, icon, bricks, noPyton, noSketch, fromApp)
+		},
+	}
+
+	cmd.Flags().StringVarP(&icon, "icon", "i", "", "Icon for the app")
+	cmd.Flags().StringVarP(&fromApp, "from-app", "", "", "Create the new app from the path of an existing app")
+	cmd.Flags().StringArrayVarP(&bricks, "bricks", "b", []string{}, "List of bricks to include in the app")
+	cmd.Flags().BoolVarP(&noPyton, "no-python", "", false, "Do not include Python files")
+	cmd.Flags().BoolVarP(&noSketch, "no-sketch", "", false, "Do not include Sketch files")
+	cmd.MarkFlagsMutuallyExclusive("no-python", "no-sketch")
+
+	return cmd
+}
+
+func createHandler(ctx context.Context, name string, icon string, bricks []string, noPython, noSketch bool, fromApp string) error {
+	if fromApp != "" {
+		wd, err := paths.Getwd()
+		if err != nil {
+			feedback.Fatal(err.Error(), feedback.ErrGeneric)
+			return nil
+		}
+		fromPath := paths.New(fromApp)
+		if !fromPath.IsAbs() {
+			fromPath = wd.JoinPath(fromPath)
+		}
+		id, err := orchestrator.NewIDFromPath(fromPath)
+		if err != nil {
+			feedback.Fatal(err.Error(), feedback.ErrBadArgument)
+			return nil
+		}
+
+		resp, err := orchestrator.CloneApp(ctx, orchestrator.CloneAppRequest{
+			Name:   &name,
+			FromID: id,
+		})
+		if err != nil {
+			feedback.Fatal(err.Error(), feedback.ErrGeneric)
+			return nil
+		}
+		dst := resp.ID.ToPath()
+
+		feedback.PrintResult(results.CreateAppResult{
+			Result:  "ok",
+			Message: "App created successfully",
+			Path:    dst.String(),
+		})
+
+	} else {
+		resp, err := orchestrator.CreateApp(ctx, orchestrator.CreateAppRequest{
+			Name:       name,
+			Icon:       icon,
+			Bricks:     bricks,
+			SkipPython: noPython,
+			SkipSketch: noSketch,
+		})
+		if err != nil {
+			feedback.Fatal(err.Error(), feedback.ErrGeneric)
+			return nil
+		}
+		feedback.PrintResult(results.CreateAppResult{
+			Result:  "ok",
+			Message: "App created successfully",
+			Path:    resp.ID.ToPath().String(),
+		})
+	}
+	return nil
+}

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

@@ -0,0 +1,15 @@
+package app
+
+import (
+	"github.com/spf13/cobra"
+)
+
+func newPsCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "ps",
+		Short: "Shows the list of running Arduino Apps",
+		RunE: func(cmd *cobra.Command, args []string) error {
+			panic("not implemented")
+		},
+	}
+}

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

@@ -0,0 +1,34 @@
+package app
+
+import (
+	"fmt"
+
+	"github.com/spf13/cobra"
+
+	"github.com/bcmi-labs/orchestrator/cmd/arduino-app-cli/completion"
+	"github.com/bcmi-labs/orchestrator/cmd/feedback"
+)
+
+func newRestartCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "restart app_path",
+		Short: "Restart or Start an Arduino app",
+		Args:  cobra.MaximumNArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if len(args) == 0 {
+				return cmd.Help()
+			}
+			app, err := Load(args[0])
+			if err != nil {
+				feedback.Fatal(err.Error(), feedback.ErrBadArgument)
+				return nil
+			}
+			if err := stopHandler(cmd.Context(), app); err != nil {
+				feedback.Warning(fmt.Sprintf("failed to stop app: %s", err.Error()))
+			}
+			return startHandler(cmd.Context(), app)
+		},
+		ValidArgsFunction: completion.ApplicationNames(),
+	}
+	return cmd
+}

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

@@ -0,0 +1,66 @@
+package app
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/spf13/cobra"
+
+	"github.com/bcmi-labs/orchestrator/cmd/arduino-app-cli/completion"
+	"github.com/bcmi-labs/orchestrator/cmd/arduino-app-cli/internal/servicelocator"
+	"github.com/bcmi-labs/orchestrator/cmd/arduino-app-cli/results"
+	"github.com/bcmi-labs/orchestrator/cmd/feedback"
+	"github.com/bcmi-labs/orchestrator/internal/orchestrator"
+	"github.com/bcmi-labs/orchestrator/internal/orchestrator/app"
+)
+
+func newStartCmd() *cobra.Command {
+	return &cobra.Command{
+		Use:   "start app_path",
+		Short: "Start an Arduino app",
+		Args:  cobra.MaximumNArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if len(args) == 0 {
+				return cmd.Help()
+			}
+			app, err := Load(args[0])
+			if err != nil {
+				return err
+			}
+			return startHandler(cmd.Context(), app)
+		},
+		ValidArgsFunction: completion.ApplicationNames(),
+	}
+}
+
+func startHandler(ctx context.Context, app app.ArduinoApp) error {
+	out, _, getResult := feedback.OutputStreams()
+
+	stream := orchestrator.StartApp(
+		ctx,
+		servicelocator.GetDockerClient(),
+		servicelocator.GetProvisioner(),
+		servicelocator.GetModelsIndex(),
+		servicelocator.GetBricksIndex(),
+		app,
+	)
+	for message := range stream {
+		switch message.GetType() {
+		case orchestrator.ProgressType:
+			fmt.Fprintf(out, "Progress: %.0f%%\n", message.GetProgress().Progress)
+		case orchestrator.InfoType:
+			fmt.Fprintln(out, "[INFO]", message.GetData())
+		case orchestrator.ErrorType:
+			feedback.Fatal(message.GetError().Error(), feedback.ErrGeneric)
+			return nil
+		}
+	}
+	outputResult := getResult()
+	feedback.PrintResult(results.StartAppResult{
+		AppName: app.Name,
+		Status:  "started",
+		Output:  outputResult,
+	})
+
+	return nil
+}