From 8cdae1ac965f8bbb03fff1fb68b2d2ee3c1f744f Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Sat, 6 Apr 2024 22:13:35 +0200 Subject: [PATCH] fix: remove reqwest_11 --- backend/Cargo.lock | 1 - backend/Cargo.toml | 1 - backend/ee-repo-ref.txt | 2 +- backend/windmill-api/Cargo.toml | 1 - backend/windmill-api/src/lib.rs | 5 ----- 5 files changed, 1 insertion(+), 9 deletions(-) diff --git a/backend/Cargo.lock b/backend/Cargo.lock index 9bf4ef0bce..22030a2437 100644 --- a/backend/Cargo.lock +++ b/backend/Cargo.lock @@ -9785,7 +9785,6 @@ dependencies = [ "quick_cache", "rand 0.8.5", "regex", - "reqwest 0.11.20", "reqwest 0.12.3", "rsa 0.7.2", "rsmq_async", diff --git a/backend/Cargo.toml b/backend/Cargo.toml index cae9f8e38f..54b4ad9dbd 100644 --- a/backend/Cargo.toml +++ b/backend/Cargo.toml @@ -143,7 +143,6 @@ urlencoding = "^2" url = "^2" async-oauth2 = "^0" reqwest = { version = "^0.12", features = ["json", "stream"] } -reqwest_11 = { package = "reqwest", version = "0.11" } time = "0.3.16" serde_urlencoded = "^0" tokio-tar = "^0" diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt index 03d8ea446f..f89532859f 100644 --- a/backend/ee-repo-ref.txt +++ b/backend/ee-repo-ref.txt @@ -1 +1 @@ -d5cc50b88e88b25dd9ddd39cc75bc1acbeb23a89 \ No newline at end of file +79ae996c9f44fb7013f53c8c73d1d47344c62cb9 \ No newline at end of file diff --git a/backend/windmill-api/Cargo.toml b/backend/windmill-api/Cargo.toml index 1963d0e6ae..00e965f292 100644 --- a/backend/windmill-api/Cargo.toml +++ b/backend/windmill-api/Cargo.toml @@ -39,7 +39,6 @@ tower-http.workspace = true hyper.workspace = true itertools.workspace = true reqwest.workspace = true -reqwest_11.workspace = true serde.workspace = true sqlx.workspace = true async-oauth2.workspace = true diff --git a/backend/windmill-api/src/lib.rs b/backend/windmill-api/src/lib.rs index c107a514ac..2ba6263bf9 100644 --- a/backend/windmill-api/src/lib.rs +++ b/backend/windmill-api/src/lib.rs @@ -107,11 +107,6 @@ lazy_static::lazy_static! { .danger_accept_invalid_certs(std::env::var("ACCEPT_INVALID_CERTS").is_ok()) .build().unwrap(); - pub static ref HTTP_CLIENT_11: reqwest_11::Client = reqwest_11::ClientBuilder::new() - .user_agent("windmill/beta") - .danger_accept_invalid_certs(std::env::var("ACCEPT_INVALID_CERTS").is_ok()) - .build().unwrap(); - pub static ref OAUTH_CLIENTS: Arc> = Arc::new(RwLock::new(AllClients { logins: HashMap::new(), connects: HashMap::new(),