From 2502a964b66c36b2b3d81813e58240d01cf5767b Mon Sep 17 00:00:00 2001 From: Ryan Levick Date: Tue, 17 Sep 2024 10:33:58 +0200 Subject: [PATCH] Update Spin again Signed-off-by: Ryan Levick --- Cargo.lock | 96 +++++++++++++++++++++++++++++++++--------------------- Cargo.toml | 12 +++---- 2 files changed, 64 insertions(+), 44 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 899411d..816f189 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1874,6 +1874,7 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", + "serde", ] [[package]] @@ -3731,7 +3732,7 @@ dependencies = [ [[package]] name = "spin-app" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "async-trait", @@ -3744,7 +3745,7 @@ dependencies = [ [[package]] name = "spin-common" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "dirs 5.0.1", @@ -3757,7 +3758,7 @@ dependencies = [ [[package]] name = "spin-componentize" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "tracing", @@ -3771,7 +3772,7 @@ dependencies = [ [[package]] name = "spin-compose" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "async-trait", @@ -3788,7 +3789,7 @@ dependencies = [ [[package]] name = "spin-core" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "async-trait", @@ -3799,7 +3800,7 @@ dependencies = [ [[package]] name = "spin-expressions" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "async-trait", @@ -3813,7 +3814,7 @@ dependencies = [ [[package]] name = "spin-factor-key-value" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "lru 0.9.0", @@ -3831,7 +3832,7 @@ dependencies = [ [[package]] name = "spin-factor-llm" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "async-trait", @@ -3849,7 +3850,7 @@ dependencies = [ [[package]] name = "spin-factor-outbound-http" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "http 1.1.0", @@ -3874,7 +3875,7 @@ dependencies = [ [[package]] name = "spin-factor-outbound-mqtt" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "rumqttc", @@ -3890,7 +3891,7 @@ dependencies = [ [[package]] name = "spin-factor-outbound-mysql" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "flate2", @@ -3911,7 +3912,7 @@ dependencies = [ [[package]] name = "spin-factor-outbound-networking" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "futures-util", @@ -3926,6 +3927,7 @@ dependencies = [ "spin-factor-wasi", "spin-factors", "spin-locked-app", + "spin-manifest", "spin-serde", "terminal", "tracing", @@ -3937,7 +3939,7 @@ dependencies = [ [[package]] name = "spin-factor-outbound-pg" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "native-tls", @@ -3955,7 +3957,7 @@ dependencies = [ [[package]] name = "spin-factor-outbound-redis" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "redis", @@ -3970,7 +3972,7 @@ dependencies = [ [[package]] name = "spin-factor-sqlite" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "async-trait", "serde", @@ -3980,12 +3982,13 @@ dependencies = [ "table", "tokio", "toml", + "tracing", ] [[package]] name = "spin-factor-variables" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "azure_core", "azure_identity", @@ -4004,7 +4007,7 @@ dependencies = [ [[package]] name = "spin-factor-wasi" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "async-trait", "bytes", @@ -4019,7 +4022,7 @@ dependencies = [ [[package]] name = "spin-factors" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "serde", @@ -4034,7 +4037,7 @@ dependencies = [ [[package]] name = "spin-factors-derive" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "proc-macro2", "quote", @@ -4044,7 +4047,7 @@ dependencies = [ [[package]] name = "spin-factors-executor" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "spin-app", @@ -4055,7 +4058,7 @@ dependencies = [ [[package]] name = "spin-key-value-azure" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "azure_data_cosmos", @@ -4071,7 +4074,7 @@ dependencies = [ [[package]] name = "spin-key-value-redis" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "redis", @@ -4086,7 +4089,7 @@ dependencies = [ [[package]] name = "spin-key-value-spin" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "once_cell", @@ -4101,7 +4104,7 @@ dependencies = [ [[package]] name = "spin-llm-remote-http" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "http 0.2.12", @@ -4116,7 +4119,7 @@ dependencies = [ [[package]] name = "spin-locked-app" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "async-trait", @@ -4126,10 +4129,27 @@ dependencies = [ "thiserror", ] +[[package]] +name = "spin-manifest" +version = "2.8.0-pre0" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" +dependencies = [ + "anyhow", + "indexmap 1.9.3", + "semver", + "serde", + "spin-serde", + "terminal", + "thiserror", + "toml", + "url", + "wasm-pkg-common", +] + [[package]] name = "spin-runtime-config" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "spin-common", @@ -4156,7 +4176,7 @@ dependencies = [ [[package]] name = "spin-runtime-factors" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "clap", @@ -4184,7 +4204,7 @@ dependencies = [ [[package]] name = "spin-serde" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "base64 0.22.1", @@ -4196,7 +4216,7 @@ dependencies = [ [[package]] name = "spin-sqlite" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "async-trait", "serde", @@ -4214,7 +4234,7 @@ dependencies = [ [[package]] name = "spin-sqlite-inproc" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "async-trait", @@ -4224,28 +4244,27 @@ dependencies = [ "spin-factor-sqlite", "spin-world", "tokio", - "tracing", ] [[package]] name = "spin-sqlite-libsql" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "async-trait", "libsql", "rusqlite", + "spin-factor-sqlite", "spin-world", "sqlparser", "tokio", - "tracing", ] [[package]] name = "spin-telemetry" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "http 0.2.12", @@ -4265,7 +4284,7 @@ dependencies = [ [[package]] name = "spin-trigger" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "anyhow", "clap", @@ -4293,7 +4312,7 @@ dependencies = [ [[package]] name = "spin-world" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "async-trait", "wasmtime", @@ -4445,7 +4464,7 @@ dependencies = [ [[package]] name = "table" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" [[package]] name = "target-lexicon" @@ -4477,7 +4496,7 @@ dependencies = [ [[package]] name = "terminal" version = "2.8.0-pre0" -source = "git+https://github.com/fermyon/spin?rev=4fbf872505976ded774005f602584c2feefbfd8b#4fbf872505976ded774005f602584c2feefbfd8b" +source = "git+https://github.com/fermyon/spin?rev=485b04090644ecfda4d0034891a5feca9a90332c#485b04090644ecfda4d0034891a5feca9a90332c" dependencies = [ "atty", "once_cell", @@ -4707,6 +4726,7 @@ version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", diff --git a/Cargo.toml b/Cargo.toml index 2a84157..a5e909a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,12 +16,12 @@ edition = "2021" anyhow = "1.0" clap = { version = "3.1.15", features = ["derive", "env"] } serde = "1.0" -spin-trigger = { git = "https://github.com/fermyon/spin", rev = "4fbf872505976ded774005f602584c2feefbfd8b" } -spin-core = { git = "https://github.com/fermyon/spin", rev = "4fbf872505976ded774005f602584c2feefbfd8b" } -spin-telemetry = { git = "https://github.com/fermyon/spin", rev = "4fbf872505976ded774005f602584c2feefbfd8b" } -spin-factors = { git = "https://github.com/fermyon/spin", rev = "4fbf872505976ded774005f602584c2feefbfd8b" } -spin-factor-wasi = { git = "https://github.com/fermyon/spin", rev = "4fbf872505976ded774005f602584c2feefbfd8b" } -spin-runtime-factors = { git = "https://github.com/fermyon/spin", rev = "4fbf872505976ded774005f602584c2feefbfd8b" } +spin-trigger = { git = "https://github.com/fermyon/spin", rev = "485b04090644ecfda4d0034891a5feca9a90332c" } +spin-core = { git = "https://github.com/fermyon/spin", rev = "485b04090644ecfda4d0034891a5feca9a90332c" } +spin-telemetry = { git = "https://github.com/fermyon/spin", rev = "485b04090644ecfda4d0034891a5feca9a90332c" } +spin-factors = { git = "https://github.com/fermyon/spin", rev = "485b04090644ecfda4d0034891a5feca9a90332c" } +spin-factor-wasi = { git = "https://github.com/fermyon/spin", rev = "485b04090644ecfda4d0034891a5feca9a90332c" } +spin-runtime-factors = { git = "https://github.com/fermyon/spin", rev = "485b04090644ecfda4d0034891a5feca9a90332c" } tokio = { version = "1.40", features = ["rt", "macros"] } tracing = { version = "0.1", features = ["log"] } wasmtime-wasi = "22.0.0"