Central github structs

Author: augustuswm

Cargo.lock

@@ -156,6 +156,7 @@ pub struct GitHubConfig {
     pub owner: String,
     pub path: String,
     pub repo: String,
+    pub default_branch: String,
 }
 
 #[derive(Debug, Deserialize)]

rfd-api/src/config.rs

@@ -336,6 +336,7 @@ impl ApiContext {
                 services.github.owner,
                 services.github.repo,
                 services.github.path,
+                services.github.default_branch,
             )
             .await?,
         })
@@ -2083,6 +2084,7 @@ pub(crate) mod test_mocks {
                     owner: String::new(),
                     repo: String::new(),
                     path: String::new(),
+                    default_branch: String::new(),
                     auth: GitHubAuthConfig::User {
                         token: String::default(),
                     },

rfd-api/src/context.rs

@@ -3,12 +3,7 @@
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 use std::{
-    borrow::Cow,
-    collections::HashMap,
-    fmt::Debug,
-    future::Future,
-    pin::Pin,
-    str::{from_utf8, Utf8Error},
+    borrow::Cow, collections::HashMap, fmt::Debug, future::Future, pin::Pin, str::{from_utf8, Utf8Error}
 };
 
 use base64::{prelude::BASE64_STANDARD, DecodeError, Engine};
@@ -75,10 +70,11 @@ impl GitHubRfdRepo {
         owner: String,
         repo: String,
         path: String,
+        default_branch: String
     ) -> Result<Self, GitHubError> {
         Ok(Self {
             client: client.clone(),
-            default_branch: client.repos().get(&owner, &repo).await?.body.default_branch,
+            default_branch,
             owner,
             repo,
             path,

rfd-github/src/lib.rs

@@ -28,6 +28,7 @@ reqwest-middleware = { workspace = true }
 reqwest-retry = { workspace = true }
 reqwest-tracing = { workspace = true }
 rfd-data = { path = "../rfd-data" }
+rfd-github = { path = "../rfd-github" }
 rfd-model = { path = "../rfd-model" }
 rsa = { workspace = true }
 serde = { workspace = true }

rfd-processor/Cargo.toml

@@ -7,6 +7,7 @@ use std::{borrow::Cow, env, io, path::PathBuf, str::Utf8Error, string::FromUtf8E
 use async_trait::async_trait;
 use base64::DecodeError;
 use octorust::Client;
+use rfd_github::{GitHubError, GitHubRfdLocation};
 use rfd_data::{
     content::{RfdAsciidoc, RfdContent, RfdDocument, RfdMarkdown},
     RfdNumber,
@@ -19,7 +20,6 @@ use tracing::instrument;
 use uuid::Uuid;
 
 use crate::{
-    github::{GitHubError, GitHubRfdLocation},
     pdf::RfdPdf,
     util::{decode_base64, write_file, FileIoError},
 };

rfd-processor/src/content/mod.rs

@@ -16,6 +16,7 @@ use octorust::{
     Client as GitHubClient, ClientError,
 };
 use reqwest::Error as ReqwestError;
+use rfd_github::{GitHubError, GitHubRfdRepo};
 use rfd_model::{schema_ext::PdfSource, storage::postgres::PostgresStore};
 use rsa::{
     pkcs1::{DecodeRsaPrivateKey, EncodeRsaPrivateKey},
@@ -26,7 +27,6 @@ use thiserror::Error;
 use tracing::instrument;
 
 use crate::{
-    github::{GitHubError, GitHubRfdRepo},
     pdf::{PdfFileLocation, PdfStorage, RfdPdf, RfdPdfError},
     search::RfdSearchIndex,
     updater::{BoxedAction, RfdUpdateMode, RfdUpdaterError},
@@ -130,6 +130,7 @@ impl Context {
             config.source.owner.clone(),
             config.source.repo.clone(),
             config.source.path.clone(),
+            config.source.default_branch.clone(),
         )
         .await?;