From 74e2641f5a9d8d99f6d50b57d61c200f6f5f5f28 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 9 Aug 2018 16:43:46 -0400
Subject: [PATCH] request IDs aren't optional anymore

---
 ofborg/src/tasks/githubcommentposter.rs   | 16 ++++++++--------
 ofborg/src/tasks/log_message_collector.rs |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ofborg/src/tasks/githubcommentposter.rs b/ofborg/src/tasks/githubcommentposter.rs
index 6449415..fd0edcb 100644
--- a/ofborg/src/tasks/githubcommentposter.rs
+++ b/ofborg/src/tasks/githubcommentposter.rs
@@ -195,7 +195,7 @@ mod tests {
                 "/nix/store/pcja75y9isdvgz5i00pkrpif9rxzxc29-gdb-8.1".to_owned(),
             ],
             attempt_id: "neatattemptid".to_owned(),
-            request_id: Some("bogus-request-id".to_owned()),
+            request_id: "bogus-request-id".to_owned(),
             system: "x86_64-linux".to_owned(),
             attempted_attrs: Some(vec!["foo".to_owned()]),
             skipped_attrs: Some(vec!["bar".to_owned()]),
@@ -258,7 +258,7 @@ patching script interpreter paths in /nix/store/pcja75y9isdvgz5i00pkrpif9rxzxc29
                 "/nix/store/pcja75y9isdvgz5i00pkrpif9rxzxc29-gdb-8.1".to_owned(),
             ],
             attempt_id: "neatattemptid".to_owned(),
-            request_id: Some("bogus-request-id".to_owned()),
+            request_id: "bogus-request-id".to_owned(),
             system: "x86_64-linux".to_owned(),
             attempted_attrs: Some(vec!["foo".to_owned()]),
             skipped_attrs: None,
@@ -318,7 +318,7 @@ patching script interpreter paths in /nix/store/pcja75y9isdvgz5i00pkrpif9rxzxc29
                 "error: build of '/nix/store/l1limh50lx2cx45yb2gqpv7k8xl1mik2-gdb-8.1.drv' failed".to_owned(),
             ],
             attempt_id: "neatattemptid".to_owned(),
-            request_id: Some("bogus-request-id".to_owned()),
+            request_id: "bogus-request-id".to_owned(),
             system: "x86_64-linux".to_owned(),
             attempted_attrs: Some(vec!["foo".to_owned()]),
             skipped_attrs: None,
@@ -378,7 +378,7 @@ error: build of '/nix/store/l1limh50lx2cx45yb2gqpv7k8xl1mik2-gdb-8.1.drv' failed
                 "/nix/store/pcja75y9isdvgz5i00pkrpif9rxzxc29-gdb-8.1".to_owned(),
             ],
             attempt_id: "neatattemptid".to_owned(),
-            request_id: Some("bogus-request-id".to_owned()),
+            request_id: "bogus-request-id".to_owned(),
             system: "x86_64-linux".to_owned(),
             attempted_attrs: None,
             skipped_attrs: None,
@@ -437,7 +437,7 @@ patching script interpreter paths in /nix/store/pcja75y9isdvgz5i00pkrpif9rxzxc29
                 "/nix/store/pcja75y9isdvgz5i00pkrpif9rxzxc29-gdb-8.1".to_owned(),
             ],
             attempt_id: "neatattemptid".to_owned(),
-            request_id: Some("bogus-request-id".to_owned()),
+            request_id: "bogus-request-id".to_owned(),
             system: "x86_64-linux".to_owned(),
             attempted_attrs: None,
             skipped_attrs: None,
@@ -485,7 +485,7 @@ patching script interpreter paths in /nix/store/pcja75y9isdvgz5i00pkrpif9rxzxc29
             },
             output: vec!["foo".to_owned()],
             attempt_id: "foo".to_owned(),
-            request_id: Some("bogus-request-id".to_owned()),
+            request_id: "bogus-request-id".to_owned(),
             system: "x86_64-linux".to_owned(),
             attempted_attrs: None,
             skipped_attrs: Some(vec!["not-attempted".to_owned()]),
@@ -526,7 +526,7 @@ foo
             },
             output: vec![],
             attempt_id: "foo".to_owned(),
-            request_id: Some("bogus-request-id".to_owned()),
+            request_id: "bogus-request-id".to_owned(),
             system: "x86_64-linux".to_owned(),
             attempted_attrs: None,
             skipped_attrs: Some(vec!["not-attempted".to_owned()]),
@@ -572,7 +572,7 @@ No partial log is available.
                 "/nix/store/pcja75y9isdvgz5i00pkrpif9rxzxc29-gdb-8.1".to_owned(),
             ],
             attempt_id: "neatattemptid".to_owned(),
-            request_id: Some("bogus-request-id".to_owned()),
+            request_id: "bogus-request-id".to_owned(),
             system: "x86_64-linux".to_owned(),
             attempted_attrs: Some(vec!["foo".to_owned()]),
             skipped_attrs: Some(vec!["bar".to_owned()]),
diff --git a/ofborg/src/tasks/log_message_collector.rs b/ofborg/src/tasks/log_message_collector.rs
index e63a595..5536078 100644
--- a/ofborg/src/tasks/log_message_collector.rs
+++ b/ofborg/src/tasks/log_message_collector.rs
@@ -445,7 +445,7 @@ mod tests {
                                                system: "x86_64-linux".to_owned(),
                                                output: vec![],
                                                attempt_id: "attempt-id-foo".to_owned(),
-                                               request_id: Some("bogus-request-id".to_owned()),
+                                               request_id: "bogus-request-id".to_owned(),
                                                status: Some(BuildStatus::Success),
                                                success: Some(true),
                                                attempted_attrs: Some(vec!["foo".to_owned()]),