fix(core): change command signature to fix sort of same command (#2705)

scaleway · Dec 27, 2022 · 63d043a · 63d043a
1 parent fa9a24b
commit 63d043a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/cmd/scw/testdata/test-all-usage-account-usage#01.golden b/cmd/scw/testdata/test-all-usage-account-usage#01.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-This API allows you to manage projects.
+Account API
 
 USAGE:
   scw account <command>

diff --git a/cmd/scw/testdata/test-all-usage-account-usage.golden b/cmd/scw/testdata/test-all-usage-account-usage.golden
@@ -1,6 +1,6 @@
 🎲🎲🎲 EXIT CODE: 0 🎲🎲🎲
 🟥🟥🟥 STDERR️️ 🟥🟥🟥️
-This API allows you to manage projects.
+Account API
 
 USAGE:
   scw account <command>

diff --git a/cmd/scw/testdata/test-main-usage-usage.golden b/cmd/scw/testdata/test-main-usage-usage.golden
@@ -4,7 +4,7 @@ USAGE:
   scw <command>
 
 AVAILABLE COMMANDS:
-  account       User related data
+  account       Account API
   apple-silicon Apple silicon API
   autocomplete  Autocomplete related commands
   baremetal     Elastic metal API

diff --git a/internal/core/command.go b/internal/core/command.go
@@ -246,7 +246,7 @@ func (c *Commands) GetSortedCommand() []*Command {
 	copy(commands, c.commands)
 
 	sort.Slice(commands, func(i, j int) bool {
-		return fmt.Sprintf("%s %s %s", commands[i].Namespace, commands[i].Resource, commands[i].Verb) < fmt.Sprintf("%s %s %s", commands[j].Namespace, commands[j].Resource, commands[j].Verb)
+		return commands[i].signature() < commands[j].signature()
 	})
 	return commands
 }
@@ -278,3 +278,8 @@ func (c *Command) getHumanMarshalerOpt() *human.MarshalOpt {
 	}
 	return nil
 }
+
+// get a signature to sort commands
+func (c *Command) signature() string {
+	return c.Namespace + " " + c.Resource + " " + c.Verb + " " + c.Short
+}