Merge pull request vitessio#7321 from tinyspeck/am_vtctldclient_comma…

…nd_pkg

[vtctld] vtctldclient command pkg

Signed-off-by: Andrew Mason <amason@slack-corp.com>

go/cmd/vtctldclient/formats.go → go/cmd/vtctldclient/cli/awk.go

@@ -14,15 +14,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package cli
 
 import (
  "fmt"
  "sort"
  "strings"
 )
 
-func fmtMapAwkable(m map[string]string) string {
+// MarshalMapAWK returns a string representation of a string->string map in an
+// AWK-friendly format.
+func MarshalMapAWK(m map[string]string) string {
  pairs := make([]string, len(m))
  i := 0
 

go/cmd/vtctldclient/json.go → go/cmd/vtctldclient/cli/json.go

@@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 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,
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package main
+package cli
 
 import (
  "bytes"