diff --git a/Cargo.lock b/Cargo.lock index 2de7d27..e8282a6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -641,6 +641,26 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "const_format" +version = "0.2.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "126f97965c8ad46d6d9163268ff28432e8f6a1196a55578867832e3049df63dd" +dependencies = [ + "const_format_proc_macros", +] + +[[package]] +name = "const_format_proc_macros" +version = "0.2.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744" +dependencies = [ + "proc-macro2", + "quote", + "unicode-xid", +] + [[package]] name = "convert_case" version = "0.6.0" @@ -2187,9 +2207,9 @@ dependencies = [ [[package]] name = "oci-client" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "474675fdc023fbcc9dcf4782e938a3a1ae5fd469c728d8db40599bd25c77e1ba" +checksum = "9b74df13319e08bc386d333d3dc289c774c88cc543cae31f5347db07b5ec2172" dependencies = [ "bytes", "chrono", @@ -2205,7 +2225,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "thiserror 1.0.69", + "thiserror 2.0.6", "tokio", "tracing", "unicase", @@ -2213,10 +2233,11 @@ dependencies = [ [[package]] name = "oci-spec" -version = "0.7.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da406e58efe2eb5986a6139626d611ce426e5324a824133d76367c765cf0b882" +checksum = "2078e2f6be932a4de9aca90a375a45590809dfb5a08d93ab1ee217107aceeb67" dependencies = [ + "const_format", "derive_builder", "getset", "regex", @@ -2229,9 +2250,9 @@ dependencies = [ [[package]] name = "oci-wasm" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0609c917e8f4c44cd9d619a6e4741535d1cc199cfd995ad75580742bf6d624e8" +checksum = "1b0e073bbc223f0ea26fed8da329622d763ffd5fcd197dfdfb8818cbe8b7b7a5" dependencies = [ "anyhow", "chrono", @@ -2240,8 +2261,8 @@ dependencies = [ "serde_json", "sha2", "tokio", - "wit-component 0.224.0", - "wit-parser 0.224.0", + "wit-component 0.230.0", + "wit-parser 0.230.0", ] [[package]] @@ -3116,12 +3137,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "rustversion" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248" - [[package]] name = "ryu" version = "1.0.18" @@ -3529,20 +3544,19 @@ dependencies = [ [[package]] name = "strum" -version = "0.26.3" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf" [[package]] name = "strum_macros" -version = "0.26.4" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "rustversion", "syn", ] @@ -4359,12 +4373,12 @@ dependencies = [ [[package]] name = "wasm-encoder" -version = "0.224.0" +version = "0.230.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7249cf8cb0c6b9cb42bce90c0a5feb276fbf963fa385ff3d818ab3d90818ed6" +checksum = "d4349d0943718e6e434b51b9639e876293093dca4b96384fb136ab5bd5ce6660" dependencies = [ - "leb128", - "wasmparser 0.224.0", + "leb128fmt", + "wasmparser 0.230.0", ] [[package]] @@ -4379,19 +4393,14 @@ dependencies = [ [[package]] name = "wasm-metadata" -version = "0.224.0" +version = "0.230.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79d13d93febc749413cb6f327e4fdba8c84e4d03bd69fcc4a220c66f113c8de1" +checksum = "1a52e010df5494f4289ccc68ce0c2a8c17555225a5e55cc41b98f5ea28d0844b" dependencies = [ "anyhow", "indexmap 2.7.0", - "serde", - "serde_derive", - "serde_json", - "spdx", - "url", - "wasm-encoder 0.224.0", - "wasmparser 0.224.0", + "wasm-encoder 0.230.0", + "wasmparser 0.230.0", ] [[package]] @@ -4528,9 +4537,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.224.0" +version = "0.230.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65881a664fdd43646b647bb27bf186ab09c05bf56779d40aed4c6dce47d423f5" +checksum = "808198a69b5a0535583370a51d459baa14261dfab04800c4864ee9e1a14346ed" dependencies = [ "bitflags 2.6.0", "hashbrown 0.15.2", @@ -4840,9 +4849,9 @@ dependencies = [ [[package]] name = "wit-component" -version = "0.224.0" +version = "0.230.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad555ab4f4e676474df746d937823c7279c2d6dd36c3e97a61db893d4ef64ee5" +checksum = "b607b15ead6d0e87f5d1613b4f18c04d4e80ceeada5ffa608d8360e6909881df" dependencies = [ "anyhow", "bitflags 2.6.0", @@ -4851,10 +4860,10 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "wasm-encoder 0.224.0", - "wasm-metadata 0.224.0", - "wasmparser 0.224.0", - "wit-parser 0.224.0", + "wasm-encoder 0.230.0", + "wasm-metadata 0.230.0", + "wasmparser 0.230.0", + "wit-parser 0.230.0", ] [[package]] @@ -4878,9 +4887,9 @@ dependencies = [ [[package]] name = "wit-parser" -version = "0.224.0" +version = "0.230.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e2925a7365d2c6709ae17bdbb5777ffd8154fd70906b413fc01b75f0dba59e" +checksum = "679fde5556495f98079a8e6b9ef8c887f731addaffa3d48194075c1dd5cd611b" dependencies = [ "anyhow", "id-arena", @@ -4891,7 +4900,7 @@ dependencies = [ "serde_derive", "serde_json", "unicode-xid", - "wasmparser 0.224.0", + "wasmparser 0.230.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 870a2e1..35cd064 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,10 +15,10 @@ bytes = "1.8" docker_credential = "1.2.1" etcetera = "0.8" futures-util = "0.3.30" -oci-client = { version = "0.14", default-features = false, features = [ +oci-client = { version = "0.15", default-features = false, features = [ "rustls-tls", ] } -oci-wasm = { version = "0.2.1", default-features = false, features = [ +oci-wasm = { version = "0.3.0", default-features = false, features = [ "rustls-tls", ] } semver = "1.0.23" diff --git a/crates/wasm-pkg-client/src/oci/config.rs b/crates/wasm-pkg-client/src/oci/config.rs index 87ea143..1666143 100644 --- a/crates/wasm-pkg-client/src/oci/config.rs +++ b/crates/wasm-pkg-client/src/oci/config.rs @@ -24,6 +24,7 @@ impl Clone for OciRegistryConfig { protocol: self.client_config.protocol.clone(), extra_root_certificates: self.client_config.extra_root_certificates.clone(), platform_resolver: None, + http_proxy: self.client_config.http_proxy.clone(), https_proxy: self.client_config.https_proxy.clone(), no_proxy: self.client_config.no_proxy.clone(), ..self.client_config