Rename GitProvider to GitProviderType and move it to config module

Author: SRv6d

src/cli/manage_sources.rs

@@ -1,4 +1,4 @@
-use crate::GitProvider;
+use crate::config;
 use clap::Subcommand;
 
 #[derive(Debug, Subcommand)]
@@ -9,7 +9,7 @@ pub enum ManageSources {
         name: String,
         /// The Git provider used by the source.
         #[arg(short, long)]
-        provider: GitProvider,
+        provider: config::GitProviderType,
         /// The URL of the source.
         #[arg(short, long)]
         url: Option<reqwest::Url>,

src/config.rs

@@ -1,4 +1,3 @@
-use crate::GitProvider;
 use figment::{
     providers::{Format, Serialized, Toml},
     Figment,
@@ -31,12 +30,12 @@ impl Default for Config {
             sources: Some(vec![
                 Source {
                     name: "github".to_string(),
-                    provider: GitProvider::Github,
+                    provider: GitProviderType::Github,
                     url: "https://api.github.com".to_string(),
                 },
                 Source {
                     name: "gitlab".to_string(),
-                    provider: GitProvider::Gitlab,
+                    provider: GitProviderType::Gitlab,
                     url: "https://gitlab.com".to_string(),
                 },
             ]),
@@ -83,6 +82,16 @@ fn git_allowed_signers() -> Option<PathBuf> {
     Some(path.into())
 }
 
+/// The type of Git provider.
+#[derive(Debug, Clone, Copy, Deserialize, Serialize, PartialEq, Eq, clap::ValueEnum)]
+#[serde(rename_all = "lowercase")]
+pub enum GitProviderType {
+    /// A Git provider that implements the GitHub API.
+    Github,
+    /// A Git provider that implements the GitLab API.
+    Gitlab,
+}
+
 #[derive(Debug, Deserialize, Serialize, PartialEq)]
 struct User {
     name: String,
@@ -98,7 +107,7 @@ struct Organization {
 #[derive(Debug, Deserialize, Serialize, PartialEq)]
 struct Source {
     name: String,
-    provider: GitProvider,
+    provider: GitProviderType,
     url: String,
 }
 
@@ -168,17 +177,17 @@ mod tests {
             sources: Some(vec![
                 Source {
                     name: "github".to_string(),
-                    provider: GitProvider::Github,
+                    provider: GitProviderType::Github,
                     url: "https://api.github.com".to_string(),
                 },
                 Source {
                     name: "gitlab".to_string(),
-                    provider: GitProvider::Gitlab,
+                    provider: GitProviderType::Gitlab,
                     url: "https://gitlab.com".to_string(),
                 },
                 Source {
                     name: "acme-corp".to_string(),
-                    provider: GitProvider::Gitlab,
+                    provider: GitProviderType::Gitlab,
                     url: "https://git.acme.corp".to_string(),
                 },
             ])

src/core.rs

@@ -30,11 +30,3 @@ pub trait GetPublicKeys {
     /// Get the public keys of a user by their username.
     async fn by_username(&self, username: &str) -> Result<Vec<SshPublicKey>, Self::Err>;
 }
-
-/// A Git provider.
-#[derive(Debug, Clone, Copy, Deserialize, Serialize, PartialEq, Eq, clap::ValueEnum)]
-#[serde(rename_all = "lowercase")]
-pub enum GitProvider {
-    Github,
-    Gitlab,
-}