Warg update 0.7 (#116)

updated warg version to 0.7.0

Author: calvinrp

Cargo.lock

@@ -80,10 +80,10 @@ wat = "1.202.0"
 logos = "0.14.0"
 miette = "7.2.0"
 thiserror = "1.0.58"
-warg-client = "0.6.0"
-warg-protocol = "0.6.0"
-warg-crypto = "0.6.0"
-warg-server = "0.6.0"
+warg-client = "0.7.0"
+warg-protocol = "0.7.0"
+warg-crypto = "0.7.0"
+warg-server = "0.7.0"
 futures = "0.3.30"
 indicatif = "0.17.8"
 pretty_assertions = "1.4.0"

Cargo.toml

@@ -40,23 +40,23 @@ impl RegistryPackageResolver {
     /// client configuration file.
     ///
     /// If `url` is `None`, the default URL will be used.
-    pub fn new(url: Option<&str>, bar: Option<Box<dyn ProgressBar>>) -> Result<Self> {
+    pub async fn new(url: Option<&str>, bar: Option<Box<dyn ProgressBar>>) -> Result<Self> {
         Ok(Self {
-            client: Arc::new(Client::new_with_default_config(url)?),
+            client: Arc::new(Client::new_with_default_config(url).await?),
             bar,
         })
     }
 
     /// Creates a new registry package resolver with the given configuration.
     ///
     /// If `url` is `None`, the default URL will be used.
-    pub fn new_with_config(
+    pub async fn new_with_config(
         url: Option<&str>,
         config: &Config,
         bar: Option<Box<dyn ProgressBar>>,
     ) -> Result<Self> {
         Ok(Self {
-            client: Arc::new(Client::new_with_config(url, config, None)?),
+            client: Arc::new(Client::new_with_config(url, config, None).await?),
             bar,
         })
     }

crates/wac-resolver/src/registry.rs

@@ -61,7 +61,7 @@ export i2.foo as "bar";
 "#,
     )?;
 
-    let resolver = RegistryPackageResolver::new_with_config(None, &config, None)?;
+    let resolver = RegistryPackageResolver::new_with_config(None, &config, None).await?;
     let packages = resolver.resolve(&packages(&document)?).await?;
 
     let resolution = document.resolve(packages)?;

crates/wac-resolver/tests/registry.rs

@@ -64,7 +64,7 @@ pub async fn publish(
     content: Vec<u8>,
     init: bool,
 ) -> Result<()> {
-    let client = FileSystemClient::new_with_config(None, config, None)?;
+    let client = FileSystemClient::new_with_config(None, config, None).await?;
 
     let digest = client
         .content()
@@ -148,6 +148,7 @@ pub async fn spawn_server(root: &Path) -> Result<(ServerInstance, warg_client::C
         content_dir: Some(root.join("content")),
         namespace_map_path: Some(root.join("namespaces")),
         keyring_auth: false,
+        keyring_backend: None,
         keys: Default::default(),
         ignore_federation_hints: false,
         auto_accept_federation_hints: false,

crates/wac-resolver/tests/support/mod.rs

@@ -84,7 +84,8 @@ impl EncodeCommand {
             self.deps.into_iter().collect(),
             #[cfg(feature = "registry")]
             self.registry.as_deref(),
-        )?;
+        )
+        .await?;
 
         let packages = resolver
             .resolve(&document)

src/commands/encode.rs

@@ -105,9 +105,9 @@ impl PlugCommand {
             #[cfg(feature = "registry")]
             PackageRef::RegistryPackage((name, version)) => {
                 if client.is_none() {
-                    client = Some(FileSystemClient::new_with_default_config(
-                        self.registry.as_deref(),
-                    ));
+                    client = Some(
+                        FileSystemClient::new_with_default_config(self.registry.as_deref()).await,
+                    );
                 }
                 let client = client.as_ref().unwrap().as_ref().map_err(|_| {
                     anyhow::anyhow!(
@@ -176,9 +176,10 @@ impl PlugCommand {
                     #[cfg(feature = "registry")]
                     PackageRef::RegistryPackage((name, version)) => {
                         if client.is_none() {
-                            client = Some(FileSystemClient::new_with_default_config(
-                                self.registry.as_deref(),
-                            ));
+                            client = Some(
+                                FileSystemClient::new_with_default_config(self.registry.as_deref())
+                                    .await,
+                            );
                         }
                         let client = client.as_ref().unwrap().as_ref().map_err(|_| {
                             anyhow::anyhow!(

src/commands/plug.rs

@@ -56,7 +56,8 @@ impl ResolveCommand {
             self.deps.into_iter().collect(),
             #[cfg(feature = "registry")]
             self.registry.as_deref(),
-        )?;
+        )
+        .await?;
 
         let packages = resolver
             .resolve(&document)

src/commands/resolve.rs

@@ -52,7 +52,7 @@ pub struct PackageResolver {
 
 impl PackageResolver {
     /// Creates a new package resolver.
-    pub fn new(
+    pub async fn new(
         dir: impl Into<PathBuf>,
         overrides: HashMap<String, PathBuf>,
         #[cfg(feature = "registry")] registry: Option<&str>,
@@ -63,7 +63,8 @@ impl PackageResolver {
             registry: wac_resolver::RegistryPackageResolver::new(
                 registry,
                 Some(Box::new(progress::ProgressBar::new())),
-            )?,
+            )
+            .await?,
         })
     }