Merge pull request #1370 from rylev/fix-commit-extraction

Fix commit extraction for rust-timer commands

Author: Mark-Simulacrum

site/src/request_handlers/github.rs

@@ -7,17 +7,17 @@ use crate::load::SiteCtxt;
 
 use std::sync::Arc;
 
-use regex::Regex;
+use regex::{Captures, Regex};
 
 lazy_static::lazy_static! {
     static ref BODY_TRY_COMMIT: Regex =
         Regex::new(r#"(?:\W|^)@rust-timer\s+build\s+(\w+)(?:\W|$)(?:include=(\S+))?\s*(?:exclude=(\S+))?\s*(?:runs=(\d+))?"#).unwrap();
     static ref BODY_QUEUE: Regex =
         Regex::new(r#"(?:\W|^)@rust-timer\s+queue(?:\W|$)(?:include=(\S+))?\s*(?:exclude=(\S+))?\s*(?:runs=(\d+))?"#).unwrap();
     static ref BODY_MAKE_PR_FOR: Regex =
-        Regex::new(r#"(?:\W|^)@rust-timer\s+make-pr-for\s+(\w+)(?:\W|$)"#).unwrap();
+        Regex::new(r#"(?:\W|^)@rust-timer\s+make-pr-for\s+([\w:/\.\-]+)(?:\W|$)"#).unwrap();
     static ref BODY_UDPATE_PR_FOR: Regex =
-        Regex::new(r#"(?:\W|^)@rust-timer\s+update-branch-for\s+(\w+)(?:\W|$)"#).unwrap();
+        Regex::new(r#"(?:\W|^)@rust-timer\s+update-branch-for\s+([\w:/\.\-]+)(?:\W|$)"#).unwrap();
 }
 
 pub async fn handle_github(
@@ -86,50 +86,93 @@ pub async fn handle_github(
         }
     }
 
-    let captures = BODY_MAKE_PR_FOR
-        .captures_iter(&request.comment.body)
-        .collect::<Vec<_>>();
-    for capture in captures {
-        if let Some(rollup_merge) = capture.get(1).map(|c| c.as_str().to_owned()) {
-            let rollup_merge =
-                rollup_merge.trim_start_matches("https://github.com/rust-lang/rust/commit/");
-            let client = reqwest::Client::new();
-            pr_and_try_for_rollup(
-                &client,
-                ctxt.clone(),
-                &request.issue.repository_url,
-                &rollup_merge,
-                &request.comment.html_url,
-            )
-            .await
-            .map_err(|e| format!("{:?}", e))?;
-        }
+    for rollup_merge in extract_make_pr_for(&request.comment.body) {
+        let client = reqwest::Client::new();
+        pr_and_try_for_rollup(
+            &client,
+            ctxt.clone(),
+            &request.issue.repository_url,
+            &rollup_merge,
+            &request.comment.html_url,
+        )
+        .await
+        .map_err(|e| format!("{:?}", e))?;
     }
 
-    let captures = BODY_UDPATE_PR_FOR
-        .captures_iter(&request.comment.body)
-        .collect::<Vec<_>>();
-    for capture in captures {
-        if let Some(rollup_merge) = capture.get(1).map(|c| c.as_str().to_owned()) {
-            let rollup_merge =
-                rollup_merge.trim_start_matches("https://github.com/rust-lang/rust/commit/");
-
-            // This just creates or updates the branch for this merge commit.
-            // Intended for resolving the race condition of master merging in
-            // between us updating the commit and merging things.
-            let client = reqwest::Client::new();
-            let branch =
-                branch_for_rollup(&client, &ctxt, &request.issue.repository_url, rollup_merge)
-                    .await
-                    .map_err(|e| e.to_string())?;
-            post_comment(
-                &ctxt.config,
-                request.issue.number,
-                &format!("Master base SHA: {}", branch.master_base_sha),
-            )
-            .await;
-        }
+    for rollup_merge in extract_update_pr_for(&request.comment.body) {
+        // This just creates or updates the branch for this merge commit.
+        // Intended for resolving the race condition of master merging in
+        // between us updating the commit and merging things.
+        let client = reqwest::Client::new();
+        let branch = branch_for_rollup(&client, &ctxt, &request.issue.repository_url, rollup_merge)
+            .await
+            .map_err(|e| e.to_string())?;
+        post_comment(
+            &ctxt.config,
+            request.issue.number,
+            &format!("Master base SHA: {}", branch.master_base_sha),
+        )
+        .await;
     }
 
     Ok(github::Response)
 }
+
+fn extract_make_pr_for(body: &str) -> impl Iterator<Item = &str> + '_ {
+    BODY_MAKE_PR_FOR
+        .captures_iter(body)
+        .filter_map(|c| extract_rollup_merge(c))
+}
+
+fn extract_update_pr_for(body: &str) -> impl Iterator<Item = &str> + '_ {
+    BODY_UDPATE_PR_FOR
+        .captures_iter(body)
+        .filter_map(|c| extract_rollup_merge(c))
+}
+
+fn extract_rollup_merge(capture: Captures) -> Option<&str> {
+    capture.get(1).map(|c| {
+        println!("{}", c.as_str());
+        c.as_str()
+            .trim_start_matches("https://github.com/rust-lang/rust/commit/")
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn captures_the_right_sha() {
+        let message = r#"This is a message.
+
+        @rust-timer make-pr-for https://github.com/rust-lang/rust/commit/857afc75e6ca69cc7dcae36a6fac8c093ee6fa31
+        @rust-timer make-pr-for https://github.com/rust-lang/rust/commit/857afc75e6ca69cc7dcae36a6fac8c093ee6fa31
+        "#;
+
+        let mut iter = extract_make_pr_for(message);
+        assert_eq!(
+            iter.next().unwrap(),
+            "857afc75e6ca69cc7dcae36a6fac8c093ee6fa31",
+            "sha did not match"
+        );
+        assert_eq!(
+            iter.next().unwrap(),
+            "857afc75e6ca69cc7dcae36a6fac8c093ee6fa31",
+            "sha did not match"
+        );
+        assert!(iter.next().is_none(), "there were more rollup merges");
+        let message = r#"This is a message.
+
+        @rust-timer update-branch-for https://github.com/rust-lang/rust/commit/857afc75e6ca69cc7dcae36a6fac8c093ee6fa31"#;
+
+        let mut iter = extract_update_pr_for(message);
+        let sha = iter.next().unwrap();
+        println!("{sha}");
+        assert_eq!(
+            sha, "857afc75e6ca69cc7dcae36a6fac8c093ee6fa31",
+            "sha did not match"
+        );
+        assert!(iter.next().is_none(), "there were more rollup merges");
+    }
+}