version bumped warg to the 0.6.0 and removed unused deps

Author: calvinrp

Cargo.lock

@@ -43,7 +43,7 @@ indicatif = { workspace = true, optional = true }
 default = ["wit", "registry"]
 wat = ["wac-resolver/wat"]
 wit = ["wac-resolver/wit"]
-registry = ["wac-resolver/registry", "indicatif"]
+registry = ["wac-resolver/registry", "dep:indicatif"]
 
 [workspace.dependencies]
 wac-parser = { path = "crates/wac-parser", version = "0.1.0", default-features = false }
@@ -71,12 +71,10 @@ wat = "1.202.0"
 logos = "0.14.0"
 miette = "7.2.0"
 thiserror = "1.0.58"
-warg-client = "0.5.0"
-warg-protocol = "0.5.0"
-warg-crypto = "0.5.0"
-warg-server = "0.5.0"
-warg-credentials = "0.5.0"
-secrecy = "0.8.0"
+warg-client = "0.6.0"
+warg-protocol = "0.6.0"
+warg-crypto = "0.6.0"
+warg-server = "0.6.0"
 futures = "0.3.30"
 indicatif = "0.17.8"
 pretty_assertions = "1.4.0"

Cargo.toml

@@ -24,8 +24,6 @@ miette = { workspace = true }
 warg-client = { workspace = true, optional = true }
 warg-protocol = { workspace = true, optional = true }
 warg-crypto = { workspace = true, optional = true }
-warg-credentials = { workspace = true, optional = true }
-secrecy = { workspace = true, optional = true }
 tokio = { workspace = true, optional = true }
 futures = { workspace = true, optional = true }
 
@@ -40,5 +38,5 @@ tempdir = "0.3.7"
 [features]
 default = ["registry"]
 wat = ["dep:wat"]
-wit = ["wit-parser"]
-registry = ["warg-client", "warg-protocol", "warg-crypto", "warg-credentials", "secrecy", "tokio", "futures"]
+wit = ["dep:wit-parser"]
+registry = ["dep:warg-client", "dep:warg-protocol", "dep:warg-crypto", "dep:tokio", "dep:futures"]

crates/wac-resolver/Cargo.toml

@@ -3,12 +3,10 @@ use anyhow::Result;
 use futures::{stream::FuturesUnordered, StreamExt};
 use indexmap::IndexMap;
 use miette::SourceSpan;
-use secrecy::Secret;
 use semver::{Version, VersionReq};
 use std::{fs, path::Path, sync::Arc};
 use wac_types::BorrowedPackageKey;
-use warg_client::{Client, ClientError, Config, FileSystemClient, RegistryUrl};
-use warg_credentials::keyring::get_auth_token;
+use warg_client::{Client, ClientError, Config, FileSystemClient};
 use warg_protocol::registry::PackageName;
 
 /// Implemented by progress bars.
@@ -43,13 +41,8 @@ impl RegistryPackageResolver {
     ///
     /// If `url` is `None`, the default URL will be used.
     pub fn new(url: Option<&str>, bar: Option<Box<dyn ProgressBar>>) -> Result<Self> {
-        let config = Config::from_default_file()?.unwrap_or_default();
         Ok(Self {
-            client: Arc::new(Client::new_with_config(
-                url,
-                &config,
-                Self::auth_token(&config, url)?,
-            )?),
+            client: Arc::new(Client::new_with_default_config(url)?),
             bar,
         })
     }
@@ -63,11 +56,7 @@ impl RegistryPackageResolver {
         bar: Option<Box<dyn ProgressBar>>,
     ) -> Result<Self> {
         Ok(Self {
-            client: Arc::new(Client::new_with_config(
-                url,
-                config,
-                Self::auth_token(config, url)?,
-            )?),
+            client: Arc::new(Client::new_with_config(url, config, None)?),
             bar,
         })
     }
@@ -201,18 +190,4 @@ impl RegistryPackageResolver {
             source: e.into(),
         })
     }
-
-    pub fn auth_token(config: &Config, url: Option<&str>) -> Result<Option<Secret<String>>> {
-        if config.keyring_auth {
-            return if let Some(url) = url {
-                Ok(get_auth_token(&RegistryUrl::new(url)?)?)
-            } else if let Some(url) = config.home_url.as_ref() {
-                Ok(get_auth_token(&RegistryUrl::new(url)?)?)
-            } else {
-                Ok(None)
-            };
-        }
-
-        Ok(None)
-    }
 }