Merge pull request #481 from allmightyspiff/termWrapping

Disables text wrapping for Table rows,…

Author: Aerex

bluemix/authentication/iam/iam_test.go

@@ -311,25 +311,6 @@ func TestRefreshSession(t *testing.T) {
 	assert.Nil(t, err)
 }
 
-func TestAllowPrintCorrelationID(t *testing.T) {
-	testCases := []struct {
-		path                    string
-		allowPrintCorrelationID bool
-	}{
-		{
-			path:                    "/v1/sessions",
-			allowPrintCorrelationID: false,
-		},
-		{
-			path:                    "/v1/tokens",
-			allowPrintCorrelationID: true,
-		},
-	}
-
-	for _, testCase := range testCases {
-		assert.Equal(t, AllowPrintCorrelationID(testCase.path), testCase.allowPrintCorrelationID)
-	}
-}
 
 // startMockIAMServerForCRExchange will start a mock server endpoint that supports both the
 // IAM operations that we'll need to call.

bluemix/terminal/prompt.go

@@ -82,7 +82,7 @@ func (p *Prompt) resolveSingle(dest interface{}) error {
 	for {
 		input, readErr := p.read(prompt)
 		if readErr != nil {
-			return fmt.Errorf(T("Could not read from input: ") + readErr.Error())
+			return fmt.Errorf("%s", T("Could not read from input: ") + readErr.Error())
 		}
 
 		var err error
@@ -224,7 +224,7 @@ func (p *Prompt) resolveChoices(dest interface{}) error {
 	for {
 		input, readErr := p.read(prompt)
 		if readErr != nil {
-			return fmt.Errorf(T("Could not read from input: ") + readErr.Error())
+			return fmt.Errorf("%s", T("Could not read from input: ") + readErr.Error())
 		}
 
 		var selectedNum int

bluemix/terminal/table.go

@@ -162,6 +162,11 @@ func (t *PrintableTable) createColumnConfigs() []table.ColumnConfig {
 			Align:       text.AlignLeft,
 			WidthMax:    maxColWidth,
 			Number:      colIndex + 1,
+			WidthMaxEnforcer: func(str string, warpLen int) string {
+				// This effectively disables wrapping.
+				// https://github.com/jedib0t/go-pretty/blob/main/table/config.go#L68C2-L68C18
+				return str
+			},
 		}
 
 		// assuming the table has headers: store columns with wide content where the max width may need to be adjusted

bluemix/terminal/table_test.go

@@ -100,13 +100,12 @@ func TestMoreColThanTerminalWidth(t *testing.T) {
 }
 
 func TestWideHeaderNames(t *testing.T) {
-	t.Skip("Skip until terminal width issue is fixed")
 	buf := bytes.Buffer{}
 	testTable := NewTable(&buf, []string{"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt u", "NAME"})
 	testTable.Add("col1", "col2")
 	testTable.Print()
 	assert.Contains(t, buf.String(), "Lorem ipsum dolor sit amet, consectetu")
-	assert.Equal(t, bold+"ID                                             "+reset+bold+"Name   "+reset+"\nABCDEFG-9b8babbd-f2ed-4371-b817-a839e4130332   row2\n", buf.String())
+	assert.Equal(t, bold+"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt u   "+reset+bold+"NAME   "+reset+"\ncol1                                                                                          col2\n", buf.String())
 }
 
 func TestWidestColumn(t *testing.T) {
@@ -120,16 +119,27 @@ func TestWidestColumn(t *testing.T) {
 }
 
 func TestMultiWideColumns(t *testing.T) {
-	t.Skip("Skip until terminal width issue is fixed")
 	buf := bytes.Buffer{}
 	id := "ABCDEFG-9b8babbd-f2ed-4371-b817-a839e4130332"
 	desc := "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut"
 	testTable := NewTable(&buf, []string{"ID", "Description", "Name"})
 	testTable.Add(id, desc, "col3")
 	testTable.Print()
-	assert.Contains(t, buf.String(), "ABCDEFG-9b8babbd-f2ed-4371-b817-a839")
-	assert.Contains(t, buf.String(), "e4130332")
-	assert.Equal(t, buf.String(), "ID                                     Description                           Name\nABCDEFG-9b8babbd-f2ed-4371-b817-a839   Lorem ipsum dolor sit amet, consect   col3\ne4130332                               etur adipiscing elit, sed do eiusmo\n                                       d tempor incididunt ut\n")
+	result := strings.Split(buf.String(), "\n")
+	assert.Equal(t, result[0], bold+"ID                                             "+reset+bold+"Description                                                                                    "+reset+bold+"Name   "+reset)
+	assert.Equal(t, result[1], "ABCDEFG-9b8babbd-f2ed-4371-b817-a839e4130332   Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut   col3")
+}
+
+func TestMultiWideColumnsWithoutDescription(t *testing.T) {
+	buf := bytes.Buffer{}
+	id := "ABCDEFG-9b8babbd-f2ed-4371-b817-a839e4130332"
+	desc := "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+	testTable := NewTable(&buf, []string{"AA", "BB", "CC", "DD", "FF", "ZZ"})
+	testTable.Add(id, desc, "col3", "Column The fourth", "Yet another column value", "ZZZZZZ")
+	testTable.Print()
+	result := strings.Split(buf.String(), "\n")
+	assert.Equal(t, result[0], "\x1b[1mAA                                             \x1b[0m\x1b[1mBB                                                                                                                                                                     \x1b[0m\x1b[1mCC     \x1b[0m\x1b[1mDD                  \x1b[0m\x1b[1mFF                         \x1b[0m\x1b[1mZZ       \x1b[0m")
+	assert.Equal(t, result[1], "ABCDEFG-9b8babbd-f2ed-4371-b817-a839e4130332   Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.   col3   Column The fourth   Yet another column value   ZZZZZZ")
 }
 
 func TestNotEnoughRowEntiresJson(t *testing.T) {

testhelpers/terminal/test_ui.go

@@ -70,7 +70,7 @@ func (ui *FakeUI) Ok() {
 	if ui.quiet {
 		return
 	}
-	ui.Say(term.SuccessColor("OK"))
+	ui.Say("%s", term.SuccessColor("OK"))
 }
 
 func (ui *FakeUI) Info(template string, args ...interface{}) {
@@ -82,8 +82,8 @@ func (ui *FakeUI) Info(template string, args ...interface{}) {
 
 func (ui *FakeUI) Failed(template string, args ...interface{}) {
 	message := fmt.Sprintf(template, args...)
-	ui.Info(term.FailureColor("FAILED"))
-	ui.error(message)
+	ui.Info("%s", term.FailureColor("FAILED"))
+	ui.error("%s", message)
 	ui.Info("")
 }