Merge branch 'main' into diesel-less-generic

Cargo.toml

@@ -8,7 +8,9 @@ members = [
     "common",
     "ddm-admin-client",
     "deploy",
-    "dev-tools",
+    "dev-tools/omdb",
+    "dev-tools/omicron-dev",
+    "dev-tools/xtask",
     "dns-server",
     "dns-service-client",
     "dpd-client",
@@ -37,7 +39,6 @@ members = [
     "nexus/test-utils-macros",
     "nexus/test-utils",
     "nexus/types",
-    "omdb",
     "oxide-client",
     "oximeter-client",
     "oximeter/collector",
@@ -62,7 +63,6 @@ members = [
     "wicket",
     "wicketd-client",
     "wicketd",
-    "xtask",
 ]
 
 default-members = [
@@ -74,7 +74,9 @@ default-members = [
     "ddm-admin-client",
     "dpd-client",
     "deploy",
-    "dev-tools",
+    "dev-tools/omdb",
+    "dev-tools/omicron-dev",
+    "dev-tools/xtask",
     "dns-server",
     "dns-service-client",
     "gateway",
@@ -98,7 +100,6 @@ default-members = [
     "nexus/db-queries",
     "nexus/defaults",
     "nexus/types",
-    "omdb",
     "oxide-client",
     "oximeter-client",
     "oximeter/collector",
@@ -123,7 +124,6 @@ default-members = [
     "wicket-dbg",
     "wicketd",
     "wicketd-client",
-    "xtask",
 ]
 resolver = "2"
 
@@ -159,7 +159,7 @@ clap = { version = "4.4", features = ["derive", "env", "wrap_help"] }
 cookie = "0.16"
 criterion = { version = "0.5.1", features = [ "async_tokio" ] }
 crossbeam = "0.8"
-crossterm = { version = "0.26.1", features = ["event-stream"] }
+crossterm = { version = "0.27.0", features = ["event-stream"] }
 crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "aeb69dda26c7e1a8b6eada425670cd4b83f91c07" }
 crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "aeb69dda26c7e1a8b6eada425670cd4b83f91c07" }
 crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "aeb69dda26c7e1a8b6eada425670cd4b83f91c07" }
@@ -235,7 +235,7 @@ nexus-types = { path = "nexus/types" }
 num-integer = "0.1.45"
 num = { version = "0.4.1", default-features = false, features = [ "libm" ] }
 omicron-common = { path = "common" }
-omicron-dev-tools = { path = "dev-tools" }
+omicron-dev = { path = "dev-tools/omicron-dev" }
 omicron-gateway = { path = "gateway" }
 omicron-nexus = { path = "nexus" }
 omicron-omdb = { path = "omdb" }

omdb/Cargo.toml → dev-tools/omdb/Cargo.toml

@@ -15,6 +15,7 @@ clap.workspace = true
 diesel.workspace = true
 dropshot.workspace = true
 humantime.workspace = true
+internal-dns.workspace = true
 nexus-client.workspace = true
 nexus-db-model.workspace = true
 nexus-db-queries.workspace = true