Upgrade everything else to manifest V2

Signed-off-by: Lann Martin <[email protected]>

Author: lann

Cargo.lock

@@ -12,7 +12,7 @@ authors = ["Fermyon Engineering <[email protected]>"]
 edition = "2021"
 
 [dependencies]
-anyhow = "1.0"
+anyhow = { workspace = true }
 async-trait = "0.1"
 bytes = "1.1"
 chrono = "0.4"
@@ -78,6 +78,7 @@ subprocess = "0.2.9"
 openssl = { version = "0.10" }
 
 [dev-dependencies]
+anyhow = { workspace = true, features = ["backtrace"] }
 hex = "0.4.3"
 hyper = { workspace = true }
 sha2 = "0.10.1"
@@ -107,6 +108,7 @@ llm-cublas = ["llm", "spin-trigger-http/llm-cublas"]
 members = ["crates/*", "sdk/rust", "sdk/rust/macro"]
 
 [workspace.dependencies]
+anyhow = "1.0.75"
 tracing = { version = "0.1", features = ["log"] }
 wasmtime-wasi = { git = "https://github.com/bytecodealliance/wasmtime", rev = "c796ce7376a57a40605f03e74bd78cefcc9acf3a", features = [
   "tokio",

Cargo.toml

@@ -28,6 +28,8 @@ pub use metadata::MetadataKey;
 pub const APP_NAME_KEY: MetadataKey = MetadataKey::new("name");
 /// MetadataKey for extracting the application version.
 pub const APP_VERSION_KEY: MetadataKey = MetadataKey::new("version");
+/// MetadataKey for extracting the application description.
+pub const APP_DESCRIPTION_KEY: MetadataKey = MetadataKey::new("description");
 /// MetadataKey for extracting the OCI image digest.
 pub const OCI_IMAGE_DIGEST_KEY: MetadataKey = MetadataKey::new("oci_image_digest");
 

crates/app/src/lib.rs

@@ -161,12 +161,6 @@ impl<const V: usize> From<FixedVersion<V>> for usize {
     }
 }
 
-impl<const V: usize> From<FixedVersion<V>> for String {
-    fn from(_: FixedVersion<V>) -> String {
-        V.to_string()
-    }
-}
-
 impl<const V: usize> TryFrom<usize> for FixedVersion<V> {
     type Error = String;
 
@@ -178,17 +172,6 @@ impl<const V: usize> TryFrom<usize> for FixedVersion<V> {
     }
 }
 
-impl<const V: usize> TryFrom<String> for FixedVersion<V> {
-    type Error = String;
-
-    fn try_from(value: String) -> Result<Self, Self::Error> {
-        let value: usize = value
-            .parse()
-            .map_err(|err| format!("invalid version: {}", err))?;
-        value.try_into()
-    }
-}
-
 mod serde_base64 {
     use std::borrow::Cow;
 

crates/app/src/locked.rs

@@ -16,9 +16,21 @@ impl ValuesMapBuilder {
         Self::default()
     }
 
+    /// Returns a ValuesMapBuilder populated from the given map-serializable
+    /// value.
+    pub fn try_from<S: Serialize>(s: S) -> serde_json::Result<Self> {
+        let value = serde_json::to_value(s)?;
+        let map = serde_json::from_value(value)?;
+        Ok(Self(map))
+    }
+
     /// Inserts a string value into the map.
     pub fn string(&mut self, key: impl Into<String>, value: impl Into<String>) -> &mut Self {
-        self.entry(key, value.into())
+        let value = value.into();
+        if value.is_empty() {
+            return self;
+        }
+        self.entry(key, value)
     }
 
     /// Inserts a string value into the map only if the given Option is Some.
@@ -39,7 +51,11 @@ impl ValuesMapBuilder {
         key: impl Into<String>,
         iter: impl IntoIterator<Item = T>,
     ) -> &mut Self {
-        self.entry(key, iter.into_iter().map(|s| s.into()).collect::<Vec<_>>())
+        let entries = iter.into_iter().map(|s| s.into()).collect::<Vec<_>>();
+        if entries.is_empty() {
+            return self;
+        }
+        self.entry(key, entries)
     }
 
     /// Inserts an entry into the map using the value's `impl Into<Value>`.
@@ -55,7 +71,9 @@ impl ValuesMapBuilder {
         value: impl Serialize,
     ) -> serde_json::Result<&mut Self> {
         let value = serde_json::to_value(value)?;
-        self.0.insert(key.into(), value);
+        if !value.is_null() {
+            self.0.insert(key.into(), value);
+        }
         Ok(self)
     }
 

crates/app/src/values.rs

@@ -8,7 +8,8 @@ edition = { workspace = true }
 anyhow = "1.0.57"
 futures = "0.3.21"
 serde = { version = "1.0", features = [ "derive" ] }
-spin-loader = { path = "../loader" }
+spin-common = { path = "../common" }
+spin-manifest = { path = "../manifest" }
 terminal = { path = "../terminal" }
 subprocess = "0.2.8"
 tokio = { version = "1.23", features = [ "full" ] }

crates/build/Cargo.toml

@@ -5,7 +5,7 @@
 mod manifest;
 
 use anyhow::{anyhow, bail, Context, Result};
-use spin_loader::local::parent_dir;
+use spin_common::paths::parent_dir;
 use std::{
     collections::HashSet,
     path::{Path, PathBuf},

crates/build/src/lib.rs

@@ -1,5 +1,5 @@
 use serde::{Deserialize, Serialize};
-use spin_loader::local::config::FixedStringVersion;
+use spin_manifest::schema::FixedStringVersion;
 use std::path::PathBuf;
 
 #[derive(Clone, Debug, Deserialize)]

crates/build/src/manifest.rs

@@ -8,7 +8,5 @@ edition = { workspace = true }
 anyhow = "1.0"
 dirs = "4.0"
 sha2 = "0.10"
-tokio = { version = "1", features = ["rt", "time"] }
-
-[dev-dependencies]
-tempfile = "3.5"
+tempfile = "3.5"
+tokio = { version = "1", features = ["rt", "time"] }