Use an enum for GitProvider instead of trait (#16)

Author: SRv6d

Cargo.lock

@@ -6,7 +6,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-async-trait = "0.1.79"
 chrono = "0.4.37"
 clap = { version = "4.5.4", features = ["derive", "env", "string"] }
 figment = { version = "0.10.16", features = ["toml"] }

Cargo.toml

@@ -7,6 +7,4 @@ mod allowed_signers;
 pub mod cli;
 mod config;
 mod core;
-mod github;
-mod gitlab;
 mod provider;

src/lib.rs

@@ -0,0 +1,22 @@
+use super::{github::Github, gitlab::Gitlab};
+use crate::SshPublicKey;
+
+/// A Git provider.
+#[derive(Debug)]
+pub enum GitProvider<'a> {
+    Github(Github<'a>),
+    Gitlab(Gitlab<'a>),
+}
+
+impl GitProvider<'_> {
+    /// Get the public keys of a user by their username.
+    async fn get_keys_by_username(
+        &self,
+        username: &str,
+    ) -> Result<Vec<SshPublicKey>, reqwest::Error> {
+        match self {
+            Self::Github(provider) => provider.get_keys_by_username(username).await,
+            Self::Gitlab(provider) => provider.get_keys_by_username(username).await,
+        }
+    }
+}

src/provider.rs

@@ -1,29 +1,23 @@
-use crate::{GitProvider, SshPublicKey, USER_AGENT};
-use async_trait::async_trait;
+use crate::{SshPublicKey, USER_AGENT};
 use reqwest::{Client, Result, Url};
 
 #[derive(Debug)]
-pub struct Api<'a> {
+pub struct Github<'a> {
     /// The base URL of the API.
     base_url: Url,
     /// The client used to make requests to the API.
     client: &'a Client,
 }
 
-impl Api<'_> {
+impl Github<'_> {
     const VERSION: &'static str = "2022-11-28";
     const ACCEPT_HEADER: &'static str = "application/vnd.github+json";
-}
-
-#[async_trait]
-impl GitProvider for Api<'_> {
-    type Err = reqwest::Error;
 
     /// Get the signing keys of a user by their username.
     ///
     /// # API documentation
     /// https://docs.github.com/en/rest/users/ssh-signing-keys?apiVersion=2022-11-28#list-ssh-signing-keys-for-a-user
-    async fn get_keys_by_username(&self, username: &str) -> Result<Vec<SshPublicKey>> {
+    pub async fn get_keys_by_username(&self, username: &str) -> Result<Vec<SshPublicKey>> {
         let url = self
             .base_url
             .join(&format!("/users/{username}/ssh_signing_keys"))
@@ -63,7 +57,7 @@ mod tests {
         });
 
         let client = Client::new();
-        let api = Api {
+        let api = Github {
             base_url: server.base_url().parse().unwrap(),
             client: &client,
         };
@@ -118,7 +112,7 @@ mod tests {
         });
 
         let client = Client::new();
-        let api = Api {
+        let api = Github {
             base_url: server.base_url().parse().unwrap(),
             client: &client,
         };

src/provider/core.rs

@@ -1,30 +1,24 @@
-use crate::{GitProvider, SshPublicKey, USER_AGENT};
-use async_trait::async_trait;
+use crate::{SshPublicKey, USER_AGENT};
 use reqwest::{Client, Result, Url};
 use serde::Deserialize;
 
 #[derive(Debug)]
-pub struct Api<'a> {
+pub struct Gitlab<'a> {
     /// The base URL of the API.
     base_url: Url,
     /// The client used to make requests to the API.
     client: &'a Client,
 }
 
-impl Api<'_> {
+impl Gitlab<'_> {
     const VERSION: &'static str = "v4";
     const ACCEPT_HEADER: &'static str = "application/json";
-}
-
-#[async_trait]
-impl GitProvider for Api<'_> {
-    type Err = reqwest::Error;
 
     /// Get the signing keys of a user by their username.
     ///
     /// # API documentation
     /// https://docs.gitlab.com/16.10/ee/api/users.html#list-ssh-keys-for-user
-    async fn get_keys_by_username(&self, username: &str) -> Result<Vec<SshPublicKey>> {
+    pub async fn get_keys_by_username(&self, username: &str) -> Result<Vec<SshPublicKey>> {
         let url = self
             .base_url
             .join(&format!(
@@ -106,7 +100,7 @@ mod tests {
         });
 
         let client = Client::new();
-        let api = Api {
+        let api = Gitlab {
             base_url: server.base_url().parse().unwrap(),
             client: &client,
         };
@@ -166,7 +160,7 @@ mod tests {
         });
 
         let client = Client::new();
-        let api = Api {
+        let api = Gitlab {
             base_url: server.base_url().parse().unwrap(),
             client: &client,
         };

src/github.rs src/provider/github.rs

@@ -0,0 +1,5 @@
+pub use core::GitProvider;
+
+mod core;
+mod github;
+mod gitlab;