rebase on main

Created using spr 1.3.6-beta.1

Cargo.toml

@@ -323,8 +323,16 @@ fs-err = "2.11.0"
 futures = "0.3.30"
 gateway-api = { path = "gateway-api" }
 gateway-client = { path = "clients/gateway-client" }
-gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "c85a4ca043aaa389df12aac5348d8a3feda28762", default-features = false, features = ["std"] }
-gateway-sp-comms = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "c85a4ca043aaa389df12aac5348d8a3feda28762" }
+# If you're updating the pinned revision of these MGS dependencies, you should
+# also update the git commit revision for the `omicron-faux-mgs` package in
+# `package-manifest.toml`. Failure to do so won't cause incorrect behavior, but
+# does mean the `faux-mgs` shipped with the switch zone would be out of date
+# relative to the MGS proper shipped in that same switch zone. (Generally this
+# is "fine", because SP/MGS communication maintains forwards and backwards
+# compatibility, but will mean that faux-mgs might be missing new
+# functionality.)
+gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "319e7b92db69792ab8efa4c68554ad0cf83adf93", default-features = false, features = ["std"] }
+gateway-sp-comms = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "319e7b92db69792ab8efa4c68554ad0cf83adf93" }
 gateway-test-utils = { path = "gateway-test-utils" }
 gateway-types = { path = "gateway-types" }
 gethostname = "0.4.3"

dev-tools/omicron-dev/Cargo.toml

@@ -14,24 +14,25 @@ omicron-rpaths.workspace = true
 anyhow.workspace = true
 camino.workspace = true
 clap.workspace = true
-dropshot = { workspace = true, optional = true }
-futures = { workspace = true, optional = true }
-gateway-messages = { workspace = true, optional = true }
-gateway-test-utils = { workspace = true, optional = true }
+dropshot.workspace = true
+futures.workspace = true
+gateway-messages.workspace = true
+gateway-test-utils.workspace = true
 libc.workspace = true
-nexus-config = { workspace = true, optional = true }
-nexus-test-interface = { workspace = true, optional = true }
-nexus-test-utils = { workspace = true, features = ["omicron-dev"], optional = true }
+nexus-config.workspace = true
+nexus-test-utils = { workspace = true, features = ["omicron-dev"] }
+nexus-test-interface.workspace = true
 omicron-common.workspace = true
-omicron-nexus = { workspace = true, optional = true }
-omicron-test-utils = { workspace = true, optional = true }
+omicron-nexus.workspace = true
+omicron-test-utils.workspace = true
 # See omicron-rpaths for more about the "pq-sys" dependency.
 pq-sys = "*"
-rcgen = { workspace = true, optional = true }
-signal-hook-tokio = { workspace = true, optional = true }
+rcgen.workspace = true
+signal-hook.workspace = true
+signal-hook-tokio.workspace = true
 tokio = { workspace = true, features = [ "full" ] }
-tokio-postgres = { workspace = true, optional = true }
-toml = { workspace = true, optional = true }
+tokio-postgres.workspace = true
+toml.workspace = true
 omicron-workspace-hack.workspace = true
 
 [dev-dependencies]
@@ -48,29 +49,3 @@ subprocess.workspace = true
 [[bin]]
 name = "omicron-dev"
 doc = false
-
-[[test]]
-name = "test_omicron_dev"
-required-features = ["default"]
-
-[features]
-# default-features set to all of the below features for two reasons:
-#
-# 1. Backwards compatibility with existing users of this crate.
-# 2. rust-analyzer will build the crate with all features enabled by default.
-#
-# The xtask uses --no-default-features to ensure that only the right set of
-# features is built.
-default = ["include-cert", "include-clickhouse", "include-db", "include-mgs", "include-nexus"]
-
-# Each feature corresponds to one file in `src`, and is feature-flagged in
-# lib.rs.
-#
-# NOTE: When adding a new feature, also add it to:
-# - the `default` feature list above
-# - CI_MUTUALLY_EXCLUSIVE_FEATURES in dev-tools/xtask/src/check_features.rs
-include-cert = ["dep:rcgen"]
-include-clickhouse = ["dep:dropshot", "dep:futures", "dep:omicron-test-utils", "dep:signal-hook-tokio"]
-include-db = ["dep:futures", "dep:omicron-test-utils", "dep:signal-hook-tokio", "dep:tokio-postgres"]
-include-mgs = ["dep:futures", "dep:gateway-messages", "dep:gateway-test-utils", "dep:signal-hook-tokio"]
-include-nexus = ["dep:dropshot", "dep:futures", "dep:nexus-config", "dep:nexus-test-interface", "dep:nexus-test-utils", "dep:omicron-nexus",  "dep:signal-hook-tokio", "dep:toml"]