From fa95ebdd25fc145616aef758f31a15ae47648f44 Mon Sep 17 00:00:00 2001 From: Ryan Levick Date: Tue, 17 Sep 2024 10:43:56 +0200 Subject: [PATCH] Update Spin again Signed-off-by: Ryan Levick --- Cargo.lock | 96 +++++++++++++++++++++++++++++++++--------------------- Cargo.toml | 10 +++--- 2 files changed, 63 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d6df39c..b80c8f1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2199,6 +2199,7 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown 0.12.3", + "serde", ] [[package]] @@ -4125,7 +4126,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", @@ -4138,7 +4139,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", @@ -4151,7 +4152,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", @@ -4165,7 +4166,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", @@ -4182,7 +4183,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", @@ -4193,7 +4194,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", @@ -4207,7 +4208,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", @@ -4225,7 +4226,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", @@ -4243,7 +4244,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", @@ -4268,7 +4269,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", @@ -4284,7 +4285,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", @@ -4305,7 +4306,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", @@ -4320,6 +4321,7 @@ dependencies = [ "spin-factor-wasi", "spin-factors", "spin-locked-app", + "spin-manifest", "spin-serde", "terminal", "tracing", @@ -4331,7 +4333,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", @@ -4349,7 +4351,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", @@ -4364,7 +4366,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", @@ -4374,12 +4376,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", @@ -4398,7 +4401,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", @@ -4413,7 +4416,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", @@ -4428,7 +4431,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", @@ -4438,7 +4441,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", @@ -4449,7 +4452,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", @@ -4465,7 +4468,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", @@ -4480,7 +4483,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", @@ -4495,7 +4498,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.11", @@ -4510,7 +4513,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", @@ -4520,10 +4523,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", @@ -4550,7 +4570,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", @@ -4578,7 +4598,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", @@ -4590,7 +4610,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", @@ -4608,7 +4628,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", @@ -4618,28 +4638,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.11", @@ -4659,7 +4678,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", @@ -4687,7 +4706,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", @@ -4839,7 +4858,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" @@ -4871,7 +4890,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", @@ -5122,6 +5141,7 @@ version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" dependencies = [ + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", diff --git a/Cargo.toml b/Cargo.toml index 4f7140c..878a104 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,11 +11,11 @@ aws-sdk-sqs = "0.22.0" clap = { version = "3.1.15", features = ["derive", "env"] } futures = "0.3.25" serde = "1.0" -spin-core = { git = "https://github.com/fermyon/spin", rev = "4fbf872505976ded774005f602584c2feefbfd8b" } -spin-factors = { git = "https://github.com/fermyon/spin", rev = "4fbf872505976ded774005f602584c2feefbfd8b" } -spin-runtime-factors = { git = "https://github.com/fermyon/spin", rev = "4fbf872505976ded774005f602584c2feefbfd8b" } -spin-telemetry = { git = "https://github.com/fermyon/spin", rev = "4fbf872505976ded774005f602584c2feefbfd8b" } -spin-trigger = { git = "https://github.com/fermyon/spin", rev = "4fbf872505976ded774005f602584c2feefbfd8b" } +spin-core = { git = "https://github.com/fermyon/spin", rev = "485b04090644ecfda4d0034891a5feca9a90332c" } +spin-factors = { git = "https://github.com/fermyon/spin", rev = "485b04090644ecfda4d0034891a5feca9a90332c" } +spin-runtime-factors = { git = "https://github.com/fermyon/spin", rev = "485b04090644ecfda4d0034891a5feca9a90332c" } +spin-telemetry = { git = "https://github.com/fermyon/spin", rev = "485b04090644ecfda4d0034891a5feca9a90332c" } +spin-trigger = { git = "https://github.com/fermyon/spin", rev = "485b04090644ecfda4d0034891a5feca9a90332c" } tokio = { version = "1.40", features = ["rt", "macros", "time", "signal"] } tokio-scoped = "0.2.0" tracing = { version = "0.1", features = ["log"] }