Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xtask: Use reqwest to fetch gen_init_cpio.c #1208

Closed
wants to merge 1 commit into from
Closed

xtask: Use reqwest to fetch gen_init_cpio.c #1208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ jobs:
run: |
set -euxo pipefail
find test/.tmp -name 'vmlinuz-*' -print0 | xargs -t -0 \
cargo xtask integration-test vm --cache-dir test/.tmp --github-api-token ${{ secrets.GITHUB_TOKEN }}
cargo xtask integration-test vm --cache-dir test/.tmp

# Provides a single status check for the entire build workflow.
# This is used for merge automation, like Mergify, since GH actions
Expand Down
3 changes: 1 addition & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ edition = "2024"
# them to do that, but in the meantime we need to be careful.
[workspace.dependencies]
anyhow = { version = "1", default-features = false }
base64 = { version = "0.22.1", default-features = false }
assert_matches = { version = "1.5.0", default-features = false }
async-io = { version = "2.0", default-features = false }
bindgen = { version = "0.71", default-features = false }
Expand All @@ -82,14 +81,14 @@ netns-rs = { version = "0.1", default-features = false }
nix = { version = "0.29.0", default-features = false }
num_enum = { version = "0.7", default-features = false }
object = { version = "0.36", default-features = false }
octorust = { version = "0.9.0", default-features = false }
once_cell = { version = "1.20.1", default-features = false }
proc-macro2 = { version = "1", default-features = false }
proc-macro2-diagnostics = { version = "0.10.1", default-features = false }
public-api = { version = "0.44.0", default-features = false }
quote = { version = "1", default-features = false }
rand = { version = "0.9", default-features = false }
rbpf = { version = "0.3.0", default-features = false }
reqwest = { version = "0.12", default-features = false }
rustdoc-json = { version = "0.9.0", default-features = false }
rustup-toolchain = { version = "0.1.5", default-features = false }
rustversion = { version = "1.0.0", default-features = false }
Expand Down
3 changes: 1 addition & 2 deletions xtask/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,15 @@ edition.workspace = true
[dependencies]
anyhow = { workspace = true, features = ["std"] }
aya-tool = { path = "../aya-tool", version = "0.1.0", default-features = false }
base64 = { workspace = true, features = ["std"] }
cargo_metadata = { workspace = true }
clap = { workspace = true, features = ["derive"] }
dialoguer = { workspace = true }
diff = { workspace = true }
indoc = { workspace = true }
octorust = { workspace = true, features = ["rustls-tls"] }
proc-macro2 = { workspace = true }
public-api = { workspace = true }
quote = { workspace = true }
reqwest = { workspace = true, features = ["rustls-tls"] }
rustdoc-json = { workspace = true }
rustup-toolchain = { workspace = true }
syn = { workspace = true }
Expand Down
36 changes: 7 additions & 29 deletions xtask/src/run.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ use std::{
};

use anyhow::{Context as _, Result, anyhow, bail};
use base64::engine::Engine as _;
use cargo_metadata::{Artifact, CompilerMessage, Message, Target};
use clap::Parser;
use xtask::{AYA_BUILD_INTEGRATION_BPF, Errors};
Expand All @@ -29,12 +28,6 @@ enum Environment {
#[clap(long)]
cache_dir: PathBuf,

/// The Github API token to use if network requests to Github are made.
///
/// This may be required if Github rate limits are exceeded.
#[clap(long)]
github_api_token: Option<String>,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This served a purpose. We frequently were getting rate limited in CI. Please reinstate it.


/// The kernel images to use.
///
/// You can download some images with:
Expand Down Expand Up @@ -180,7 +173,6 @@ pub fn run(opts: Options) -> Result<()> {
}
Environment::VM {
cache_dir,
github_api_token,
kernel_image,
} => {
// The user has asked us to run the tests on a VM. This is involved; strap in.
Expand All @@ -206,31 +198,17 @@ pub fn run(opts: Options) -> Result<()> {
.try_exists()
.context("failed to check existence of gen_init_cpio")?
{
// TODO(https://github.com/oxidecomputer/third-party-api-clients/issues/96): Use ETag-based caching.
let client = octorust::Client::new(
String::from("aya-xtask-integration-test-run"),
github_api_token.map(octorust::auth::Credentials::Token),
)?;
let octorust::Response {
status: _,
headers: _,
body: octorust::types::ContentFile { mut content, .. },
} = tokio::runtime::Builder::new_current_thread()
let content = tokio::runtime::Builder::new_current_thread()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd rather use: https://docs.rs/reqwest/latest/reqwest/blocking/index.html

.enable_all()
.build()
.unwrap()
.block_on(client.repos().get_content_file(
"torvalds",
"linux",
"usr/gen_init_cpio.c",
"master",
))
.block_on(async {
reqwest::get("https://github.com/torvalds/linux/raw/refs/heads/master/usr/gen_init_cpio.c")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll want to use https://docs.rs/reqwest/latest/reqwest/blocking/struct.Client.html
so we can set headers.

This doc suggests it would be wise to:

  1. Set the header for the expect API version
  2. Set the auth header if --github-api-token was provided

Furthermore, I would suggest using the same API endpoint as octorust was using due to the aforementioned issues with rate limiting.

https://docs.github.com/en/rest/repos/contents?apiVersion=2022-11-28

You'll then want to parse the reponse with serde_json

.await?
.bytes()
.await
})
.context("failed to download gen_init_cpio.c")?;
// Github very helpfully wraps their base64 at 10 columns /s.
content.retain(|c| !c.is_whitespace());
let content = base64::engine::general_purpose::STANDARD
.decode(content)
.context("failed to decode gen_init_cpio.c")?;

let mut clang = Command::new("clang");
clang
Expand Down
Loading