From a3c52c77611588676b4aff589375b3b0665b33ab Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sun, 7 Apr 2024 16:14:05 +0100 Subject: [PATCH] feat(config): rename propery url as hostname --- server-default.toml | 2 +- src/server/config.rs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server-default.toml b/server-default.toml index 7744392..b11501b 100644 --- a/server-default.toml +++ b/server-default.toml @@ -1,6 +1,6 @@ [forge.default] forge_type = "forgejo" -url = "https://git.example.net" +hostname = "git.example.net" user = "git-next" # the user to perform actions as # API token for user? # path to private SSH key for user? diff --git a/src/server/config.rs b/src/server/config.rs index cd6d8f5..1f20c07 100644 --- a/src/server/config.rs +++ b/src/server/config.rs @@ -6,7 +6,7 @@ use crate::filesystem::FileSystem; #[derive(Debug, PartialEq, Eq, Deserialize)] pub struct Config { forge_type: ForgeType, - url: String, + hostname: String, user: String, // API Token // Private SSH Key Path @@ -29,8 +29,8 @@ impl Config { pub const fn forge_type(&self) -> &ForgeType { &self.forge_type } - pub fn url(&self) -> &str { - self.url.as_str() + pub fn hostname(&self) -> &str { + self.hostname.as_str() } pub fn user(&self) -> &str { self.user.as_str() @@ -50,14 +50,14 @@ mod tests { "git-next-server.toml", r#" forge_type = "ForgeJo" - url = "https://forge.jo" + hostname = "git.example.net" user = "Bob" "#, ) .map_err(OneOf::new)?; let config = Config::load(&fs)?; assert_eq!(config.forge_type(), &ForgeType::ForgeJo); - assert_eq!(config.url(), "https://forge.jo".to_string()); + assert_eq!(config.hostname(), "git.example.net".to_string()); assert_eq!(config.user(), "Bob".to_string()); Ok(())