Skip to content

Commit bd2d2ff

Browse files
committed
[urfavecli] Description -> Usage
1 parent 5f8e90e commit bd2d2ff

File tree

3 files changed

+35
-35
lines changed

3 files changed

+35
-35
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ rootCmd := &cobra.Command{
6666

6767
// urfave/cli
6868
rootCmd := &cli.Command{
69-
Name: "calc",
70-
Description: "My Calc",
69+
Name: "calc",
70+
Usage: "My Calc",
7171
}
7272
```
7373

urfavecli.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ func addParamsUrfaveCli(cmd *cli.Command, op *v3.Operation, handlerData *Handler
3333
for _, param := range op.Parameters {
3434
t := getParamType(param, op)
3535
name := param.Name
36-
desc := param.Description
36+
usage := param.Description
3737
required := false
3838
if req := param.Required; req != nil {
3939
required = *req
@@ -43,25 +43,25 @@ func addParamsUrfaveCli(cmd *cli.Command, op *v3.Operation, handlerData *Handler
4343
case String:
4444
flags = append(flags, &cli.StringFlag{
4545
Name: name,
46-
Usage: desc,
46+
Usage: usage,
4747
Required: required,
4848
})
4949
case Integer:
5050
flags = append(flags, &cli.IntFlag{
5151
Name: name,
52-
Usage: desc,
52+
Usage: usage,
5353
Required: required,
5454
})
5555
case Number:
5656
flags = append(flags, &cli.Float64Flag{
5757
Name: name,
58-
Usage: desc,
58+
Usage: usage,
5959
Required: required,
6060
})
6161
case Boolean:
6262
flags = append(flags, &cli.BoolFlag{
6363
Name: name,
64-
Usage: desc,
64+
Usage: usage,
6565
Required: required,
6666
})
6767
default:
@@ -166,9 +166,9 @@ func BootstrapV3UrfaveCli(rootCmd *cli.Command, model libopenapi.DocumentModel[v
166166

167167
cmd.Hidden = exts.hidden
168168
cmd.Aliases = exts.aliases
169-
cmd.Description = op.Description
169+
cmd.Usage = op.Description
170170
if op.Summary != "" {
171-
cmd.Description = op.Summary
171+
cmd.Usage = op.Summary
172172
}
173173
cmd.Action = func(_ context.Context, cmd *cli.Command) error {
174174
if err := interpolatePathUrfaveCli(cmd, &hData); err != nil {
@@ -197,8 +197,8 @@ func BootstrapV3UrfaveCli(rootCmd *cli.Command, model libopenapi.DocumentModel[v
197197

198198
for group, cmds := range cmdGroups {
199199
groupedCmd := cli.Command{
200-
Name: group,
201-
Description: fmt.Sprintf("Operations on %s", group),
200+
Name: group,
201+
Usage: fmt.Sprintf("Operations on %s", group),
202202
}
203203
groupedCmd.Commands = cmds
204204
rootCmd.Commands = append(rootCmd.Commands, &groupedCmd)

urfavecli_test.go

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func assertCmdTreeUrfaveCli(t *testing.T, cmd *cli.Command, expected *cli.Comman
5454
t.Logf("Checking command %s", cmd.Name)
5555

5656
assert.Equal(t, expected.Name, cmd.Name)
57-
assert.Equal(t, expected.Description, cmd.Description)
57+
assert.Equal(t, expected.Usage, cmd.Usage)
5858
assert.Equal(t, expected.Aliases, cmd.Aliases)
5959

6060
cmd.InvalidFlagAccessHandler = func(_ context.Context, cmd *cli.Command, name string) {
@@ -94,8 +94,8 @@ func TestBootstrapV3UrfaveCli(t *testing.T) {
9494
return nil
9595
}
9696
rootCmd := &cli.Command{
97-
Name: "calc",
98-
Description: "My Calc",
97+
Name: "calc",
98+
Usage: "My Calc",
9999
}
100100
handlers := map[string]HandlerUrfaveCli{
101101
"AddGet": handler,
@@ -109,31 +109,31 @@ func TestBootstrapV3UrfaveCli(t *testing.T) {
109109

110110
var noAlias []string
111111
expectedCmd := &cli.Command{
112-
Name: "calc",
113-
Description: "My Calc",
114-
Aliases: noAlias,
112+
Name: "calc",
113+
Usage: "My Calc",
114+
Aliases: noAlias,
115115
Commands: []*cli.Command{
116116
{
117-
Name: "info",
118-
Description: "Operations on info",
119-
Aliases: noAlias,
117+
Name: "info",
118+
Usage: "Operations on info",
119+
Aliases: noAlias,
120120
Commands: []*cli.Command{
121121
{
122-
Name: "GetInfo",
123-
Description: "Returns info",
124-
Aliases: noAlias,
122+
Name: "GetInfo",
123+
Usage: "Returns info",
124+
Aliases: noAlias,
125125
},
126126
},
127127
},
128128
{
129-
Name: "ops",
130-
Description: "Operations on ops",
131-
Aliases: noAlias,
129+
Name: "ops",
130+
Usage: "Operations on ops",
131+
Aliases: noAlias,
132132
Commands: []*cli.Command{
133133
{
134-
Name: "add-get",
135-
Description: "Adds two numbers",
136-
Aliases: []string{"ag"},
134+
Name: "add-get",
135+
Usage: "Adds two numbers",
136+
Aliases: []string{"ag"},
137137
Flags: []cli.Flag{
138138
&cli.IntFlag{
139139
Name: "n1",
@@ -144,9 +144,9 @@ func TestBootstrapV3UrfaveCli(t *testing.T) {
144144
},
145145
},
146146
{
147-
Name: "add-post",
148-
Description: "Adds two numbers via POST",
149-
Aliases: []string{"ap"},
147+
Name: "add-post",
148+
Usage: "Adds two numbers via POST",
149+
Aliases: []string{"ap"},
150150
Flags: []cli.Flag{
151151
&cli.StringFlag{
152152
Name: "nmap",
@@ -156,9 +156,9 @@ func TestBootstrapV3UrfaveCli(t *testing.T) {
156156
},
157157
},
158158
{
159-
Name: "ping",
160-
Description: "Returns Ok if all is well",
161-
Aliases: noAlias,
159+
Name: "ping",
160+
Usage: "Returns Ok if all is well",
161+
Aliases: noAlias,
162162
},
163163
},
164164
}

0 commit comments

Comments
 (0)