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.

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

Add simulated crucible pantry checks #4600

Merged
merged 1 commit into from
Dec 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
113 changes: 97 additions & 16 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-
gateway-sp-comms = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "2739c18e80697aa6bc235c935176d14b4d757ee9" }
gateway-test-utils = { path = "gateway-test-utils" }
glob = "0.3.1"
guppy = "0.17.4"
headers = "0.3.9"
heck = "0.4"
hex = "0.4.3"
Expand Down
1 change: 1 addition & 0 deletions sled-agent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ opte-ioctl.workspace = true
[dev-dependencies]
assert_matches.workspace = true
expectorate.workspace = true
guppy.workspace = true
http.workspace = true
hyper.workspace = true
omicron-test-utils.workspace = true
Expand Down
98 changes: 98 additions & 0 deletions sled-agent/src/sim/http_entrypoints_pantry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -280,3 +280,101 @@ async fn detach(

Ok(HttpResponseDeleted())
}

#[cfg(test)]
mod tests {
use guppy::graph::ExternalSource;
use guppy::graph::GitReq;
use guppy::graph::PackageGraph;
use guppy::MetadataCommand;
use serde_json::Value;
use std::path::Path;

fn load_real_api_as_json() -> serde_json::Value {
let manifest_path = Path::new(env!("CARGO_MANIFEST_DIR"))
.parent()
.unwrap()
.join("Cargo.toml");
let mut cmd = MetadataCommand::new();
cmd.manifest_path(&manifest_path);
let graph = PackageGraph::from_command(&mut cmd).unwrap();
let package = graph
.packages()
.find(|pkg| pkg.name() == "crucible-pantry-client")
.unwrap();
let ExternalSource::Git { req, .. } =
package.source().parse_external().unwrap()
else {
panic!("This should be a Git dependency");
};
let part = match req {
GitReq::Branch(inner) => inner,
GitReq::Rev(inner) => inner,
GitReq::Tag(inner) => inner,
GitReq::Default => "main",
_ => unreachable!(),
};
let raw_url = format!(
"https://raw.githubusercontent.com/oxidecomputer/crucible/{part}/openapi/crucible-pantry.json",
);
let raw_json =
bnaecker marked this conversation as resolved.
Show resolved Hide resolved
reqwest::blocking::get(&raw_url).unwrap().text().unwrap();
serde_json::from_str(&raw_json).unwrap()
}

// Regression test for https://github.com/oxidecomputer/omicron/issues/4599.
#[test]
fn test_simulated_api_matches_real() {
let real_api = load_real_api_as_json();
let Value::String(ref title) = real_api["info"]["title"] else {
unreachable!();
};
let Value::String(ref version) = real_api["info"]["version"] else {
unreachable!();
};
let sim_api = super::api().openapi(title, version).json().unwrap();

// We'll assert that anything which apppears in the simulated API must
// appear exactly as-is in the real API. I.e., the simulated is a subset
// (possibly non-strict) of the real API.
compare_json_values(&sim_api, &real_api, String::new());
}

fn compare_json_values(lhs: &Value, rhs: &Value, path: String) {
match lhs {
Value::Array(values) => {
let Value::Array(rhs_values) = &rhs else {
panic!(
"Expected an array in the real API JSON at \
path \"{path}\", found {rhs:?}",
);
};
assert_eq!(values.len(), rhs_values.len());
for (i, (left, right)) in
values.iter().zip(rhs_values.iter()).enumerate()
{
let new_path = format!("{path}[{i}]");
compare_json_values(left, right, new_path);
}
}
Value::Object(map) => {
let Value::Object(rhs_map) = &rhs else {
panic!(
"Expected a map in the real API JSON at \
path \"{path}\", found {rhs:?}",
);
};
for (key, value) in map.iter() {
let new_path = format!("{path}/{key}");
let rhs_value = rhs_map.get(key).unwrap_or_else(|| {
panic!("Real API JSON missing key: \"{new_path}\"")
});
compare_json_values(value, rhs_value, new_path);
}
}
_ => {
assert_eq!(lhs, rhs, "Mismatched keys at JSON path \"{path}\"")
}
}
}
}
Loading
Loading