Skip to content

Commit b2176ab

Browse files
labbottlabbott
committed
fmt
1 parent 00c53b7 commit b2176ab

File tree

16 files changed

+68
-45
lines changed

16 files changed

+68
-45
lines changed

‎nexus/db-model/src/inventory.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@ use sled_agent_types::inventory::ManifestNonBootInventory;
8686
use sled_agent_types::inventory::MupdateOverrideBootInventory;
8787
use sled_agent_types::inventory::MupdateOverrideInventory;
8888
use sled_agent_types::inventory::MupdateOverrideNonBootInventory;
89+
use sled_agent_types::inventory::OmicronFileSourceResolverInventory;
8990
use sled_agent_types::inventory::OmicronSingleMeasurement;
9091
use sled_agent_types::inventory::OrphanedDataset;
9192
use sled_agent_types::inventory::ReconciledSingleMeasurement;
9293
use sled_agent_types::inventory::RemoveMupdateOverrideBootSuccessInventory;
9394
use sled_agent_types::inventory::RemoveMupdateOverrideInventory;
9495
use sled_agent_types::inventory::ZoneArtifactInventory;
95-
use sled_agent_types::inventory::OmicronFileSourceResolverInventory;
9696
use sled_agent_types::inventory::{
9797
ConfigReconcilerInventoryResult, OmicronSledConfig, OmicronZoneConfig,
9898
OmicronZoneDataset, OmicronZoneImageSource, OmicronZoneType,

‎nexus/db-queries/src/db/datastore/inventory.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,8 +409,9 @@ impl DataStore {
409409
} = config_reconciler_fields_by_sled
410410
.remove(&sled_agent.sled_id)
411411
.expect("all sled IDs should exist");
412-
let file_source_resolver =
413-
InvOmicronFileSourceResolver::new(&sled_agent.file_source_resolver);
412+
let file_source_resolver = InvOmicronFileSourceResolver::new(
413+
&sled_agent.file_source_resolver,
414+
);
414415
InvSledAgent::new_without_baseboard(
415416
collection_id,
416417
sled_agent,

‎nexus/db-queries/src/db/datastore/physical_disk.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,8 @@ mod test {
347347
use omicron_uuid_kinds::ZpoolUuid;
348348
use sled_agent_types::inventory::{
349349
Baseboard, ConfigReconcilerInventoryStatus, HealthMonitorInventory,
350-
Inventory, InventoryDisk, SledCpuFamily, SledRole,
351-
OmicronFileSourceResolverInventory,
350+
Inventory, InventoryDisk, OmicronFileSourceResolverInventory,
351+
SledCpuFamily, SledRole,
352352
};
353353
use std::num::NonZeroU32;
354354

@@ -705,7 +705,8 @@ mod test {
705705
reconciler_status:
706706
ConfigReconcilerInventoryStatus::NotYetRun,
707707
last_reconciliation: None,
708-
file_source_resolver: OmicronFileSourceResolverInventory::new_fake(),
708+
file_source_resolver:
709+
OmicronFileSourceResolverInventory::new_fake(),
709710
health_monitor: HealthMonitorInventory::new(),
710711
},
711712
)

‎nexus/inventory/src/collector.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ use std::time::Duration;
3333
use strum::IntoEnumIterator;
3434
use tufaceous_artifact::ArtifactHash;
3535

36-
3736
/// connection and request timeout used for Sled Agent HTTP client
3837
const SLED_AGENT_TIMEOUT: Duration = Duration::from_secs(60);
3938

@@ -738,14 +737,14 @@ mod test {
738737
use sled_agent_types::inventory::OmicronZoneType;
739738
use sled_agent_types::inventory::SledCpuFamily;
740739
use slog::o;
740+
use std::collections::BTreeSet;
741741
use std::net::Ipv6Addr;
742742
use std::net::SocketAddrV6;
743743
use std::sync::Arc;
744744
use std::time::Duration;
745745
use swrite::SWrite as _;
746746
use swrite::swrite;
747747
use swrite::swriteln;
748-
use std::collections::BTreeSet;
749748

750749
fn dump_sled_config(s: &mut String, config: &OmicronSledConfig) {
751750
let OmicronSledConfig {

‎nexus/inventory/src/examples.rs‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ use sled_agent_types::inventory::Inventory;
4848
use sled_agent_types::inventory::InventoryDataset;
4949
use sled_agent_types::inventory::InventoryDisk;
5050
use sled_agent_types::inventory::InventoryZpool;
51+
use sled_agent_types::inventory::OmicronFileSourceResolverInventory;
5152
use sled_agent_types::inventory::OmicronSledConfig;
5253
use sled_agent_types::inventory::OmicronZonesConfig;
5354
use sled_agent_types::inventory::OrphanedDataset;
5455
use sled_agent_types::inventory::ReconciledSingleMeasurement;
5556
use sled_agent_types::inventory::SledCpuFamily;
5657
use sled_agent_types::inventory::SledRole;
57-
use sled_agent_types::inventory::OmicronFileSourceResolverInventory;
5858
use sled_agent_types::zone_images::MeasurementManifestStatus;
5959
use sled_agent_types::zone_images::MupdateOverrideNonBootInfo;
6060
use sled_agent_types::zone_images::MupdateOverrideNonBootMismatch;
@@ -575,10 +575,12 @@ pub fn representative() -> Representative {
575575
zpools,
576576
datasets,
577577
Some(sled14),
578-
file_source_resolver(OmicronFileSourceResolverExampleKind::Success {
579-
deserialized_zone_manifest: true,
580-
has_mupdate_override: true,
581-
}),
578+
file_source_resolver(
579+
OmicronFileSourceResolverExampleKind::Success {
580+
deserialized_zone_manifest: true,
581+
has_mupdate_override: true,
582+
},
583+
),
582584
),
583585
)
584586
.unwrap();
@@ -607,10 +609,12 @@ pub fn representative() -> Representative {
607609
vec![],
608610
vec![],
609611
Some(sled16),
610-
file_source_resolver(OmicronFileSourceResolverExampleKind::Success {
611-
deserialized_zone_manifest: false,
612-
has_mupdate_override: false,
613-
}),
612+
file_source_resolver(
613+
OmicronFileSourceResolverExampleKind::Success {
614+
deserialized_zone_manifest: false,
615+
has_mupdate_override: false,
616+
},
617+
),
614618
),
615619
)
616620
.unwrap();
@@ -638,9 +642,11 @@ pub fn representative() -> Representative {
638642
// being present. There's one case that's unexplored: mismatch
639643
// with no mupdate override. But to express that case we would
640644
// need an additional fifth sled.
641-
file_source_resolver(OmicronFileSourceResolverExampleKind::Mismatch {
642-
has_mupdate_override: true,
643-
}),
645+
file_source_resolver(
646+
OmicronFileSourceResolverExampleKind::Mismatch {
647+
has_mupdate_override: true,
648+
},
649+
),
644650
),
645651
)
646652
.unwrap();
@@ -665,7 +671,9 @@ pub fn representative() -> Representative {
665671
// config here.
666672
None,
667673
// Simulate an error here.
668-
file_source_resolver(OmicronFileSourceResolverExampleKind::Error),
674+
file_source_resolver(
675+
OmicronFileSourceResolverExampleKind::Error,
676+
),
669677
),
670678
)
671679
.unwrap();
@@ -821,7 +829,9 @@ pub fn file_source_resolver(
821829
Ok(has_mupdate_override.then(|| cx.override_info()));
822830
(measurement_m_result, zm_result, override_result)
823831
}
824-
OmicronFileSourceResolverExampleKind::Mismatch { has_mupdate_override } => {
832+
OmicronFileSourceResolverExampleKind::Mismatch {
833+
has_mupdate_override,
834+
} => {
825835
// In this case, the zone manifest result is generated using the
826836
// invalid (mismatched) context.
827837
let zm_result = Ok(invalid_cx.expected_result(

‎nexus/mgs-updates/src/test_util/host_phase_2_test_state.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,10 +247,10 @@ mod api_impl {
247247
use sled_agent_types::inventory::Inventory;
248248
use sled_agent_types::inventory::ManifestInventory;
249249
use sled_agent_types::inventory::MupdateOverrideInventory;
250+
use sled_agent_types::inventory::OmicronFileSourceResolverInventory;
250251
use sled_agent_types::inventory::OmicronSledConfig;
251252
use sled_agent_types::inventory::SledCpuFamily;
252253
use sled_agent_types::inventory::SledRole;
253-
use sled_agent_types::inventory::OmicronFileSourceResolverInventory;
254254
use sled_agent_types::probes::ProbeSet;
255255
use sled_agent_types::sled::AddSledRequest;
256256
use sled_agent_types::support_bundle::RangeRequestHeaders;

‎nexus/reconfigurator/planning/src/mgs_updates/test_helpers.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
//! Test-only support code for testing MGS update planning.
66
7-
use std::collections::BTreeMap;
8-
use std::collections::BTreeSet;
97
use chrono::Utc;
108
use gateway_client::types::PowerState;
119
use gateway_client::types::RotState;
@@ -44,13 +42,15 @@ use sled_agent_types::inventory::ConfigReconcilerInventoryStatus;
4442
use sled_agent_types::inventory::HealthMonitorInventory;
4543
use sled_agent_types::inventory::HostPhase2DesiredSlots;
4644
use sled_agent_types::inventory::Inventory;
45+
use sled_agent_types::inventory::OmicronFileSourceResolverInventory;
4746
use sled_agent_types::inventory::OmicronSledConfig;
4847
use sled_agent_types::inventory::SledCpuFamily;
4948
use sled_agent_types::inventory::SledRole;
50-
use sled_agent_types::inventory::OmicronFileSourceResolverInventory;
5149
use sled_hardware_types::COSMO_SLED_MODEL;
5250
use sled_hardware_types::GIMLET_SLED_MODEL;
5351
use sled_hardware_types::OxideSled;
52+
use std::collections::BTreeMap;
53+
use std::collections::BTreeSet;
5454
use tufaceous_artifact::ArtifactHash;
5555
use tufaceous_artifact::ArtifactKind;
5656
use tufaceous_artifact::ArtifactVersion;

‎nexus/reconfigurator/planning/src/system.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ use sled_agent_types::inventory::InventoryDisk;
6868
use sled_agent_types::inventory::InventoryZpool;
6969
use sled_agent_types::inventory::ManifestBootInventory;
7070
use sled_agent_types::inventory::MupdateOverrideBootInventory;
71+
use sled_agent_types::inventory::OmicronFileSourceResolverInventory;
7172
use sled_agent_types::inventory::OmicronSledConfig;
7273
use sled_agent_types::inventory::SledCpuFamily;
7374
use sled_agent_types::inventory::SledRole;
74-
use sled_agent_types::inventory::OmicronFileSourceResolverInventory;
7575
use sled_agent_types::inventory::ZoneKind;
7676
use sled_hardware_types::BaseboardId;
7777
use sled_hardware_types::GIMLET_SLED_MODEL;
@@ -1473,7 +1473,8 @@ impl Sled {
14731473
),
14741474
),
14751475
// XXX: return something more reasonable here?
1476-
file_source_resolver: OmicronFileSourceResolverInventory::new_fake(),
1476+
file_source_resolver:
1477+
OmicronFileSourceResolverInventory::new_fake(),
14771478
health_monitor: HealthMonitorInventory::new(),
14781479
}
14791480
};

‎nexus/types/src/inventory.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ use sled_agent_types_versions::latest::inventory::HealthMonitorInventory;
4242
use sled_agent_types_versions::latest::inventory::InventoryDataset;
4343
use sled_agent_types_versions::latest::inventory::InventoryDisk;
4444
use sled_agent_types_versions::latest::inventory::InventoryZpool;
45+
use sled_agent_types_versions::latest::inventory::OmicronFileSourceResolverInventory;
4546
use sled_agent_types_versions::latest::inventory::OmicronSledConfig;
4647
use sled_agent_types_versions::latest::inventory::OmicronZoneConfig;
4748
use sled_agent_types_versions::latest::inventory::SledCpuFamily;
4849
use sled_agent_types_versions::latest::inventory::SledRole;
49-
use sled_agent_types_versions::latest::inventory::OmicronFileSourceResolverInventory;
5050
use sled_hardware_types::BaseboardId;
5151
use std::collections::BTreeMap;
5252
use std::collections::BTreeSet;

‎sled-agent/src/rack_setup/plan/service.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1306,8 +1306,8 @@ mod tests {
13061306
use oxnet::Ipv6Net;
13071307
use sled_agent_types::inventory::ConfigReconcilerInventoryStatus;
13081308
use sled_agent_types::inventory::HealthMonitorInventory;
1309-
use sled_agent_types::inventory::SledCpuFamily;
13101309
use sled_agent_types::inventory::OmicronFileSourceResolverInventory;
1310+
use sled_agent_types::inventory::SledCpuFamily;
13111311
use sled_agent_types::rack_init::BootstrapAddressDiscovery;
13121312
use sled_agent_types::rack_init::RecoverySiloConfig;
13131313
use sled_hardware_types::Baseboard;
@@ -1527,7 +1527,8 @@ mod tests {
15271527
ledgered_sled_config: None,
15281528
reconciler_status: ConfigReconcilerInventoryStatus::NotYetRun,
15291529
last_reconciliation: None,
1530-
file_source_resolver: OmicronFileSourceResolverInventory::new_fake(),
1530+
file_source_resolver:
1531+
OmicronFileSourceResolverInventory::new_fake(),
15311532
health_monitor: HealthMonitorInventory::new(),
15321533
},
15331534
is_scrimlet,

0 commit comments

Comments
 (0)