chore(oci): api updates per oci-distribution crate rev

Signed-off-by: Vaughn Dice <[email protected]>

Author: vdice

Cargo.lock

@@ -17,8 +17,7 @@ docker_credential = "1.0"
 dirs = "4.0"
 futures-util = "0.3"
 itertools = "0.12.1"
-# TODO: use commit from fermyon/oci-distribution once required changes are in
-oci-distribution = { git = "https://github.com/vdice/oci-distribution", rev = "36b987cf433d25d968a717294fd07f3d6087869c" }
+oci-distribution = { git = "https://github.com/fermyon/oci-distribution", rev = "7e4ce9be9bcd22e78a28f06204931f10c44402ba" }
 reqwest = "0.11"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

crates/oci/Cargo.toml

@@ -368,7 +368,7 @@ impl Client {
         // Assume that these bytes may represent the locked app config and write it as such.
         let mut cfg_bytes = Vec::new();
         self.oci
-            .pull_blob(&reference, &manifest.config.digest, &mut cfg_bytes)
+            .pull_blob(&reference, &manifest.config, &mut cfg_bytes)
             .await?;
         self.write_locked_app_config(&reference.to_string(), &cfg_bytes)
             .await
@@ -391,9 +391,7 @@ impl Client {
 
                     tracing::debug!("Pulling layer {}", &layer.digest);
                     let mut bytes = Vec::with_capacity(layer.size.try_into()?);
-                    this.oci
-                        .pull_blob(&reference, &layer.digest, &mut bytes)
-                        .await?;
+                    this.oci.pull_blob(&reference, &layer, &mut bytes).await?;
                     match layer.media_type.as_str() {
                         SPIN_APPLICATION_MEDIA_TYPE => {
                             this.write_locked_app_config(&reference.to_string(), &bytes)
@@ -569,13 +567,13 @@ impl Client {
     }
 
     /// Insert a token in the OCI client token cache.
-    pub fn insert_token(
+    pub async fn insert_token(
         &mut self,
         reference: &Reference,
         op: RegistryOperation,
         token: RegistryTokenType,
     ) {
-        self.oci.tokens.insert(reference, op, token);
+        self.oci.tokens.insert(reference, op, token).await;
     }
 
     /// Validate the credentials by attempting to send an authenticated request to the registry.