Handle conflicts

Author: anisaoshafi

cmd/root.go

@@ -71,8 +71,8 @@ func NewRootCmd(cfg *env.Env, tel *telemetry.Client, logger log.Logger) *cobra.C
 		newVolumeCmd(cfg),
 		newUpdateCmd(cfg),
 		newDocsCmd(),
-		newAWSCmd(cfg, tel),
-		newSnapshotCmd(cfg, tel),
+		newAWSCmd(cfg),
+		newSnapshotCmd(cfg),
 	)
 
 	return root

cmd/snapshot.go

@@ -11,21 +11,20 @@ import (
 	"github.com/localstack/lstk/internal/output"
 	"github.com/localstack/lstk/internal/runtime"
 	"github.com/localstack/lstk/internal/snapshot"
-	"github.com/localstack/lstk/internal/telemetry"
 	"github.com/localstack/lstk/internal/ui"
 	"github.com/spf13/cobra"
 )
 
-func newSnapshotCmd(cfg *env.Env, tel *telemetry.Client) *cobra.Command {
+func newSnapshotCmd(cfg *env.Env) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "snapshot",
 		Short: "Manage emulator snapshots",
 	}
-	cmd.AddCommand(newSnapshotSaveCmd(cfg, tel))
+	cmd.AddCommand(newSnapshotSaveCmd(cfg))
 	return cmd
 }
 
-func newSnapshotSaveCmd(cfg *env.Env, tel *telemetry.Client) *cobra.Command {
+func newSnapshotSaveCmd(cfg *env.Env) *cobra.Command {
 	return &cobra.Command{
 		Use:   "save [destination]",
 		Short: "Save a snapshot of the emulator state",
@@ -40,7 +39,7 @@ The destination must be a file path. Use a path prefix to save locally:
 Cloud destinations are not yet supported.`,
 		Args:    cobra.MaximumNArgs(1),
 		PreRunE: initConfig,
-		RunE: commandWithTelemetry("snapshot save", tel, func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, args []string) error {
 			var destArg string
 			if len(args) > 0 {
 				destArg = args[0]
@@ -80,6 +79,6 @@ Cloud destinations are not yet supported.`,
 				return ui.RunSnapshotSave(cmd.Context(), rt, containers, exporter, dest)
 			}
 			return snapshot.Save(cmd.Context(), rt, containers, exporter, dest, output.NewPlainSinkSplit(os.Stdout, os.Stderr))
-		}),
+		},
 	}
 }

internal/snapshot/save.go

@@ -24,7 +24,7 @@ func Save(ctx context.Context, rt runtime.Runtime, containers []config.Container
 		return fmt.Errorf("checking emulator status: %w", err)
 	}
 	if !running {
-		output.EmitError(sink, output.ErrorEvent{
+		sink.Emit(output.ErrorEvent{
 			Title: "LocalStack is not running",
 			Actions: []output.ErrorAction{
 				{Label: "Start LocalStack:", Value: "lstk"},
@@ -34,33 +34,33 @@ func Save(ctx context.Context, rt runtime.Runtime, containers []config.Container
 		return output.NewSilentError(fmt.Errorf("LocalStack is not running"))
 	}
 
-	output.EmitSpinnerStart(sink, "Saving snapshot...")
+	sink.Emit(output.SpinnerStart("Saving snapshot..."))
 
 	body, err := exporter.ExportState(ctx)
 	if err != nil {
-		output.EmitSpinnerStop(sink)
+		sink.Emit(output.SpinnerStop())
 		return fmt.Errorf("export state from LocalStack: %w", err)
 	}
 	defer func() { _ = body.Close() }()
 
 	w, err := os.Create(dest)
 	if err != nil {
-		output.EmitSpinnerStop(sink)
+		sink.Emit(output.SpinnerStop())
 		return fmt.Errorf("save to %s: %w", dest, err)
 	}
 
 	if _, err := io.Copy(w, body); err != nil {
 		_ = w.Close()
-		output.EmitSpinnerStop(sink)
+		sink.Emit(output.SpinnerStop())
 		return fmt.Errorf("write snapshot: %w", err)
 	}
 
 	if err := w.Close(); err != nil {
-		output.EmitSpinnerStop(sink)
+		sink.Emit(output.SpinnerStop())
 		return fmt.Errorf("close snapshot: %w", err)
 	}
 
-	output.EmitSpinnerStop(sink)
-	output.EmitSuccess(sink, fmt.Sprintf("Snapshot saved to %s", dest))
+	sink.Emit(output.SpinnerStop())
+	sink.Emit(output.MessageEvent{Severity: output.SeveritySuccess, Text: fmt.Sprintf("Snapshot saved to %s", dest)})
 	return nil
 }

internal/snapshot/save_test.go

@@ -31,13 +31,13 @@ func (f *fakeExporter) ExportState(_ context.Context) (io.ReadCloser, error) {
 	return io.NopCloser(bytes.NewReader(f.body)), nil
 }
 
-func captureEvents(t *testing.T) (output.Sink, func() []any) {
+func captureEvents(t *testing.T) (output.Sink, func() []output.Event) {
 	t.Helper()
-	var events []any
-	sink := output.SinkFunc(func(event any) {
+	var events []output.Event
+	sink := output.SinkFunc(func(event output.Event) {
 		events = append(events, event)
 	})
-	return sink, func() []any { return events }
+	return sink, func() []output.Event { return events }
 }
 
 func healthyRunningMock(t *testing.T) *runtime.MockRuntime {