Add tests for commands (#35)

cmd/cephctl/main.go

@@ -13,6 +13,7 @@ import (
 	dumpCephConfigCmd "github.com/teran/cephctl/commands/dump/cephconfig"
 	healthcheckCmd "github.com/teran/cephctl/commands/healthcheck"
 	"github.com/teran/cephctl/differ"
+	"github.com/teran/cephctl/printer"
 	"github.com/teran/cephctl/service"
 )
 
@@ -35,16 +36,18 @@ var (
 		Envar("CEPHCTL_TRACE").
 		Bool()
 
-	apply         = app.Command("apply", "Apply ceph configuration")
-	applySpecFile = apply.Arg("filename", "Filename with configuration specification").Required().String()
-
-	diff      = app.Command("diff", "Show difference between running and desired configurations")
-	diffColor = diff.
+	colorize = app.
 			Flag("color", "Colorize diff output").
 			Short('c').
 			Envar("CEPHCTL_COLOR").
 			Default("true").
 			Bool()
+
+	apply         = app.Command("apply", "Apply ceph configuration")
+	applySpecFile = apply.Arg("filename", "Filename with configuration specification").Required().String()
+
+	diff = app.Command("diff", "Show difference between running and desired configurations")
+
 	diffSpecFile = diff.Arg("filename", "Filename with configuration specification").Required().String()
 
 	dump           = app.Command("dump", "Dump runtime configuration")
@@ -68,6 +71,7 @@ func main() {
 	}
 
 	svc := service.New(ceph.New(*cephBinary), differ.New())
+	prntr := printer.New(*colorize)
 
 	switch appCmd {
 	case apply.FullCommand():
@@ -81,7 +85,7 @@ func main() {
 
 	case diff.FullCommand():
 		if err := diffCmd.Diff(ctx, diffCmd.DiffConfig{
-			Colorize: *diffColor,
+			Printer:  prntr,
 			Service:  svc,
 			SpecFile: *diffSpecFile,
 		}); err != nil {
@@ -91,13 +95,17 @@ func main() {
 	case dumpCephConfig.FullCommand():
 		log.Tracef("running dump command")
 		if err := dumpCephConfigCmd.DumpCephConfig(ctx, dumpCephConfigCmd.DumpCephConfigConfig{
+			Printer: prntr,
 			Service: svc,
 		}); err != nil {
 			panic(err)
 		}
 
 	case healthcheck.FullCommand():
-		if err := healthcheckCmd.Healthcheck(ctx, svc); err != nil {
+		if err := healthcheckCmd.Healthcheck(ctx, healthcheckCmd.HealthcheckConfig{
+			Printer: prntr,
+			Service: svc,
+		}); err != nil {
 			panic(err)
 		}
 

commands/apply/apply.go

@@ -1,4 +1,4 @@
-package commands
+package apply
 
 import (
 	"context"

commands/apply/apply_test.go

@@ -0,0 +1,29 @@
+package apply
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"github.com/teran/cephctl/models"
+	"github.com/teran/cephctl/service"
+)
+
+func TestApply(t *testing.T) {
+	r := require.New(t)
+
+	m := service.NewMock()
+	defer m.AssertExpectations(t)
+
+	m.On("ApplyCephConfig", models.CephConfig{
+		"global": {
+			"test": "value",
+		},
+	}).Return(nil).Once()
+
+	err := Apply(context.Background(), ApplyConfig{
+		Service:  m,
+		SpecFile: "testdata/cephconfig.yaml",
+	})
+	r.NoError(err)
+}

commands/apply/testdata/cephconfig.yaml

@@ -0,0 +1,5 @@
+---
+kind: CephConfig
+spec:
+  global:
+    test: value

commands/diff/diff.go

@@ -1,22 +1,22 @@
-package commands
+package diff
 
 import (
 	"context"
 	"strings"
 
-	"github.com/fatih/color"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 
 	"github.com/teran/cephctl/ceph/config/spec"
 	"github.com/teran/cephctl/ceph/config/spec/cephconfig"
 	"github.com/teran/cephctl/models"
+	"github.com/teran/cephctl/printer"
 	"github.com/teran/cephctl/service"
 )
 
 type DiffConfig struct {
 	Service  service.Service
-	Colorize bool
+	Printer  printer.Printer
 	SpecFile string
 }
 
@@ -26,8 +26,6 @@ func Diff(ctx context.Context, ac DiffConfig) error {
 		return err
 	}
 
-	color.NoColor = !ac.Colorize
-
 	switch strings.ToLower(kind) {
 	case "cephconfig":
 		cfg, err := cephconfig.New(specData)
@@ -45,11 +43,11 @@ func Diff(ctx context.Context, ac DiffConfig) error {
 
 			switch change.Kind {
 			case models.CephConfigDifferenceKindAdd:
-				color.Green("+ %s %s %s", change.Section, change.Key, *change.Value)
+				ac.Printer.Green("+ %s %s %s", change.Section, change.Key, *change.Value)
 			case models.CephConfigDifferenceKindChange:
-				color.Yellow("~ %s %s %s -> %s", change.Section, change.Key, *change.OldValue, *change.Value)
+				ac.Printer.Yellow("~ %s %s %s -> %s", change.Section, change.Key, *change.OldValue, *change.Value)
 			case models.CephConfigDifferenceKindRemove:
-				color.Red("- %s %s", change.Section, change.Key)
+				ac.Printer.Red("- %s %s", change.Section, change.Key)
 			}
 		}
 

commands/diff/diff_test.go

@@ -0,0 +1,58 @@
+package diff
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"github.com/teran/cephctl/models"
+	"github.com/teran/cephctl/printer"
+	"github.com/teran/cephctl/service"
+	"github.com/teran/go-ptr"
+)
+
+func TestDiff(t *testing.T) {
+	r := require.New(t)
+
+	m := service.NewMock()
+	defer m.AssertExpectations(t)
+
+	p := printer.NewMock()
+	defer p.AssertExpectations(t)
+
+	m.On("DiffCephConfig", models.CephConfig{
+		"global": {
+			"test": "value",
+		},
+	}).Return([]models.CephConfigDifference{
+		{
+			Kind:    models.CephConfigDifferenceKindAdd,
+			Section: "mon",
+			Key:     "test_key",
+			Value:   ptr.String("value"),
+		},
+		{
+			Kind:     models.CephConfigDifferenceKindChange,
+			Section:  "osd.3",
+			Key:      "test_key",
+			OldValue: ptr.String("old_value"),
+			Value:    ptr.String("value"),
+		},
+		{
+			Kind:    models.CephConfigDifferenceKindRemove,
+			Section: "osd",
+			Key:     "test_key",
+		},
+	}, nil).Once()
+
+	p.On("Green", "+ %s %s %s", []any{"mon", "test_key", "value"}).Return().Once()
+	p.On("Yellow", "~ %s %s %s -> %s", []any{"osd.3", "test_key", "old_value", "value"}).Return().Once()
+	p.On("Red", "- %s %s", []any{"osd", "test_key"}).Return().Once()
+
+	err := Diff(context.Background(), DiffConfig{
+		Printer:  p,
+		Service:  m,
+		SpecFile: "testdata/cephconfig.yaml",
+	})
+	r.NoError(err)
+}

commands/diff/testdata/cephconfig.yaml

@@ -0,0 +1,5 @@
+---
+kind: CephConfig
+spec:
+  global:
+    test: value

commands/dump/cephconfig/cephconfig.go

@@ -2,14 +2,16 @@ package cephconfig
 
 import (
 	"context"
-	"fmt"
+
+	yaml "gopkg.in/yaml.v3"
 
 	"github.com/teran/cephctl/models"
+	"github.com/teran/cephctl/printer"
 	"github.com/teran/cephctl/service"
-	yaml "gopkg.in/yaml.v3"
 )
 
 type DumpCephConfigConfig struct {
+	Printer printer.Printer
 	Service service.Service
 }
 
@@ -34,6 +36,6 @@ func DumpCephConfig(ctx context.Context, dc DumpCephConfigConfig) error {
 		return err
 	}
 
-	fmt.Println(string(data))
+	dc.Printer.Println(string(data))
 	return nil
 }

commands/dump/cephconfig/cephconfig_test.go

@@ -0,0 +1,35 @@
+package cephconfig
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"github.com/teran/cephctl/models"
+	"github.com/teran/cephctl/printer"
+	"github.com/teran/cephctl/service"
+)
+
+func TestDumpCephConfig(t *testing.T) {
+	r := require.New(t)
+
+	m := service.NewMock()
+	defer m.AssertExpectations(t)
+
+	p := printer.NewMock()
+	defer p.AssertExpectations(t)
+
+	m.On("DumpConfig").Return(models.CephConfig{
+		"global": {
+			"key": "value",
+		},
+	}, nil).Once()
+
+	p.On("Println", []any{"kind: CephConfig\nspec:\n    global:\n        key: value\n"}).Return().Once()
+
+	err := DumpCephConfig(context.Background(), DumpCephConfigConfig{
+		Printer: p,
+		Service: m,
+	})
+	r.NoError(err)
+}

commands/healthcheck/healthcheck.go

@@ -1,29 +1,34 @@
-package status
+package healthcheck
 
 import (
 	"context"
 
-	"github.com/fatih/color"
 	"github.com/teran/cephctl/models"
+	"github.com/teran/cephctl/printer"
 	"github.com/teran/cephctl/service"
 )
 
-func Healthcheck(ctx context.Context, svc service.Service) error {
-	indicators, err := svc.CheckClusterHealth(ctx)
+type HealthcheckConfig struct {
+	Service service.Service
+	Printer printer.Printer
+}
+
+func Healthcheck(ctx context.Context, hc HealthcheckConfig) error {
+	indicators, err := hc.Service.CheckClusterHealth(ctx)
 	if err != nil {
 		return err
 	}
 
 	for _, indicator := range indicators {
-		var printFn func(string, ...interface{}) = color.HiRed
+		var printFn func(string, ...any) = hc.Printer.HiRed
 
 		switch indicator.CurrentValueStatus {
 		case models.ClusterHealthIndicatorStatusGood:
-			printFn = color.Green
+			printFn = hc.Printer.Green
 		case models.ClusterHealthIndicatorStatusAtRisk:
-			printFn = color.Yellow
+			printFn = hc.Printer.Yellow
 		case models.ClusterHealthIndicatorStatusDangerous:
-			printFn = color.Red
+			printFn = hc.Printer.Red
 		}
 
 		printFn(

commands/healthcheck/healthcheck_test.go

@@ -0,0 +1,55 @@
+package healthcheck
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"github.com/teran/cephctl/models"
+	"github.com/teran/cephctl/printer"
+	"github.com/teran/cephctl/service"
+)
+
+func TestHealthcheck(t *testing.T) {
+	r := require.New(t)
+
+	m := service.NewMock()
+	defer m.AssertExpectations(t)
+
+	p := printer.NewMock()
+	defer p.AssertExpectations(t)
+
+	m.On("CheckClusterHealth").Return([]models.ClusterHealthIndicator{
+		{
+			Indicator:          models.ClusterHealthIndicatorTypeClusterStatus,
+			CurrentValue:       "HEALTH_OK",
+			CurrentValueStatus: models.ClusterHealthIndicatorStatusGood,
+		},
+		{
+			Indicator:          models.ClusterHealthIndicatorTypeQuorum,
+			CurrentValue:       "5 of 5",
+			CurrentValueStatus: models.ClusterHealthIndicatorStatusGood,
+		},
+		{
+			Indicator:          models.ClusterHealthIndicatorTypeOSDsDown,
+			CurrentValue:       "0 of 15",
+			CurrentValueStatus: models.ClusterHealthIndicatorStatusGood,
+		},
+	}, nil).Once()
+
+	p.On("Green", "[%s] %s = %s", []any{
+		"     GOOD", models.ClusterHealthIndicatorTypeClusterStatus, "HEALTH_OK",
+	}).Return().Once()
+	p.On("Green", "[%s] %s = %s", []any{
+		"     GOOD", models.ClusterHealthIndicatorTypeQuorum, "5 of 5",
+	}).Return().Once()
+	p.On("Green", "[%s] %s = %s", []any{
+		"     GOOD", models.ClusterHealthIndicatorTypeOSDsDown, "0 of 15",
+	}).Return().Once()
+
+	err := Healthcheck(context.Background(), HealthcheckConfig{
+		Printer: p,
+		Service: m,
+	})
+	r.NoError(err)
+}