anthony/dredge
1
0
Fork 0
mirror of https://github.com/anthonyoteri/dredge.git synced 2026-06-05 15:26:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #54 from anthonyoteri/dependabot/cargo/http-1.0.0

Browse Source
This commit is contained in:
dependabot[bot]
2023-11-16 16:18:29 +00:00
committed by GitHub
parent 5e7d0e4e1e 07746429bb
commit b6fda7162f
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.toml
+1 -1
View File
@@ -28,7 +28,7 @@ name = "dredge"
[dependencies] [dependencies]
clap = { version = "4.4.3", features = ["derive", "env", "wrap_help"] } clap = { version = "4.4.3", features = ["derive", "env", "wrap_help"] }
simple_logger = { version = "4.2.0", features = ["timestamps", "colors", "stderr"] } simple_logger = { version = "4.2.0", features = ["timestamps", "colors", "stderr"] }
http = "0.2.9" http = "1.0.0"
indoc = "2.0.4" indoc = "2.0.4"
log = "0.4.20" log = "0.4.20"
reqwest = { version = "0.11.20", features = ["json", "gzip", "multipart", "native-tls-vendored"] } reqwest = { version = "0.11.20", features = ["json", "gzip", "multipart", "native-tls-vendored"] }
src/api.rs
+9 -9
View File
@@ -7,7 +7,9 @@
* copied, modified, or distributed except according to those terms. * copied, modified, or distributed except according to those terms.
*/ */
use http::header; use reqwest::header;
use reqwest::header::HeaderValue;
use reqwest::StatusCode;
use serde::Deserialize; use serde::Deserialize;
use url::Url; use url::Url;
@@ -52,7 +54,7 @@ pub async fn fetch_paginated<T: for<'de> Deserialize<'de>>(
responses.push(json); responses.push(json);
} }
if let Some(p) = parse_rfc5988(headers.get(http::header::LINK))? { if let Some(p) = parse_rfc5988(headers.get(header::LINK))? {
next_path = p; next_path = p;
} else { } else {
break; break;
@@ -73,7 +75,7 @@ pub async fn fetch_paginated<T: for<'de> Deserialize<'de>>(
/// ///
/// Returns and `ApiError` if there is a problem parsing contents of the /// Returns and `ApiError` if there is a problem parsing contents of the
/// supplied header value. /// supplied header value.
fn parse_rfc5988(header_value: Option<&http::HeaderValue>) -> Result<Option<String>, ApiError> { fn parse_rfc5988(header_value: Option<&HeaderValue>) -> Result<Option<String>, ApiError> {
log::trace!("parse_rfc5988(header_value: {header_value:?})"); log::trace!("parse_rfc5988(header_value: {header_value:?})");
if let Some(link_value) = header_value { if let Some(link_value) = header_value {
@@ -127,7 +129,7 @@ pub fn parse_response_status(response: &reqwest::Response) -> Result<(), ApiErro
log::trace!("parse_response_status(response: {response:?})"); log::trace!("parse_response_status(response: {response:?})");
match response.status() { match response.status() {
http::StatusCode::OK | http::StatusCode::ACCEPTED => { StatusCode::OK | StatusCode::ACCEPTED => {
let headers = response.headers(); let headers = response.headers();
if let Some(header_value) = headers.get("Docker-Distribution-API-Version") { if let Some(header_value) = headers.get("Docker-Distribution-API-Version") {
if header_value.to_str()? == "registry/2.0" { if header_value.to_str()? == "registry/2.0" {
@@ -141,8 +143,8 @@ pub fn parse_response_status(response: &reqwest::Response) -> Result<(), ApiErro
)) ))
} }
} }
http::StatusCode::METHOD_NOT_ALLOWED => Err(ApiError::MethodNotAllowed), StatusCode::METHOD_NOT_ALLOWED => Err(ApiError::MethodNotAllowed),
http::StatusCode::UNAUTHORIZED => { StatusCode::UNAUTHORIZED => {
let headers = response.headers(); let headers = response.headers();
if let Some(header_value) = headers.get("Docker-Distribution-API-Version") { if let Some(header_value) = headers.get("Docker-Distribution-API-Version") {
if header_value.to_str()? == "registry/2.0" { if header_value.to_str()? == "registry/2.0" {
@@ -156,7 +158,7 @@ pub fn parse_response_status(response: &reqwest::Response) -> Result<(), ApiErro
)) ))
} }
} }
http::StatusCode::NOT_FOUND => Err(ApiError::NotFound), StatusCode::NOT_FOUND => Err(ApiError::NotFound),
e => Err(ApiError::UnexpectedResponse(format!( e => Err(ApiError::UnexpectedResponse(format!(
"Undocumented status code: {e:?}" "Undocumented status code: {e:?}"
))), ))),
@@ -192,8 +194,6 @@ pub async fn get_digest(client: &reqwest::Client, url: &Url) -> Result<String, A
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use http::header::HeaderValue;
use super::*; use super::*;
/// Test parsing a valid RFC5988 header value. /// Test parsing a valid RFC5988 header value.