Merge pull request #1600 from radu-matei/fix/pub-oci-client

(fix/oci-client): allow adding a token for OCI client

crates/oci/Cargo.toml

@@ -11,7 +11,7 @@ dkregistry = { git = "https://github.com/camallo/dkregistry-rs", rev = "37acecb4
 docker_credential = "1.0"
 dirs = "4.0"
 futures-util = "0.3"
-oci-distribution = { git = "https://github.com/krustlet/oci-distribution", rev = "64986855ef0d692df3b270d23c4bee8c41d97c27" }
+oci-distribution = { git = "https://github.com/fermyon/oci-distribution", rev = "05022618d78feef9b99f20b5da8fd6def6bb80d2" }
 reqwest = "0.11"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
@@ -22,4 +22,5 @@ spin-trigger = { path = "../trigger" }
 tempfile = "3.3"
 tokio = { version = "1", features = ["fs"] }
 tracing = { workspace = true }
-walkdir = "2.3"
+walkdir = "2.3"
+

crates/oci/src/client.rs

@@ -4,6 +4,8 @@ use anyhow::{bail, Context, Result};
 use docker_credential::DockerCredential;
 use futures_util::future;
 use futures_util::stream::{self, StreamExt, TryStreamExt};
+use oci_distribution::token_cache::RegistryTokenType;
+use oci_distribution::RegistryOperation;
 use oci_distribution::{
     client::{Config, ImageLayer},
     manifest::OciImageManifest,
@@ -37,6 +39,7 @@ const CONTENT_REF_INLINE_MAX_SIZE: usize = 128;
 pub struct Client {
     /// Global cache for the metadata, Wasm modules, and static assets pulled from OCI registries.
     pub cache: Cache,
+    /// Underlying OCI client.
     oci: oci_distribution::Client,
 }
 
@@ -326,6 +329,16 @@ impl Client {
         auth.save_default().await
     }
 
+    /// Insert a token in the OCI client token cache.
+    pub fn insert_token(
+        &mut self,
+        reference: &Reference,
+        op: RegistryOperation,
+        token: RegistryTokenType,
+    ) {
+        self.oci.tokens.insert(reference, op, token);
+    }
+
     /// Validate the credentials by attempting to send an authenticated request to the registry.
     async fn validate_credentials(
         server: impl AsRef<str>,