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.

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

[nexus/sled-agent] move some types around, straighten up the dependency graph #6138

Merged
merged 15 commits into from
Jul 25, 2024
Merged

[nexus/sled-agent] move some types around, straighten up the dependency graph #6138

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
abec472
[𝘀𝗽𝗿] initial version
sunshowers Jul 22, 2024
e03e830
rebase
sunshowers Jul 22, 2024
bb33000
update openapi
sunshowers Jul 22, 2024
7c521f6
update wicket
sunshowers Jul 22, 2024
aeeb1a8
remove dead file
sunshowers Jul 22, 2024
971b811
some more work
sunshowers Jul 22, 2024
840a21a
update comments
sunshowers Jul 22, 2024
af9f927
fix illumos
sunshowers Jul 22, 2024
4ccceaf
more import path cleanup
sunshowers Jul 22, 2024
01695d1
rebase
sunshowers Jul 22, 2024
420dd83
ready to land
sunshowers Jul 24, 2024
d30e4c8
it's always been nexus-sled-agent-shared. we've always been at war wi…
sunshowers Jul 24, 2024
d5c2330
clippy
sunshowers Jul 24, 2024
e5db276
update nexus.json
sunshowers Jul 24, 2024
c29eee3
update one more file
sunshowers Jul 25, 2024
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
32 changes: 30 additions & 2 deletions Cargo.lock
View file
Open in desktop

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

3 changes: 3 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ members = [
"cockroach-admin/api",
"cockroach-admin/types",
"common",
"common-extended",
"dev-tools/crdb-seed",
"dev-tools/omdb",
"dev-tools/omicron-dev",
Expand Down Expand Up @@ -118,6 +119,7 @@ default-members = [
"cockroach-admin/api",
"cockroach-admin/types",
"common",
"common-extended",
"dev-tools/crdb-seed",
"dev-tools/omdb",
"dev-tools/omicron-dev",
Expand Down Expand Up @@ -390,6 +392,7 @@ num-integer = "0.1.46"
num = { version = "0.4.3", default-features = false, features = [ "libm" ] }
omicron-cockroach-admin = { path = "cockroach-admin" }
omicron-common = { path = "common" }
omicron-common-extended = { path = "common-extended" }
omicron-gateway = { path = "gateway" }
omicron-nexus = { path = "nexus" }
omicron-omdb = { path = "dev-tools/omdb" }
Expand Down
1 change: 1 addition & 0 deletions clients/nexus-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ chrono.workspace = true
futures.workspace = true
nexus-types.workspace = true
omicron-common.workspace = true
omicron-common-extended.workspace = true
omicron-passwords.workspace = true
oxnet.workspace = true
progenitor.workspace = true
Expand Down
5 changes: 5 additions & 0 deletions clients/nexus-client/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,18 @@ progenitor::generate_api!(
// as "blueprint" this way, but we have really useful functionality
// (e.g., diff'ing) that's implemented on our local type.
Blueprint = nexus_types::deployment::Blueprint,
Certificate = omicron_common::api::internal::nexus::Certificate,
DatasetKind = omicron_common::api::internal::shared::DatasetKind,
Generation = omicron_common::api::external::Generation,
ImportExportPolicy = omicron_common::api::external::ImportExportPolicy,
MacAddr = omicron_common::api::external::MacAddr,
Name = omicron_common::api::external::Name,
NetworkInterface = omicron_common::api::internal::shared::NetworkInterface,
NetworkInterfaceKind = omicron_common::api::internal::shared::NetworkInterfaceKind,
NewPasswordHash = omicron_passwords::NewPasswordHash,
OmicronPhysicalDiskConfig = nexus_types::disk::OmicronPhysicalDiskConfig,
OmicronPhysicalDisksConfig = nexus_types::disk::OmicronPhysicalDisksConfig,
RecoverySiloConfig = omicron_common_extended::recovery_silo::RecoverySiloConfig,
TypedUuidForCollectionKind = omicron_uuid_kinds::CollectionUuid,
TypedUuidForDownstairsKind = omicron_uuid_kinds::TypedUuid<omicron_uuid_kinds::DownstairsKind>,
TypedUuidForPropolisKind = omicron_uuid_kinds::TypedUuid<omicron_uuid_kinds::PropolisKind>,
Expand Down
1 change: 1 addition & 0 deletions clients/sled-agent-client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ anyhow.workspace = true
async-trait.workspace = true
chrono.workspace = true
omicron-common.workspace = true
omicron-common-extended.workspace = true
omicron-uuid-kinds.workspace = true
omicron-workspace-hack.workspace = true
oxnet.workspace = true
Expand Down
Loading
Loading