move UnquoteString to output_filter.go

cli/parser.go

@@ -166,10 +166,3 @@ func SplitStringWithPrefix(s string, splitters string) (string, string, bool) {
 	return s[:i], s[i+1:], true
 
 }
-
-func UnquoteString(s string) string {
-	if strings.HasPrefix(s, "\"") && strings.HasSuffix(s, "\"") && len(s) >= 2 {
-		return s[1 : len(s)-1]
-	}
-	return s
-}

cli/parser_test.go

@@ -30,7 +30,6 @@ func (tc *testContext) detectFlag(name string) (*Flag, error) {
 		return f, nil
 	}
 	return nil, fmt.Errorf("unknown flag --%s", name)
-
 }
 
 func (tc *testContext) detectFlagByShorthand(ch rune) (*Flag, error) {
@@ -39,7 +38,6 @@ func (tc *testContext) detectFlagByShorthand(ch rune) (*Flag, error) {
 		return f, nil
 	}
 	return nil, fmt.Errorf("unknown flag -%c", ch)
-
 }
 
 func newTestContext() *testContext {
@@ -120,8 +118,3 @@ func TestParser3(t *testing.T) {
 	assert.Equal(t, "s1", s)
 	assert.NotNil(t, fs.Get("prev"))
 }
-
-func TestUnquoteString(t *testing.T) {
-	str := UnquoteString(`"nicai"`)
-	assert.Equal(t, "nicai", str)
-}

openapi/output_filter.go

@@ -85,7 +85,7 @@ func (a *TableOutputFilter) FilterOutput(s string) (string, error) {
 
 	var colNames []string
 	if v, ok := OutputFlag(a.ctx.Flags()).GetFieldValue("cols"); ok {
-		v = cli.UnquoteString(v)
+		v = UnquoteString(v)
 		colNames = strings.Split(v, ",")
 	} else {
 		return s, fmt.Errorf("you need to assign col=col1,col2,... with --output")
@@ -158,3 +158,10 @@ func toIntfArray(stringArray []string) []interface{} {
 	}
 	return intfArray
 }
+
+func UnquoteString(s string) string {
+	if strings.HasPrefix(s, "\"") && strings.HasSuffix(s, "\"") && len(s) >= 2 {
+		return s[1 : len(s)-1]
+	}
+	return s
+}

openapi/output_filter_test.go

@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//     http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -105,3 +105,8 @@ func TestTableOutputFilter_FormatTable(t *testing.T) {
 	assert.Equal(t, "Num | name  | type  | api\n--- | ----  | ----  | ---\n0   | <nil> | <nil> | <nil>\n1   | <nil> | <nil> | <nil>\n", str)
 	assert.Nil(t, err)
 }
+
+func TestUnquoteString(t *testing.T) {
+	str := UnquoteString(`"nicai"`)
+	assert.Equal(t, "nicai", str)
+}