From 618ecd5f8f78c910b9abde155a4b4863ab4ff037 Mon Sep 17 00:00:00 2001 From: Jeremy Andrews Date: Wed, 6 Dec 2023 11:42:38 +0100 Subject: [PATCH 1/5] update http --- CHANGELOG.md | 1 + Cargo.toml | 2 +- src/goose.rs | 3 +-- src/metrics.rs | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3778f944..2bc0d702 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## 0.17.3-dev - [#565](https://github.com/tag1consulting/goose/pull/565) add `--accept-invalid-certs` to skip validation of https certificates - [#568](https://github.com/tag1consulting/goose/pull/568) don't panic when truncating non utf-8 string + - update [`http`](https://docs.rs/http) ## 0.17.2 August 28, 2023 - [#557](https://github.com/tag1consulting/goose/pull/557) speed up user initialization on Linux diff --git a/Cargo.toml b/Cargo.toml index 660cc139..28a62458 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ downcast-rs = "1.2" flume = "0.11" futures = "0.3" gumdrop = "0.8" -http = "0.2" +http = "1.0" itertools = "0.11" lazy_static = "1.4" log = "0.4" diff --git a/src/goose.rs b/src/goose.rs index 47bdd5a9..5f951d5f 100644 --- a/src/goose.rs +++ b/src/goose.rs @@ -288,9 +288,8 @@ //! limitations under the License. use downcast_rs::{impl_downcast, Downcast}; -use http::method::Method; use regex::Regex; -use reqwest::{header, Client, ClientBuilder, RequestBuilder, Response}; +use reqwest::{header, Client, ClientBuilder, Method, RequestBuilder, Response}; use serde::{Deserialize, Serialize}; use std::hash::{Hash, Hasher}; use std::sync::Arc; diff --git a/src/metrics.rs b/src/metrics.rs index 66636b60..35a3032b 100644 --- a/src/metrics.rs +++ b/src/metrics.rs @@ -16,7 +16,7 @@ use crate::test_plan::{TestPlanHistory, TestPlanStepAction}; use crate::util; use crate::{GooseAttack, GooseAttackRunState, GooseConfiguration, GooseError}; use chrono::prelude::*; -use http::StatusCode; +use reqwest::StatusCode; use itertools::Itertools; use num_format::{Locale, ToFormattedString}; use regex::RegexSet; @@ -3872,7 +3872,7 @@ mod test { assert!(request_metric.success); assert!(!request_metric.update); - let status_code = http::StatusCode::OK; + let status_code = reqwest::StatusCode::OK; request_metric.set_status_code(Some(status_code)); assert_eq!(request_metric.raw.method, GooseMethod::Get); assert_eq!(request_metric.name, "/".to_string()); From 268beece1a1a99fd874c259e2412cd7323531951 Mon Sep 17 00:00:00 2001 From: Jeremy Andrews Date: Wed, 6 Dec 2023 11:47:14 +0100 Subject: [PATCH 2/5] update itertools --- CHANGELOG.md | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bc0d702..29bd3dd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## 0.17.3-dev - [#565](https://github.com/tag1consulting/goose/pull/565) add `--accept-invalid-certs` to skip validation of https certificates - [#568](https://github.com/tag1consulting/goose/pull/568) don't panic when truncating non utf-8 string - - update [`http`](https://docs.rs/http) + - [#574](https://github.com/tag1consulting/goose/pull/574) update [`http`](https://docs.rs/http), [`itertools`](https://docs.rs/itertools) ## 0.17.2 August 28, 2023 - [#557](https://github.com/tag1consulting/goose/pull/557) speed up user initialization on Linux diff --git a/Cargo.toml b/Cargo.toml index 28a62458..5723bdca 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ flume = "0.11" futures = "0.3" gumdrop = "0.8" http = "1.0" -itertools = "0.11" +itertools = "0.12" lazy_static = "1.4" log = "0.4" num-format = "0.4" From f655ca17a23ef256c860c700cf91b480486001a1 Mon Sep 17 00:00:00 2001 From: Jeremy Andrews Date: Wed, 6 Dec 2023 11:50:25 +0100 Subject: [PATCH 3/5] update nix --- CHANGELOG.md | 2 +- Cargo.toml | 2 +- src/metrics.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29bd3dd4..59e5759d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## 0.17.3-dev - [#565](https://github.com/tag1consulting/goose/pull/565) add `--accept-invalid-certs` to skip validation of https certificates - [#568](https://github.com/tag1consulting/goose/pull/568) don't panic when truncating non utf-8 string - - [#574](https://github.com/tag1consulting/goose/pull/574) update [`http`](https://docs.rs/http), [`itertools`](https://docs.rs/itertools) + - [#574](https://github.com/tag1consulting/goose/pull/574) update [`http`](https://docs.rs/http), [`itertools`](https://docs.rs/itertools) [`nix`](https://docs.rs/nix) ## 0.17.2 August 28, 2023 - [#557](https://github.com/tag1consulting/goose/pull/557) speed up user initialization on Linux diff --git a/Cargo.toml b/Cargo.toml index 5723bdca..3d61ee93 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -58,6 +58,6 @@ rustls-tls = ["reqwest/rustls-tls", "tokio-tungstenite/rustls"] [dev-dependencies] httpmock = "0.6" native-tls = "0.2" -nix = "0.26" +nix = "0.27" rustls = "0.20" serial_test = "0.9" diff --git a/src/metrics.rs b/src/metrics.rs index 35a3032b..86cd5e6a 100644 --- a/src/metrics.rs +++ b/src/metrics.rs @@ -16,10 +16,10 @@ use crate::test_plan::{TestPlanHistory, TestPlanStepAction}; use crate::util; use crate::{GooseAttack, GooseAttackRunState, GooseConfiguration, GooseError}; use chrono::prelude::*; -use reqwest::StatusCode; use itertools::Itertools; use num_format::{Locale, ToFormattedString}; use regex::RegexSet; +use reqwest::StatusCode; use serde::ser::SerializeStruct; use serde::{Deserialize, Serialize, Serializer}; use std::cmp::Ordering; From 38fa9d864bc1f50147bd378dfcd0e569936c825f Mon Sep 17 00:00:00 2001 From: Jeremy Andrews Date: Wed, 6 Dec 2023 11:54:16 +0100 Subject: [PATCH 4/5] update rustls --- CHANGELOG.md | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 59e5759d..a708ffa9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## 0.17.3-dev - [#565](https://github.com/tag1consulting/goose/pull/565) add `--accept-invalid-certs` to skip validation of https certificates - [#568](https://github.com/tag1consulting/goose/pull/568) don't panic when truncating non utf-8 string - - [#574](https://github.com/tag1consulting/goose/pull/574) update [`http`](https://docs.rs/http), [`itertools`](https://docs.rs/itertools) [`nix`](https://docs.rs/nix) + - [#574](https://github.com/tag1consulting/goose/pull/574) update [`http`](https://docs.rs/http), [`itertools`](https://docs.rs/itertools) [`nix`](https://docs.rs/nix), [`rustls`](https://docs.rs/rustls/) ## 0.17.2 August 28, 2023 - [#557](https://github.com/tag1consulting/goose/pull/557) speed up user initialization on Linux diff --git a/Cargo.toml b/Cargo.toml index 3d61ee93..29bd729c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -59,5 +59,5 @@ rustls-tls = ["reqwest/rustls-tls", "tokio-tungstenite/rustls"] httpmock = "0.6" native-tls = "0.2" nix = "0.27" -rustls = "0.20" +rustls = "0.22" serial_test = "0.9" From b1eb70c00fde8874dafafe3a225abe874e9f4d21 Mon Sep 17 00:00:00 2001 From: Jeremy Andrews Date: Wed, 6 Dec 2023 12:02:07 +0100 Subject: [PATCH 5/5] update serial_test --- CHANGELOG.md | 2 +- Cargo.toml | 2 +- tests/one_taskset.rs | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a708ffa9..7c3ac19a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ ## 0.17.3-dev - [#565](https://github.com/tag1consulting/goose/pull/565) add `--accept-invalid-certs` to skip validation of https certificates - [#568](https://github.com/tag1consulting/goose/pull/568) don't panic when truncating non utf-8 string - - [#574](https://github.com/tag1consulting/goose/pull/574) update [`http`](https://docs.rs/http), [`itertools`](https://docs.rs/itertools) [`nix`](https://docs.rs/nix), [`rustls`](https://docs.rs/rustls/) + - [#574](https://github.com/tag1consulting/goose/pull/574) update [`http`](https://docs.rs/http), [`itertools`](https://docs.rs/itertools) [`nix`](https://docs.rs/nix), [`rustls`](https://docs.rs/rustls/), and [`serial_test`](https://docs.rs/serial_test) ## 0.17.2 August 28, 2023 - [#557](https://github.com/tag1consulting/goose/pull/557) speed up user initialization on Linux diff --git a/Cargo.toml b/Cargo.toml index 29bd729c..86f70b47 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -60,4 +60,4 @@ httpmock = "0.6" native-tls = "0.2" nix = "0.27" rustls = "0.22" -serial_test = "0.9" +serial_test = "2.0" diff --git a/tests/one_taskset.rs b/tests/one_taskset.rs index a67b628f..b454ab04 100644 --- a/tests/one_taskset.rs +++ b/tests/one_taskset.rs @@ -253,7 +253,6 @@ async fn test_one_scenario_reset_metrics() { run_standalone_test(TestType::ResetMetrics).await; } -#[ignore] #[tokio::test(flavor = "multi_thread", worker_threads = 8)] #[cfg_attr(not(feature = "gaggle"), ignore)] #[serial]