Skip to content

Improve error reporting when omdb tries to fetch the inventory for a collection that doesn't exist #10430

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

Open
piffio wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Improve error reporting when omdb tries to fetch the inventory for a collection that doesn't exist #10430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
989d250
test: add failing test for the collection not found error
piffio May 9, 2026
a240233
Return informative errors when a collection doesn't exist
piffio May 9, 2026
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
1 change: 1 addition & 0 deletions common/src/api/external/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -957,6 +957,7 @@ pub enum ResourceType {
IdentityProvider,
Image,
Instance,
InventoryCollection,
InstanceNetworkInterface,
InternetGateway,
InternetGatewayIpAddress,
Expand Down
38 changes: 36 additions & 2 deletions nexus/db-queries/src/db/datastore/inventory.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4738,8 +4738,20 @@ impl DataStore {
.map_err(|e| {
public_error_from_diesel(e, ErrorHandler::Server)
})?;
bail_unless!(collections.len() == 1);
let collection = collections.into_iter().next().unwrap();
let collection = match collections.len() {
0 => {
return Err(Error::ObjectNotFound {
type_name: ResourceType::InventoryCollection,
lookup_type: LookupType::ById(id.into_untyped_uuid()),
});
},
1 => collections.into_iter().next().unwrap(),
n => {
return Err(Error::internal_error(&format!(
"expected 1 collection row, got {n}"
)));
},
};
(
collection.time_started,
collection.time_done,
Expand Down Expand Up @@ -5238,6 +5250,28 @@ mod test {
logctx.cleanup_successful();
}

#[tokio::test]
async fn test_inventory_collection_read_missing_returns_not_found() {
let logctx = dev::test_setup_log("inventory_collection_read_missing");
let db = TestDatabase::new_with_datastore(&logctx.log).await;
let (opctx, datastore) = (db.opctx(), db.datastore());

let missing_id = CollectionUuid::new_v4();

let err = datastore
.inventory_collection_read(&opctx, missing_id)
.await
.expect_err("expected error for missing collection");

assert!(
matches!(err, Error::ObjectNotFound { .. }),
"expected ObjectNotFound error, got: {err:?}"
);

db.terminate().await;
logctx.cleanup_successful();
}

/// Tests inserting several collections, reading them back, and making sure
/// they look the same.
#[tokio::test]
Expand Down