diff --git a/Cargo.lock b/Cargo.lock index a97f3d23..ccc953f1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -221,7 +221,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sha1", + "sha1 0.10.7", "sync_wrapper", "tokio", "tokio-tungstenite", @@ -278,7 +278,7 @@ dependencies = [ "pin-project-lite", "tokio", "tower", - "tower-http", + "tower-http 0.6.11", ] [[package]] @@ -313,12 +313,6 @@ version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" -[[package]] -name = "base64ct" -version = "1.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af50177e190e07a26ab74f8b1efbfe2ef87da2116221318cb1c2e82baf7de06" - [[package]] name = "bit-set" version = "0.8.0" @@ -336,9 +330,9 @@ checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] name = "bitflags" -version = "2.13.0" +version = "2.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" +checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da" dependencies = [ "serde_core", ] @@ -352,6 +346,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-buffer" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2f6c7dbe95a6ed67ad9f18e57daf93a2f034c524b99fd2b76d18fdfeb6660aa" +dependencies = [ + "hybrid-array", +] + [[package]] name = "block2" version = "0.6.2" @@ -463,9 +466,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.6.1" +version = "4.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51" +checksum = "dd059f9da4f5c36b3787f65d38ccaab1cc315f07b01f89abc8359ee6a8205011" dependencies = [ "clap_builder", "clap_derive", @@ -473,9 +476,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.6.0" +version = "4.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f" +checksum = "f09628afdcc538b57f3c6341e9c8e9970f18e4a481690a64974d7023bd33548b" dependencies = [ "anstream", "anstyle", @@ -510,6 +513,12 @@ dependencies = [ "cc", ] +[[package]] +name = "cmov" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a" + [[package]] name = "colorchoice" version = "1.0.5" @@ -546,12 +555,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "const-oid" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" - [[package]] name = "core-foundation" version = "0.10.1" @@ -706,6 +709,24 @@ dependencies = [ "typenum", ] +[[package]] +name = "crypto-common" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce6e4c961d6cd6c9a86db418387425e8bdeaf05b3c8bc1411e6dca4c252f1453" +dependencies = [ + "hybrid-array", +] + +[[package]] +name = "ctutils" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5515a3834141de9eafb9717ad39eea8247b5674e6066c404e8c4b365d2a29e" +dependencies = [ + "cmov", +] + [[package]] name = "dashmap" version = "6.2.1" @@ -736,17 +757,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "der" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb" -dependencies = [ - "const-oid", - "pem-rfc7468", - "zeroize", -] - [[package]] name = "deranged" version = "0.5.8" @@ -759,10 +769,19 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer", - "const-oid", - "crypto-common", - "subtle", + "block-buffer 0.10.4", + "crypto-common 0.1.7", +] + +[[package]] +name = "digest" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1dd6dbb5841937940781866fa1281a1ff7bd3bf827091440879f9994983d5c2" +dependencies = [ + "block-buffer 0.12.1", + "crypto-common 0.2.2", + "ctutils", ] [[package]] @@ -831,13 +850,12 @@ dependencies = [ [[package]] name = "etcetera" -version = "0.8.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" +checksum = "de48cc4d1c1d97a20fd819def54b890cadde72ed3ad0c614822a0a433361be96" dependencies = [ "cfg-if", - "home", - "windows-sys 0.48.0", + "windows-sys 0.61.2", ] [[package]] @@ -886,9 +904,9 @@ checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" [[package]] name = "flume" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" +checksum = "5e139bc46ca777eb5efaf62df0ab8cc5fd400866427e56c68b22e414e53bd3be" dependencies = [ "futures-core", "futures-sink", @@ -901,12 +919,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foldhash" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" - [[package]] name = "foldhash" version = "0.2.0" @@ -1164,24 +1176,15 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -[[package]] -name = "hashbrown" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" -dependencies = [ - "allocator-api2", - "equivalent", - "foldhash 0.1.5", -] - [[package]] name = "hashbrown" version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ - "foldhash 0.2.0", + "allocator-api2", + "equivalent", + "foldhash", ] [[package]] @@ -1192,11 +1195,11 @@ checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" [[package]] name = "hashlink" -version = "0.10.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1" +checksum = "824e001ac4f3012dd16a264bec811403a67ca9deb6c102fc5049b32c4574b35f" dependencies = [ - "hashbrown 0.15.5", + "hashbrown 0.16.1", ] [[package]] @@ -1213,29 +1216,20 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hkdf" -version = "0.12.4" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" +checksum = "4aaa26c720c68b866f2c96ef5c1264b3e6f473fe5d4ce61cd44bbe913e553018" dependencies = [ "hmac", ] [[package]] name = "hmac" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" -dependencies = [ - "digest", -] - -[[package]] -name = "home" -version = "0.5.12" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d" +checksum = "6303bc9732ae41b04cb554b844a762b4115a61bfaa81e3e83050991eeb56863f" dependencies = [ - "windows-sys 0.61.2", + "digest 0.11.3", ] [[package]] @@ -1300,6 +1294,15 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "15cdd26707701c53297e2fa6afb323d55fbc1d0810c3aec078ae3ef0424c3c15" +[[package]] +name = "hybrid-array" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "818356c5132c1fede50f837ca96afbe78ff42413047f4abb886217845e1b6c8c" +dependencies = [ + "typenum", +] + [[package]] name = "hyper" version = "1.10.1" @@ -1651,9 +1654,6 @@ name = "lazy_static" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -dependencies = [ - "spin", -] [[package]] name = "left-right" @@ -1672,29 +1672,11 @@ version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" -[[package]] -name = "libm" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" - -[[package]] -name = "libredox" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c943259e342f1e06ff2da7a83eabdfe7f92ce10262688dbf1895ff0b3e6e4652" -dependencies = [ - "bitflags", - "libc", - "plain", - "redox_syscall 0.9.0", -] - [[package]] name = "libsqlite3-sys" -version = "0.30.1" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" +checksum = "b1f111c8c41e7c61a49cd34e44c7619462967221a6443b0ec299e0ac30cfb9b1" dependencies = [ "cc", "pkg-config", @@ -1777,12 +1759,12 @@ checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" [[package]] name = "md-5" -version = "0.10.6" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" +checksum = "69b6441f590336821bb897fb28fc622898ccceb1d6cea3fde5ea86b090c4de98" dependencies = [ "cfg-if", - "digest", + "digest 0.11.3", ] [[package]] @@ -1917,47 +1899,12 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "num-bigint-dig" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e661dda6640fad38e827a6d4a310ff4763082116fe217f279885c97f511bb0b7" -dependencies = [ - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand 0.8.7", - "smallvec", - "zeroize", -] - [[package]] name = "num-conv" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" -[[package]] -name = "num-integer" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" -dependencies = [ - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92800bd69a1eac91786bcfe9da64a897eb72911b8dc3095decbd07429e8048b" -dependencies = [ - "num-integer", - "num-traits", -] - [[package]] name = "num-traits" version = "0.2.19" @@ -1965,7 +1912,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", - "libm", ] [[package]] @@ -2315,7 +2261,7 @@ dependencies = [ "http", "humantime", "insta", - "itertools 0.14.0", + "itertools 0.15.0", "moka", "moro-local", "object_store", @@ -2341,7 +2287,7 @@ dependencies = [ "tokio", "tokio-tungstenite", "tokio-util", - "tower-http", + "tower-http 0.7.0", "tracing", "tracing-opentelemetry", "tracing-subscriber", @@ -2419,20 +2365,11 @@ checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.18", + "redox_syscall", "smallvec", "windows-link", ] -[[package]] -name = "pem-rfc7468" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" -dependencies = [ - "base64ct", -] - [[package]] name = "percent-encoding" version = "2.3.2" @@ -2465,39 +2402,12 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" -[[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der", - "pkcs8", - "spki", -] - -[[package]] -name = "pkcs8" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" -dependencies = [ - "der", - "spki", -] - [[package]] name = "pkg-config" version = "0.3.33" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" -[[package]] -name = "plain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" - [[package]] name = "plotters" version = "0.3.7" @@ -2576,7 +2486,7 @@ dependencies = [ "bitflags", "num-traits", "rand 0.9.5", - "rand_chacha 0.9.0", + "rand_chacha", "rand_xorshift", "regex-syntax", "rusty-fork", @@ -2813,24 +2723,13 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" -[[package]] -name = "rand" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22f6172bdec972074665ed81ed53b71da00bfc44b65a753cfde883ec4c702a1a" -dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - [[package]] name = "rand" version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41" dependencies = [ - "rand_chacha 0.9.0", + "rand_chacha", "rand_core 0.9.5", ] @@ -2845,16 +2744,6 @@ dependencies = [ "rand_core 0.10.1", ] -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - [[package]] name = "rand_chacha" version = "0.9.0" @@ -2865,15 +2754,6 @@ dependencies = [ "rand_core 0.9.5", ] -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.17", -] - [[package]] name = "rand_core" version = "0.9.5" @@ -2963,20 +2843,11 @@ dependencies = [ "bitflags", ] -[[package]] -name = "redox_syscall" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5102a6aaa05aa011a238e178e6bca86d2cb56fc9f586d37cb80f5bca6e07759" -dependencies = [ - "bitflags", -] - [[package]] name = "regex" -version = "1.13.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0e75113e14dc5acb068cd0786884f214f1312650a3d36d269f5c4f3cdee8a2" +checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d" dependencies = [ "aho-corasick", "memchr", @@ -2986,9 +2857,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.15" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f388202e4b80542a0921078cc23b6333bcf1409c1e3f86404cae4766a6131db" +checksum = "8fcfdb36bda0c880c5931cdc7a2bcdc8ba4556847b9d912bca70bc94708711ad" dependencies = [ "aho-corasick", "memchr", @@ -3034,7 +2905,7 @@ dependencies = [ "tokio-rustls", "tokio-util", "tower", - "tower-http", + "tower-http 0.6.11", "tower-service", "url", "wasm-bindgen", @@ -3057,26 +2928,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "rsa" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8573f03f5883dcaebdfcf4725caa1ecb9c15b2ef50c43a07b816e06799bb12d" -dependencies = [ - "const-oid", - "digest", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8", - "rand_core 0.6.4", - "signature", - "spki", - "subtle", - "zeroize", -] - [[package]] name = "rustc-demangle" version = "0.1.28" @@ -3273,9 +3124,9 @@ checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" [[package]] name = "sentry" -version = "0.47.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb25f439f97d26fea01d717fa626167ceffcd981addaa670001e70505b72acbb" +checksum = "d631477761f57c76148456e55e80e9a479ff3fa4c65b2b4a0c3acf1167fd4638" dependencies = [ "cfg_aliases", "httpdate", @@ -3293,9 +3144,9 @@ dependencies = [ [[package]] name = "sentry-anyhow" -version = "0.47.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e15257eeba11d42eb0d6893fed26033504b031abaef3b3809343e4967f476502" +checksum = "d8f73466a403f4da78c7e576049d6044b31d2b16dfcc26b51705f318ed74b804" dependencies = [ "anyhow", "sentry-backtrace", @@ -3304,9 +3155,9 @@ dependencies = [ [[package]] name = "sentry-backtrace" -version = "0.47.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46a8c2c1bd5c1f735e84f28b48e7d72efcaafc362b7541bc8253e60e8fcdffc6" +checksum = "448b0981fbde6cdc9eb087ba3dc01035a253fef9a0d9e79aaf198fc26acb2e64" dependencies = [ "backtrace", "regex", @@ -3315,9 +3166,9 @@ dependencies = [ [[package]] name = "sentry-contexts" -version = "0.47.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b88a90baa654d7f0e1f4b667f6b434293d9f72c71bef16b197c76af5b7d5803" +checksum = "9e5e909d02170ba6d1dc5ebd05bef7999280f5d960e3eaee5d1a18d88d41b334" dependencies = [ "hostname", "libc", @@ -3329,9 +3180,9 @@ dependencies = [ [[package]] name = "sentry-core" -version = "0.47.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ac170a5bba8bec6e3339c90432569d89641fa7a3d3e4f44987d24f0762e6adf" +checksum = "ecf0b1a4a4e9ec88395b52e6fa4868b95564c1fa96b26a0606f5f6288a0f7149" dependencies = [ "rand 0.9.5", "sentry-types", @@ -3342,9 +3193,9 @@ dependencies = [ [[package]] name = "sentry-panic" -version = "0.47.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6127d3d304ba5ce0409401e85aae538e303a569f8dbb031bf64f9ba0f7174346" +checksum = "0b7d93d6ecb55d2251c5fc084c55c03a2bc68904918d76117e602c999e92f00f" dependencies = [ "sentry-backtrace", "sentry-core", @@ -3352,9 +3203,9 @@ dependencies = [ [[package]] name = "sentry-tracing" -version = "0.47.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27701acc51e68db5281802b709010395bfcbcb128b1d0a4e5873680d3b47ff0c" +checksum = "58d26379236c4ef97eaf081bca3c7bf0ef6f06b3aa881eca2ee8e8dbc923e5b8" dependencies = [ "bitflags", "sentry-backtrace", @@ -3365,9 +3216,9 @@ dependencies = [ [[package]] name = "sentry-types" -version = "0.47.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56780cb5597d676bf22e6c11d1f062eb4def46390ea3bfb047bcbcf7dfd19bdb" +checksum = "2239099d47e76857b0825a182ecdb90159add7aa1097b60247c6e7ca6bf49c6a" dependencies = [ "debugid", "hex", @@ -3463,7 +3314,18 @@ checksum = "a978451301f4db1d02937a4ab3ccce137717b81826e79b7d49ffe3244a13c3b8" dependencies = [ "cfg-if", "cpufeatures 0.2.17", - "digest", + "digest 0.10.7", +] + +[[package]] +name = "sha1" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aacc4cc499359472b4abe1bf11d0b12e688af9a805fa5e3016f9a386dc2d0214" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "digest 0.11.3", ] [[package]] @@ -3474,7 +3336,18 @@ checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", "cpufeatures 0.2.17", - "digest", + "digest 0.10.7", +] + +[[package]] +name = "sha2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "446ba717509524cb3f22f17ecc096f10f4822d76ab5c0b9822c5f9c284e825f4" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "digest 0.11.3", ] [[package]] @@ -3502,16 +3375,6 @@ dependencies = [ "libc", ] -[[package]] -name = "signature" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" -dependencies = [ - "digest", - "rand_core 0.6.4", -] - [[package]] name = "simd_cesu8" version = "1.2.0" @@ -3583,16 +3446,6 @@ dependencies = [ "lock_api", ] -[[package]] -name = "spki" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" -dependencies = [ - "base64ct", - "der", -] - [[package]] name = "sqlformat" version = "0.5.0" @@ -3605,9 +3458,9 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.8.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fefb893899429669dcdd979aff487bd78f4064e5e7907e4269081e0ef7d97dc" +checksum = "378620ccc25c62c89d8be1c819e76a88d59bdcc3304733330788948e619bfd71" dependencies = [ "sqlx-core", "sqlx-macros", @@ -3618,12 +3471,13 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.8.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee6798b1838b6a0f69c007c133b8df5866302197e404e8b6ee8ed3e3a5e68dc6" +checksum = "05b44e85bf579a8eeb4ceaa77a3a523baf2bf0e9bac7e40f405d537b5d2d5ccb" dependencies = [ "base64", "bytes", + "cfg-if", "chrono", "crc", "crossbeam-queue", @@ -3633,16 +3487,15 @@ dependencies = [ "futures-intrusive", "futures-io", "futures-util", - "hashbrown 0.15.5", + "hashbrown 0.16.1", "hashlink", "indexmap", "log", "memchr", - "once_cell", "percent-encoding", "serde", "serde_json", - "sha2", + "sha2 0.10.9", "smallvec", "thiserror", "tokio", @@ -3653,9 +3506,9 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.8.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2d452988ccaacfbf5e0bdbc348fb91d7c8af5bee192173ac3636b5fb6e6715d" +checksum = "bd2b84f2bc39a5705ef27ec785a11c934a41bbd4a24941e257927cddc26b60bf" dependencies = [ "proc-macro2", "quote", @@ -3666,77 +3519,62 @@ dependencies = [ [[package]] name = "sqlx-macros-core" -version = "0.8.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19a9c1841124ac5a61741f96e1d9e2ec77424bf323962dd894bdb93f37d5219b" +checksum = "fb8d96de5fdc85a5c4ec813432b523ec637e80ba98f046555f75f7908ddac7c3" dependencies = [ + "cfg-if", "dotenvy", "either", "heck", "hex", - "once_cell", "proc-macro2", "quote", "serde", "serde_json", - "sha2", + "sha2 0.10.9", "sqlx-core", "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", "syn", + "thiserror", "tokio", "url", ] [[package]] name = "sqlx-mysql" -version = "0.8.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa003f0038df784eb8fecbbac13affe3da23b45194bd57dba231c8f48199c526" +checksum = "90b8020fe17c5f2c245bfa2505d7ef59c5604839527c740266ad2214acebea27" dependencies = [ - "atoi", - "base64", "bitflags", "byteorder", "bytes", "chrono", "crc", - "digest", + "digest 0.11.3", "dotenvy", "either", - "futures-channel", "futures-core", - "futures-io", "futures-util", "generic-array", - "hex", - "hkdf", - "hmac", - "itoa", "log", - "md-5", - "memchr", - "once_cell", "percent-encoding", - "rand 0.8.7", - "rsa", "serde", - "sha1", - "sha2", - "smallvec", + "sha1 0.11.0", + "sha2 0.11.0", "sqlx-core", - "stringprep", "thiserror", "tracing", - "whoami", ] [[package]] name = "sqlx-postgres" -version = "0.8.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db58fcd5a53cf07c184b154801ff91347e4c30d17a3562a635ff028ad5deda46" +checksum = "87a2bdd6e83f6b3ea525ca9fee568030508b58355a43d0b2c1674d5f79dcd65e" dependencies = [ "atoi", "base64", @@ -3752,16 +3590,14 @@ dependencies = [ "hex", "hkdf", "hmac", - "home", "itoa", "log", "md-5", "memchr", - "once_cell", - "rand 0.8.7", + "rand 0.10.2", "serde", "serde_json", - "sha2", + "sha2 0.11.0", "smallvec", "sqlx-core", "stringprep", @@ -3772,13 +3608,14 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.8.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2d12fe70b2c1b4401038055f90f151b78208de1f9f89a7dbfd41587a10c3eea" +checksum = "488e99c397a62007e4229aec669a179816339afc6d2620ca6fa420dbee2e982c" dependencies = [ "atoi", "chrono", "flume", + "form_urlencoded", "futures-channel", "futures-core", "futures-executor", @@ -3788,7 +3625,6 @@ dependencies = [ "log", "percent-encoding", "serde", - "serde_urlencoded", "sqlx-core", "thiserror", "tracing", @@ -3976,9 +3812,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.52.3" +version = "1.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" +checksum = "317fafbbe3f02fc663dad00ea6186197de963cd4190e86a26d8d0fae095539af" dependencies = [ "bytes", "libc", @@ -4127,15 +3963,32 @@ dependencies = [ "futures-util", "http", "http-body", - "http-body-util", "pin-project-lite", "tower", "tower-layer", "tower-service", - "tracing", "url", ] +[[package]] +name = "tower-http" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b11f75e912b0c2be01b63d8cf8057b8c3f97cf34abb3d431a3a4c8675498e233" +dependencies = [ + "bitflags", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "percent-encoding", + "pin-project-lite", + "tower-layer", + "tower-service", + "tracing", +] + [[package]] name = "tower-layer" version = "0.3.3" @@ -4244,7 +4097,7 @@ dependencies = [ "httparse", "log", "rand 0.9.5", - "sha1", + "sha1 0.10.7", "thiserror", ] @@ -4375,9 +4228,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.23.5" +version = "1.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea5fab0d6c3c01ae70085a09cb03d4c7a1d6314e2b3e075392783396d724ca0a" +checksum = "bf3923a6f5c4c6382e0b653c4117f48d631ea17f38ed86e2a828e6f7412f5239" dependencies = [ "getrandom 0.4.3", "js-sys", @@ -4453,12 +4306,6 @@ dependencies = [ "wit-bindgen", ] -[[package]] -name = "wasite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" - [[package]] name = "wasm-bindgen" version = "0.2.126" @@ -4567,13 +4414,9 @@ dependencies = [ [[package]] name = "whoami" -version = "1.6.1" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d" -dependencies = [ - "libredox", - "wasite", -] +checksum = "998767ef88740d1f5b0682a9c53c24431453923962269c2db68ee43788c5a40d" [[package]] name = "winapi" @@ -4674,15 +4517,6 @@ dependencies = [ "windows-link", ] -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows-sys" version = "0.52.0" diff --git a/opsqueue/Cargo.toml b/opsqueue/Cargo.toml index 4fc5c026..4531cb03 100644 --- a/opsqueue/Cargo.toml +++ b/opsqueue/Cargo.toml @@ -17,7 +17,7 @@ required-features = ["server-logic"] [dependencies] # Datatypes and concurrency: -itertools = "0.14.0" +itertools = "0.15.0" arc-swap = {version = "1.9.1", optional = true} moka = { version = "0.12.15", features = ["sync"], optional = true } chrono = { version = "0.4.44", features = ["serde"]} @@ -32,7 +32,7 @@ ux = "0.1.6" # Error handling: anyhow = "1.0.102" # Database: -sqlx = { version = "0.8.2", features = ["sqlite", "runtime-tokio", "chrono"], optional = true } +sqlx = { version = "0.9.0", features = ["sqlite", "runtime-tokio", "chrono"], optional = true } # Serialization: serde = { version = "1.0.203", features = ["derive"] } serde_json = "1.0.149" @@ -46,12 +46,12 @@ axum = { version = "0.8.9", features = ["ws", "macros"], optional = true } reqwest = { version = "0.13.2", default-features = false, features = ["json"], optional = true } url = {version = "2.5.2"} tokio-util = { version = "0.7.18", features = ["io", "rt", "time"] } -tower-http = { version = "0.6.8", features = ["trace", "catch-panic"], optional = true } +tower-http = { version = "0.7.0", features = ["trace", "catch-panic"], optional = true } # Logging and tracing: tracing = {version = "0.1", features = ["log"] } tracing-subscriber = {version = "0.3", features = ["std", "env-filter"] } -sentry = {version = "0.47", optional = true, default-features=false, features=["rustls", "reqwest", "anyhow", "backtrace", "contexts", "tracing", "panic"]} -sentry-tracing = {version = "0.47", optional = true} +sentry = {version = "0.48", optional = true, default-features=false, features=["rustls", "reqwest", "anyhow", "backtrace", "contexts", "tracing", "panic"]} +sentry-tracing = {version = "0.48", optional = true} # Exporting traces to Opentelemetry: opentelemetry = { version = "0.32", default-features = false, features = ["trace"] } opentelemetry_sdk = { version = "0.32", default-features = false, features = ["trace", "rt-tokio"] } diff --git a/opsqueue/src/common/chunk.rs b/opsqueue/src/common/chunk.rs index b5b84414..8edb2eb8 100644 --- a/opsqueue/src/common/chunk.rs +++ b/opsqueue/src/common/chunk.rs @@ -227,14 +227,14 @@ pub mod db { impl<'q> sqlx::Encode<'q, Sqlite> for super::ChunkIndex { fn encode_by_ref( &self, - buf: &mut ::ArgumentBuffer<'q>, + buf: &mut ::ArgumentBuffer, ) -> Result { >::encode_by_ref(&i64::from(*self), buf) } fn encode( self, - buf: &mut ::ArgumentBuffer<'q>, + buf: &mut ::ArgumentBuffer, ) -> Result where Self: Sized, @@ -605,7 +605,7 @@ pub mod test { use super::db::*; use super::*; - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] pub async fn test_insert_chunk(db: sqlx::SqlitePool) { let db = WriterPool::new(db); let mut conn = db.writer_conn().await.unwrap(); @@ -622,7 +622,7 @@ pub mod test { assert!(count_chunks(&mut conn).await.unwrap() == u63::new(1)); } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] pub async fn test_get_chunk(db: sqlx::SqlitePool) { let db = WriterPool::new(db); let mut conn = db.writer_conn().await.unwrap(); @@ -642,7 +642,7 @@ pub mod test { assert!(chunk == fetched_chunk); } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] pub async fn test_complete_chunk_raw(db: sqlx::SqlitePool) { let db = WriterPool::new(db); let mut conn = db.writer_conn().await.unwrap(); @@ -680,7 +680,7 @@ pub mod test { assert!(count_chunks_failed(&mut conn).await.unwrap() == u63::new(0)); } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] pub async fn test_complete_chunk_raw_updates_submissions_chunk_total(db: sqlx::SqlitePool) { let db = WriterPool::new(db); let mut conn = db.writer_conn().await.unwrap(); @@ -723,7 +723,7 @@ pub mod test { } } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] pub async fn test_fail_chunk(db: sqlx::SqlitePool) { let db = WriterPool::new(db); let mut conn = db.writer_conn().await.unwrap(); diff --git a/opsqueue/src/common/submission.rs b/opsqueue/src/common/submission.rs index 2e0ffc27..45ecb4ca 100644 --- a/opsqueue/src/common/submission.rs +++ b/opsqueue/src/common/submission.rs @@ -282,14 +282,14 @@ pub mod db { impl<'q> sqlx::Encode<'q, Sqlite> for SubmissionId { fn encode_by_ref( &self, - buf: &mut ::ArgumentBuffer<'q>, + buf: &mut ::ArgumentBuffer, ) -> Result { >::encode_by_ref(&i64::from(*self), buf) } fn encode( self, - buf: &mut ::ArgumentBuffer<'q>, + buf: &mut ::ArgumentBuffer, ) -> Result where Self: Sized, @@ -1042,7 +1042,7 @@ pub mod test { use super::*; async fn explain_query_plan(query: &str, conn: &mut SqliteConnection) -> String { - sqlx::raw_sql(&format!("EXPLAIN QUERY PLAN {query}")) + sqlx::raw_sql(sqlx::AssertSqlSafe(format!("EXPLAIN QUERY PLAN {query}"))) .fetch_all(&mut *conn) .await .unwrap_or_else(|_| panic!("Invalid query: \n{query}\n")) @@ -1067,7 +1067,7 @@ pub mod test { ); } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] pub async fn test_query_plan_submission_status_in_progress(db: sqlx::SqlitePool) { let mut conn = db.acquire().await.unwrap(); let query = r#" @@ -1095,7 +1095,7 @@ pub mod test { "); } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] pub async fn test_query_plan_submission_status_completed(db: sqlx::SqlitePool) { let mut conn = db.acquire().await.unwrap(); let query = r#" @@ -1123,7 +1123,7 @@ pub mod test { "); } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] pub async fn test_query_plan_submission_status_failed(db: sqlx::SqlitePool) { let mut conn = db.acquire().await.unwrap(); let query = r#" @@ -1153,7 +1153,7 @@ pub mod test { "); } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] pub async fn test_query_plan_submission_status_cancelled(db: sqlx::SqlitePool) { let mut conn = db.acquire().await.unwrap(); let query = r#" @@ -1180,7 +1180,7 @@ pub mod test { "); } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] pub async fn test_insert_submission(db: sqlx::SqlitePool) { let db = WriterPool::new(db); let mut conn = db.writer_conn().await.unwrap(); @@ -1200,7 +1200,7 @@ pub mod test { assert_matches!(count_submissions(&mut conn).await, Ok(1)); } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] pub async fn test_get_submission(db: sqlx::SqlitePool) { let db = WriterPool::new(db); let mut conn = db.writer_conn().await.unwrap(); @@ -1223,7 +1223,7 @@ pub mod test { assert_eq!(fetched_submission, submission); } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] pub async fn test_submission_strategic_metadata(db: sqlx::SqlitePool) { let strategic_metadata: StrategicMetadataMap = [("company_id".to_string(), 123), ("flavour".to_string(), 42)] @@ -1250,7 +1250,7 @@ pub mod test { assert_eq!(fetched_metadata, strategic_metadata); } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] pub async fn test_complete_submission_raw(db: sqlx::SqlitePool) { let db = WriterPool::new(db); let mut conn = db.writer_conn().await.unwrap(); @@ -1275,7 +1275,7 @@ pub mod test { assert_matches!(count_submissions_failed(&mut conn).await, Ok(0)); } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] pub async fn test_fail_submission_raw(db: sqlx::SqlitePool) { let db = WriterPool::new(db); let mut conn = db.writer_conn().await.unwrap(); @@ -1302,7 +1302,7 @@ pub mod test { assert_matches!(count_submissions_failed(&mut conn).await, Ok(1)); } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] pub async fn test_cleanup_old(db: sqlx::SqlitePool) { let db = WriterPool::new(db); let mut conn = db.writer_conn().await.unwrap(); @@ -1429,7 +1429,7 @@ pub mod test { let _sub2 = submission_status(old_four_unfailed, &mut conn).await; } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] /// Test whether empty submissions are marked as completed right away by `insert_submission_from_chunks`. pub async fn auto_complete_empty_submission(db: sqlx::SqlitePool) { let db = WriterPool::new(db); diff --git a/opsqueue/src/consumer/client.rs b/opsqueue/src/consumer/client.rs index b0c74fb1..0cdb8b67 100644 --- a/opsqueue/src/consumer/client.rs +++ b/opsqueue/src/consumer/client.rs @@ -497,7 +497,7 @@ mod tests { use super::*; - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] pub async fn test_fetch_chunks(pool: sqlx::SqlitePool) { let db_pools = db::DBPools::from_test_pool(&pool); let uri = "0.0.0.0:10083"; diff --git a/opsqueue/src/consumer/strategy.rs b/opsqueue/src/consumer/strategy.rs index 68f0493b..5bcb59cc 100644 --- a/opsqueue/src/consumer/strategy.rs +++ b/opsqueue/src/consumer/strategy.rs @@ -25,9 +25,9 @@ pub enum Strategy { impl Strategy { pub fn build_query<'a>( &'a self, - qb: &'a mut QueryBuilder<'a, Sqlite>, + qb: &'a mut QueryBuilder, metastate: &MetaState, - ) -> &'a mut QueryBuilder<'a, Sqlite> { + ) -> &'a mut QueryBuilder { let qb = self.build_query_snippet(qb, metastate); tracing::trace!("sql: {:?}", qb.sql()); qb @@ -35,9 +35,9 @@ impl Strategy { fn build_query_snippet<'a>( &'a self, - qb: &'a mut QueryBuilder<'a, Sqlite>, + qb: &'a mut QueryBuilder, metastate: &MetaState, - ) -> &'a mut QueryBuilder<'a, Sqlite> { + ) -> &'a mut QueryBuilder { use Strategy::*; match self { Oldest => qb.push("SELECT * FROM chunks ORDER BY submission_id ASC"), @@ -105,33 +105,37 @@ pub mod test { use sqlx::Row; use sqlx::{QueryBuilder, Sqlite, SqliteConnection}; - async fn explain( - qb: &mut sqlx::QueryBuilder<'_, Sqlite>, - conn: &mut SqliteConnection, - ) -> String { - let formatted_query = format(qb.sql(), &QueryParams::None, &FormatOptions::default()); - - sqlx::raw_sql(&format!("EXPLAIN QUERY PLAN {}", formatted_query)) - .fetch_all(&mut *conn) - .await - .unwrap_or_else(|_| panic!("Invalid query: \n{}\n", formatted_query)) - .into_iter() - .map(|row| { - let id = row.get::("id"); - let parent = row.get::("parent"); - let detail = row.get::("detail"); - format!("{id}, {parent}, {detail}") - }) - .join("\n") + async fn explain(qb: &mut sqlx::QueryBuilder, conn: &mut SqliteConnection) -> String { + let formatted_query = format( + qb.sql().as_str(), + &QueryParams::None, + &FormatOptions::default(), + ); + + sqlx::raw_sql(sqlx::AssertSqlSafe(format!( + "EXPLAIN QUERY PLAN {formatted_query}" + ))) + .fetch_all(&mut *conn) + .await + .unwrap_or_else(|_| panic!("Invalid query: \n{}\n", formatted_query)) + .into_iter() + .map(|row| { + let id = row.get::("id"); + let parent = row.get::("parent"); + let detail = row.get::("detail"); + format!("{id}, {parent}, {detail}") + }) + .join("\n") } - fn assert_streaming_query(qb: &sqlx::QueryBuilder<'_, Sqlite>, explained: &str) { - let query = qb.sql(); + fn assert_streaming_query(qb: &sqlx::QueryBuilder, explained: &str) { + let query_binding = qb.sql(); + let query = query_binding.as_str(); assert!(!explained.contains("MATERIALIZED"), "Query should contain no materialization, but it did\n\nQuery: {query}\n\nPlan: \n\n {explained}"); assert!(!explained.contains("B-TREE"), "Query should contain no temporary B-tree construction, but it did.\n\nQuery: {query}\n\nPlan: \n\n{explained}"); } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] pub async fn test_query_plan_oldest(db: sqlx::SqlitePool) { let mut conn = db.acquire().await.unwrap(); let mut qb = QueryBuilder::new(""); @@ -139,7 +143,7 @@ pub mod test { let qb = Strategy::Oldest.build_query(&mut qb, &metastate); let options = FormatOptions::default(); - let formatted_query = format(qb.sql(), &QueryParams::None, &options); + let formatted_query = format(qb.sql().as_str(), &QueryParams::None, &options); insta::assert_snapshot!(formatted_query, @" SELECT * @@ -154,7 +158,7 @@ pub mod test { assert_eq!(explained, "3, 0, SCAN chunks"); } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] pub async fn test_query_plan_newest(db: sqlx::SqlitePool) { let mut conn = db.acquire().await.unwrap(); let mut qb = QueryBuilder::new(""); @@ -162,7 +166,7 @@ pub mod test { let qb = Strategy::Newest.build_query(&mut qb, &metastate); let options = FormatOptions::default(); - let formatted_query = format(qb.sql(), &QueryParams::None, &options); + let formatted_query = format(qb.sql().as_str(), &QueryParams::None, &options); insta::assert_snapshot!(formatted_query, @" SELECT * @@ -177,7 +181,7 @@ pub mod test { assert_eq!(explained, "3, 0, SCAN chunks"); } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] pub async fn test_query_plan_random(db: sqlx::SqlitePool) { let mut conn = db.acquire().await.unwrap(); let metastate = MetaState::default(); @@ -185,7 +189,11 @@ pub mod test { let qb = Strategy::Random.build_query(&mut qb, &metastate); - let formatted_query = format(qb.sql(), &QueryParams::None, &FormatOptions::default()); + let formatted_query = format( + qb.sql().as_str(), + &QueryParams::None, + &FormatOptions::default(), + ); insta::assert_snapshot!(formatted_query, @" SELECT * @@ -213,7 +221,7 @@ pub mod test { "); } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] pub async fn test_query_plan_prefer_distinct_oldest(db: sqlx::SqlitePool) { use Strategy::*; let mut conn = db.acquire().await.unwrap(); @@ -226,7 +234,11 @@ pub mod test { let mut qb = QueryBuilder::new(""); let qb = strategy.build_query(&mut qb, &metastate); - let formatted_query = format(qb.sql(), &QueryParams::None, &FormatOptions::default()); + let formatted_query = format( + qb.sql().as_str(), + &QueryParams::None, + &FormatOptions::default(), + ); insta::assert_snapshot!(formatted_query, @" WITH inner_company_id AS NOT MATERIALIZED ( @@ -299,7 +311,7 @@ pub mod test { "); } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] pub async fn test_query_plan_prefer_distinct_newest(db: sqlx::SqlitePool) { use Strategy::*; let mut conn = db.acquire().await.unwrap(); @@ -312,7 +324,11 @@ pub mod test { let mut qb = QueryBuilder::new(""); let qb = strategy.build_query(&mut qb, &metastate); - let formatted_query = format(qb.sql(), &QueryParams::None, &FormatOptions::default()); + let formatted_query = format( + qb.sql().as_str(), + &QueryParams::None, + &FormatOptions::default(), + ); insta::assert_snapshot!(formatted_query, @" WITH inner_company_id AS NOT MATERIALIZED ( @@ -385,7 +401,7 @@ pub mod test { "); } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] pub async fn test_query_plan_prefer_distinct_random(db: sqlx::SqlitePool) { use Strategy::*; let mut conn = db.acquire().await.unwrap(); @@ -398,7 +414,11 @@ pub mod test { let mut qb = QueryBuilder::new(""); let qb = strategy.build_query(&mut qb, &metastate); - let formatted_query = format(qb.sql(), &QueryParams::None, &FormatOptions::default()); + let formatted_query = format( + qb.sql().as_str(), + &QueryParams::None, + &FormatOptions::default(), + ); insta::assert_snapshot!(formatted_query, @" WITH inner_company_id AS NOT MATERIALIZED ( @@ -494,7 +514,7 @@ pub mod test { "); } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] pub async fn test_query_plan_prefer_distinct_nested(db: sqlx::SqlitePool) { use Strategy::*; let mut conn = db.acquire().await.unwrap(); @@ -511,7 +531,11 @@ pub mod test { let mut qb = QueryBuilder::new(""); let qb = strategy.build_query(&mut qb, &metastate); - let formatted_query = format(qb.sql(), &QueryParams::None, &FormatOptions::default()); + let formatted_query = format( + qb.sql().as_str(), + &QueryParams::None, + &FormatOptions::default(), + ); insta::assert_snapshot!(formatted_query, @" WITH inner_company_id AS NOT MATERIALIZED ( @@ -718,7 +742,7 @@ pub mod test { use crate::db::Connection; use futures::stream::TryStreamExt as _; - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] /// Tests whether the 'cutting the deck' technique is working /// /// We do this by checking whether two selects in a huge amount of available chunks diff --git a/opsqueue/src/lib.rs b/opsqueue/src/lib.rs index 0389bbdb..4c52412d 100644 --- a/opsqueue/src/lib.rs +++ b/opsqueue/src/lib.rs @@ -47,3 +47,6 @@ pub const VERSION_CARGO_SEMVER: &str = env!("CARGO_PKG_VERSION"); pub fn version_info() -> String { format!("v{VERSION_CARGO_SEMVER}") } + +#[cfg(all(test, feature = "server-logic"))] +const MIGRATOR: sqlx::migrate::Migrator = sqlx::migrate!(); diff --git a/opsqueue/src/producer/client.rs b/opsqueue/src/producer/client.rs index b09e20b0..26415b09 100644 --- a/opsqueue/src/producer/client.rs +++ b/opsqueue/src/producer/client.rs @@ -313,7 +313,7 @@ mod tests { tokio::task::yield_now().await; } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] async fn test_count_submissions(pool: sqlx::SqlitePool) { let url = "0.0.0.0:4002"; start_server_in_background(&pool, url).await; @@ -339,7 +339,7 @@ mod tests { assert_eq!(count, 1); } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] async fn test_insert_submission(pool: sqlx::SqlitePool) { let url = "0.0.0.0:4000"; start_server_in_background(&pool, url).await; @@ -389,7 +389,7 @@ mod tests { assert_eq!(count, 4); } - #[sqlx::test] + #[sqlx::test(migrator = "crate::MIGRATOR")] async fn test_get_submission(pool: sqlx::SqlitePool) { let url = "0.0.0.0:4001"; start_server_in_background(&pool, url).await;