From d0356fc93540c9ea502a782b671f92eece31d3bf Mon Sep 17 00:00:00 2001 From: Ulyssa Date: Mon, 8 Jul 2024 13:05:55 -0700 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=8E=81=20Prepare=20release=20v0.10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 26 ++++++- Cargo.lock | 138 ++++++++++++++++----------------- cli/Cargo.toml | 4 +- cli/tests/trap-test/Cargo.lock | 138 ++++++++++++++++----------------- lib/Cargo.toml | 2 +- test-fixtures/Cargo.lock | 20 ++--- 6 files changed, 176 insertions(+), 152 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ddfc6ab0..110b9f66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,28 @@ -## Unreleased +## 0.10.0 (2024-07-09) + +- Add `get_addr_dest_{ip,port}` hostcalls ([#402](https://github.com/fastly/Viceroy/pull/402)) +- Add `downstream_server_ip_addr` hostcall ([#401](https://github.com/fastly/Viceroy/pull/401)) +- Support `wat` files when adapting core wasm ([#399](https://github.com/fastly/Viceroy/pull/399)) +- Add support for environment variables in the adapter ([#400](https://github.com/fastly/Viceroy/pull/400)) +- Run tests as components ([#396](https://github.com/fastly/Viceroy/pull/396)) +- Remove some unused memory management code in the adapter ([#398](https://github.com/fastly/Viceroy/pull/398)) +- Allow capturing logging endpoint messages ([#397](https://github.com/fastly/Viceroy/pull/397)) +- Support cli args in the adapter ([#394](https://github.com/fastly/Viceroy/pull/394)) +- Rework component testing support to make test updates easier ([#395](https://github.com/fastly/Viceroy/pull/395)) +- Populate the guest cli args ([#393](https://github.com/fastly/Viceroy/pull/393)) +- Update to wasmtime 22.0.0 ([#392](https://github.com/fastly/Viceroy/pull/392)) +- Populate `nwritten_out` when errors occur in config-store::get or dictionary::get ([#389](https://github.com/fastly/Viceroy/pull/389)) +- Switch to using the on-demand allocator, instead of the pooling allocator ([#391](https://github.com/fastly/Viceroy/pull/391)) +- Explicitly test the dictionary host calls in the dictionary fixture ([#390](https://github.com/fastly/Viceroy/pull/390)) +- Enable the config-store-lookup tests ([#387](https://github.com/fastly/Viceroy/pull/387)) +- Run the `request` tests as a component ([#386](https://github.com/fastly/Viceroy/pull/386)) +- Update Ubuntu and MacOS runners to latest (and non-EOL) versions ([#388](https://github.com/fastly/Viceroy/pull/388)) +- Fix trap handling when running components ([#382](https://github.com/fastly/Viceroy/pull/382)) +- fix(wiggle_abi): write the result's length, not the guest buffer's ([#385](https://github.com/fastly/Viceroy/pull/385)) +- Add adaptive buffer support for geo + device detection lookups ([#383](https://github.com/fastly/Viceroy/pull/383)) +- Fix buffer-len handling in the component adapter ([#381](https://github.com/fastly/Viceroy/pull/381)) +- Switch to reading dictionaries during the `fastly_dictionary_open` call ([#379](https://github.com/fastly/Viceroy/pull/379)) +- Support adapting core wasm to components ([#374](https://github.com/fastly/Viceroy/pull/374)) ## 0.9.7 (2024-05-24) diff --git a/Cargo.lock b/Cargo.lock index ef533716..6e8a19ea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -125,9 +125,9 @@ checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", @@ -212,9 +212,9 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "cap-fs-ext" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc2d2954524be4866aaa720f008fba9995de54784957a1b0e0119992d6d5e52" +checksum = "eb23061fc1c4ead4e45ca713080fe768e6234e959f5a5c399c39eb41aa34e56e" dependencies = [ "cap-primitives", "cap-std", @@ -224,9 +224,9 @@ dependencies = [ [[package]] name = "cap-net-ext" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799c81d79ea9c71a1438efd417c788214bc9e7986046d3710b6bbe60da4d8275" +checksum = "f83ae11f116bcbafc5327c6af250341db96b5930046732e1905f7dc65887e0e1" dependencies = [ "cap-primitives", "cap-std", @@ -236,9 +236,9 @@ dependencies = [ [[package]] name = "cap-primitives" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00172660727e2d7f808e7cc2bfffd093fdb3ea2ff2ef819289418a3c3ffab5ac" +checksum = "6d00bd8d26c4270d950eaaa837387964a2089a1c3c349a690a1fa03221d29531" dependencies = [ "ambient-authority", "fs-set-times", @@ -253,9 +253,9 @@ dependencies = [ [[package]] name = "cap-rand" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "270f1d341a2afc62604f8f688bee4e444d052b7a74c1458dd3aa7efb47d4077f" +checksum = "dbcb16a619d8b8211ed61f42bd290d2a1ac71277a69cf8417ec0996fa92f5211" dependencies = [ "ambient-authority", "rand", @@ -263,9 +263,9 @@ dependencies = [ [[package]] name = "cap-std" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd9187bb3f7478a4c135ea10473a41a5f029d2ac800c1adf64f35ec7d4c8603" +checksum = "19eb8e3d71996828751c1ed3908a439639752ac6bdc874e41469ef7fc15fbd7f" dependencies = [ "cap-primitives", "io-extras", @@ -275,9 +275,9 @@ dependencies = [ [[package]] name = "cap-time-ext" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91666f31e30c85b1d2ee8432c90987f752c45f5821f5638027b41e73e16a395b" +checksum = "61142dc51e25b7acc970ca578ce2c3695eac22bbba46c1073f5f583e78957725" dependencies = [ "ambient-authority", "cap-primitives", @@ -289,9 +289,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.104" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" +checksum = "066fce287b1d4eafef758e89e09d724a24808a9196fe9756b8ca90e86d0719a2" dependencies = [ "jobserver", "libc", @@ -1198,7 +1198,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1419,7 +1419,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1814,18 +1814,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -1994,9 +1994,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.68" +version = "2.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" dependencies = [ "proc-macro2", "quote", @@ -2021,9 +2021,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" [[package]] name = "tempfile" @@ -2078,9 +2078,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -2190,9 +2190,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.14" +version = "0.22.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" dependencies = [ "indexmap", "serde", @@ -2366,7 +2366,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "viceroy" -version = "0.9.8" +version = "0.10.0" dependencies = [ "anyhow", "base64", @@ -2406,7 +2406,7 @@ dependencies = [ [[package]] name = "viceroy-lib" -version = "0.9.8" +version = "0.10.0" dependencies = [ "anyhow", "async-trait", @@ -3037,7 +3037,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -3055,7 +3055,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -3075,18 +3075,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -3097,9 +3097,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -3109,9 +3109,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -3121,15 +3121,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -3139,9 +3139,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -3151,9 +3151,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -3163,9 +3163,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -3175,9 +3175,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -3306,18 +3306,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", @@ -3326,27 +3326,27 @@ dependencies = [ [[package]] name = "zstd" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "7.1.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" +checksum = "fa556e971e7b568dc775c136fc9de8c779b1c2fc3a63defaafadffdbd3181afa" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.11+zstd.1.5.6" +version = "2.0.12+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" +checksum = "0a4e40c320c3cb459d9a9ff6de98cff88f4751ee9275d140e2be94a2b74e4c13" dependencies = [ "cc", "pkg-config", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index bb86a80f..ebb26587 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "viceroy" description = "Viceroy is a local testing daemon for Fastly Compute." -version = "0.9.8" +version = "0.10.0" authors = ["Fastly"] readme = "../README.md" edition = "2021" @@ -45,7 +45,7 @@ tokio-rustls = { workspace = true } tracing = { workspace = true } tracing-futures = { workspace = true } tracing-subscriber = { version = "^0.3.16", features = ["env-filter", "fmt"] } -viceroy-lib = { path = "../lib", version = "^0.9.8" } +viceroy-lib = { path = "../lib", version = "^0.10.0" } wat = "^1.0.38" wasmtime = { workspace = true } wasmtime-wasi = { workspace = true } diff --git a/cli/tests/trap-test/Cargo.lock b/cli/tests/trap-test/Cargo.lock index 774c91c4..e49e46d2 100644 --- a/cli/tests/trap-test/Cargo.lock +++ b/cli/tests/trap-test/Cargo.lock @@ -140,9 +140,9 @@ checksum = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b39e8e18a6f05471870e110" [[package]] name = "async-trait" -version = "0.1.80" +version = "0.1.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" +checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", @@ -223,9 +223,9 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "cap-fs-ext" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc2d2954524be4866aaa720f008fba9995de54784957a1b0e0119992d6d5e52" +checksum = "eb23061fc1c4ead4e45ca713080fe768e6234e959f5a5c399c39eb41aa34e56e" dependencies = [ "cap-primitives", "cap-std", @@ -235,9 +235,9 @@ dependencies = [ [[package]] name = "cap-net-ext" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "799c81d79ea9c71a1438efd417c788214bc9e7986046d3710b6bbe60da4d8275" +checksum = "f83ae11f116bcbafc5327c6af250341db96b5930046732e1905f7dc65887e0e1" dependencies = [ "cap-primitives", "cap-std", @@ -247,9 +247,9 @@ dependencies = [ [[package]] name = "cap-primitives" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00172660727e2d7f808e7cc2bfffd093fdb3ea2ff2ef819289418a3c3ffab5ac" +checksum = "6d00bd8d26c4270d950eaaa837387964a2089a1c3c349a690a1fa03221d29531" dependencies = [ "ambient-authority", "fs-set-times", @@ -264,9 +264,9 @@ dependencies = [ [[package]] name = "cap-rand" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "270f1d341a2afc62604f8f688bee4e444d052b7a74c1458dd3aa7efb47d4077f" +checksum = "dbcb16a619d8b8211ed61f42bd290d2a1ac71277a69cf8417ec0996fa92f5211" dependencies = [ "ambient-authority", "rand", @@ -274,9 +274,9 @@ dependencies = [ [[package]] name = "cap-std" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd9187bb3f7478a4c135ea10473a41a5f029d2ac800c1adf64f35ec7d4c8603" +checksum = "19eb8e3d71996828751c1ed3908a439639752ac6bdc874e41469ef7fc15fbd7f" dependencies = [ "cap-primitives", "io-extras", @@ -286,9 +286,9 @@ dependencies = [ [[package]] name = "cap-time-ext" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91666f31e30c85b1d2ee8432c90987f752c45f5821f5638027b41e73e16a395b" +checksum = "61142dc51e25b7acc970ca578ce2c3695eac22bbba46c1073f5f583e78957725" dependencies = [ "ambient-authority", "cap-primitives", @@ -300,9 +300,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.104" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490" +checksum = "066fce287b1d4eafef758e89e09d724a24808a9196fe9756b8ca90e86d0719a2" dependencies = [ "jobserver", "libc", @@ -324,7 +324,7 @@ dependencies = [ "android-tzdata", "iana-time-zone", "num-traits", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1202,7 +1202,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1407,7 +1407,7 @@ dependencies = [ "libc", "redox_syscall", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1802,18 +1802,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -1957,9 +1957,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.68" +version = "2.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" dependencies = [ "proc-macro2", "quote", @@ -1984,9 +1984,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.14" +version = "0.12.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" [[package]] name = "termcolor" @@ -2029,9 +2029,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -2127,9 +2127,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.14" +version = "0.22.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" dependencies = [ "indexmap", "serde", @@ -2330,7 +2330,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "viceroy-lib" -version = "0.9.8" +version = "0.10.0" dependencies = [ "anyhow", "async-trait", @@ -2960,7 +2960,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2978,7 +2978,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -2998,18 +2998,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -3020,9 +3020,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -3032,9 +3032,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -3044,15 +3044,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -3062,9 +3062,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -3074,9 +3074,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -3086,9 +3086,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -3098,9 +3098,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" @@ -3190,18 +3190,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.7.34" +version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", @@ -3210,27 +3210,27 @@ dependencies = [ [[package]] name = "zstd" -version = "0.13.1" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" +checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "7.1.0" +version = "7.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" +checksum = "fa556e971e7b568dc775c136fc9de8c779b1c2fc3a63defaafadffdbd3181afa" dependencies = [ "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.11+zstd.1.5.6" +version = "2.0.12+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" +checksum = "0a4e40c320c3cb459d9a9ff6de98cff88f4751ee9275d140e2be94a2b74e4c13" dependencies = [ "cc", "pkg-config", diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 32edc64c..0a235ba6 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "viceroy-lib" -version = "0.9.8" +version = "0.10.0" description = "Viceroy implementation details." authors = ["Fastly"] edition = "2021" diff --git a/test-fixtures/Cargo.lock b/test-fixtures/Cargo.lock index a4d91000..4faf415c 100644 --- a/test-fixtures/Cargo.lock +++ b/test-fixtures/Cargo.lock @@ -230,22 +230,22 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -297,9 +297,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.68" +version = "2.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" dependencies = [ "proc-macro2", "quote", @@ -337,7 +337,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.68", + "syn 2.0.70", ] [[package]] @@ -368,9 +368,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] From aa665a6ef8c91ceb47eb38e156346057df3c2c3f Mon Sep 17 00:00:00 2001 From: Ulyssa Date: Tue, 9 Jul 2024 12:50:52 -0700 Subject: [PATCH 2/3] Exclude `viceroy-component-adapter` crate from release build The `viceroy-component-adapter` does not need to be built in the release builds, since it is meant to be rebuilt with `make adapter` and then have the generated WASM binary under `lib/data/` committed. --- .github/workflows/release.yml | 2 +- lib/data/viceroy-component-adapter.wasm | Bin 175373 -> 177177 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d01af579..181c4477 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -60,7 +60,7 @@ jobs: - name: Build run: | - cargo build --release --all --locked --target=${{ matrix.rust_arch }}-${{ matrix.rust_abi }} + cargo build --release --workspace --exclude viceroy-component-adapter --locked --target=${{ matrix.rust_arch }}-${{ matrix.rust_abi }} - name: Strip symbols (linux) if: ${{ matrix.name == 'linux' }} diff --git a/lib/data/viceroy-component-adapter.wasm b/lib/data/viceroy-component-adapter.wasm index 3202e302f3a9f6655c843b6e9edd946adc5c19c9..000703bdc344011cdd1d86cf0e7e9223abe85359 100755 GIT binary patch delta 33536 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�VbgMXaF>!(ZqCdzzuUaJ*b(kYFeKf^{+5yBHoo zl*vNkE|cNoBTf!H2_`~qFoog50UuMNq+KNr*pYMru@V!`jt1*iu-4M=L<_8r3BX2B z7{PrV0cs!V9of2s#-ZP6lG}$N;)JYS5l$LuWgnb@fW9Z$Abx9IbY4gByj=}e0+p

kb8G6~7R4gF>)!{A8tz|++=QSuBE853(GjpHGG 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 delta 31771 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 Date: Tue, 9 Jul 2024 13:35:48 -0700 Subject: [PATCH 3/3] Bump to v0.10.1 --- CHANGELOG.md | 2 ++ Cargo.lock | 4 ++-- cli/Cargo.toml | 4 ++-- cli/tests/trap-test/Cargo.lock | 2 +- lib/Cargo.toml | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 110b9f66..f3ac269b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## Unreleased + ## 0.10.0 (2024-07-09) - Add `get_addr_dest_{ip,port}` hostcalls ([#402](https://github.com/fastly/Viceroy/pull/402)) diff --git a/Cargo.lock b/Cargo.lock index 6e8a19ea..c385bf3d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2366,7 +2366,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "viceroy" -version = "0.10.0" +version = "0.10.1" dependencies = [ "anyhow", "base64", @@ -2406,7 +2406,7 @@ dependencies = [ [[package]] name = "viceroy-lib" -version = "0.10.0" +version = "0.10.1" dependencies = [ "anyhow", "async-trait", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index ebb26587..12247a30 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "viceroy" description = "Viceroy is a local testing daemon for Fastly Compute." -version = "0.10.0" +version = "0.10.1" authors = ["Fastly"] readme = "../README.md" edition = "2021" @@ -45,7 +45,7 @@ tokio-rustls = { workspace = true } tracing = { workspace = true } tracing-futures = { workspace = true } tracing-subscriber = { version = "^0.3.16", features = ["env-filter", "fmt"] } -viceroy-lib = { path = "../lib", version = "^0.10.0" } +viceroy-lib = { path = "../lib", version = "^0.10.1" } wat = "^1.0.38" wasmtime = { workspace = true } wasmtime-wasi = { workspace = true } diff --git a/cli/tests/trap-test/Cargo.lock b/cli/tests/trap-test/Cargo.lock index e49e46d2..446f72b6 100644 --- a/cli/tests/trap-test/Cargo.lock +++ b/cli/tests/trap-test/Cargo.lock @@ -2330,7 +2330,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "viceroy-lib" -version = "0.10.0" +version = "0.10.1" dependencies = [ "anyhow", "async-trait", diff --git a/lib/Cargo.toml b/lib/Cargo.toml index 0a235ba6..4c97fc4d 100644 --- a/lib/Cargo.toml +++ b/lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "viceroy-lib" -version = "0.10.0" +version = "0.10.1" description = "Viceroy implementation details." authors = ["Fastly"] edition = "2021"