diff --git a/containerd-shim-slight-v1/Cargo.lock b/containerd-shim-slight-v1/Cargo.lock index c5a43703..e476132c 100644 --- a/containerd-shim-slight-v1/Cargo.lock +++ b/containerd-shim-slight-v1/Cargo.lock @@ -1406,7 +1406,7 @@ dependencies = [ [[package]] name = "containerd-shim-slight-v1" -version = "0.7.0" +version = "0.8.0" dependencies = [ "chrono", "clap", diff --git a/containerd-shim-slight-v1/Cargo.toml b/containerd-shim-slight-v1/Cargo.toml index 1a380821..27a4ded7 100644 --- a/containerd-shim-slight-v1/Cargo.toml +++ b/containerd-shim-slight-v1/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "containerd-shim-slight-v1" -version = "0.7.0" +version = "0.8.0" authors = ["DeisLabs Engineering Team"] edition = "2021" repository = 'https://github.com/deislabs/containerd-wasm-shims' diff --git a/containerd-shim-spin-v1/Cargo.lock b/containerd-shim-spin-v1/Cargo.lock index 553abc81..fc986ed3 100644 --- a/containerd-shim-spin-v1/Cargo.lock +++ b/containerd-shim-spin-v1/Cargo.lock @@ -738,7 +738,7 @@ dependencies = [ [[package]] name = "containerd-shim-spin-v1" -version = "0.7.0" +version = "0.8.0" dependencies = [ "anyhow", "async-trait", diff --git a/containerd-shim-spin-v1/Cargo.toml b/containerd-shim-spin-v1/Cargo.toml index d87fa9a4..6c7ae9fc 100644 --- a/containerd-shim-spin-v1/Cargo.toml +++ b/containerd-shim-spin-v1/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "containerd-shim-spin-v1" -version = "0.7.0" +version = "0.8.0" authors = ["DeisLabs Engineering Team"] edition = "2021" repository = 'https://github.com/deislabs/containerd-wasm-shims' diff --git a/containerd-shim-wws-v1/Cargo.toml b/containerd-shim-wws-v1/Cargo.toml index a6d0e0b1..016c5160 100644 --- a/containerd-shim-wws-v1/Cargo.toml +++ b/containerd-shim-wws-v1/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "containerd-shim-wws-v1" -version = "0.7.0" +version = "0.8.0" authors = ["Wasm Labs team "] edition = "2021" repository = 'https://github.com/deislabs/containerd-wasm-shims' diff --git a/deployments/k3d/README.md b/deployments/k3d/README.md index 3369a708..11d429ff 100644 --- a/deployments/k3d/README.md +++ b/deployments/k3d/README.md @@ -17,7 +17,7 @@ $ tree . ## How to run the example The shell script below will create a k3d cluster locally with the Wasm shims installed and containerd configured. The script then applies the runtime classes for the shims and an example service and deployment. Finally, we curl the `/hello` and receive a response from the example workload. ```shell -k3d cluster create wasm-cluster --image ghcr.io/deislabs/containerd-wasm-shims/examples/k3d:v0.7.0 -p "8081:80@loadbalancer" --agents 2 +k3d cluster create wasm-cluster --image ghcr.io/deislabs/containerd-wasm-shims/examples/k3d:v0.8.0 -p "8081:80@loadbalancer" --agents 2 kubectl apply -f https://github.com/deislabs/containerd-wasm-shims/raw/main/deployments/workloads/runtime.yaml kubectl apply -f https://github.com/deislabs/containerd-wasm-shims/raw/main/deployments/workloads/workload.yaml echo "waiting 5 seconds for workload to be ready" diff --git a/deployments/workloads/workload.yaml b/deployments/workloads/workload.yaml index f1b65e24..bfb646eb 100644 --- a/deployments/workloads/workload.yaml +++ b/deployments/workloads/workload.yaml @@ -15,7 +15,7 @@ spec: runtimeClassName: wasmtime-slight containers: - name: slight-hello - image: ghcr.io/deislabs/containerd-wasm-shims/examples/slight-rust-hello:v0.7.0 + image: ghcr.io/deislabs/containerd-wasm-shims/examples/slight-rust-hello:v0.8.0 command: ["/"] resources: # limit the resources to 128Mi of memory and 100m of CPU limits: @@ -54,7 +54,7 @@ spec: runtimeClassName: wasmtime-spin containers: - name: spin-hello - image: ghcr.io/deislabs/containerd-wasm-shims/examples/spin-rust-hello:v0.7.0 + image: ghcr.io/deislabs/containerd-wasm-shims/examples/spin-rust-hello:v0.8.0 command: ["/"] resources: # limit the resources to 128Mi of memory and 100m of CPU limits: @@ -93,7 +93,7 @@ spec: runtimeClassName: wasmtime-wws containers: - name: wws-hello - image: ghcr.io/deislabs/containerd-wasm-shims/examples/wws-js-hello:v0.7.0 + image: ghcr.io/deislabs/containerd-wasm-shims/examples/wws-js-hello:v0.8.0 command: ["/"] resources: # limit the resources to 128Mi of memory and 100m of CPU limits: diff --git a/images/slight/Cargo.lock b/images/slight/Cargo.lock index ad4faa6b..cce9ca34 100644 --- a/images/slight/Cargo.lock +++ b/images/slight/Cargo.lock @@ -42,7 +42,7 @@ dependencies = [ [[package]] name = "http-server-lib" -version = "0.6.0" +version = "0.8.0" dependencies = [ "anyhow", "slight-http-handler-macro", diff --git a/images/slight/Cargo.toml b/images/slight/Cargo.toml index 23ea989c..4c03724d 100644 --- a/images/slight/Cargo.toml +++ b/images/slight/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "http-server-lib" -version = "0.7.0" +version = "0.8.0" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/images/spin-outbound-redis/Cargo.lock b/images/spin-outbound-redis/Cargo.lock index 11eef80e..3bdda69c 100644 --- a/images/spin-outbound-redis/Cargo.lock +++ b/images/spin-outbound-redis/Cargo.lock @@ -19,12 +19,24 @@ dependencies = [ "syn 2.0.4", ] +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + [[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + [[package]] name = "bytes" version = "1.4.0" @@ -46,6 +58,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + [[package]] name = "heck" version = "0.3.3" @@ -55,6 +73,15 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "http" version = "0.2.9" @@ -72,12 +99,45 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown", + "serde", +] + [[package]] name = "itoa" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +[[package]] +name = "leb128" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" + +[[package]] +name = "log" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" + [[package]] name = "memchr" version = "2.5.0" @@ -105,7 +165,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "memchr", "unicase", ] @@ -119,10 +179,66 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "routefinder" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94f8f99b10dedd317514253dda1fa7c14e344aac96e1f78149a64879ce282aca" +dependencies = [ + "smartcow", + "smartstring", +] + +[[package]] +name = "semver" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" + +[[package]] +name = "serde" +version = "1.0.164" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.164" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.4", +] + +[[package]] +name = "smartcow" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "656fcb1c1fca8c4655372134ce87d8afdf5ec5949ebabe8d314be0141d8b5da2" +dependencies = [ + "smartstring", +] + +[[package]] +name = "smartstring" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" +dependencies = [ + "autocfg", + "static_assertions", + "version_check", +] + [[package]] name = "spin-macro" version = "0.1.0" -source = "git+https://github.com/fermyon/spin?tag=v1.0.0#df99be238267b498451993d47b7e42e17da95c09" +source = "git+https://github.com/fermyon/spin?tag=v1.4.0#7aab1fe43be70a271ba6336b959cd52191fc2253" dependencies = [ "anyhow", "bytes", @@ -130,36 +246,40 @@ dependencies = [ "proc-macro2", "quote", "syn 1.0.109", - "wit-bindgen-gen-core", - "wit-bindgen-gen-rust-wasm", - "wit-bindgen-rust", ] [[package]] name = "spin-outbound-redis" -version = "0.1.0" +version = "0.8.0" dependencies = [ "anyhow", "bytes", "http", "spin-sdk", - "wit-bindgen-rust", + "wit-bindgen-rust 0.2.0", ] [[package]] name = "spin-sdk" -version = "1.0.0" -source = "git+https://github.com/fermyon/spin?tag=v1.0.0#df99be238267b498451993d47b7e42e17da95c09" +version = "1.4.0" +source = "git+https://github.com/fermyon/spin?tag=v1.4.0#7aab1fe43be70a271ba6336b959cd52191fc2253" dependencies = [ "anyhow", "bytes", "form_urlencoded", "http", + "routefinder", "spin-macro", "thiserror", - "wit-bindgen-rust", + "wit-bindgen", ] +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "syn" version = "1.0.109" @@ -226,6 +346,12 @@ dependencies = [ "version_check", ] +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + [[package]] name = "unicode-ident" version = "1.0.8" @@ -253,19 +379,83 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +[[package]] +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + [[package]] name = "version_check" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "wasm-encoder" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881" +dependencies = [ + "leb128", +] + +[[package]] +name = "wasm-metadata" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36e5156581ff4a302405c44ca7c85347563ca431d15f1a773f12c9c7b9a6cdc9" +dependencies = [ + "anyhow", + "indexmap", + "serde", + "wasm-encoder", + "wasmparser", +] + +[[package]] +name = "wasmparser" +version = "0.107.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e3ac9b780c7dda0cac7a52a5d6d2d6707cc6e3451c9db209b6c758f40d7acb" +dependencies = [ + "indexmap", + "semver", +] + +[[package]] +name = "wit-bindgen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "392d16e9e46cc7ca98125bc288dd5e4db469efe8323d3e0dac815ca7f2398522" +dependencies = [ + "bitflags 2.3.3", + "wit-bindgen-rust-macro", +] + +[[package]] +name = "wit-bindgen-core" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d422d36cbd78caa0e18c3371628447807c66ee72466b69865ea7e33682598158" +dependencies = [ + "anyhow", + "wit-component", + "wit-parser 0.8.0", +] + [[package]] name = "wit-bindgen-gen-core" version = "0.2.0" source = "git+https://github.com/bytecodealliance/wit-bindgen?rev=cb871cfa1ee460b51eb1d144b175b9aab9c50aba#cb871cfa1ee460b51eb1d144b175b9aab9c50aba" dependencies = [ "anyhow", - "wit-parser", + "wit-parser 0.2.0", ] [[package]] @@ -273,7 +463,7 @@ name = "wit-bindgen-gen-rust" version = "0.2.0" source = "git+https://github.com/bytecodealliance/wit-bindgen?rev=cb871cfa1ee460b51eb1d144b175b9aab9c50aba#cb871cfa1ee460b51eb1d144b175b9aab9c50aba" dependencies = [ - "heck", + "heck 0.3.3", "wit-bindgen-gen-core", ] @@ -282,7 +472,7 @@ name = "wit-bindgen-gen-rust-wasm" version = "0.2.0" source = "git+https://github.com/bytecodealliance/wit-bindgen?rev=cb871cfa1ee460b51eb1d144b175b9aab9c50aba#cb871cfa1ee460b51eb1d144b175b9aab9c50aba" dependencies = [ - "heck", + "heck 0.3.3", "wit-bindgen-gen-core", "wit-bindgen-gen-rust", ] @@ -293,10 +483,23 @@ version = "0.2.0" source = "git+https://github.com/bytecodealliance/wit-bindgen?rev=cb871cfa1ee460b51eb1d144b175b9aab9c50aba#cb871cfa1ee460b51eb1d144b175b9aab9c50aba" dependencies = [ "async-trait", - "bitflags", + "bitflags 1.3.2", "wit-bindgen-rust-impl", ] +[[package]] +name = "wit-bindgen-rust" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b76db68264f5d2089dc4652581236d8e75c5b89338de6187716215fd0e68ba3" +dependencies = [ + "heck 0.4.1", + "wasm-metadata", + "wit-bindgen-core", + "wit-bindgen-rust-lib", + "wit-component", +] + [[package]] name = "wit-bindgen-rust-impl" version = "0.2.0" @@ -308,6 +511,46 @@ dependencies = [ "wit-bindgen-gen-rust-wasm", ] +[[package]] +name = "wit-bindgen-rust-lib" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c50f334bc08b0903a43387f6eea6ef6aa9eb2a085729f1677b29992ecef20ba" +dependencies = [ + "heck 0.4.1", + "wit-bindgen-core", +] + +[[package]] +name = "wit-bindgen-rust-macro" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced38a5e174940c6a41ae587babeadfd2e2c2dc32f3b6488bcdca0e8922cf3f3" +dependencies = [ + "anyhow", + "proc-macro2", + "syn 2.0.4", + "wit-bindgen-core", + "wit-bindgen-rust 0.8.0", + "wit-component", +] + +[[package]] +name = "wit-component" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cbd4c7f8f400327c482c88571f373844b7889e61460650d650fc5881bb3575c" +dependencies = [ + "anyhow", + "bitflags 1.3.2", + "indexmap", + "log", + "wasm-encoder", + "wasm-metadata", + "wasmparser", + "wit-parser 0.8.0", +] + [[package]] name = "wit-parser" version = "0.2.0" @@ -319,3 +562,19 @@ dependencies = [ "unicode-normalization", "unicode-xid", ] + +[[package]] +name = "wit-parser" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6daec9f093dbaea0e94043eeb92ece327bbbe70c86b1f41aca9bbfefd7f050f0" +dependencies = [ + "anyhow", + "id-arena", + "indexmap", + "log", + "pulldown-cmark", + "semver", + "unicode-xid", + "url", +] diff --git a/images/spin-outbound-redis/Cargo.toml b/images/spin-outbound-redis/Cargo.toml index f18fa209..77183064 100644 --- a/images/spin-outbound-redis/Cargo.toml +++ b/images/spin-outbound-redis/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "spin-outbound-redis" -version = "0.7.0" +version = "0.8.0" authors = ["DeisLabs Engineering Team"] edition = "2021" @@ -11,7 +11,7 @@ crate-type = ["cdylib"] anyhow = "1" bytes = "1" http = "0.2" -spin-sdk = { git = "https://github.com/fermyon/spin", tag = "v1.2.0" } +spin-sdk = { git = "https://github.com/fermyon/spin", tag = "v1.4.0" } wit-bindgen-rust = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "cb871cfa1ee460b51eb1d144b175b9aab9c50aba" } [workspace] diff --git a/images/spin/Cargo.lock b/images/spin/Cargo.lock index 927c9c8d..5357bc19 100644 --- a/images/spin/Cargo.lock +++ b/images/spin/Cargo.lock @@ -19,12 +19,24 @@ dependencies = [ "syn 2.0.4", ] +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + [[package]] name = "bitflags" version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" + [[package]] name = "bytes" version = "1.4.0" @@ -46,6 +58,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + [[package]] name = "heck" version = "0.3.3" @@ -55,6 +73,15 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "http" version = "0.2.9" @@ -72,12 +99,45 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" +[[package]] +name = "idna" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown", + "serde", +] + [[package]] name = "itoa" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" +[[package]] +name = "leb128" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" + +[[package]] +name = "log" +version = "0.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" + [[package]] name = "memchr" version = "2.5.0" @@ -105,7 +165,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffade02495f22453cd593159ea2f59827aae7f53fa8323f756799b670881dcf8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "memchr", "unicase", ] @@ -119,10 +179,66 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "routefinder" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94f8f99b10dedd317514253dda1fa7c14e344aac96e1f78149a64879ce282aca" +dependencies = [ + "smartcow", + "smartstring", +] + +[[package]] +name = "semver" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" + +[[package]] +name = "serde" +version = "1.0.164" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e8c8cf938e98f769bc164923b06dce91cea1751522f46f8466461af04c9027d" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.164" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9735b638ccc51c28bf6914d90a2e9725b377144fc612c49a611fddd1b631d68" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.4", +] + +[[package]] +name = "smartcow" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "656fcb1c1fca8c4655372134ce87d8afdf5ec5949ebabe8d314be0141d8b5da2" +dependencies = [ + "smartstring", +] + +[[package]] +name = "smartstring" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" +dependencies = [ + "autocfg", + "static_assertions", + "version_check", +] + [[package]] name = "spin-macro" version = "0.1.0" -source = "git+https://github.com/fermyon/spin?tag=v1.0.0#df99be238267b498451993d47b7e42e17da95c09" +source = "git+https://github.com/fermyon/spin?tag=v1.4.0#7aab1fe43be70a271ba6336b959cd52191fc2253" dependencies = [ "anyhow", "bytes", @@ -130,36 +246,40 @@ dependencies = [ "proc-macro2", "quote", "syn 1.0.109", - "wit-bindgen-gen-core", - "wit-bindgen-gen-rust-wasm", - "wit-bindgen-rust", ] [[package]] name = "spin-rust-hello" -version = "0.1.0" +version = "0.8.0" dependencies = [ "anyhow", "bytes", "http", "spin-sdk", - "wit-bindgen-rust", + "wit-bindgen-rust 0.2.0", ] [[package]] name = "spin-sdk" -version = "1.0.0" -source = "git+https://github.com/fermyon/spin?tag=v1.0.0#df99be238267b498451993d47b7e42e17da95c09" +version = "1.4.0" +source = "git+https://github.com/fermyon/spin?tag=v1.4.0#7aab1fe43be70a271ba6336b959cd52191fc2253" dependencies = [ "anyhow", "bytes", "form_urlencoded", "http", + "routefinder", "spin-macro", "thiserror", - "wit-bindgen-rust", + "wit-bindgen", ] +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "syn" version = "1.0.109" @@ -226,6 +346,12 @@ dependencies = [ "version_check", ] +[[package]] +name = "unicode-bidi" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" + [[package]] name = "unicode-ident" version = "1.0.8" @@ -253,19 +379,83 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +[[package]] +name = "url" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + [[package]] name = "version_check" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "wasm-encoder" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18c41dbd92eaebf3612a39be316540b8377c871cb9bde6b064af962984912881" +dependencies = [ + "leb128", +] + +[[package]] +name = "wasm-metadata" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36e5156581ff4a302405c44ca7c85347563ca431d15f1a773f12c9c7b9a6cdc9" +dependencies = [ + "anyhow", + "indexmap", + "serde", + "wasm-encoder", + "wasmparser", +] + +[[package]] +name = "wasmparser" +version = "0.107.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29e3ac9b780c7dda0cac7a52a5d6d2d6707cc6e3451c9db209b6c758f40d7acb" +dependencies = [ + "indexmap", + "semver", +] + +[[package]] +name = "wit-bindgen" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "392d16e9e46cc7ca98125bc288dd5e4db469efe8323d3e0dac815ca7f2398522" +dependencies = [ + "bitflags 2.3.3", + "wit-bindgen-rust-macro", +] + +[[package]] +name = "wit-bindgen-core" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d422d36cbd78caa0e18c3371628447807c66ee72466b69865ea7e33682598158" +dependencies = [ + "anyhow", + "wit-component", + "wit-parser 0.8.0", +] + [[package]] name = "wit-bindgen-gen-core" version = "0.2.0" source = "git+https://github.com/bytecodealliance/wit-bindgen?rev=cb871cfa1ee460b51eb1d144b175b9aab9c50aba#cb871cfa1ee460b51eb1d144b175b9aab9c50aba" dependencies = [ "anyhow", - "wit-parser", + "wit-parser 0.2.0", ] [[package]] @@ -273,7 +463,7 @@ name = "wit-bindgen-gen-rust" version = "0.2.0" source = "git+https://github.com/bytecodealliance/wit-bindgen?rev=cb871cfa1ee460b51eb1d144b175b9aab9c50aba#cb871cfa1ee460b51eb1d144b175b9aab9c50aba" dependencies = [ - "heck", + "heck 0.3.3", "wit-bindgen-gen-core", ] @@ -282,7 +472,7 @@ name = "wit-bindgen-gen-rust-wasm" version = "0.2.0" source = "git+https://github.com/bytecodealliance/wit-bindgen?rev=cb871cfa1ee460b51eb1d144b175b9aab9c50aba#cb871cfa1ee460b51eb1d144b175b9aab9c50aba" dependencies = [ - "heck", + "heck 0.3.3", "wit-bindgen-gen-core", "wit-bindgen-gen-rust", ] @@ -293,10 +483,23 @@ version = "0.2.0" source = "git+https://github.com/bytecodealliance/wit-bindgen?rev=cb871cfa1ee460b51eb1d144b175b9aab9c50aba#cb871cfa1ee460b51eb1d144b175b9aab9c50aba" dependencies = [ "async-trait", - "bitflags", + "bitflags 1.3.2", "wit-bindgen-rust-impl", ] +[[package]] +name = "wit-bindgen-rust" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b76db68264f5d2089dc4652581236d8e75c5b89338de6187716215fd0e68ba3" +dependencies = [ + "heck 0.4.1", + "wasm-metadata", + "wit-bindgen-core", + "wit-bindgen-rust-lib", + "wit-component", +] + [[package]] name = "wit-bindgen-rust-impl" version = "0.2.0" @@ -308,6 +511,46 @@ dependencies = [ "wit-bindgen-gen-rust-wasm", ] +[[package]] +name = "wit-bindgen-rust-lib" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c50f334bc08b0903a43387f6eea6ef6aa9eb2a085729f1677b29992ecef20ba" +dependencies = [ + "heck 0.4.1", + "wit-bindgen-core", +] + +[[package]] +name = "wit-bindgen-rust-macro" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ced38a5e174940c6a41ae587babeadfd2e2c2dc32f3b6488bcdca0e8922cf3f3" +dependencies = [ + "anyhow", + "proc-macro2", + "syn 2.0.4", + "wit-bindgen-core", + "wit-bindgen-rust 0.8.0", + "wit-component", +] + +[[package]] +name = "wit-component" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cbd4c7f8f400327c482c88571f373844b7889e61460650d650fc5881bb3575c" +dependencies = [ + "anyhow", + "bitflags 1.3.2", + "indexmap", + "log", + "wasm-encoder", + "wasm-metadata", + "wasmparser", + "wit-parser 0.8.0", +] + [[package]] name = "wit-parser" version = "0.2.0" @@ -319,3 +562,19 @@ dependencies = [ "unicode-normalization", "unicode-xid", ] + +[[package]] +name = "wit-parser" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6daec9f093dbaea0e94043eeb92ece327bbbe70c86b1f41aca9bbfefd7f050f0" +dependencies = [ + "anyhow", + "id-arena", + "indexmap", + "log", + "pulldown-cmark", + "semver", + "unicode-xid", + "url", +] diff --git a/images/spin/Cargo.toml b/images/spin/Cargo.toml index 565ff0f4..e8716526 100644 --- a/images/spin/Cargo.toml +++ b/images/spin/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "spin-rust-hello" -version = "0.7.0" +version = "0.8.0" authors = ["DeisLabs Engineering Team"] edition = "2021" @@ -11,7 +11,7 @@ crate-type = ["cdylib"] anyhow = "1" bytes = "1" http = "0.2" -spin-sdk = { git = "https://github.com/fermyon/spin", tag = "v1.2.0" } +spin-sdk = { git = "https://github.com/fermyon/spin", tag = "v1.4.0" } wit-bindgen-rust = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "cb871cfa1ee460b51eb1d144b175b9aab9c50aba" } [workspace]