From b4e7ec9566d2dd8becc253efc03b7f71ba9bb81f Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 25 Feb 2025 15:17:14 +0100 Subject: [PATCH 1/2] chore: Add snafu::report to get better error detail Before: ``` Error: ConstructHttpClient { source: reqwest::Error { kind: Builder, source: Normal(ErrorStack(])) } } stream closed EOF for kuttl-test-assuring-molly/test-opa-server-default-wwhn7 (user-info-fetcher) ``` After: ``` Error: failed to construct http client Caused by these errors (recent errors listed first): 1: builder error 2: OpenSSL error stream closed EOF for kuttl-test-assuring-molly/test-opa-server-default-5pjjk (user-info-fetcher) ``` Co-authored-by: Techassi --- rust/user-info-fetcher/src/main.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/rust/user-info-fetcher/src/main.rs b/rust/user-info-fetcher/src/main.rs index 5372ac4c..8e7cac3e 100644 --- a/rust/user-info-fetcher/src/main.rs +++ b/rust/user-info-fetcher/src/main.rs @@ -79,6 +79,7 @@ async fn read_config_file(path: &Path) -> Result { } #[tokio::main] +#[snafu::report] async fn main() -> Result<(), StartupError> { let args = Args::parse(); From 68dd3d4a5d370567e1793faada4b6dd32ef6b089 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 25 Feb 2025 15:19:54 +0100 Subject: [PATCH 2/2] fix: Update native-tls due to regression See: https://github.com/sfackler/rust-native-tls/releases/tag/v0.2.14 Co-authored-by: Techassi --- Cargo.lock | 10 +++++----- Cargo.nix | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 58287839..cd7e249f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -756,7 +756,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -2107,9 +2107,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dab59f8e050d5df8e4dd87d9206fb6f65a483e20ac9fda365ade4fab353196c" +checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e" dependencies = [ "libc", "log", @@ -2674,7 +2674,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] @@ -3348,7 +3348,7 @@ dependencies = [ "getrandom 0.3.1", "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys 0.52.0", ] [[package]] diff --git a/Cargo.nix b/Cargo.nix index 1faed953..a1ce3c10 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -2301,7 +2301,7 @@ rec { } { name = "windows-sys"; - packageId = "windows-sys 0.59.0"; + packageId = "windows-sys 0.52.0"; target = { target, features }: (target."windows" or false); features = [ "Win32_Foundation" "Win32_System_Diagnostics_Debug" ]; } @@ -7003,9 +7003,9 @@ rec { }; "native-tls" = rec { crateName = "native-tls"; - version = "0.2.13"; + version = "0.2.14"; edition = "2015"; - sha256 = "0v0rafrzmr5dcnizvj8awa1s8rbgzc394zfq9n7dzmahw3w5kaqd"; + sha256 = "03hga800x8bzkp8h7frnm7yp545dwwawgmaq673vx7byk1139pl7"; libName = "native_tls"; authors = [ "Steven Fackler " @@ -8946,7 +8946,7 @@ rec { } { name = "windows-sys"; - packageId = "windows-sys 0.59.0"; + packageId = "windows-sys 0.52.0"; target = { target, features }: (target."windows" or false); features = [ "Win32_Foundation" "Win32_Networking_WinSock" "Win32_NetworkManagement_IpHelper" "Win32_System_Threading" ]; } @@ -11078,7 +11078,7 @@ rec { } { name = "windows-sys"; - packageId = "windows-sys 0.59.0"; + packageId = "windows-sys 0.52.0"; target = { target, features }: (target."windows" or false); features = [ "Win32_Storage_FileSystem" "Win32_Foundation" ]; } @@ -15265,7 +15265,7 @@ rec { "Win32_Web" = [ "Win32" ]; "Win32_Web_InternetExplorer" = [ "Win32_Web" ]; }; - resolvedDefaultFeatures = [ "Wdk" "Wdk_Foundation" "Wdk_Storage" "Wdk_Storage_FileSystem" "Wdk_System" "Wdk_System_IO" "Win32" "Win32_Foundation" "Win32_Networking" "Win32_Networking_WinSock" "Win32_Security" "Win32_Storage" "Win32_Storage_FileSystem" "Win32_System" "Win32_System_Console" "Win32_System_IO" "Win32_System_Pipes" "Win32_System_SystemServices" "Win32_System_Threading" "Win32_System_WindowsProgramming" "default" ]; + resolvedDefaultFeatures = [ "Wdk" "Wdk_Foundation" "Wdk_Storage" "Wdk_Storage_FileSystem" "Wdk_System" "Wdk_System_IO" "Win32" "Win32_Foundation" "Win32_NetworkManagement" "Win32_NetworkManagement_IpHelper" "Win32_Networking" "Win32_Networking_WinSock" "Win32_Security" "Win32_Storage" "Win32_Storage_FileSystem" "Win32_System" "Win32_System_Console" "Win32_System_Diagnostics" "Win32_System_Diagnostics_Debug" "Win32_System_IO" "Win32_System_Pipes" "Win32_System_SystemServices" "Win32_System_Threading" "Win32_System_WindowsProgramming" "default" ]; }; "windows-sys 0.59.0" = rec { crateName = "windows-sys"; @@ -15524,7 +15524,7 @@ rec { "Win32_Web" = [ "Win32" ]; "Win32_Web_InternetExplorer" = [ "Win32_Web" ]; }; - resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_NetworkManagement" "Win32_NetworkManagement_IpHelper" "Win32_Networking" "Win32_Networking_WinSock" "Win32_Security" "Win32_Security_Authentication" "Win32_Security_Authentication_Identity" "Win32_Security_Credentials" "Win32_Security_Cryptography" "Win32_Storage" "Win32_Storage_FileSystem" "Win32_System" "Win32_System_Com" "Win32_System_Console" "Win32_System_Diagnostics" "Win32_System_Diagnostics_Debug" "Win32_System_LibraryLoader" "Win32_System_Memory" "Win32_System_SystemInformation" "Win32_System_Threading" "Win32_UI" "Win32_UI_Shell" "default" ]; + resolvedDefaultFeatures = [ "Win32" "Win32_Foundation" "Win32_Security" "Win32_Security_Authentication" "Win32_Security_Authentication_Identity" "Win32_Security_Credentials" "Win32_Security_Cryptography" "Win32_Storage" "Win32_Storage_FileSystem" "Win32_System" "Win32_System_Com" "Win32_System_Console" "Win32_System_LibraryLoader" "Win32_System_Memory" "Win32_System_SystemInformation" "Win32_UI" "Win32_UI_Shell" "default" ]; }; "windows-targets" = rec { crateName = "windows-targets";