Merge pull request #7 from trunk-io/eli/more-detail

MergeQueue Tool Updates for content

.trunk/trunk.yaml

@@ -22,6 +22,10 @@ actions:
     - trunk-fmt-pre-commit
     - trunk-upgrade-available
 
+lint:
+  enabled:
+    - [email protected]
+
 tools:
   enabled:
     - [email protected]

src/github.rs

@@ -31,7 +31,7 @@ pub struct Event {
 pub struct PullRequest {
     pub number: u32,
     pub head: Head,
-    pub body: String,
+    pub body: Option<String>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]

src/main.rs

@@ -238,18 +238,22 @@ fn create_pull_request(
     }
 
     let mut body = config.pullrequest.body.to_string();
-    body.push_str("\n\n[test]");
-    body.push_str(&format!("\nflake rate: {}", config.test.flake_rate));
+    body.push_str("\n\n[test]\n");
+    body.push_str(&format!("flake rate: {}\n", config.test.flake_rate));
     body.push_str(&format!(
-        "\nlogical conflict every: {}",
+        "logical conflict every: {}\n",
         config.pullrequest.logical_conflict_every
     ));
     body.push_str(&format!(
-        "\nsleep for: {}s",
+        "sleep for: {}s\n",
         config.sleep_duration().as_secs()
     ));
     body.push_str(&format!(
-        "\n\n[pullrequest]\nrequests per hour: {}",
+        "close stale after: {}\n",
+        config.pullrequest.close_stale_after
+    ));
+    body.push_str(&format!(
+        "\n\n[pullrequest]\nrequests per hour: {}\n",
         config.pullrequest.requests_per_hour
     ));
 

src/trunk.rs

@@ -8,12 +8,17 @@ use std::fs;
 
 pub fn upload_targets(config: &Conf, cli: &Cli, github_json_path: &str) {
     let github_json = fs::read_to_string(github_json_path).expect("Failed to read file");
-
     let ga = GitHubAction::from_json(&github_json);
-    let re = Regex::new(r".*deps=\[(.*?)\].*").unwrap();
 
+    if !&ga.event.pull_request.body.is_some() {
+        // no body content to pull deps from
+        return;
+    }
+
+    let re = Regex::new(r".*deps=\[(.*?)\].*").unwrap();
+    let body = ga.event.pull_request.body.clone().unwrap();
     let mut impacted_targets: Vec<String> = Vec::new();
-    if let Some(caps) = re.captures(&ga.event.pull_request.body) {
+    if let Some(caps) = re.captures(&body) {
         impacted_targets = caps[1]
             .split(',')
             .map(|s| s.trim().to_owned())