Merge pull request #2996 from fibonacci1729/push

feat(push): allow pushing composed components to registry

Author: fibonacci1729

Cargo.lock

@@ -155,6 +155,12 @@ wasmtime = "29.0.1"
 wasmtime-wasi = "29.0.1"
 wasmtime-wasi-http = "29.0.1"
 
+wasm-encoder = "0.217"
+wasm-metadata = "0.217"
+wasmparser = "0.217"
+wit-component = "0.217"
+wit-parser = "0.217"
+
 spin-componentize = { path = "crates/componentize" }
 
 [workspace.lints.clippy]

Cargo.toml

@@ -11,11 +11,11 @@ rust-version.workspace = true
 [dependencies]
 anyhow = { workspace = true }
 tracing = { workspace = true }
-wasm-encoder = "0.217"
-wasm-metadata = "0.217"
-wasmparser = "0.217"
-wit-component = "0.217"
-wit-parser = "0.217"
+wasm-encoder = { workspace = true }
+wasm-metadata = { workspace = true }
+wasmparser = { workspace = true }
+wit-component = { workspace = true }
+wit-parser = { workspace = true }
 
 [dev-dependencies]
 async-trait = { workspace = true }

crates/componentize/Cargo.toml

@@ -14,8 +14,11 @@ async-trait = { workspace = true }
 indexmap = "2"
 semver = "1"
 spin-app = { path = "../app" }
+spin-common = { path = "../common" }
+spin-componentize = { path = "../componentize" }
 spin-serde = { path = "../serde" }
 thiserror = { workspace = true }
+tokio = { workspace = true, features = ["fs"] }
 wac-graph = "0.6"
 
 [lints]

crates/compose/Cargo.toml

@@ -2,6 +2,7 @@ use anyhow::Context;
 use indexmap::IndexMap;
 use semver::Version;
 use spin_app::locked::{self, InheritConfiguration, LockedComponent, LockedComponentDependency};
+use spin_common::{ui::quoted_path, url::parse_file_url};
 use spin_serde::{DependencyName, KebabId};
 use std::collections::BTreeMap;
 use thiserror::Error;
@@ -42,6 +43,36 @@ pub trait ComponentSourceLoader {
     ) -> anyhow::Result<Vec<u8>>;
 }
 
+/// A ComponentSourceLoader that loads component sources from the filesystem.
+pub struct ComponentSourceLoaderFs;
+
+#[async_trait::async_trait]
+impl ComponentSourceLoader for ComponentSourceLoaderFs {
+    async fn load_component_source(
+        &self,
+        source: &locked::LockedComponentSource,
+    ) -> anyhow::Result<Vec<u8>> {
+        let source = source
+            .content
+            .source
+            .as_ref()
+            .context("LockedComponentSource missing source field")?;
+
+        let path = parse_file_url(source)?;
+
+        let bytes: Vec<u8> = tokio::fs::read(&path).await.with_context(|| {
+            format!(
+                "failed to read component source from disk at path {}",
+                quoted_path(&path)
+            )
+        })?;
+
+        let component = spin_componentize::componentize_if_necessary(&bytes)?;
+
+        Ok(component.into())
+    }
+}
+
 /// Represents an error that can occur when composing dependencies.
 #[derive(Debug, Error)]
 pub enum ComposeError {

crates/compose/src/lib.rs

@@ -22,10 +22,16 @@ reqwest = "0.12"
 serde = { workspace = true }
 serde_json = { workspace = true }
 spin-common = { path = "../common" }
+spin-compose = { path = "../compose" }
 spin-loader = { path = "../loader" }
 spin-locked-app = { path = "../locked-app" }
 tempfile = { workspace = true }
 tokio = { workspace = true, features = ["fs"] }
 tokio-util = { version = "0.7", features = ["compat"] }
 tracing = { workspace = true }
 walkdir = "2"
+
+[dev-dependencies]
+wasm-encoder = { workspace = true }
+wit-component = { workspace = true, features = ["dummy-module"] }
+wit-parser = { workspace = true }