diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2024-07-13 17:08:23 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-13 21:08:23 +0000 |
commit | e0cfc9da39e1d05e6a95c89c41cff8ae34fcbd66 (patch) | |
tree | 97e291e29e8e0e49796f3929e9bf5f42d0e5f76c /cli/tools/registry/provenance.rs | |
parent | f6fd6619e708a515831f707438368d81b0c9aa56 (diff) |
Revert "refactor(fetch): reimplement fetch with hyper instead of reqwest (#24237)" (#24574)
This reverts commit f6fd6619e708a515831f707438368d81b0c9aa56.
I'm seeing a difference between canary and 1.45.2. In
`deno-docs/reference_gen` I can't download dax when running `deno task
types`
```
~/src/deno-docs/reference_gen# deno upgrade --canary
Looking up latest canary version
Found latest version f6fd6619e708a515831f707438368d81b0c9aa56
Downloading https://dl.deno.land/canary/f6fd6619e708a515831f707438368d81b0c9aa56/deno-aarch64-apple-darwin.zip
Deno is upgrading to version f6fd6619e708a515831f707438368d81b0c9aa56
Archive: /var/folders/9v/kys6gqns6kl8nksyn4l1f9v40000gn/T/.tmpb5lDnq/deno.zip
inflating: deno
Upgraded successfully
~/src/deno-docs/reference_gen# deno -v
deno 1.45.2+f6fd661
~/src/deno-docs/reference_gen# rm -rf /Users/ry/Library/Caches/deno
~/src/deno-docs/reference_gen# deno task types
Task types deno task types:deno && deno task types:node
Task types:deno deno run --allow-read --allow-write --allow-run --allow-env --allow-sys deno-docs.ts
error: JSR package manifest for '@david/dax' failed to load. expected value at line 1 column 1
at file:///Users/ry/src/deno-docs/reference_gen/deno-docs.ts:2:15
~/src/deno-docs/reference_gen# deno upgrade --version 1.45.2
Downloading https://github.com/denoland/deno/releases/download/v1.45.2/deno-aarch64-apple-darwin.zip
Deno is upgrading to version 1.45.2
Archive: /var/folders/9v/kys6gqns6kl8nksyn4l1f9v40000gn/T/.tmp3R7uhF/deno.zip
inflating: deno
Upgraded successfully
~/src/deno-docs/reference_gen# rm -rf /Users/ry/Library/Caches/deno
~/src/deno-docs/reference_gen# deno task types
Task types deno task types:deno && deno task types:node
Task types:deno deno run --allow-read --allow-write --allow-run --allow-env --allow-sys deno-docs.ts
Task types:node deno run --allow-read --allow-write=. --allow-env --allow-sys node-docs.ts
```
Diffstat (limited to 'cli/tools/registry/provenance.rs')
-rw-r--r-- | cli/tools/registry/provenance.rs | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/cli/tools/registry/provenance.rs b/cli/tools/registry/provenance.rs index ce3d6ff8a..622e483d6 100644 --- a/cli/tools/registry/provenance.rs +++ b/cli/tools/registry/provenance.rs @@ -1,6 +1,5 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -use crate::http_util; use crate::http_util::HttpClient; use super::api::OidcTokenResponse; @@ -13,8 +12,6 @@ use deno_core::anyhow; use deno_core::anyhow::bail; use deno_core::error::AnyError; use deno_core::serde_json; -use deno_core::url::Url; -use http_body_util::BodyExt; use once_cell::sync::Lazy; use p256::elliptic_curve; use p256::pkcs8::AssociatedOid; @@ -507,12 +504,12 @@ impl<'a> FulcioSigner<'a> { let response = self .http_client - .post_json(url.parse()?, &request_body)? + .post(url) + .json(&request_body) .send() .await?; - let body: SigningCertificateResponse = - http_util::body_to_json(response).await?; + let body: SigningCertificateResponse = response.json().await?; let key = body .signed_certificate_embedded_sct @@ -530,23 +527,15 @@ impl<'a> FulcioSigner<'a> { bail!("No OIDC token available"); }; - let mut url = req_url.parse::<Url>()?; - url.query_pairs_mut().append_pair("audience", aud); - let res_bytes = self + let res = self .http_client - .get(url)? - .header( - http::header::AUTHORIZATION, - format!("Bearer {}", token) - .parse() - .map_err(http::Error::from)?, - ) + .get(&req_url) + .bearer_auth(token) + .query(&[("audience", aud)]) .send() .await? - .collect() - .await? - .to_bytes(); - let res: OidcTokenResponse = serde_json::from_slice(&res_bytes)?; + .json::<OidcTokenResponse>() + .await?; Ok(res.value) } } @@ -696,10 +685,11 @@ async fn testify( let url = format!("{}/api/v1/log/entries", *DEFAULT_REKOR_URL); let res = http_client - .post_json(url.parse()?, &proposed_intoto_entry)? + .post(&url) + .json(&proposed_intoto_entry) .send() .await?; - let body: RekorEntry = http_util::body_to_json(res).await?; + let body: RekorEntry = res.json().await?; Ok(body) } |