From 27ef86c1b4d1c420719a71ec94c945b114aab063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20K=C3=B6rber?= Date: Wed, 15 Jun 2022 20:49:13 +0200 Subject: [PATCH] forge: Use "origin" as the default remote name Close #33 --- e2e_tests/test_repos_find_remote.py | 22 +++++++++++----------- src/provider/github.rs | 5 ----- src/provider/gitlab.rs | 5 ----- src/provider/mod.rs | 5 +++-- 4 files changed, 14 insertions(+), 23 deletions(-) diff --git a/e2e_tests/test_repos_find_remote.py b/e2e_tests/test_repos_find_remote.py index f0f37cf..77023be 100644 --- a/e2e_tests/test_repos_find_remote.py +++ b/e2e_tests/test_repos_find_remote.py @@ -359,7 +359,7 @@ def test_repos_find_remote_user( if override_remote_name: assert repo["remotes"][0]["name"] == "otherremote" else: - assert repo["remotes"][0]["name"] == provider + assert repo["remotes"][0]["name"] == "origin" if force_ssh or i == 1: assert ( repo["remotes"][0]["url"] @@ -544,14 +544,14 @@ def test_repos_find_remote_group( assert isinstance(repo["remotes"], list) assert len(repo["remotes"]) == 1 if force_ssh or i == 1: - assert repo["remotes"][0]["name"] == provider + assert repo["remotes"][0]["name"] == "origin" assert ( repo["remotes"][0]["url"] == f"ssh://git@example.com/mygroup1/myproject{i}.git" ) assert repo["remotes"][0]["type"] == "ssh" else: - assert repo["remotes"][0]["name"] == provider + assert repo["remotes"][0]["name"] == "origin" assert ( repo["remotes"][0]["url"] == f"https://example.com/mygroup1/myproject{i}.git" @@ -668,7 +668,7 @@ def test_repos_find_remote_user_and_group( assert repo["worktree_setup"] is (not worktree_default and worktree) assert isinstance(repo["remotes"], list) assert len(repo["remotes"]) == 1 - assert repo["remotes"][0]["name"] == provider + assert repo["remotes"][0]["name"] == "origin" if force_ssh or i == 1: assert ( repo["remotes"][0]["url"] @@ -693,7 +693,7 @@ def test_repos_find_remote_user_and_group( assert repo["worktree_setup"] is (not worktree_default and worktree) assert isinstance(repo["remotes"], list) assert len(repo["remotes"]) == 1 - assert repo["remotes"][0]["name"] == provider + assert repo["remotes"][0]["name"] == "origin" if force_ssh or i == 1: assert ( repo["remotes"][0]["url"] @@ -823,7 +823,7 @@ def test_repos_find_remote_owner( assert repo["worktree_setup"] is (not worktree_default and worktree) assert isinstance(repo["remotes"], list) assert len(repo["remotes"]) == 1 - assert repo["remotes"][0]["name"] == provider + assert repo["remotes"][0]["name"] == "origin" if force_ssh or i == 1: assert ( repo["remotes"][0]["url"] @@ -846,7 +846,7 @@ def test_repos_find_remote_owner( assert repo["worktree_setup"] is (not worktree_default and worktree) assert isinstance(repo["remotes"], list) assert len(repo["remotes"]) == 1 - assert repo["remotes"][0]["name"] == provider + assert repo["remotes"][0]["name"] == "origin" if force_ssh or i == 1: assert ( repo["remotes"][0]["url"] @@ -870,7 +870,7 @@ def test_repos_find_remote_owner( assert repo["worktree_setup"] is (not worktree_default and worktree) assert isinstance(repo["remotes"], list) assert len(repo["remotes"]) == 1 - assert repo["remotes"][0]["name"] == provider + assert repo["remotes"][0]["name"] == "origin" if force_ssh: assert ( repo["remotes"][0]["url"] == f"ssh://git@example.com/myuser2/myproject3.git" @@ -899,7 +899,7 @@ def test_repos_find_remote_owner( assert repo["worktree_setup"] is (not worktree_default and worktree) assert isinstance(repo["remotes"], list) assert len(repo["remotes"]) == 1 - assert repo["remotes"][0]["name"] == provider + assert repo["remotes"][0]["name"] == "origin" if force_ssh or i == 1: assert ( repo["remotes"][0]["url"] @@ -919,7 +919,7 @@ def test_repos_find_remote_owner( assert repo["worktree_setup"] is (not worktree_default and worktree) assert isinstance(repo["remotes"], list) assert len(repo["remotes"]) == 1 - assert repo["remotes"][0]["name"] == provider + assert repo["remotes"][0]["name"] == "origin" if force_ssh: assert ( repo["remotes"][0]["url"] @@ -945,7 +945,7 @@ def test_repos_find_remote_owner( assert repo["worktree_setup"] is (not worktree_default and worktree) assert isinstance(repo["remotes"], list) assert len(repo["remotes"]) == 1 - assert repo["remotes"][0]["name"] == provider + assert repo["remotes"][0]["name"] == "origin" if force_ssh: assert ( repo["remotes"][0]["url"] diff --git a/src/provider/github.rs b/src/provider/github.rs index 76b6b53..e495237 100644 --- a/src/provider/github.rs +++ b/src/provider/github.rs @@ -8,7 +8,6 @@ use super::JsonError; use super::Project; use super::Provider; -const PROVIDER_NAME: &str = "github"; const ACCEPT_HEADER_JSON: &str = "application/vnd.github.v3+json"; const GITHUB_API_BASEURL: &str = option_env!("GITHUB_API_BASEURL").unwrap_or("https://api.github.com"); @@ -88,10 +87,6 @@ impl Provider for Github { }) } - fn name(&self) -> &str { - PROVIDER_NAME - } - fn filter(&self) -> &Filter { &self.filter } diff --git a/src/provider/gitlab.rs b/src/provider/gitlab.rs index 6acff35..b1a08b8 100644 --- a/src/provider/gitlab.rs +++ b/src/provider/gitlab.rs @@ -8,7 +8,6 @@ use super::JsonError; use super::Project; use super::Provider; -const PROVIDER_NAME: &str = "gitlab"; const ACCEPT_HEADER_JSON: &str = "application/json"; const GITLAB_API_BASEURL: &str = option_env!("GITLAB_API_BASEURL").unwrap_or("https://gitlab.com"); @@ -105,10 +104,6 @@ impl Provider for Gitlab { }) } - fn name(&self) -> &str { - PROVIDER_NAME - } - fn filter(&self) -> &Filter { &self.filter } diff --git a/src/provider/mod.rs b/src/provider/mod.rs index cbf4007..c96557f 100644 --- a/src/provider/mod.rs +++ b/src/provider/mod.rs @@ -14,6 +14,8 @@ use super::repo; use std::collections::HashMap; +const DEFAULT_REMOTE_NAME: &str = "origin"; + #[derive(Debug, Deserialize, Serialize, clap::ArgEnum, Clone)] pub enum RemoteProvider { #[serde(alias = "github", alias = "GitHub")] @@ -122,7 +124,6 @@ pub trait Provider { where Self: Sized; - fn name(&self) -> &str; fn filter(&self) -> &Filter; fn secret_token(&self) -> &auth::AuthToken; fn auth_header_key() -> &'static str; @@ -293,7 +294,7 @@ pub trait Provider { let mut ret: HashMap, Vec> = HashMap::new(); - let remote_name = remote_name.unwrap_or_else(|| self.name().to_string()); + let remote_name = remote_name.unwrap_or_else(|| DEFAULT_REMOTE_NAME.to_string()); for repo in repos { let namespace = repo.namespace();