further work

Author: apiraino

parser/src/command/relabel.rs

@@ -12,7 +12,7 @@ use std::fmt;
 #[derive(Debug, PartialEq, Eq)]
 pub struct RelabelCommand(pub Vec<LabelDelta>);
 
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub enum LabelDelta {
     Add(Label),
     Remove(Label),

parser/src/lib.rs

@@ -2,7 +2,8 @@ pub mod command;
 pub mod error;
 mod ignore_block;
 mod mentions;
-mod token;
+// XXX: is this necessary?
+pub mod token;
 
 pub use ignore_block::replace_all_outside_ignore_blocks;
 pub use mentions::get_mentions;

src/config.rs

@@ -260,27 +260,33 @@ pub(crate) struct RelabelConfig {
 
 impl RelabelConfig {
     pub(crate) fn retrieve_command_from_alias(&self, input: RelabelCommand) -> RelabelCommand {
+        let mut deltas = vec![];
         match &self.configs {
             Some(configs) => {
-                dbg!(&configs);
-                // get only the first token from the command
-                // extract the "alias" from the RelabelCommand
+                // parse all tokens: if one matches an alias, extract the labels
+                // else, it will assumed to be a valid label
                 if input.0.len() > 0 {
-                    let name = input.0.get(0).unwrap();
-                    let name = name.label().as_str();
-                    // check if this alias matches any RelabelRuleConfig key in our config
-                    // extract the labels and build a new command
-                    if configs.contains_key(name) {
-                        let (_alias, cfg) = configs.get_key_value(name).unwrap();
-                        return cfg.to_command();
+                    for tk in input.0.iter() {
+                        let name = tk.label().as_str();
+                        if configs.contains_key(name) {
+                            if let Some((_, cfg)) = configs.get_key_value(name) {
+                                let cmd = cfg.to_command();
+                                for d in cmd.0 {
+                                    deltas.push(d);
+                                }
+                            }
+                        } else {
+                            deltas.push(tk.clone());
+                        }
                     }
                 }
             }
             None => {
+                // nothing to do, return the original command
                 return input;
             }
         };
-        input
+        RelabelCommand(deltas)
     }
 }
 
@@ -807,11 +813,11 @@ mod tests {
 
             [mentions."src/"]
             cc = ["@someone"]
-            
+
             [mentions."target/"]
             message = "This is a message."
             cc = ["@someone"]
-            
+
             [mentions."#[rustc_attr]"]
             type = "content"
             message = "This is a message."
@@ -1080,6 +1086,35 @@ mod tests {
         );
     }
 
+    #[test]
+    fn relabel_alias_config() {
+        let config = r#"
+            [relabel.to-stable]
+            add-labels = ["regression-from-stable-to-stable"]
+            rem-labels = ["regression-from-stable-to-beta", "regression-from-stable-to-nightly"]
+        "#;
+        let config = toml::from_str::<Config>(&config).unwrap();
+
+        let mut relabel_configs = HashMap::new();
+        relabel_configs.insert(
+            "to-stable".into(),
+            RelabelRuleConfig {
+                add_labels: vec!["regression-from-stable-to-stable".to_string()],
+                rem_labels: vec![
+                    "regression-from-stable-to-beta".to_string(),
+                    "regression-from-stable-to-nightly".to_string(),
+                ],
+            },
+        );
+
+        let expected_cfg = RelabelConfig {
+            allow_unauthenticated: vec![],
+            configs: Some(relabel_configs),
+        };
+
+        assert_eq!(config.relabel, Some(expected_cfg));
+    }
+
     #[test]
     fn issue_links_uncanonicalized() {
         let config = r#"

src/github.rs

@@ -1340,9 +1340,6 @@ impl IssuesEvent {
     }
 }
 
-#[derive(Debug, serde::Deserialize)]
-struct PullRequestEventFields {}
-
 #[derive(Debug, serde::Deserialize)]
 pub struct WorkflowRunJob {
     pub name: String,

src/handlers/relabel.rs

@@ -1,7 +1,7 @@
-//! Purpose: Allow any user to modify issue labels on GitHub via comments.
+//! Purpose: Allow any user to modify labels on GitHub issues and pull requests via comments.
 //!
-//! Labels are checked against the labels in the project; the bot does not support creating new
-//! labels.
+//! Labels are checked against the existing set in the git repository; the bot does not support
+//! creating new labels.
 //!
 //! Parsing is done in the `parser::command::relabel` module.
 //!
@@ -27,11 +27,15 @@ pub(super) async fn handle_command(
     input: RelabelCommand,
 ) -> anyhow::Result<()> {
     let Some(issue) = event.issue() else {
-        return user_error!("Can only add and remove labels on an issue");
+        return user_error!("Can only add and remove labels on issues and pull requests");
     };
 
+    // If the input matches a valid alias, read the [relabel] config.
+    // if any alias matches, extract the alias config (RelabelRuleConfig) and build a new RelabelCommand.
+    let new_input = config.retrieve_command_from_alias(input);
+
     // Check label authorization for the current user
-    for delta in &input.0 {
+    for delta in &new_input.0 {
         let name = delta.label().as_str();
         let err = match check_filter(name, config, is_member(&event.user(), &ctx.team).await) {
             Ok(CheckFilterResult::Allow) => None,
@@ -53,7 +57,7 @@ pub(super) async fn handle_command(
     }
 
     // Compute the labels to add and remove
-    let (to_add, to_remove) = compute_label_deltas(&input.0);
+    let (to_add, to_remove) = compute_label_deltas(&new_input.0);
 
     // Add labels
     if let Err(e) = issue.add_labels(&ctx.github, to_add.clone()).await {