feat: Updates tests and examples to support the new wkg deps

This updates all dependencies to have a wkg.lock but I didn't add to the
gitignore for convenience. The deps are still committed in tree for backwards
compatibility and they all use the new versioned logging. This looks
really chunky bust is mostly dep updates/deletes

Signed-off-by: Taylor Thomas <taylor@cosmonic.com>

Author: thomastaylor312

Cargo.lock

@@ -248,8 +248,8 @@ normpath = { version = "1", default-features = false }
 notify = { version = "6", default-features = false }
 nuid = { version = "0.4", default-features = false }
 num = { version = "0.4", default-features = false }
-oci-distribution = { version = "0.11", default-features = false }
-oci-wasm = { version = "0.0.4", default-features = false }
+oci-client = { version = "0.13", default-features = false }
+oci-wasm = { version = "0.1.0", default-features = false }
 once_cell = { version = "1", default-features = false }
 opentelemetry = { version = "0.23", default-features = false }
 opentelemetry-appender-tracing = { version = "0.4", default-features = false }
@@ -330,17 +330,17 @@ unicase = { version = "2.7.0", default-features = false }
 url = { version = "2" }
 uuid = { version = "1", default-features = false }
 vaultrs = { version = "0.7", default-features = false }
-wadm = { version = "0.17.0", default-features = false }
+wadm = { version = "0.17.1", default-features = false }
 wadm-client = { version = "0.6.1", default-features = false }
-wadm-types = { version = "0.6.0", default-features = false }
+wadm-types = { version = "0.6.1", default-features = false }
 walkdir = { version = "2", default-features = false }
 warp = { version = "0.3", default-features = false }
 wascap = { version = "^0.15.0", path = "./crates/wascap", default-features = false }
 wash-cli = { version = "0", path = "./crates/wash-cli", default-features = false }
 wash-lib = { version = "^0.28.0", path = "./crates/wash-lib", default-features = false }
 wasi = { version = "0.13.3", default-features = false }
-wasm-pkg-client = { version = "0.7.4", default-features = false }
-wasm-pkg-core = { version = "0.7.4", default-features = false }
+wasm-pkg-client = { version = "0.8", default-features = false }
+wasm-pkg-core = { version = "0.8", default-features = false }
 wasi-preview1-component-adapter-provider = { version = "25", default-features = false }
 wasm-encoder = { version = "0.219", default-features = false }
 wasm-gen = { version = "0.1", default-features = false }

Cargo.toml

@@ -20,7 +20,7 @@ async-trait = { workspace = true }
 bytes = { workspace = true }
 cloudevents-sdk = { workspace = true }
 futures = { workspace = true }
-oci-distribution = { workspace = true, features = ["rustls-tls"] }
+oci-client = { workspace = true, features = ["rustls-tls"] }
 opentelemetry = { workspace = true }
 opentelemetry_sdk = { workspace = true, features = [
     "trace",

crates/control-interface/Cargo.toml

@@ -72,7 +72,7 @@ fn default_registry_type() -> String {
     "oci".to_string()
 }
 
-impl TryFrom<&RegistryCredential> for oci_distribution::secrets::RegistryAuth {
+impl TryFrom<&RegistryCredential> for oci_client::secrets::RegistryAuth {
     type Error = anyhow::Error;
 
     fn try_from(cred: &RegistryCredential) -> Result<Self, Self::Error> {
@@ -85,7 +85,7 @@ impl TryFrom<&RegistryCredential> for oci_distribution::secrets::RegistryAuth {
                 username: Some(username),
                 password: Some(password),
                 ..
-            } => Ok(oci_distribution::secrets::RegistryAuth::Basic(
+            } => Ok(oci_client::secrets::RegistryAuth::Basic(
                 username.clone(),
                 password.clone(),
             )),
@@ -95,7 +95,7 @@ impl TryFrom<&RegistryCredential> for oci_distribution::secrets::RegistryAuth {
                 password: None,
                 token: Some(token),
                 ..
-            } => Ok(oci_distribution::secrets::RegistryAuth::Basic(
+            } => Ok(oci_client::secrets::RegistryAuth::Basic(
                 username.clone(),
                 token.clone(),
             )),

crates/control-interface/src/types/registry.rs

@@ -19,7 +19,7 @@ default = [
 ]
 hyper-rustls = ["dep:hyper-rustls", "dep:hyper-util"]
 otel = []
-oci = ["dep:oci-distribution", "dep:oci-wasm"]
+oci = ["dep:oci-client", "dep:oci-wasm"]
 
 [dependencies]
 anyhow = { workspace = true, features = ["std"] }
@@ -34,7 +34,7 @@ hyper-rustls = { workspace = true, features = [
 ], optional = true }
 hyper-util = { workspace = true, optional = true }
 nkeys = { workspace = true }
-oci-distribution = { workspace = true, features = ["rustls-tls"], optional = true }
+oci-client = { workspace = true, features = ["rustls-tls"], optional = true }
 oci-wasm = { workspace = true, features = ["rustls-tls"], optional = true }
 once_cell = { workspace = true }
 provider-archive = { workspace = true }

crates/core/Cargo.toml

@@ -33,17 +33,17 @@ wasmcloud-core = "0.7.0"
 
 `wasmcloud-core` comes with the following features:
 
-| Feature             | Default? | Description                                                                             |
-|---------------------|----------|-----------------------------------------------------------------------------------------|
-| hyper-rustls        | yes      | Enable [`hyper-rustls`][hyper-rustls] usage (see `tls` module)                          |
-| oci                 | yes      | Enable [`oci-distribution`][oci-distribution] and [`oci-wasm`] usage (see `tls` module) |
-| reqwest             | yes      | Enable [`reqwest`][request] extensions (see `tls` module)                               |
-| rustls-native-certs | yes      | Enable [`rustls-native-certs`][rustls-native-certs] (see `tls` module)                  |
-| webpki-roots        | yes      | Enable [`webpki-roots`][webpki-roots] (see `tls` module)                                |
-| otel                | no       | Enable [OpenTelemetry][otel] module support                                             |
+| Feature             | Default? | Description                                                                 |
+| ------------------- | -------- | --------------------------------------------------------------------------- |
+| hyper-rustls        | yes      | Enable [`hyper-rustls`][hyper-rustls] usage (see `tls` module)              |
+| oci                 | yes      | Enable [`oci-client`][oci-client] and [`oci-wasm`] usage (see `tls` module) |
+| reqwest             | yes      | Enable [`reqwest`][request] extensions (see `tls` module)                   |
+| rustls-native-certs | yes      | Enable [`rustls-native-certs`][rustls-native-certs] (see `tls` module)      |
+| webpki-roots        | yes      | Enable [`webpki-roots`][webpki-roots] (see `tls` module)                    |
+| otel                | no       | Enable [OpenTelemetry][otel] module support                                 |
 
 [hyper-rustls]: https://crates.io/crates/hyper-rustls
-[oci-distribution]: https://crates.io/crates/oci-distribution
+[oci-client]: https://crates.io/crates/oci-client
 [reqwest]: https://crates.io/crates/reqwest
 [rustls-native-certs]: https://crates.io/crates/rustls-native-certs
 [webpki-roots]: https://crates.io/crates/webpki-roots

crates/core/README.md

@@ -3,9 +3,9 @@ use std::path::{Path, PathBuf};
 use std::str::FromStr;
 
 use anyhow::{bail, Context as _};
-use oci_distribution::client::ClientProtocol;
-use oci_distribution::client::ImageData;
-use oci_distribution::Reference;
+use oci_client::client::ClientProtocol;
+use oci_client::client::ImageData;
+use oci_client::Reference;
 use oci_wasm::WASM_LAYER_MEDIA_TYPE;
 use oci_wasm::WASM_MANIFEST_MEDIA_TYPE;
 use tokio::fs;
@@ -36,7 +36,7 @@ pub struct OciFetcher {
     additional_ca_paths: Vec<PathBuf>,
     allow_latest: bool,
     allow_insecure: bool,
-    auth: oci_distribution::secrets::RegistryAuth,
+    auth: oci_client::secrets::RegistryAuth,
 }
 
 impl Default for OciFetcher {
@@ -45,7 +45,7 @@ impl Default for OciFetcher {
             additional_ca_paths: Vec::default(),
             allow_latest: false,
             allow_insecure: false,
-            auth: oci_distribution::secrets::RegistryAuth::Anonymous,
+            auth: oci_client::secrets::RegistryAuth::Anonymous,
         }
     }
 }
@@ -158,13 +158,13 @@ impl OciFetcher {
                 tls::load_certs_from_paths(&self.additional_ca_paths)
                     .context("failed to load CA certs from provided paths")?
                     .iter()
-                    .map(|cert| oci_distribution::client::Certificate {
-                        encoding: oci_distribution::client::CertificateEncoding::Der,
+                    .map(|cert| oci_client::client::Certificate {
+                        encoding: oci_client::client::CertificateEncoding::Der,
                         data: cert.to_vec(),
                     }),
             );
         }
-        let c = oci_distribution::Client::new(oci_distribution::client::ClientConfig {
+        let c = oci_client::Client::new(oci_client::client::ClientConfig {
             protocol,
             extra_root_certificates: certs,
             ..Default::default()

crates/core/src/oci.rs

@@ -34,7 +34,7 @@ impl From<(Option<String>, Option<String>)> for RegistryAuth {
 }
 
 #[cfg(feature = "oci")]
-impl From<&RegistryAuth> for oci_distribution::secrets::RegistryAuth {
+impl From<&RegistryAuth> for oci_client::secrets::RegistryAuth {
     fn from(auth: &crate::RegistryAuth) -> Self {
         match auth {
             crate::RegistryAuth::Basic(username, password) => {
@@ -46,7 +46,7 @@ impl From<&RegistryAuth> for oci_distribution::secrets::RegistryAuth {
 }
 
 #[cfg(feature = "oci")]
-impl From<RegistryAuth> for oci_distribution::secrets::RegistryAuth {
+impl From<RegistryAuth> for oci_client::secrets::RegistryAuth {
     fn from(auth: crate::RegistryAuth) -> Self {
         match auth {
             crate::RegistryAuth::Basic(username, password) => Self::Basic(username, password),

crates/core/src/registry.rs

@@ -34,11 +34,11 @@ pub static NATIVE_ROOTS: Lazy<Arc<[rustls::pki_types::CertificateDer<'static>]>>
     });
 
 #[cfg(all(feature = "rustls-native-certs", feature = "oci"))]
-pub static NATIVE_ROOTS_OCI: Lazy<Arc<[oci_distribution::client::Certificate]>> = Lazy::new(|| {
+pub static NATIVE_ROOTS_OCI: Lazy<Arc<[oci_client::client::Certificate]>> = Lazy::new(|| {
     NATIVE_ROOTS
         .iter()
-        .map(|cert| oci_distribution::client::Certificate {
-            encoding: oci_distribution::client::CertificateEncoding::Der,
+        .map(|cert| oci_client::client::Certificate {
+            encoding: oci_client::client::CertificateEncoding::Der,
             data: cert.to_vec(),
         })
         .collect()

crates/core/src/tls.rs

@@ -27,7 +27,7 @@ http-body = { workspace = true }
 humantime = { workspace = true }
 names = { workspace = true }
 nkeys = { workspace = true }
-oci-distribution = { workspace = true, features = ["rustls-tls"] }
+oci-client = { workspace = true, features = ["rustls-tls"] }
 opentelemetry-nats = { workspace = true }
 provider-archive = { workspace = true }
 rmp-serde = { workspace = true }

crates/host/Cargo.toml

@@ -325,7 +325,7 @@ fn get_log_level_filter(log_level_override: Option<&Level>) -> EnvFilter {
             .add_directive("async_nats=info".parse().unwrap())
             .add_directive("cranelift_codegen=warn".parse().unwrap())
             .add_directive("hyper=info".parse().unwrap())
-            .add_directive("oci_distribution=info".parse().unwrap());
+            .add_directive("oci_client=info".parse().unwrap());
 
         // Allow RUST_LOG to override the other directives
         if let Ok(rust_log) = env::var("RUST_LOG") {

crates/tracing/src/traces.rs

@@ -1132,7 +1132,7 @@ The combination of wash app undeploy --all and wash app delete --all-undeployed
  - <csr-id-f7582160d5bd9d7f967ada2045239bc94653cb9b/> registry image URL parsing
    When URLs are submitted to `wash push` as the first argument, unless a
    `--registry` is provided, the URL is parsed as an
-   `oci_distribution::Reference`.
+   `oci_client::Reference`.
 
    It is possible for a URL like `ghcr.io/wasmCloud/img:v0.1.0` to
    correctly parse *yet* fail the the `url == image.whole()` test,
@@ -1141,7 +1141,7 @@ The combination of wash app undeploy --all and wash app delete --all-undeployed
 
    This commit performs the lowercasing of the URL and registry (if
    supplied) consistently in `resolve_artifact_ref()`, ensuring that the
-   comparison works, and `oci_distribution::Reference`s that correctly
+   comparison works, and `oci_client::Reference`s that correctly
    parse are used.
 
 ### Reverted

crates/wash-cli/CHANGELOG.md

@@ -43,7 +43,7 @@ indicatif = { workspace = true }
 nix = { workspace = true, features = ["signal"] }
 nkeys = { workspace = true, features = ["xkeys"] }
 notify = { workspace = true }
-oci-distribution = { workspace = true, features = ["rustls-tls"] }
+oci-client = { workspace = true, features = ["rustls-tls"] }
 oci-wasm = { workspace = true, features = ["rustls-tls"] }
 once_cell = { workspace = true }
 provider-archive = { workspace = true }
@@ -121,4 +121,4 @@ tokio = { workspace = true, features = ["macros", "net"] }
 
 [package.metadata.binstall]
 pkg-url = "{ repo }/releases/download/{name}-v{version}/wash-{ target }{ binary-ext }"
-pkg-fmt = "bin"
+pkg-fmt = "bin"

crates/wash-cli/Cargo.toml

@@ -2,7 +2,7 @@ use std::{collections::HashMap, path::PathBuf};
 
 use anyhow::{bail, Context, Result};
 use docker_credential::{get_credential, DockerCredential};
-use oci_distribution::Reference;
+use oci_client::Reference;
 use serde_json::json;
 use tokio::fs::File;
 use tokio::io::AsyncWriteExt;
@@ -111,10 +111,14 @@ pub async fn registry_push(
         _ => resolve_registry_credentials(image.registry()).await,
     }?;
 
-    let annotations = match cmd.annotations {
-        Some(annotations) => input_vec_to_hashmap(annotations).ok(),
-        None => None,
-    };
+    let annotations = cmd.annotations.and_then(|annotations| {
+        Some(
+            input_vec_to_hashmap(annotations)
+                .ok()?
+                .into_iter()
+                .collect(),
+        )
+    });
 
     let (maybe_tag, digest) = push_oci_artifact(
         artifact_url.clone(),
@@ -151,7 +155,7 @@ fn resolve_artifact_ref(
     registry: &str,
     project_config: Option<PathBuf>,
 ) -> Result<Reference> {
-    // NOTE: Image URLs must be all lower case for `oci_distribution::Reference` to parse them properly
+    // NOTE: Image URLs must be all lower case for `oci_client::Reference` to parse them properly
     let url = url.trim().to_ascii_lowercase();
     let registry = registry.trim().to_ascii_lowercase();
 

crates/wash-cli/src/common/registry_cmd.rs

@@ -3,7 +3,7 @@ use std::path::PathBuf;
 use anyhow::Context;
 use clap::{Parser, Subcommand};
 use futures::TryStreamExt;
-use oci_distribution::Reference;
+use oci_client::Reference;
 use sha2::{Digest, Sha256};
 use tokio::io::AsyncWriteExt;
 use wash_lib::{

crates/wash-cli/src/plugin.rs

@@ -8,7 +8,7 @@ use std::{
 };
 
 use anyhow::{bail, ensure, Context, Result};
-use oci_distribution::Reference;
+use oci_client::Reference;
 use rand::{distributions::Alphanumeric, Rng};
 use sysinfo::{ProcessExt, SystemExt};
 use tempfile::TempDir;
@@ -83,8 +83,8 @@ pub async fn fetch_artifact_digest(url: &str) -> Result<String> {
     );
 
     let accept_manifest_media_types = [
-        oci_distribution::manifest::IMAGE_MANIFEST_MEDIA_TYPE,
-        oci_distribution::manifest::OCI_IMAGE_MEDIA_TYPE,
+        oci_client::manifest::IMAGE_MANIFEST_MEDIA_TYPE,
+        oci_client::manifest::OCI_IMAGE_MEDIA_TYPE,
     ]
     .join(",");
 

crates/wash-cli/tests/common/mod.rs

@@ -1037,7 +1037,7 @@ dangling providers/components which aren’t linked to anything<csr-unknown>
  - <csr-id-f7582160d5bd9d7f967ada2045239bc94653cb9b/> registry image URL parsing
    When URLs are submitted to `wash push` as the first argument, unless a
    `--registry` is provided, the URL is parsed as an
-   `oci_distribution::Reference`.
+   `oci_client::Reference`.
 
    It is possible for a URL like `ghcr.io/wasmCloud/img:v0.1.0` to
    correctly parse *yet* fail the the `url == image.whole()` test,
@@ -1046,7 +1046,7 @@ dangling providers/components which aren’t linked to anything<csr-unknown>
 
    This commit performs the lowercasing of the URL and registry (if
    supplied) consistently in `resolve_artifact_ref()`, ensuring that the
-   comparison works, and `oci_distribution::Reference`s that correctly
+   comparison works, and `oci_client::Reference`s that correctly
    parse are used.
 
 ### Bug Fixes (BREAKING)
@@ -1953,7 +1953,7 @@ dangling providers/components which aren’t linked to anything<csr-unknown>
  - <csr-id-ae65e85bf4b8bcbc215d48664fcf6941d25de165/> v0.9.2
  - <csr-id-0ed956f457a94ad390b847a46df9911e5ebb35a9/> wash v0.16.1, wash-lib v0.6.1
  - <csr-id-80b104011536c03ef3c1c58a1440992defae1351/> adopt workspace dependencies
-   This simplifies maintenance of the repository and allows for easier
+   This simplifies maintenance of the repository and allows for easier
    audit of the dependencies
  - <csr-id-52ef5b6b1b6b01bc5e7a2c8fe3cbb2a08d4ad864/> Creates new context library
    This creates a new context library with some extendable traits for

crates/wash-lib/CHANGELOG.md

@@ -61,7 +61,7 @@ ignore = { workspace = true, optional = true }
 indicatif = { workspace = true, optional = true }
 nkeys = { workspace = true }
 normpath = { workspace = true }
-oci-distribution = { workspace = true, features = ["rustls-tls"] }
+oci-client = { workspace = true, features = ["rustls-tls"] }
 oci-wasm = { workspace = true, features = ["rustls-tls"] }
 path-absolutize = { workspace = true, features = [
     "once_cell_cache",

crates/wash-lib/Cargo.toml

@@ -15,7 +15,6 @@ use std::str::FromStr;
 
 use anyhow::{bail, Context, Result};
 use clap::Args;
-use etcetera::BaseStrategy;
 use nkeys::{KeyPair, KeyPairType};
 use serde::{Deserialize, Serialize};
 use serde_json::json;
@@ -307,12 +306,8 @@ impl CommonPackageArgs {
         let dir = if let Some(dir) = self.cache.as_ref() {
             dir.clone()
         } else {
-            // We're using native strategy here because it matches what `dirs` does with computing the cache dir
-            etcetera::base_strategy::choose_native_strategy()
-                .context("unable to find cache directory")?
-                .cache_dir()
+            FileCache::global_cache_path().context("failed to get global cache dir")?
         };
-        let dir = dir.join("wkg");
         FileCache::new(dir).await
     }
 

crates/wash-lib/src/cli/mod.rs

@@ -1,13 +1,13 @@
 //! Utilities for pulling and pushing artifacts to various registries
 
 use std::{
-    collections::HashMap,
+    collections::BTreeMap,
     path::{Path, PathBuf},
 };
 
 use anyhow::{bail, Context as _, Result};
-use oci_distribution::manifest::OciImageManifest;
-use oci_distribution::{
+use oci_client::manifest::OciImageManifest;
+use oci_client::{
     client::{Client, ClientConfig, ClientProtocol, Config, ImageLayer},
     secrets::RegistryAuth,
     Reference,
@@ -58,7 +58,7 @@ pub struct OciPushOptions {
     /// Whether or not OCI registry's certificate will be checked for validity. This will make your HTTPS connections insecure.
     pub insecure_skip_tls_verify: bool,
     /// Optional annotations you'd like to add to the pushed artifact
-    pub annotations: Option<HashMap<String, String>>,
+    pub annotations: Option<BTreeMap<String, String>>,
 }
 
 /// The types of artifacts that wash supports

crates/wash-lib/src/registry.rs

@@ -0,0 +1,2 @@
+
+*.o