Merge remote-tracking branch 'origin/main' into byoung/kv-builder

fastly · Sep 27, 2024 · 2154eb0 · 2154eb0
2 parents c22e3a8 + c9ad383
commit 2154eb0
Show file tree

Hide file tree

Showing 15 changed files with 708 additions and 668 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -41,21 +41,21 @@ futures = "0.3.24"
 url = "2.3.1"
 
 # Wasmtime dependencies
-wasmtime = "22.0.0"
-wasmtime-wasi = "22.0.0"
-wasmtime-wasi-nn = "22.0.0"
-wiggle = "22.0.0"
+wasmtime = "25.0.0"
+wasmtime-wasi = "25.0.0"
+wasmtime-wasi-nn = "25.0.0"
+wiggle = "25.0.0"
 wat = "1.212.0"
-wasmparser = "0.208.0"
-wasm-encoder = { version = "0.208.0", features = ["wasmparser"] }
-wit-component = "0.208.0"
+wasmparser = "0.217.0"
+wasm-encoder = { version = "0.217.0", features = ["wasmparser"] }
+wit-component = "0.217.0"
 
 # Adapter dependencies
 byte-array-literals = { path = "crates/adapter/byte-array-literals" }
 bitflags = { version = "2.5.0", default-features = false }
 object = { version = "0.33", default-features = false, features = ["archive"] }
 wasi = { version = "0.11.0", default-features = false }
-wit-bindgen-rust-macro = { version = "0.25.0", default-features = false }
+wit-bindgen-rust-macro = { version = "0.32.0", default-features = false }
 
 [profile.release.package.viceroy-component-adapter]
 opt-level = 's'

diff --git a/cli/tests/integration/secret_store.rs b/cli/tests/integration/secret_store.rs
@@ -14,6 +14,7 @@ viceroy_test!(secret_store_works, |is_component| {
         language = "rust"
         [local_server]
         secret_stores.store_one = [{key = "first", data = "This is some data"},{key = "second", file = "../test-fixtures/data/kv-store.txt"}]
+        secret_stores.store_two = {file = "../test-fixtures/data/json-secret_store.json", format = "json"}
     "#;
 
     let resp = Test::using_fixture("secret-store.wasm")