From 42647c89062168851438f861bb84c7f6e14440f5 Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Sun, 12 Nov 2017 17:47:32 +0100
Subject: find_and_track_build_and_update_status(): Pass in configuration

Pass logins & tokens for API communication into this function. Since
this is the entry point into everything else, it seemed to make sense to
have it be the thing that took the config.

Ended up not making a Config struct to be simple. I guess.
---
 src/jenkins.rs | 9 +++++++--
 src/main.rs    | 8 +++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/jenkins.rs b/src/jenkins.rs
index 3269653..6bc1d8d 100644
--- a/src/jenkins.rs
+++ b/src/jenkins.rs
@@ -80,8 +80,13 @@ impl Job {
     }
 }
 
-pub fn find_and_track_build_and_update_status(commit_ref: CommitRef)
-    -> Result<(), Box<Error>> {
+pub fn find_and_track_build_and_update_status(
+    commit_ref: CommitRef,
+    jenkins_url: &String,
+    jenkins_user_id: &String,
+    jenkins_token: &String,
+    github_token: &String,
+) -> Result<(), Box<Error>> {
     let jobs = get_jobs(commit_ref.repo.as_ref())?;
     let t20_minutes = 60 * 20;
 
diff --git a/src/main.rs b/src/main.rs
index 98bd5e5..b03b963 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -103,7 +103,13 @@ fn main() {
                             Err(_) => return internal_server_error(),
                         };
 
-                        match jenkins::find_and_track_build_and_update_status(commit_ref) {
+                        match jenkins::find_and_track_build_and_update_status(
+                            commit_ref,
+                            &jenkins_url,
+                            &jenkins_user_id,
+                            &jenkins_token,
+                            &github_token,
+                        ) {
                             Ok(_) => {},
                             Err(_) => return internal_server_error(),
                         };
-- 
cgit v1.2.3