Skip to content

Commit 8c0f7b3

Browse files
authored
[15/n] [sled-agent-zone-images] move status types to sled-agent-types, add examples (#8332)
These examples will be used for testing within sled-agent-zone-images, and also in nexus inventory examples. This is pure code movement with no functional changes.
1 parent 3f677fc commit 8c0f7b3

File tree

18 files changed

+1096
-1023
lines changed

18 files changed

+1096
-1023
lines changed

Cargo.lock

Lines changed: 24 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ members = [
127127
"sled-agent/repo-depot-api",
128128
"sled-agent/types",
129129
"sled-agent/zone-images",
130+
"sled-agent/zone-images-examples",
130131
"sled-diagnostics",
131132
"sled-hardware",
132133
"sled-hardware/types",
@@ -279,6 +280,7 @@ default-members = [
279280
"sled-agent/repo-depot-api",
280281
"sled-agent/types",
281282
"sled-agent/zone-images",
283+
"sled-agent/zone-images-examples",
282284
"sled-diagnostics",
283285
"sled-hardware",
284286
"sled-hardware/types",
@@ -677,6 +679,7 @@ sled-agent-client = { path = "clients/sled-agent-client" }
677679
sled-agent-config-reconciler = { path = "sled-agent/config-reconciler" }
678680
sled-agent-types = { path = "sled-agent/types" }
679681
sled-agent-zone-images = { path = "sled-agent/zone-images" }
682+
sled-agent-zone-images-examples = { path = "sled-agent/zone-images-examples" }
680683
sled-diagnostics = { path = "sled-diagnostics" }
681684
sled-hardware = { path = "sled-hardware" }
682685
sled-hardware-types = { path = "sled-hardware/types" }

sled-agent/src/services.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,8 @@ use omicron_ddm_admin_client::DdmError;
9393
use omicron_uuid_kinds::OmicronZoneUuid;
9494
use sled_agent_config_reconciler::InternalDisksReceiver;
9595
use sled_agent_types::sled::SWITCH_ZONE_BASEBOARD_FILE;
96-
use sled_agent_zone_images::ZoneImageSourceResolver;
97-
use sled_agent_zone_images::{MupdateOverrideReadError, ZoneImageSource};
96+
use sled_agent_types::zone_images::MupdateOverrideReadError;
97+
use sled_agent_zone_images::{ZoneImageSource, ZoneImageSourceResolver};
9898
use sled_hardware::DendriteAsic;
9999
use sled_hardware::SledMode;
100100
use sled_hardware::is_gimlet;

sled-agent/types/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ async-trait.workspace = true
1313
bootstore.workspace = true
1414
camino.workspace = true
1515
chrono.workspace = true
16+
iddqd.workspace = true
1617
nexus-sled-agent-shared.workspace = true
1718
# Note: we're trying to avoid a dependency from sled-agent-types to nexus-types
1819
# because the correct direction of dependency is unclear. If there are types
@@ -29,9 +30,11 @@ serde_json.workspace = true
2930
sha3.workspace = true
3031
sled-hardware-types.workspace = true
3132
slog.workspace = true
33+
slog-error-chain.workspace = true
3234
strum.workspace = true
3335
thiserror.workspace = true
3436
toml.workspace = true
37+
tufaceous-artifact.workspace = true
3538
uuid.workspace = true
3639

3740
[dev-dependencies]

sled-agent/types/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ pub mod sled;
1616
pub mod support_bundle;
1717
pub mod time_sync;
1818
pub mod zone_bundle;
19+
pub mod zone_images;

0 commit comments

Comments
 (0)