From d9845ec7dff25e87fd5a9dead185a8e2881e7d53 Mon Sep 17 00:00:00 2001
From: Artemis Everfree <artemis@oxidecomputer.com>
Date: Sun, 17 Sep 2023 05:17:08 +0000
Subject: [PATCH] rebase

---
 nexus/src/app/sagas/disk_create.rs     | 3 +--
 nexus/src/app/sagas/snapshot_create.rs | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/nexus/src/app/sagas/disk_create.rs b/nexus/src/app/sagas/disk_create.rs
index 30e0e6c8dd..275c8738cc 100644
--- a/nexus/src/app/sagas/disk_create.rs
+++ b/nexus/src/app/sagas/disk_create.rs
@@ -12,11 +12,10 @@ use super::{
     ACTION_GENERATE_ID,
 };
 use crate::app::sagas::declare_saga_actions;
+use crate::app::{authn, authz, db};
 use crate::external_api::params;
-use nexus_db_queries::db::datastore::RegionAllocationStrategy;
 use nexus_db_queries::db::identity::{Asset, Resource};
 use nexus_db_queries::db::lookup::LookupPath;
-use crate::{authn, authz, db};
 use omicron_common::api::external::DiskState;
 use omicron_common::api::external::Error;
 use rand::{rngs::StdRng, RngCore, SeedableRng};
diff --git a/nexus/src/app/sagas/snapshot_create.rs b/nexus/src/app/sagas/snapshot_create.rs
index 85ec91ffd0..eeabf64894 100644
--- a/nexus/src/app/sagas/snapshot_create.rs
+++ b/nexus/src/app/sagas/snapshot_create.rs
@@ -100,12 +100,11 @@ use super::{
 };
 use crate::app::sagas::declare_saga_actions;
 use crate::app::sagas::retry_until_known_result;
+use crate::app::{authn, authz, db};
 use crate::external_api::params;
-use crate::{authn, authz, db};
 use anyhow::anyhow;
 use crucible_agent_client::{types::RegionId, Client as CrucibleAgentClient};
 use nexus_db_model::Generation;
-use nexus_db_queries::db::datastore::RegionAllocationStrategy;
 use nexus_db_queries::db::identity::{Asset, Resource};
 use nexus_db_queries::db::lookup::LookupPath;
 use omicron_common::api::external;