From 30de4a79275536a6c4da1be6a194da0ab9fcde7e Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 9 Aug 2018 15:37:52 -0400
Subject: [PATCH] request-id is not optional now

---
 ofborg/src/message/buildresult.rs | 2 +-
 ofborg/src/tasks/build.rs         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ofborg/src/message/buildresult.rs b/ofborg/src/message/buildresult.rs
index 2eea547..5038051 100644
--- a/ofborg/src/message/buildresult.rs
+++ b/ofborg/src/message/buildresult.rs
@@ -17,7 +17,7 @@ pub struct BuildResult {
     pub system: String,
     pub output: Vec<String>,
     pub attempt_id: String,
-    pub request_id: Option<String>,
+    pub request_id: String,
     pub success: Option<bool>, // replaced by status
     pub status: Option<BuildStatus>,
     pub skipped_attrs: Option<Vec<String>>,
diff --git a/ofborg/src/tasks/build.rs b/ofborg/src/tasks/build.rs
index b84057b..e594280 100644
--- a/ofborg/src/tasks/build.rs
+++ b/ofborg/src/tasks/build.rs
@@ -118,7 +118,7 @@ impl<'a, 'b> JobActions<'a, 'b> {
             system: self.system.clone(),
             output: vec![String::from("Merge failed")],
             attempt_id: self.attempt_id.clone(),
-            request_id: Some(self.job.request_id.clone()),
+            request_id: self.job.request_id.clone(),
             attempted_attrs: None,
             skipped_attrs: None,
             status: Some(BuildStatus::Failure),
@@ -202,7 +202,7 @@ impl<'a, 'b> JobActions<'a, 'b> {
             system: self.system.clone(),
             output: self.log_snippet(),
             attempt_id: self.attempt_id.clone(),
-            request_id: Some(self.job.request_id.clone()),
+            request_id: self.job.request_id.clone(),
             skipped_attrs: Some(not_attempted_attrs),
             attempted_attrs: None,
             status: None,
@@ -243,7 +243,7 @@ impl<'a, 'b> JobActions<'a, 'b> {
             system: self.system.clone(),
             output: self.log_snippet(),
             attempt_id: self.attempt_id.clone(),
-            request_id: Some(self.job.request_id.clone()),
+            request_id: self.job.request_id.clone(),
             status: Some(status),
             success: Some(success),
             attempted_attrs: Some(attempted_attrs),