Skip to content

Commit 8cb9fa6

Browse files
sypharGuillaumeGomez
authored andcommitted
drop http 0.2 dependency, let AWS SDKs use http/hyper 1
1 parent 2db535f commit 8cb9fa6

File tree

4 files changed

+9
-14
lines changed

4 files changed

+9
-14
lines changed

.github/renovate.json5

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,4 @@
1313
extends: ["schedule:weekly"],
1414
groupName: "lockfile maintenance",
1515
},
16-
"ignoreDeps": [
17-
"http02" // AWS SDK needs an old http version for testing
18-
]
1916
}

Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ constant_time_eq = "0.4.2"
108108
[dev-dependencies]
109109
criterion = "0.7.0"
110110
kuchikiki = "0.8"
111-
http02 = { version = "0.2.11", package = "http"} # AWS SDKs need http 0.2 for testing
112111
http-body-util = "0.1.0"
113112
rand = "0.9"
114113
mockito = "1.0.2"

src/cdn.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1202,16 +1202,16 @@ mod tests {
12021202
#[tokio::test(flavor = "multi_thread")]
12031203
async fn invalidate_path() {
12041204
let conn = StaticReplayClient::new(vec![ReplayEvent::new(
1205-
http02::Request::builder()
1205+
http::Request::builder()
12061206
.header("content-type", "application/xml")
1207-
.uri(http02::uri::Uri::from_static(
1207+
.uri(http::uri::Uri::from_static(
12081208
"https://cloudfront.amazonaws.com/2020-05-31/distribution/some_distribution/invalidation",
12091209
))
12101210
.body(SdkBody::from(
12111211
r#"<InvalidationBatch xmlns="http://cloudfront.amazonaws.com/doc/2020-05-31/"><Paths><Quantity>2</Quantity><Items><Path>/some/path*</Path><Path>/another/path/*</Path></Items></Paths><CallerReference>some_reference</CallerReference></InvalidationBatch>"#,
12121212
))
12131213
.unwrap(),
1214-
http02::Response::builder()
1214+
http::Response::builder()
12151215
.status(200)
12161216
.body(SdkBody::from(
12171217
r#"
@@ -1252,14 +1252,14 @@ mod tests {
12521252
#[tokio::test(flavor = "multi_thread")]
12531253
async fn get_invalidation_info_doesnt_exist() {
12541254
let conn = StaticReplayClient::new(vec![ReplayEvent::new(
1255-
http02::Request::builder()
1255+
http::Request::builder()
12561256
.header("content-type", "application/xml")
1257-
.uri(http02::uri::Uri::from_static(
1257+
.uri(http::uri::Uri::from_static(
12581258
"https://cloudfront.amazonaws.com/2020-05-31/distribution/some_distribution/invalidation/some_reference"
12591259
))
12601260
.body(SdkBody::empty())
12611261
.unwrap(),
1262-
http02::Response::builder()
1262+
http::Response::builder()
12631263
.status(404)
12641264
.body(SdkBody::empty())
12651265
.unwrap(),
@@ -1281,14 +1281,14 @@ mod tests {
12811281
#[tokio::test(flavor = "multi_thread")]
12821282
async fn get_invalidation_info_completed() {
12831283
let conn = StaticReplayClient::new(vec![ReplayEvent::new(
1284-
http02::Request::builder()
1284+
http::Request::builder()
12851285
.header("content-type", "application/xml")
1286-
.uri(http02::uri::Uri::from_static(
1286+
.uri(http::uri::Uri::from_static(
12871287
"https://cloudfront.amazonaws.com/2020-05-31/distribution/some_distribution/invalidation/some_reference"
12881288
))
12891289
.body(SdkBody::empty())
12901290
.unwrap(),
1291-
http02::Response::builder()
1291+
http::Response::builder()
12921292
.status(200)
12931293
.body(SdkBody::from(
12941294
r#"<Invalidation xmlns="http://cloudfront.amazonaws.com/doc/2020-05-31/">

0 commit comments

Comments
 (0)