From c8b11f42a65cf56c14fe79d8edbdcee1680b598e Mon Sep 17 00:00:00 2001
From: Matty Evans <mattevansnz@gmail.com>
Date: Thu, 19 Dec 2024 16:38:06 +1000
Subject: [PATCH] refactor: Refactor configuration and installation functions

---
 cmd/cli/commands/config/config.go   | 28 +++++++++++++++------------
 cmd/cli/commands/install/install.go | 30 ++++++++++++++---------------
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/cmd/cli/commands/config/config.go b/cmd/cli/commands/config/config.go
index ae63332..6028ddd 100644
--- a/cmd/cli/commands/config/config.go
+++ b/cmd/cli/commands/config/config.go
@@ -7,6 +7,7 @@ import (
 	"github.com/ethpandaops/contributoor-installer/internal/service"
 	"github.com/ethpandaops/contributoor-installer/internal/tui"
 	"github.com/rivo/tview"
+	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
 
@@ -16,23 +17,26 @@ func RegisterCommands(app *cli.App, opts *options.CommandOpts) {
 		Usage:     "Configure Contributoor settings",
 		UsageText: "contributoor config",
 		Action: func(c *cli.Context) error {
-			return showConfig(c, opts)
+			log := opts.Logger()
+
+			configService, err := service.NewConfigService(log, c.GlobalString("config-path"))
+			if err != nil {
+				return fmt.Errorf("%serror loading config: %v%s", tui.TerminalColorRed, err, tui.TerminalColorReset)
+			}
+
+			return configureContributoor(c, log, configService)
 		},
 	})
 }
 
-func showConfig(c *cli.Context, opts *options.CommandOpts) error {
-	log := opts.Logger()
-
-	configService, err := service.NewConfigService(log, c.GlobalString("config-path"))
-	if err != nil {
-		return fmt.Errorf("%sError loading config: %v%s", tui.TerminalColorRed, err, tui.TerminalColorReset)
-	}
-
-	app := tview.NewApplication()
+func configureContributoor(c *cli.Context, log *logrus.Logger, config service.ConfigManager) error {
+	var (
+		app     = tview.NewApplication()
+		display = NewConfigDisplay(log, app, config)
+	)
 
-	if err := NewConfigDisplay(log, app, configService).Run(); err != nil {
-		return fmt.Errorf("%sDisplay error: %w%s", tui.TerminalColorRed, err, tui.TerminalColorReset)
+	if err := display.Run(); err != nil {
+		return fmt.Errorf("%sdisplay error: %w%s", tui.TerminalColorRed, err, tui.TerminalColorReset)
 	}
 
 	return nil
diff --git a/cmd/cli/commands/install/install.go b/cmd/cli/commands/install/install.go
index a57964e..0023fe3 100644
--- a/cmd/cli/commands/install/install.go
+++ b/cmd/cli/commands/install/install.go
@@ -19,7 +19,14 @@ func RegisterCommands(app *cli.App, opts *options.CommandOpts) {
 		Usage:     "Install Contributoor",
 		UsageText: "contributoor install [options]",
 		Action: func(c *cli.Context) error {
-			return installContributoor(c, opts)
+			log := opts.Logger()
+
+			configService, err := service.NewConfigService(log, c.GlobalString("config-path"))
+			if err != nil {
+				return fmt.Errorf("%serror loading config: %v%s", tui.TerminalColorRed, err, tui.TerminalColorReset)
+			}
+
+			return installContributoor(c, log, configService)
 		},
 		Flags: []cli.Flag{
 			cli.StringFlag{
@@ -36,28 +43,21 @@ func RegisterCommands(app *cli.App, opts *options.CommandOpts) {
 	})
 }
 
-// installContributoor is the action for the install command.
-func installContributoor(c *cli.Context, opts *options.CommandOpts) error {
-	log := opts.Logger()
-	log.SetLevel(logrus.DebugLevel)
-
-	configService, err := service.NewConfigService(log, c.GlobalString("config-path"))
-	if err != nil {
-		return fmt.Errorf("%serror loading config: %v%s", tui.TerminalColorRed, err, tui.TerminalColorReset)
-	}
-
-	app := tview.NewApplication()
-	d := NewInstallDisplay(log, app, configService)
+func installContributoor(c *cli.Context, log *logrus.Logger, config service.ConfigManager) error {
+	var (
+		app     = tview.NewApplication()
+		display = NewInstallDisplay(log, app, config)
+	)
 
 	// Run the display.
-	if err := d.Run(); err != nil {
+	if err := display.Run(); err != nil {
 		log.Errorf("error running display: %v", err)
 
 		return fmt.Errorf("%sdisplay error: %w%s", tui.TerminalColorRed, err, tui.TerminalColorReset)
 	}
 
 	// Handle completion.
-	if err := d.OnComplete(); err != nil {
+	if err := display.OnComplete(); err != nil {
 		log.Errorf("error completing installation: %v", err)
 
 		return fmt.Errorf("%scompletion error: %w%s", tui.TerminalColorRed, err, tui.TerminalColorReset)