NixOS · Nov 30, 2018 · Nov 30, 2018 · Nov 30, 2018 · Nov 30, 2018
Showing with 611 additions and 14 deletions.

+39 −6 ofborg/Cargo.lock

+4 −3 ofborg/Cargo.toml

+1 −1 ofborg/src/bin/github-comment-poster.rs

+28 −2 ofborg/src/config.rs

+539 −2 ofborg/src/tasks/githubcommentposter.rs
diff --git a/ofborg/Cargo.lock b/ofborg/Cargo.lock
diff --git a/ofborg/Cargo.toml b/ofborg/Cargo.toml
@@ -19,13 +19,14 @@ serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 tempfile = "2.2.0"
-hubcaps = { git = "https://github.com/grahamc/hubcaps.git" }
-# hubcaps = { path = "./hubcaps/" } # for testing patches
+hubcaps = { git = "https://github.com/grahamc/hubcaps.git", tag = "0.3.9.3" }
+#hubcaps = { path = "../hubcaps/" } # for testing patches
 hyper = "0.10.*"
 hyper-native-tls = "0.2.4"
 lru-cache = "0.1.1"
 nom = "4.0.0-beta3"
 sys-info = "0.5.6"
 
-#[patch.crates-io]
+[patch.crates-io]
+hubcaps = { path = "../hubcaps" }
 #amq-proto = { path = "rust-amq-proto" }
diff --git a/ofborg/src/bin/github-comment-poster.rs b/ofborg/src/bin/github-comment-poster.rs
@@ -64,7 +64,7 @@ fn main() {
     channel
         .consume(
             worker::new(tasks::githubcommentposter::GitHubCommentPoster::new(
-                cfg.github(),
+                cfg.github_app(),
             )),
             easyamqp::ConsumeConfig {
                 queue: "build-results".to_owned(),

diff --git a/ofborg/src/config.rs b/ofborg/src/config.rs
@@ -1,11 +1,11 @@
 use serde_json;
 use std::fs::File;
-use std::path::Path;
+use std::path::{Path, PathBuf};
 use std::io::Read;
 use hyper::Client;
 use hyper::net::HttpsConnector;
 use hyper_native_tls::NativeTlsClient;
-use hubcaps::{Credentials, Github};
+use hubcaps::{Credentials, Github, InstallationTokenGenerator, JWTCredentials};
 use nix::Nix;
 use std::collections::HashMap;
 
@@ -20,6 +20,7 @@ pub struct Config {
     pub nix: NixConfig,
     pub rabbitmq: RabbitMQConfig,
     pub github: Option<GithubConfig>,
+    pub github_app: Option<GithubAppConfig>,
     pub log_storage: Option<LogStorage>,
     pub tag_paths: Option<HashMap<String, Vec<String>>>,
 }
@@ -51,6 +52,13 @@ pub struct GithubConfig {
     pub token: String,
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct GithubAppConfig {
+    pub app_id: i32,
+    pub installation_id: i32,
+    pub private_key: PathBuf,
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct LogStorage {
     pub path: String,
@@ -105,6 +113,24 @@ impl Config {
         )
     }
 
+    pub fn github_app(&self) -> Github {
+        let conf = self.github_app.clone().unwrap();
+        Github::new(
+            "github.com/grahamc/ofborg (app)",
+            // tls configured hyper client
+            Client::with_connector(HttpsConnector::new(NativeTlsClient::new().unwrap())),
+            Credentials::InstallationToken(
+                InstallationTokenGenerator::new(
+                    conf.installation_id,
+                    JWTCredentials::new(
+                        conf.app_id,
+                        conf.private_key
+                    )
+                )
+            )
+        )
+    }
+
     pub fn nix(&self) -> Nix {
         if self.nix.build_timeout_seconds < 1200 {
             error!(