Merge pull request #1905 from itowlson/oci-should-not-depend-on-trigger

Make OCI crate not depend on trigger crate

Author: itowlson

Cargo.lock

@@ -9,4 +9,5 @@ anyhow = "1.0"
 dirs = "4.0"
 sha2 = "0.10"
 tempfile = "3.5"
-tokio = { version = "1", features = ["rt", "time"] }
+tokio = { version = "1", features = ["rt", "time"] }
+url = "2"

crates/common/Cargo.toml

@@ -13,3 +13,4 @@ pub mod data_dir;
 pub mod paths;
 pub mod sha256;
 pub mod sloth;
+pub mod url;

crates/common/src/lib.rs

@@ -0,0 +1,13 @@
+//! Operations on URLs
+
+use anyhow::{anyhow, Context};
+
+use std::path::PathBuf;
+
+/// Parse the path from a 'file:' URL
+pub fn parse_file_url(url: &str) -> anyhow::Result<PathBuf> {
+    url::Url::parse(url)
+        .with_context(|| format!("Invalid URL: {url:?}"))?
+        .to_file_path()
+        .map_err(|_| anyhow!("Invalid file URL path: {url:?}"))
+}

crates/common/src/url.rs

@@ -22,7 +22,6 @@ spin-app = { path = "../app" }
 spin-common = { path = "../common" }
 spin-loader = { path = "../loader" }
 spin-manifest = { path = "../manifest" }
-spin-trigger = { path = "../trigger" }
 tempfile = "3.3"
 tokio = { version = "1", features = ["fs"] }
 tokio-util = { version = "0.7.9", features = ["compat"] }

crates/oci/Cargo.toml

@@ -18,6 +18,7 @@ use oci_distribution::{
 use reqwest::Url;
 use spin_app::locked::{ContentPath, ContentRef, LockedApp};
 use spin_common::sha256;
+use spin_common::url::parse_file_url;
 use spin_loader::cache::Cache;
 use spin_loader::FilesMountStrategy;
 use tokio::fs;
@@ -132,7 +133,7 @@ impl Client {
                 .source
                 .context("component loaded from disk should contain a file source")?;
 
-            let source = spin_trigger::parse_file_url(source.as_str())?;
+            let source = parse_file_url(source.as_str())?;
             let layer = Self::wasm_layer(&source).await?;
 
             // Update the module source with the content ref of the layer.
@@ -146,7 +147,7 @@ impl Client {
                     .content
                     .source
                     .context("file mount loaded from disk should contain a file source")?;
-                let source = spin_trigger::parse_file_url(source.as_str())?;
+                let source = parse_file_url(source.as_str())?;
 
                 if archive_layers {
                     self.push_archive_layer(&source, &mut files, &mut layers)
@@ -571,7 +572,7 @@ async fn layer_count(locked: LockedApp) -> Result<usize> {
                 .content
                 .source
                 .context("file mount loaded from disk should contain a file source")?;
-            let source = spin_trigger::parse_file_url(source.as_str())?;
+            let source = parse_file_url(source.as_str())?;
             for entry in WalkDir::new(&source) {
                 let entry = entry?;
                 if entry.file_type().is_file() && !entry.file_type().is_dir() {

crates/oci/src/client.rs

@@ -3,9 +3,9 @@ pub mod loader;
 mod runtime_config;
 mod stdio;
 
-use std::{collections::HashMap, marker::PhantomData, path::PathBuf};
+use std::{collections::HashMap, marker::PhantomData};
 
-use anyhow::{anyhow, Context, Result};
+use anyhow::{Context, Result};
 pub use async_trait::async_trait;
 use indexmap::IndexMap;
 use runtime_config::llm::LLmOptions;
@@ -354,10 +354,3 @@ pub trait TriggerHooks: Send + Sync {
 }
 
 impl TriggerHooks for () {}
-
-pub fn parse_file_url(url: &str) -> Result<PathBuf> {
-    url::Url::parse(url)
-        .with_context(|| format!("Invalid URL: {url:?}"))?
-        .to_file_path()
-        .map_err(|_| anyhow!("Invalid file URL path: {url:?}"))
-}

crates/trigger/src/lib.rs

@@ -11,7 +11,7 @@ use spin_app::{
 use spin_core::StoreBuilder;
 use tokio::fs;
 
-use crate::parse_file_url;
+use spin_common::url::parse_file_url;
 
 pub struct TriggerLoader {
     working_dir: PathBuf,