Nest CLA Assistant retry command (#5313)

## Summary
- Move `cargo ci retry-cla-assistant` under `cargo ci cla-assistant
retry`.
- Rename the helper module to `cla_assistant.rs`.
- Update the Retry CLA Assistant workflow and generated `cargo ci` docs.

## Verification
- `cargo fmt --all`
- `cargo check -p ci`
- `cargo ci self-docs --check`
- `git diff --check`

Co-authored-by: clockwork-labs-bot <clockwork-labs-bot@users.noreply.github.com>

Author: clockwork-labs-bot

.github/workflows/retry-cla-assistant.yml

@@ -77,6 +77,6 @@ jobs:
         run: |
           while read -r pr_number; do
             if [ -n "${pr_number}" ]; then
-              cargo ci retry-cla-assistant --pr-number "${pr_number}"
+              cargo ci cla-assistant retry --pr-number "${pr_number}"
             fi
           done < "${{ steps.prs.outputs.path }}"

tools/ci/README.md

@@ -254,11 +254,22 @@ Usage: docs
 
 - `--help`: Print help
 
-### `retry-cla-assistant`
+### `cla-assistant`
 
 **Usage:**
 ```bash
-Usage: retry-cla-assistant [OPTIONS] --pr-number <PR_NUMBER>
+Usage: cla-assistant <COMMAND>
+```
+
+**Options:**
+
+- `--help`: Print help
+
+#### `retry`
+
+**Usage:**
+```bash
+Usage: retry [OPTIONS] --pr-number <PR_NUMBER>
 ```
 
 **Options:**
@@ -267,6 +278,17 @@ Usage: retry-cla-assistant [OPTIONS] --pr-number <PR_NUMBER>
 - `--repo <REPO>`: Repository in `owner/name` form. Defaults to GITHUB_REPOSITORY
 - `--help`: Print help
 
+#### `help`
+
+**Usage:**
+```bash
+Usage: help [COMMAND]...
+```
+
+**Options:**
+
+- `subcommand <COMMAND>`: Print help for the subcommand(s)
+
 ### `help`
 
 **Usage:**

tools/ci/src/retry_cla_assistant.rs tools/ci/src/cla_assistant.rstools/ci/src/retry_cla_assistant.rs renamed to tools/ci/src/cla_assistant.rs

@@ -2,16 +2,22 @@ use std::collections::BTreeMap;
 use std::env;
 
 use anyhow::{anyhow, bail, Context, Result};
-use clap::Args;
+use clap::{Args, Subcommand};
 use reqwest::blocking::Client;
 use reqwest::header::{HeaderMap, HeaderValue, ACCEPT, AUTHORIZATION, USER_AGENT};
 use serde::de::DeserializeOwned;
 use serde::Deserialize;
 
 const CLA_CONTEXT: &str = "license/cla";
 
+#[derive(Subcommand)]
+pub(crate) enum ClaAssistantCmd {
+    /// Retries CLA Assistant if `license/cla` is the only remaining PR blocker.
+    Retry(RetryArgs),
+}
+
 #[derive(Args)]
-pub(crate) struct RetryClaAssistantArgs {
+pub(crate) struct RetryArgs {
     /// Pull request number to check.
     #[arg(long)]
     pub(crate) pr_number: u64,
@@ -21,7 +27,13 @@ pub(crate) struct RetryClaAssistantArgs {
     pub(crate) repo: Option<String>,
 }
 
-pub(crate) fn run(args: RetryClaAssistantArgs) -> Result<()> {
+pub(crate) fn run(cmd: ClaAssistantCmd) -> Result<()> {
+    match cmd {
+        ClaAssistantCmd::Retry(args) => retry(args),
+    }
+}
+
+fn retry(args: RetryArgs) -> Result<()> {
     let repo = args
         .repo
         .or_else(|| env::var("GITHUB_REPOSITORY").ok())

tools/ci/src/main.rs

@@ -13,8 +13,8 @@ use std::{env, fs};
 const README_PATH: &str = "tools/ci/README.md";
 
 mod ci_docs;
+mod cla_assistant;
 mod keynote_bench;
-mod retry_cla_assistant;
 mod smoketest;
 mod util;
 
@@ -368,8 +368,11 @@ enum CiCmd {
     VersionUpgradeCheck,
     /// Builds the docs site.
     Docs,
-    /// Retries CLA Assistant if `license/cla` is the only remaining PR blocker.
-    RetryClaAssistant(retry_cla_assistant::RetryClaAssistantArgs),
+    /// Interacts with CLA Assistant.
+    ClaAssistant {
+        #[command(subcommand)]
+        cmd: cla_assistant::ClaAssistantCmd,
+    },
 }
 
 fn run_all_clap_subcommands(skips: &[String]) -> Result<()> {
@@ -775,8 +778,8 @@ fn main() -> Result<()> {
             run_docs_build()?;
         }
 
-        Some(CiCmd::RetryClaAssistant(args)) => {
-            retry_cla_assistant::run(args)?;
+        Some(CiCmd::ClaAssistant { cmd }) => {
+            cla_assistant::run(cmd)?;
         }
 
         None => run_all_clap_subcommands(&cli.skip)?,