From a427f67c5a78d29d1cc35b08b4659942cbf328e7 Mon Sep 17 00:00:00 2001 From: Kate Goldenring Date: Thu, 31 Oct 2024 11:32:46 -0700 Subject: [PATCH] chore(deps): bump containerd-shim-wasm dependency Signed-off-by: Kate Goldenring --- .gitignore | 4 +- Cargo.lock | 102 ++++++++++++++++++-------------- containerd-shim-spin/Cargo.toml | 4 +- 3 files changed, 62 insertions(+), 48 deletions(-) diff --git a/.gitignore b/.gitignore index c048ab6d..968563e4 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,6 @@ target/ .tmp -test/* \ No newline at end of file +test/* + +.vscode/* \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index aa2a54cc..5985c2c6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1182,9 +1182,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.18" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" dependencies = [ "jobserver", "libc", @@ -1478,9 +1478,9 @@ dependencies = [ [[package]] name = "containerd-shim" -version = "0.7.1" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ecfe3bbd2e126cbd3b37ebc7faadedeeb5a87a389dc1668f1f0f4d246e46769" +checksum = "0a7db624a85172d3d66c8408e8a7ec8519b6506cc7437947c31ec3730dfd8b05" dependencies = [ "cgroups-rs", "command-fds", @@ -1489,8 +1489,8 @@ dependencies = [ "lazy_static 1.5.0", "libc", "log", - "mio 0.8.11", - "nix 0.28.0", + "mio 1.0.2", + "nix 0.29.0", "oci-spec", "os_pipe", "page_size", @@ -1505,9 +1505,9 @@ dependencies = [ [[package]] name = "containerd-shim-protos" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e4ef8fa542cd6964b2705983d02de4f4bdaaac8d25feabcef5c43a87ac58291" +checksum = "11496b458083e0e6c6f7a3473b33bb2af0f1ab6a39cdaf9f1bb1f6044f43bc51" dependencies = [ "protobuf 3.2.0", "ttrpc", @@ -1576,9 +1576,9 @@ dependencies = [ [[package]] name = "containerd-shim-wasm" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "002a7cb9718411b13190f45d454c6e63936ed106077c67060a9f2e8a283c9933" +checksum = "8ce0fe77add2865b09f6ec9aeaa85fb031017ca59e95fef49ed961b06371ce78" dependencies = [ "anyhow", "caps", @@ -1594,7 +1594,6 @@ dependencies = [ "log", "nix 0.28.0", "oci-spec", - "prost-types 0.12.6", "protobuf 3.2.0", "serde 1.0.210", "serde_json", @@ -1604,7 +1603,7 @@ dependencies = [ "tokio-stream", "ttrpc", "ttrpc-codegen", - "wasmparser 0.208.1", + "wasmparser 0.214.0", "wat", "windows-sys 0.52.0", ] @@ -2196,8 +2195,8 @@ dependencies = [ "serde_ignored", "serde_json", "sha2", - "strum", - "strum_macros", + "strum 0.23.0", + "strum_macros 0.23.1", "tar", "thiserror", "tokio", @@ -3688,18 +3687,18 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.158" +version = "0.2.161" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" [[package]] name = "libcgroups" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50512872f3b6dc2e2ce89d51f13980fc669b4f435d731ba7a2c7b66cc492b9d3" +checksum = "ef6c844cd81f0e078bb07896a14fddcec9f9582833ce18f99c2d4c9b69081d53" dependencies = [ "fixedbitset 0.5.7", - "nix 0.27.1", + "nix 0.28.0", "oci-spec", "procfs", "serde 1.0.210", @@ -3709,9 +3708,9 @@ dependencies = [ [[package]] name = "libcontainer" -version = "0.3.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e60a5de019b0e4679f63e1ccf58fff28e0380553f89430f5e8eeb6a7cb655d40" +checksum = "e301f76db45c6b2612de0fb1978b9e245fd64a36898ff35928760aee7e34af70" dependencies = [ "bitflags 2.6.0", "caps", @@ -3722,7 +3721,7 @@ dependencies = [ "libcgroups", "libseccomp", "nc", - "nix 0.27.1", + "nix 0.28.0", "oci-spec", "once_cell", "prctl", @@ -4058,15 +4057,6 @@ dependencies = [ "rustix 0.38.37", ] -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.7.1" @@ -4159,6 +4149,7 @@ checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ "hermit-abi 0.3.9", "libc", + "log", "wasi 0.11.0+wasi-snapshot-preview1", "windows-sys 0.52.0", ] @@ -4255,9 +4246,9 @@ dependencies = [ [[package]] name = "nc" -version = "0.8.23" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44b24115ea9683b6fd45d99c7e83002a739601faea67908edb02737497fabdd3" +checksum = "34566634a278b9af0f62b872339d884ea689982514825ba306705f264038144e" dependencies = [ "cc", ] @@ -4272,8 +4263,6 @@ dependencies = [ "bitflags 1.3.2", "cfg-if 1.0.0", "libc", - "memoffset 0.6.5", - "pin-utils", ] [[package]] @@ -4298,7 +4287,6 @@ dependencies = [ "bitflags 2.6.0", "cfg-if 1.0.0", "libc", - "memoffset 0.9.1", ] [[package]] @@ -4324,6 +4312,7 @@ dependencies = [ "cfg-if 1.0.0", "cfg_aliases 0.2.1", "libc", + "memoffset 0.9.1", ] [[package]] @@ -4555,14 +4544,18 @@ dependencies = [ [[package]] name = "oci-spec" -version = "0.6.5" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e423c4f827362c0d8d8da4b1f571270f389ebde73bcd3240a3d23c6d6f61d0f0" +checksum = "3f5a3fe998d50101ae009351fec56d88a69f4ed182e11000e711068c2f5abf72" dependencies = [ "derive_builder 0.20.1", "getset", + "once_cell", + "regex", "serde 1.0.210", "serde_json", + "strum 0.26.3", + "strum_macros 0.26.4", "thiserror", ] @@ -5245,7 +5238,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "059a34f111a9dee2ce1ac2826a68b24601c4298cfeb1a587c3cb493d5ab46f52" dependencies = [ "libc", - "nix 0.25.1", + "nix 0.29.0", ] [[package]] @@ -7656,6 +7649,12 @@ version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cae14b91c7d11c9a851d3fbc80a963198998c2a64eec840477fa92d8ce9b70bb" +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" + [[package]] name = "strum_macros" version = "0.23.1" @@ -7669,6 +7668,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.77", +] + [[package]] name = "subprocess" version = "0.2.9" @@ -8483,9 +8495,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "ttrpc" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ea338db445bee75c596cf8a478fbfcefad5a943c9e92a7e1c805c65ed39551" +checksum = "e376927d4422245ae3e0a0d7df0e805f99652536999b5c671144de9fe4120d8c" dependencies = [ "byteorder", "crossbeam", @@ -9244,9 +9256,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.208.1" +version = "0.209.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd921789c9dcc495f589cb37d200155dee65b4a4beeb853323b5e24e0a5f9c58" +checksum = "07035cc9a9b41e62d3bb3a3815a66ab87c993c06fe1cf6b2a3f2a18499d937db" dependencies = [ "ahash", "bitflags 2.6.0", @@ -9258,9 +9270,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.209.1" +version = "0.214.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07035cc9a9b41e62d3bb3a3815a66ab87c993c06fe1cf6b2a3f2a18499d937db" +checksum = "5309c1090e3e84dad0d382f42064e9933fdaedb87e468cc239f0eabea73ddcb6" dependencies = [ "ahash", "bitflags 2.6.0", diff --git a/containerd-shim-spin/Cargo.toml b/containerd-shim-spin/Cargo.toml index 741e65d1..5693e3f0 100644 --- a/containerd-shim-spin/Cargo.toml +++ b/containerd-shim-spin/Cargo.toml @@ -11,8 +11,8 @@ Containerd shim for running Spin workloads. """ [dependencies] -containerd-shim-wasm = "0.6.0" -containerd-shim = "0.7.1" +containerd-shim-wasm = "0.7.0" +containerd-shim = "0.7.4" http = "1" log = "0.4" spin-app = { git = "https://github.com/fermyon/spin", rev = "485b04090644ecfda4d0034891a5feca9a90332c" }