Merge remote-tracking branch 'origin/main' into zl/ip-pool-multicast-support

Author: zeeshanlakhani

Cargo.lock

@@ -36,13 +36,12 @@ members = [
     "dev-tools/crdb-seed",
     "dev-tools/db-dev",
     "dev-tools/downloader",
+    "dev-tools/dropshot-apis",
     "dev-tools/ls-apis",
     "dev-tools/mgs-dev",
     "dev-tools/omdb",
     "dev-tools/omicron-dev",
     "dev-tools/omicron-dev-lib",
-    "dev-tools/openapi-manager",
-    "dev-tools/openapi-manager/types",
     "dev-tools/oxlog",
     "dev-tools/pins",
     "dev-tools/reconfigurator-cli",
@@ -196,13 +195,12 @@ default-members = [
     "dev-tools/crdb-seed",
     "dev-tools/db-dev",
     "dev-tools/downloader",
+    "dev-tools/dropshot-apis",
     "dev-tools/ls-apis",
     "dev-tools/mgs-dev",
     "dev-tools/omdb",
     "dev-tools/omicron-dev",
     "dev-tools/omicron-dev-lib",
-    "dev-tools/openapi-manager",
-    "dev-tools/openapi-manager/types",
     "dev-tools/oxlog",
     "dev-tools/pins",
     "dev-tools/reconfigurator-cli",
@@ -438,6 +436,8 @@ dns-server-api = { path = "dns-server-api" }
 dns-service-client = { path = "clients/dns-service-client" }
 dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "b3cdd095437f388069aa57be5efac4b4fadc7b4f" }
 dropshot = { version = "0.16.3", features = [ "usdt-probes" ] }
+dropshot-api-manager = "0.2.1"
+dropshot-api-manager-types = "0.2.1"
 dyn-clone = "1.0.20"
 either = "1.15.0"
 ereport-types = { path = "ereport/types" }
@@ -461,9 +461,9 @@ gateway-client = { path = "clients/gateway-client" }
 # compatibility, but will mean that faux-mgs might be missing new
 # functionality.)
 #
-gateway-ereport-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "77e316c812aa057b9714d0d99c4a7bdd36d45be2", default-features = false, features = ["debug-impls"] }
-gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "77e316c812aa057b9714d0d99c4a7bdd36d45be2", default-features = false, features = ["std"] }
-gateway-sp-comms = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "77e316c812aa057b9714d0d99c4a7bdd36d45be2" }
+gateway-ereport-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "6bd2660d651332f38949cdfd3d23d751ca54b120", default-features = false, features = ["debug-impls"] }
+gateway-messages = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "6bd2660d651332f38949cdfd3d23d751ca54b120", default-features = false, features = ["std"] }
+gateway-sp-comms = { git = "https://github.com/oxidecomputer/management-gateway-service", rev = "6bd2660d651332f38949cdfd3d23d751ca54b120" }
 gateway-test-utils = { path = "gateway-test-utils" }
 gateway-types = { path = "gateway-types" }
 gethostname = "0.5.0"
@@ -597,7 +597,6 @@ oxlog = { path = "dev-tools/oxlog" }
 oxnet = "0.1.3"
 once_cell = "1.21.3"
 openapi-lint = { git = "https://github.com/oxidecomputer/openapi-lint", branch = "main" }
-openapi-manager-types = { path = "dev-tools/openapi-manager/types" }
 openapiv3 = "2.2.0"
 # must match samael's crate!
 openssl = "0.10"
@@ -964,6 +963,8 @@ opt-level = 3
 # diesel = { path = "../../diesel/diesel" }
 # dropshot = { path = "../dropshot/dropshot" }
 # dropshot_endpoint = { path = "../dropshot/dropshot_endpoint" }
+# dropshot-api-manager = { path = "../dropshot-api-manager/crates/dropshot-api-manager" }
+# dropshot-api-manager-types = { path = "../dropshot-api-manager/crates/dropshot-api-manager-types" }
 # progenitor = { path = "../progenitor/progenitor" }
 # progenitor-client = { path = "../progenitor/progenitor-client" }
 # steno = { path = "../steno" }

Cargo.toml

@@ -10,10 +10,10 @@ workspace = true
 [dependencies]
 clickhouse-admin-types.workspace = true
 dropshot.workspace = true
+dropshot-api-manager-types.workspace = true
 omicron-common.workspace = true
 omicron-uuid-kinds.workspace = true
 omicron-workspace-hack.workspace = true
-openapi-manager-types.workspace = true
 schemars.workspace = true
 semver.workspace = true
 serde.workspace = true

clickhouse-admin/api/Cargo.toml

@@ -12,10 +12,8 @@ use dropshot::{
     HttpError, HttpResponseCreated, HttpResponseOk,
     HttpResponseUpdatedNoContent, Path, Query, RequestContext, TypedBody,
 };
+use dropshot_api_manager_types::api_versions;
 use omicron_common::api::external::Generation;
-use openapi_manager_types::{
-    SupportedVersion, SupportedVersions, api_versions,
-};
 
 api_versions!([
     // NOTE: These versions will be used across **all three** APIs defined in

clickhouse-admin/api/src/lib.rs

@@ -10,11 +10,11 @@ workspace = true
 [dependencies]
 cockroach-admin-types.workspace = true
 dropshot.workspace = true
+dropshot-api-manager-types.workspace = true
 http.workspace = true
 omicron-common.workspace = true
 omicron-uuid-kinds.workspace = true
 omicron-workspace-hack.workspace = true
-openapi-manager-types.workspace = true
 schemars.workspace = true
 semver.workspace = true
 serde.workspace = true

cockroach-admin/api/Cargo.toml

@@ -7,10 +7,8 @@ use dropshot::{
     HttpError, HttpResponseOk, HttpResponseUpdatedNoContent, RequestContext,
     TypedBody,
 };
+use dropshot_api_manager_types::api_versions;
 use omicron_uuid_kinds::OmicronZoneUuid;
-use openapi_manager_types::{
-    SupportedVersion, SupportedVersions, api_versions,
-};
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 

cockroach-admin/api/src/lib.rs

@@ -1,51 +1,34 @@
 [package]
-name = "openapi-manager"
+name = "omicron-dropshot-apis"
 version = "0.1.0"
 edition = "2021"
-license = "MPL-2.0"
-
-[lints]
-workspace = true
 
 [dependencies]
 anyhow.workspace = true
-atomicwrites.workspace = true
 bootstrap-agent-api.workspace = true
 camino.workspace = true
 clap.workspace = true
 clickhouse-admin-api.workspace = true
 cockroach-admin-api.workspace = true
-debug-ignore.workspace = true
 dns-server-api.workspace = true
-dropshot.workspace = true
-fs-err.workspace = true
+dropshot-api-manager-types.workspace = true
+dropshot-api-manager.workspace = true
 gateway-api.workspace = true
-hex.workspace = true
-indent_write.workspace = true
 installinator-api.workspace = true
-itertools.workspace = true
-newtype_derive.workspace = true
 nexus-external-api.workspace = true
 nexus-internal-api.workspace = true
 nexus-lockstep-api.workspace = true
 ntp-admin-api.workspace = true
 omicron-workspace-hack.workspace = true
 openapi-lint.workspace = true
-openapi-manager-types.workspace = true
 openapiv3.workspace = true
-owo-colors.workspace = true
 oximeter-api.workspace = true
 repo-depot-api.workspace = true
 semver.workspace = true
+serde.workspace = true
 serde_json.workspace = true
-sha2.workspace = true
-similar.workspace = true
 sled-agent-api.workspace = true
-slog-error-chain.workspace = true
-supports-color.workspace = true
-textwrap.workspace = true
-thiserror.workspace = true
 wicketd-api.workspace = true
 
-[dev-dependencies]
-assert_matches.workspace = true
+[lints]
+workspace = true