From 887e18384f8e3dae6f90d3a21685b468aa261c73 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 25 Mar 2023 01:04:29 +0000 Subject: [PATCH 01/11] Update Rust crate tower-http to 0.4.0 --- Cargo.lock | 28 +++++++++++++++++++++++----- Cargo.toml | 2 +- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e8a47da..d76e61f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -64,7 +64,7 @@ dependencies = [ "sync_wrapper", "tokio", "tower", - "tower-http", + "tower-http 0.3.5", "tower-layer", "tower-service", ] @@ -88,9 +88,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.13.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" [[package]] name = "bitflags" @@ -817,7 +817,7 @@ dependencies = [ "tar", "tokio", "tokio-util", - "tower-http", + "tower-http 0.4.0", "tracing", "tracing-subscriber", "uuid", @@ -973,6 +973,25 @@ name = "tower-http" version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +dependencies = [ + "bitflags", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-range-header", + "pin-project-lite", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658" dependencies = [ "base64", "bitflags", @@ -989,7 +1008,6 @@ dependencies = [ "pin-project-lite", "tokio", "tokio-util", - "tower", "tower-layer", "tower-service", "tracing", diff --git a/Cargo.toml b/Cargo.toml index bca3f1c..45180d8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ hyper = { version = "0.14.21" } tokio = { version = "1.23.0", features = ["full"] } tracing = "0.1.37" tracing-subscriber = {version = "0.3.16", features = ["env-filter"] } -tower-http = { version = "0.3.5", features = ["fs", "trace", "auth"] } +tower-http = { version = "0.4.0", features = ["fs", "trace", "auth"] } tar = "0.4.38" flate2 = "1.0.25" tokio-util = { version = "0.7.4", features = ["io"] } From 4e4fbb6c29838683042eeeaddfd39bbedbaad346 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 30 Mar 2023 18:02:25 +0000 Subject: [PATCH 02/11] Update Rust crate futures-util to 0.3.28 --- Cargo.lock | 55 ++++++++++++++++++++++++++++++++---------------------- Cargo.toml | 2 +- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e8a47da..c4fc0de 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -27,7 +27,7 @@ checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -198,19 +198,19 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.11", ] [[package]] @@ -221,15 +221,15 @@ checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-core", "futures-macro", @@ -482,7 +482,7 @@ checksum = "731f8ecebd9f3a4aa847dfe75455e4757a45da40a7793d2f0b1f9b6ed18b23f3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -617,7 +617,7 @@ checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -640,9 +640,9 @@ checksum = "763095e04dcbeb889b2ab35296ecb18a20fe16b4e9877ce64aab73d8fd05a8c3" [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" dependencies = [ "unicode-ident", ] @@ -665,9 +665,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.17" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -749,7 +749,7 @@ checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -862,6 +862,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21e3787bb71465627110e7d87ed4faaa36c1f61042ee67badb9e2ef173accc40" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "sync_wrapper" version = "0.1.1" @@ -896,7 +907,7 @@ checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -936,7 +947,7 @@ checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -1028,7 +1039,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -1155,7 +1166,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn", + "syn 1.0.103", "wasm-bindgen-shared", ] @@ -1177,7 +1188,7 @@ checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/Cargo.toml b/Cargo.toml index bca3f1c..e2777d3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ tower-http = { version = "0.3.5", features = ["fs", "trace", "auth"] } tar = "0.4.38" flate2 = "1.0.25" tokio-util = { version = "0.7.4", features = ["io"] } -futures-util = "0.3.25" +futures-util = "0.3.28" uuid = { version = "1.2.1", features = ["v4"] } serde_json = "1.0.91" metrics = "0.20.1" From dfd8b837881472e8f1c4c92c92443babf84e5981 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 25 Apr 2023 19:01:54 +0000 Subject: [PATCH 03/11] Update Rust crate tokio-util to 0.7.8 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e8a47da..a70d86d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -941,9 +941,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", diff --git a/Cargo.toml b/Cargo.toml index bca3f1c..5c0ff32 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ tracing-subscriber = {version = "0.3.16", features = ["env-filter"] } tower-http = { version = "0.3.5", features = ["fs", "trace", "auth"] } tar = "0.4.38" flate2 = "1.0.25" -tokio-util = { version = "0.7.4", features = ["io"] } +tokio-util = { version = "0.7.8", features = ["io"] } futures-util = "0.3.25" uuid = { version = "1.2.1", features = ["v4"] } serde_json = "1.0.91" From 2566345cce4683ab4efe23be26774cb4fc9f0708 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 25 Apr 2023 19:01:57 +0000 Subject: [PATCH 04/11] Update Rust crate tokio to 1.28.0 --- Cargo.lock | 109 +++++++++++++++++++++++++++++++---------------------- Cargo.toml | 2 +- 2 files changed, 65 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e8a47da..296d44e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -27,7 +27,7 @@ checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -210,7 +210,7 @@ checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -376,9 +376,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.122" +version = "0.2.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec647867e2bf0772e28c8bcde4f0d19a9216916e890543b5a03ed8ef27b8f259" +checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" [[package]] name = "lock_api" @@ -482,7 +482,7 @@ checksum = "731f8ecebd9f3a4aa847dfe75455e4757a45da40a7793d2f0b1f9b6ed18b23f3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -617,7 +617,7 @@ checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -640,9 +640,9 @@ checksum = "763095e04dcbeb889b2ab35296ecb18a20fe16b4e9877ce64aab73d8fd05a8c3" [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] @@ -665,9 +665,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.17" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "632d02bff7f874a36f33ea8bb416cd484b90cc66c1194b1a1110d067a7013f58" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] @@ -749,7 +749,7 @@ checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -843,9 +843,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "socket2" -version = "0.4.4" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -862,6 +862,17 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "syn" +version = "2.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "sync_wrapper" version = "0.1.1" @@ -896,7 +907,7 @@ checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -910,14 +921,13 @@ dependencies = [ [[package]] name = "tokio" -version = "1.23.0" +version = "1.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab6d665857cc6ca78d6e80303a02cea7a7851e85dfbd77cbdc09bd129f1ef46" +checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f" dependencies = [ "autocfg", "bytes", "libc", - "memchr", "mio", "num_cpus", "parking_lot", @@ -925,18 +935,18 @@ dependencies = [ "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys 0.42.0", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "1.7.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b557f72f448c511a979e2564e55d74e6c4432fc96ff4f6241bc6bded342643b7" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.15", ] [[package]] @@ -1028,7 +1038,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", ] [[package]] @@ -1155,7 +1165,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn", + "syn 1.0.103", "wasm-bindgen-shared", ] @@ -1177,7 +1187,7 @@ checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.103", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -1248,24 +1258,33 @@ dependencies = [ [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" @@ -1281,9 +1300,9 @@ checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" @@ -1299,9 +1318,9 @@ checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" @@ -1317,9 +1336,9 @@ checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" @@ -1335,15 +1354,15 @@ checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" @@ -1359,9 +1378,9 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "xattr" diff --git a/Cargo.toml b/Cargo.toml index bca3f1c..58a961b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ name = "site" [dependencies] axum = { version = "0.6.1" } hyper = { version = "0.14.21" } -tokio = { version = "1.23.0", features = ["full"] } +tokio = { version = "1.28.0", features = ["full"] } tracing = "0.1.37" tracing-subscriber = {version = "0.3.16", features = ["env-filter"] } tower-http = { version = "0.3.5", features = ["fs", "trace", "auth"] } From cc4b84c9d4eb6102125c01f405eacccbe427c9d3 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 29 Apr 2023 08:01:43 +0000 Subject: [PATCH 05/11] Update Rust crate uuid to 1.3.2 --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e8a47da..86e2894 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1093,9 +1093,9 @@ checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" [[package]] name = "uuid" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feb41e78f93363bb2df8b0e86a2ca30eed7806ea16ea0c790d757cf93f79be83" +checksum = "4dad5567ad0cf5b760e5665964bec1b47dfd077ba8a2544b513f3556d3d239a2" dependencies = [ "getrandom", ] diff --git a/Cargo.toml b/Cargo.toml index bca3f1c..8dfa81f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ tar = "0.4.38" flate2 = "1.0.25" tokio-util = { version = "0.7.4", features = ["io"] } futures-util = "0.3.25" -uuid = { version = "1.2.1", features = ["v4"] } +uuid = { version = "1.3.2", features = ["v4"] } serde_json = "1.0.91" metrics = "0.20.1" metrics-exporter-prometheus = "0.11.0" From 5fa892f5a3cffce01cda2613366418544535c61d Mon Sep 17 00:00:00 2001 From: Chewing_Bever Date: Sat, 29 Apr 2023 15:41:51 +0200 Subject: [PATCH 06/11] fix: update code to work with newer versions --- src/main.rs | 37 ++++++++++--------------------------- 1 file changed, 10 insertions(+), 27 deletions(-) diff --git a/src/main.rs b/src/main.rs index cf75511..fdb0600 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,13 +2,14 @@ use std::{future::ready, net::SocketAddr}; use axum::{ extract::Extension, - http::StatusCode, middleware, response::Redirect, - routing::{any, get, get_service}, + routing::{any, get}, Router, }; -use tower_http::{auth::RequireAuthorizationLayer, services::ServeDir, trace::TraceLayer}; +use tower_http::{ + services::ServeDir, trace::TraceLayer, validate_request::ValidateRequestHeaderLayer, +}; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; mod api; @@ -46,7 +47,7 @@ async fn main() { // Routes under /api path .nest( "/api", - api::router().layer(RequireAuthorizationLayer::bearer(&api_key)), + api::router().layer(ValidateRequestHeaderLayer::bearer(&api_key)), ) .route("/metrics", get(move || ready(recorder_handle.render()))); @@ -61,17 +62,7 @@ async fn main() { for (path, dir) in sites { let full_path = format!("{}/{}", static_dir, dir); - app = app.nest( - path, - get_service(ServeDir::new(full_path)).handle_error( - |error: std::io::Error| async move { - ( - StatusCode::INTERNAL_SERVER_ERROR, - format!("Unhandled internal error: {}", error), - ) - }, - ), - ); + app = app.nest_service(path, ServeDir::new(full_path)); } // Define some redirects @@ -90,18 +81,10 @@ async fn main() { app = app // The fallback option is to serve the actual static files - .fallback( - get_service(ServeDir::new(format!( - "{}/{}", - static_dir, DEFAULT_STATIC_SITE - ))) - .handle_error(|error: std::io::Error| async move { - ( - StatusCode::INTERNAL_SERVER_ERROR, - format!("Unhandled internal error: {}", error), - ) - }), - ) + .fallback_service(ServeDir::new(format!( + "{}/{}", + static_dir, DEFAULT_STATIC_SITE + ))) .layer(middleware::from_fn(metrics::track_metrics)) .layer(Extension(data_dir)) .layer(TraceLayer::new_for_http()); From fe5c1dc22e926f63b938f8dd60f922b33a55b447 Mon Sep 17 00:00:00 2001 From: Chewing_Bever Date: Sat, 29 Apr 2023 15:47:39 +0200 Subject: [PATCH 07/11] chore: update rust version --- .woodpecker/.build.yml | 7 +++++++ Dockerfile | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .woodpecker/.build.yml diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml new file mode 100644 index 0000000..22ea77e --- /dev/null +++ b/.woodpecker/.build.yml @@ -0,0 +1,7 @@ +platform: 'linux/amd64' + +pipeline: + lint: + image: 'rustlang/rust:1.69' + commands: + - cargo build diff --git a/Dockerfile b/Dockerfile index d56f706..62ecb30 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.64-alpine3.16 AS builder +FROM rust:1.69-alpine3.16 AS builder ARG DI_VER=1.2.5 From 88741d81e6c7ac972c034982adf837f31ea8906b Mon Sep 17 00:00:00 2001 From: Chewing_Bever Date: Sat, 29 Apr 2023 15:48:50 +0200 Subject: [PATCH 08/11] fix: correct docker image --- .woodpecker/.build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 22ea77e..4f5bc7e 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -2,6 +2,6 @@ platform: 'linux/amd64' pipeline: lint: - image: 'rustlang/rust:1.69' + image: 'rustlang/rust:1.69-alpine3.16' commands: - cargo build From b79e34cb701c4ed5fe9b6f66c7131ddc049e26a3 Mon Sep 17 00:00:00 2001 From: Chewing_Bever Date: Sat, 29 Apr 2023 15:49:39 +0200 Subject: [PATCH 09/11] fix: yee --- .woodpecker/.build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 4f5bc7e..3b0c3ec 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -1,7 +1,7 @@ platform: 'linux/amd64' pipeline: - lint: - image: 'rustlang/rust:1.69-alpine3.16' + build: + image: 'rust:1.69-alpine3.16' commands: - cargo build From 1e83db744b83c8889dfa9784be592e6909c0dbe6 Mon Sep 17 00:00:00 2001 From: Chewing_Bever Date: Sat, 29 Apr 2023 15:54:32 +0200 Subject: [PATCH 10/11] fix: een probeersel --- .woodpecker/.build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml index 3b0c3ec..a6bafed 100644 --- a/.woodpecker/.build.yml +++ b/.woodpecker/.build.yml @@ -4,4 +4,5 @@ pipeline: build: image: 'rust:1.69-alpine3.16' commands: + - apk add build-base - cargo build From 3ac0b52441ef4c5c92ff5b5532a437ef85f45115 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Sat, 29 Apr 2023 14:01:55 +0000 Subject: [PATCH 11/11] chore(deps): update rust crate futures-util to 0.3.28 --- Cargo.lock | 18 +++++++++--------- Cargo.toml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 567fabe..4c251ff 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -198,19 +198,19 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 1.0.103", + "syn 2.0.15", ] [[package]] @@ -221,15 +221,15 @@ checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-core", "futures-macro", diff --git a/Cargo.toml b/Cargo.toml index fc359b1..f353e33 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ tower-http = { version = "0.4.0", features = ["fs", "trace", "auth"] } tar = "0.4.38" flate2 = "1.0.25" tokio-util = { version = "0.7.8", features = ["io"] } -futures-util = "0.3.25" +futures-util = "0.3.28" uuid = { version = "1.3.2", features = ["v4"] } serde_json = "1.0.91" metrics = "0.20.1"