Simpler

Author: lsbardel

src/git.rs

@@ -140,19 +140,15 @@ impl GitSettings {
             )))
         }
     }
-
-    pub fn release_downloader(&self, repo: &str, file_name: &str) -> GithubDownloadRelease {
-        GithubDownloadRelease::new(repo, file_name, self.github_token.clone())
-    }
 }
 
 impl GithubDownloadRelease {
-    pub fn new(repo: &str, file_name: &str, token: Option<Secret>) -> Self {
+    pub fn new(repo: &str, file_name: &str) -> Self {
         Self {
             repo: repo.to_string(),
             file_name: file_name.to_string(),
             client: Client::new(),
-            token,
+            token: GitSettings::get_github_token(),
             version: None,
             download_url: None,
         }

src/self_update.rs

@@ -1,12 +1,11 @@
 use crate::{
     error::{RopsError, RopsResult},
+    git::GithubDownloadRelease,
     settings::Settings,
 };
 
 pub fn self_update(settings: &Settings) -> RopsResult<()> {
-    let installer = settings
-        .git
-        .release_downloader("quantmind/rops", "rops-{arch}");
+    let installer = GithubDownloadRelease::new("quantmind/rops", "rops-{arch}");
     let asset = installer.download(settings)?;
 
     self_replace::self_replace(&asset.name).map_err(|err| RopsError::Error(err.to_string()))?;

src/tools.rs

@@ -1,7 +1,7 @@
 use super::settings::Settings;
 use crate::{
     error::{RopsError, RopsResult},
-    git::{GitSettings, GithubDownloadRelease},
+    git::GithubDownloadRelease,
     utils,
 };
 use std::collections::HashMap;
@@ -70,7 +70,6 @@ impl Default for Tools {
                         GithubDownloadRelease::new(
                             "helm/helm",
                             "helm-{version}-{os}-{arch}.tar.gz",
-                            GitSettings::get_github_token(),
                         )
                         .with_download_url("https://get.helm.sh"),
                     ),
@@ -81,7 +80,6 @@ impl Default for Tools {
                     InstallMethod::GithubDownload(GithubDownloadRelease::new(
                         "derailed/k9s",
                         "k9s_{os}_{arch}.tar.gz",
-                        GitSettings::get_github_token(),
                     )),
                 ),
                 ThirdPartyTool::new(
@@ -90,7 +88,6 @@ impl Default for Tools {
                     InstallMethod::GithubDownload(GithubDownloadRelease::new(
                         "tamasfe/taplo",
                         "taplo-{os}-{arch}.gz",
-                        GitSettings::get_github_token(),
                     )),
                 ),
                 ThirdPartyTool::new(
@@ -99,7 +96,6 @@ impl Default for Tools {
                     InstallMethod::GithubDownload(GithubDownloadRelease::new(
                         "getsops/sops",
                         "sops-{version}.{os}.{arch}",
-                        GitSettings::get_github_token(),
                     )),
                 ),
             ]