Merge pull request #1357 from afbjorklund/indent-help

Remove extra indentation of list help

Author: AkihiroSuda

cmd/limactl/list.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/cheggaaa/pb/v3/termutil"
 	"github.com/lima-vm/lima/pkg/store"
+	"github.com/lithammer/dedent"
 	"github.com/mattn/go-isatty"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
@@ -37,18 +38,17 @@ func newListCommand() *cobra.Command {
 		Use:     "list [flags] [INSTANCE]...",
 		Aliases: []string{"ls"},
 		Short:   "List instances of Lima.",
-		Long: `List instances of Lima.
+		Long: "List instances of Lima.\n" + dedent.Dedent(`
 		The output can be presented in one of several formats, using the --format <format> flag.
 		
 		  --format json  - output in json format
 		  --format yaml  - output in yaml format
 		  --format table - output in table format
 		  --format '{{ <go template> }}' - if the format begins and ends with '{{ }}', then it is used as a go template.
-` + store.FormatHelp +
-			`
+`) + store.FormatHelp + dedent.Dedent(`
 		The following legacy flags continue to function:
 		  --json - equal to '--format json'
-		`,
+		`),
 		Args:              cobra.ArbitraryArgs,
 		RunE:              listAction,
 		ValidArgsFunction: listBashComplete,

go.mod

@@ -22,6 +22,7 @@ require (
 	github.com/gorilla/mux v1.8.0
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/lima-vm/sshocker v0.3.1
+	github.com/lithammer/dedent v1.1.0
 	github.com/mattn/go-isatty v0.0.17
 	github.com/mattn/go-shellwords v1.0.12
 	github.com/miekg/dns v1.1.50

go.sum

@@ -380,6 +380,8 @@ github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgx
 github.com/lima-vm/sshocker v0.3.1 h1:MxqWJVsNZ2AKw/mWJ3n2DBNxFABZpaR79olLIjAQK8o=
 github.com/lima-vm/sshocker v0.3.1/go.mod h1:Pv7KiykFCequiWTPMytCbAC92ZT2TSFPgmMqGgh3vm0=
 github.com/linuxkit/virtsock v0.0.0-20220523201153-1a23e78aa7a2/go.mod h1:SWzULI85WerrFt3u+nIm5F9l7EvxZTKQvd0InF3nmgM=
+github.com/lithammer/dedent v1.1.0 h1:VNzHMVCBNG1j0fh3OrsFRkVUwStdDArbgBWoPAffktY=
+github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a/go.mod h1:M1qoD/MqPgTZIk0EWKB38wE28ACRfVcn+cU08jyArI0=

pkg/store/instance.go

@@ -213,10 +213,10 @@ type FormatData struct {
 	IdentityFile string
 }
 
-var FormatHelp = "\n" + textutil.PrefixString("\t\t",
-	"These functions are available to go templates:\n\n"+
-		textutil.IndentString(2,
-			strings.Join(textutil.FuncHelp, "\n")+"\n"))
+var FormatHelp = "\n" +
+	"These functions are available to go templates:\n\n" +
+	textutil.IndentString(2,
+		strings.Join(textutil.FuncHelp, "\n")+"\n")
 
 func AddGlobalFields(inst *Instance) (FormatData, error) {
 	var data FormatData