sq: Assign ordering of wkd subcommands.

2 files changed, 25 insertions, 24 deletions

diff --git a/sq/sq-usage.md b/sq/sq-usage.md
index de8fab08..392ed1be 100644
--- a/sq/sq-usage.md
+++ b/sq/sq-usage.md
@@ -1360,37 +1360,22 @@ USAGE:
     sq wkd [OPTIONS] <SUBCOMMAND>
 
 OPTIONS:
-    -h, --help
-            Print help information
-
     -n, --network-policy <NETWORK-POLICY>
             Sets the network policy to use [default: encrypted] [possible
             values: offline, anonymized, encrypted, insecure]
 
+    -h, --help
+            Print help information
+
 SUBCOMMANDS:
-    direct-url    Prints the direct Web Key Directory URL of an email
-                      address.
     generate      Generates a Web Key Directory for the given domain and
                       keys.
     get           Queries for certs using Web Key Directory
-    help          Print this message or the help of the given subcommand(s)
+    direct-url    Prints the direct Web Key Directory URL of an email
+                      address.
     url           Prints the advanced Web Key Directory URL of an email
                       address.
-```
-
-### Subcommand wkd direct-url
-
-```text
-Prints the direct Web Key Directory URL of an email address.
-
-USAGE:
-    sq wkd direct-url <ADDRESS>
-
-ARGS:
-    <ADDRESS>    Queries for ADDRESS
-
-OPTIONS:
-    -h, --help    Print help information
+    help          Print this message or the help of the given subcommand(s)
 ```
 
 ### Subcommand wkd generate
@@ -1462,6 +1447,21 @@ OPTIONS:
     -o, --output <FILE>    Writes to FILE or stdout if omitted
 ```
 
+### Subcommand wkd direct-url
+
+```text
+Prints the direct Web Key Directory URL of an email address.
+
+USAGE:
+    sq wkd direct-url <ADDRESS>
+
+ARGS:
+    <ADDRESS>    Queries for ADDRESS
+
+OPTIONS:
+    -h, --help    Print help information
+```
+
 ### Subcommand wkd url
 
 ```text
diff --git a/sq/src/sq_cli.rs b/sq/src/sq_cli.rs
index dcf122bc..b877826c 100644
--- a/sq/src/sq_cli.rs
+++ b/sq/src/sq_cli.rs
@@ -2258,6 +2258,7 @@ pub struct KeyAttestCertificationsCommand {
     about = "Interacts with Web Key Directories",
     subcommand_required = true,
     arg_required_else_help = true,
+    setting(clap::AppSettings::DeriveDisplayOrder),
 )]
 pub struct WkdCommand {
     #[clap(
@@ -2275,10 +2276,10 @@ pub struct WkdCommand {
 
 #[derive(Debug, Subcommand)]
 pub enum WkdSubcommands {
-    Url(WkdUrlCommand),
-    DirectUrl(WkdDirectUrlCommand),
-    Get(WkdGetCommand),
     Generate(WkdGenerateCommand),
+    Get(WkdGetCommand),
+    DirectUrl(WkdDirectUrlCommand),
+    Url(WkdUrlCommand),
 }
 
 #[derive(Debug, Args)]