Require specifying --userid with sq key userid revoke.

- Change the user ID argument from a position argument in `sq key
    userid revoke` to an argument specified with `--userid`.

NEWS

@@ -27,6 +27,8 @@
      or --revoker`.  When `--cert` is used, and `--output` is not
      specified, the resulting revocation certificate is saved to the
      certificate store.
+   - The user ID argument to `sq key userid revoke` is no longer a
+     positional argument, but must be specified with `--userid`.
 * Changes in 0.36.0
  - Missing
 * Changes in 0.35.0

src/cli/key.rs

@@ -782,6 +782,7 @@ then that key is used to sign the revocation certificate.",
     pub revoker_file: Option<FileOrStdin>,
 
     #[clap(
+        long,
         value_name = "USERID",
         help = "The User ID to revoke",
         long_help =

tests/sq-key-userid.rs

@@ -114,7 +114,7 @@ fn sq_key_userid_revoke() -> Result<()> {
                 "key",
                 "userid",
                 "revoke",
-                userid_revoke,
+                "--userid", userid_revoke,
                 reason_str,
                 message,
             ]);
@@ -326,7 +326,7 @@ fn sq_key_userid_revoke_thirdparty() -> Result<()> {
                 "key",
                 "userid",
                 "revoke",
-                userid_revoke,
+                "--userid", userid_revoke,
                 reason_str,
                 message,
             ]);