POD-135: Refactor a bit

Author: zarianec

cmd/cities.go

@@ -0,0 +1,55 @@
+package cmd
+
+import (
+	"errors"
+	"fmt"
+	"github.com/ProspectOne/perfops-cli/perfops"
+	"github.com/spf13/cobra"
+)
+
+var (
+	listTypesMap = map[string]func(client *perfops.Client) error{
+		"countries": runCountriesCmd,
+		"cities":    runCitiesCmd,
+	}
+
+	listCmd = &cobra.Command{
+		Use:     "list [type]",
+		Short:   "Get a locations where PerfOps nodes are present",
+		Long:    `Get a locations where PerfOps nodes are present, e.g., 'list countries' or 'list cities'`,
+		Example: `perfops list countries`,
+		Args: func(cmd *cobra.Command, args []string) error {
+			if len(args) < 1 {
+				return errors.New("specify the type of data You want to get")
+			}
+			return nil
+		},
+		RunE: func(cmd *cobra.Command, args []string) error {
+			c, err := newPerfOpsClient()
+			if err != nil {
+				return err
+			}
+			return chkRunError(runListCmd(c, args[0]))
+		},
+	}
+)
+
+func initListCmd(parentCmd *cobra.Command) {
+	// Disable global flags
+	parentCmd.ResetFlags()
+
+	parentCmd.AddCommand(listCmd)
+}
+
+func runListCmd(c *perfops.Client, dataType string) error {
+	if f, ok := listTypesMap[dataType]; ok {
+		err := f(c)
+		if err != nil {
+			return errors.New(fmt.Sprintf("error happened %v", err))
+		}
+
+		return nil
+	}
+
+	return errors.New(fmt.Sprintf("no data with type '%s'", dataType))
+}

cmd/countries.go

@@ -0,0 +1,32 @@
+package cmd
+
+import (
+	"context"
+	"github.com/ProspectOne/perfops-cli/cmd/internal"
+	"github.com/ProspectOne/perfops-cli/perfops"
+	"net/http"
+)
+
+func runCitiesCmd(c *perfops.Client) error {
+	var res *[]perfops.City
+
+	ctx := context.Background()
+	u := c.BasePath + "/analytics/dns/city"
+
+	f := internal.NewFormatter(debug)
+	f.StartSpinner()
+
+	req, _ := http.NewRequest("GET", u, nil)
+	req = req.WithContext(ctx)
+
+	err := c.DoRequest(req, &res);
+	f.StopSpinner()
+
+	if err != nil {
+		return err
+	}
+
+	internal.PrintOutputJSON(res)
+
+	return nil
+}

cmd/list.go

@@ -0,0 +1,32 @@
+package cmd
+
+import (
+	"context"
+	"github.com/ProspectOne/perfops-cli/cmd/internal"
+	"github.com/ProspectOne/perfops-cli/perfops"
+	"net/http"
+)
+
+func runCountriesCmd(c *perfops.Client) error {
+	var res *[]perfops.Country
+
+	ctx := context.Background()
+	u := c.BasePath + "/analytics/dns/countries"
+
+	f := internal.NewFormatter(debug)
+	f.StartSpinner()
+
+	req, _ := http.NewRequest("GET", u, nil)
+	req = req.WithContext(ctx)
+
+	err := c.DoRequest(req, &res);
+	f.StopSpinner()
+
+	if err != nil {
+		return err
+	}
+
+	internal.PrintOutputJSON(res)
+
+	return nil
+}

cmd/list_cities.go

@@ -0,0 +1,53 @@
+package cmd
+
+import (
+	"github.com/spf13/cobra"
+	"testing"
+)
+
+func TestInitListCmd(t *testing.T) {
+	parent := &cobra.Command{}
+	listCmd.ResetFlags()
+	initListCmd(parent)
+	flags := listCmd.HasAvailableLocalFlags()
+	if flags == true {
+		t.Fatalf("expected that command doesn't have flags")
+	}
+}
+
+func TestRunListCmd(t *testing.T) {
+	testCases := map[string]struct {
+		dataType    string
+		url         string
+		expectedErr interface{}
+	}{
+		"Countries":  {"countries", "/analytics/dns/countries", nil},
+		"Cities":     {"cities", "/analytics/dns/city", nil},
+		"Wrong type": {"country", "/analytics/dns/country", "no data with type 'country'"},
+	}
+
+	for name, tc := range testCases {
+		t.Run(name, func(t *testing.T) {
+			tr := &recordingTransport{}
+			c, err := newTestPerfopsClient(tr)
+			if err != nil {
+				t.Fatalf("unexpected error %v", err)
+			}
+
+			err = runListCmd(c, tc.dataType)
+
+			if tc.expectedErr != nil {
+				if tc.expectedErr != err.Error() {
+					t.Fatalf("expected %v error; got %v", tc.expectedErr, err)
+				}
+
+				// No reason to continue if we check for error case
+				return
+			}
+
+			if got, exp := tr.req.URL.Path, tc.url; got != exp {
+				t.Fatalf("expected %v; got %v", exp, got)
+			}
+		})
+	}
+}

cmd/cities_test.go cmd/list_cities_test.gocmd/cities_test.go renamed to cmd/list_cities_test.go

@@ -79,8 +79,7 @@ func Execute() error {
 	initDNSResolveCmd(rootCmd)
 	initCurlCmd(rootCmd)
 	initCreditsCmd(rootCmd)
-	initCountriesCmd(rootCmd)
-	initCitiesCmd(rootCmd)
+	initListCmd(rootCmd)
 	return rootCmd.Execute()
 }