Formatter is unhelpful and makes things difficult to copy & paste (#305)

meroxa · Apr 8, 2022 · 4640356 · 4640356
1 parent 4111970
commit 4640356
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/utils/display.go b/utils/display.go
@@ -7,15 +7,10 @@ import (
 	"strconv"
 	"strings"
 
-	"golang.org/x/text/cases"
-	"golang.org/x/text/language"
-
 	"github.com/alexeyco/simpletable"
 	"github.com/meroxa/meroxa-go/pkg/meroxa"
 )
 
-var formatter = cases.Title(language.Und, cases.NoLower)
-
 func EndpointsTable(ends []meroxa.Endpoint, hideHeaders bool) string {
 	if len(ends) == 0 {
 		return ""
@@ -54,7 +49,7 @@ func EndpointsTable(ends []meroxa.Endpoint, hideHeaders bool) string {
 			{Text: string(end.Protocol)},
 			{Text: end.Stream},
 			{Text: u},
-			{Text: formatter.String(strconv.FormatBool(end.Ready))},
+			{Text: strconv.FormatBool(end.Ready)},
 		}
 
 		table.Body.Cells = append(table.Body.Cells, r)
@@ -94,14 +89,14 @@ func ResourceTable(res *meroxa.Resource) string {
 		},
 		{
 			{Align: simpletable.AlignRight, Text: "State:"},
-			{Text: formatter.String(string(res.Status.State))},
+			{Text: string(res.Status.State)},
 		},
 	}
 
-	if d := res.Status.Details; d != "" {
+	if res.Status.Details != "" {
 		mainTable.Body.Cells = append(mainTable.Body.Cells, []*simpletable.Cell{
 			{Align: simpletable.AlignRight, Text: "State details:"},
-			{Text: formatter.String(d)},
+			{Text: res.Status.Details},
 		})
 	}
 
@@ -166,7 +161,7 @@ func PipelineTable(p *meroxa.Pipeline) string {
 
 	mainTable.Body.Cells = append(mainTable.Body.Cells, []*simpletable.Cell{
 		{Align: simpletable.AlignRight, Text: "State:"},
-		{Text: formatter.String(string(p.State))},
+		{Text: string(p.State)},
 	})
 
 	mainTable.SetStyle(simpletable.StyleCompact)
@@ -217,7 +212,7 @@ func ResourcesTable(resources []*meroxa.Resource, hideHeaders bool) string {
 				{Text: env},
 				{Text: res.URL},
 				{Align: simpletable.AlignCenter, Text: tunnel},
-				{Align: simpletable.AlignCenter, Text: formatter.String(string(res.Status.State))},
+				{Align: simpletable.AlignCenter, Text: string(res.Status.State)},
 			}
 
 			table.Body.Cells = append(table.Body.Cells, r)
@@ -568,7 +563,7 @@ func FunctionTable(fun *meroxa.Function) string {
 		},
 		{
 			{Align: simpletable.AlignRight, Text: "State:"},
-			{Text: formatter.String(fun.Status.State)},
+			{Text: fun.Status.State},
 		},
 	}
 	mainTable.SetStyle(simpletable.StyleCompact)
@@ -865,15 +860,15 @@ func AppTable(app *meroxa.Application) string {
 		},
 		{
 			{Align: simpletable.AlignRight, Text: "State:"},
-			{Text: formatter.String(string(app.Status.State))},
+			{Text: string(app.Status.State)},
 		},
 	}
 
 	details := app.Status.Details
 	if details != "" {
 		mainTable.Body.Cells = append(mainTable.Body.Cells, []*simpletable.Cell{
 			{Align: simpletable.AlignRight, Text: "State details:"},
-			{Text: formatter.String(details)},
+			{Text: details},
 		})
 	}
 
@@ -911,7 +906,7 @@ func ExtendedAppTable(app *meroxa.Application, resources []*meroxa.Resource, con
 		},
 		{
 			{Align: simpletable.AlignRight, Text: "State:"},
-			{Text: formatter.String(string(app.Status.State))},
+			{Text: string(app.Status.State)},
 		},
 	}
 	mainTable.SetStyle(simpletable.StyleCompact)

diff --git a/utils/display_test.go b/utils/display_test.go
@@ -62,7 +62,7 @@ func TestResourcesTable(t *testing.T) {
 				if !strings.Contains(out, resource.UUID) {
 					t.Errorf("%s, not found", resource.UUID)
 				}
-				if !strings.Contains(out, formatter.String(string(resource.Status.State))) {
+				if !strings.Contains(out, string(resource.Status.State)) {
 					t.Errorf("state %s, not found", resource.Status.State)
 				}
 			case "ID_Alignment":
@@ -72,7 +72,7 @@ func TestResourcesTable(t *testing.T) {
 				if !strings.Contains(out, resIDAlign.UUID) {
 					t.Errorf("%s, not found", resIDAlign.UUID)
 				}
-				if !strings.Contains(out, formatter.String(string(resIDAlign.Status.State))) {
+				if !strings.Contains(out, string(resIDAlign.Status.State)) {
 					t.Errorf("state %s, not found", resource.Status.State)
 				}
 			}
@@ -115,7 +115,7 @@ func TestResourcesTableWithoutHeaders(t *testing.T) {
 	if !strings.Contains(out, resource.UUID) {
 		t.Errorf("%s, not found", resource.UUID)
 	}
-	if !strings.Contains(out, formatter.String(string(resource.Status.State))) {
+	if !strings.Contains(out, string(resource.Status.State)) {
 		t.Errorf("state %s, not found", resource.Status.State)
 	}
 }