diff --git a/Cargo.lock b/Cargo.lock index e4b84dd61..9f58f46c4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -147,13 +147,24 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" dependencies = [ "backtrace", ] +[[package]] +name = "api_identity" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/omicron?branch=hyper-v1#ffbb6fc817f2d63eaffd25708ed6fc9a292033be" +dependencies = [ + "omicron-workspace-hack", + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "api_identity" version = "0.1.0" @@ -224,9 +235,9 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", @@ -239,6 +250,17 @@ version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" +[[package]] +name = "atomicwrites" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ef1bb8d1b645fe38d51dfc331d720fb5fc2c94b440c76cc79c80ff265ca33e3" +dependencies = [ + "rustix", + "tempfile", + "windows-sys 0.52.0", +] + [[package]] name = "atty" version = "0.2.14" @@ -312,6 +334,16 @@ dependencies = [ "strum", ] +[[package]] +name = "bhyve_api" +version = "0.0.0" +source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#305d83abd979528515d782747e46b16413c97e66" +dependencies = [ + "bhyve_api_sys 0.0.0 (git+https://github.com/oxidecomputer/propolis?branch=hyper-v1)", + "libc", + "strum", +] + [[package]] name = "bhyve_api" version = "0.0.0" @@ -330,6 +362,15 @@ dependencies = [ "strum", ] +[[package]] +name = "bhyve_api_sys" +version = "0.0.0" +source = "git+https://github.com/oxidecomputer/propolis?branch=hyper-v1#305d83abd979528515d782747e46b16413c97e66" +dependencies = [ + "libc", + "strum", +] + [[package]] name = "bhyve_api_sys" version = "0.0.0" @@ -484,6 +525,19 @@ dependencies = [ "tempfile", ] +[[package]] +name = "cancel-safe-futures" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97eb3167cc49e8a4c1be907817009850b8b9693b225092d0f9b00fa9de076e4e" +dependencies = [ + "futures-core", + "futures-sink", + "futures-util", + "pin-project-lite", + "tokio", +] + [[package]] name = "cargo-platform" version = "0.1.8" @@ -602,6 +656,26 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +[[package]] +name = "clickhouse-admin-types" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/omicron?branch=hyper-v1#ffbb6fc817f2d63eaffd25708ed6fc9a292033be" +dependencies = [ + "anyhow", + "atomicwrites", + "camino", + "camino-tempfile", + "derive_more", + "expectorate", + "itertools 0.13.0", + "omicron-common 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "omicron-workspace-hack", + "schemars", + "serde", + "serde_json", + "slog", +] + [[package]] name = "cobs" version = "0.2.3" @@ -773,14 +847,14 @@ dependencies = [ "futures", "futures-core", "http 0.2.12", - "internal-dns", + "internal-dns 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "itertools 0.13.0", "libc", - "nexus-client", - "omicron-common", - "omicron-uuid-kinds", - "oximeter", - "oximeter-producer", + "nexus-client 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "omicron-common 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "omicron-uuid-kinds 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "oximeter 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "oximeter-producer 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "progenitor-client", "rand", "rand_chacha", @@ -866,6 +940,18 @@ dependencies = [ "uuid", ] +[[package]] +name = "crucible-smf" +version = "0.0.0" +source = "git+https://github.com/oxidecomputer/crucible?branch=hyper-v1#4ba298400a46805449da56b41a53aaac0a7c3830" +dependencies = [ + "crucible-workspace-hack", + "libc", + "num-derive 0.4.2", + "num-traits", + "thiserror", +] + [[package]] name = "crucible-smf" version = "0.0.0" @@ -1148,6 +1234,23 @@ dependencies = [ "tokio", ] +[[package]] +name = "dns-service-client" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/omicron?branch=hyper-v1#ffbb6fc817f2d63eaffd25708ed6fc9a292033be" +dependencies = [ + "anyhow", + "chrono", + "expectorate", + "http 1.1.0", + "omicron-workspace-hack", + "progenitor", + "reqwest 0.12.5", + "schemars", + "serde", + "slog", +] + [[package]] name = "dns-service-client" version = "0.1.0" @@ -1284,9 +1387,9 @@ checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" [[package]] name = "either" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "embedded-io" @@ -1645,6 +1748,25 @@ dependencies = [ "slab", ] +[[package]] +name = "gateway-client" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/omicron?branch=hyper-v1#ffbb6fc817f2d63eaffd25708ed6fc9a292033be" +dependencies = [ + "base64 0.22.1", + "chrono", + "gateway-messages 0.1.0 (git+https://github.com/oxidecomputer/management-gateway-service?rev=9bbac475dcaac88286c07a20b6bd3e94fc81d7f0)", + "omicron-workspace-hack", + "progenitor", + "rand", + "reqwest 0.12.5", + "schemars", + "serde", + "serde_json", + "slog", + "uuid", +] + [[package]] name = "gateway-client" version = "0.1.0" @@ -1652,7 +1774,7 @@ source = "git+https://github.com/oxidecomputer/omicron?branch=main#5bf5f09545b7b dependencies = [ "base64 0.22.1", "chrono", - "gateway-messages", + "gateway-messages 0.1.0 (git+https://github.com/oxidecomputer/management-gateway-service?rev=319e7b92db69792ab8efa4c68554ad0cf83adf93)", "omicron-workspace-hack", "progenitor", "rand", @@ -1679,6 +1801,22 @@ dependencies = [ "zerocopy 0.6.6", ] +[[package]] +name = "gateway-messages" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/management-gateway-service?rev=9bbac475dcaac88286c07a20b6bd3e94fc81d7f0#9bbac475dcaac88286c07a20b6bd3e94fc81d7f0" +dependencies = [ + "bitflags 2.6.0", + "hubpack", + "serde", + "serde-big-array", + "serde_repr", + "static_assertions", + "strum_macros 0.25.3", + "uuid", + "zerocopy 0.6.6", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -1778,6 +1916,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", + "indexmap 2.5.0", + "slab", + "tokio", + "tokio-util", + "tracing", +] + [[package]] name = "hash32" version = "0.3.1" @@ -2036,7 +2193,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -2059,6 +2216,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.1", "httparse", @@ -2114,6 +2272,22 @@ dependencies = [ "tokio-native-tls", ] +[[package]] +name = "hyper-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +dependencies = [ + "bytes", + "http-body-util", + "hyper 1.4.1", + "hyper-util", + "native-tls", + "tokio", + "tokio-native-tls", + "tower-service", +] + [[package]] name = "hyper-util" version = "0.1.7" @@ -2188,6 +2362,41 @@ name = "illumos-sys-hdrs" version = "0.1.0" source = "git+https://github.com/oxidecomputer/opte?rev=76878de67229ea113d70503c441eab47ac5dc653#76878de67229ea113d70503c441eab47ac5dc653" +[[package]] +name = "illumos-utils" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/omicron?branch=hyper-v1#ffbb6fc817f2d63eaffd25708ed6fc9a292033be" +dependencies = [ + "anyhow", + "async-trait", + "bhyve_api 0.0.0 (git+https://github.com/oxidecomputer/propolis?branch=hyper-v1)", + "byteorder", + "camino", + "camino-tempfile", + "cfg-if", + "crucible-smf 0.0.0 (git+https://github.com/oxidecomputer/crucible?branch=hyper-v1)", + "futures", + "ipnetwork", + "libc", + "macaddr", + "omicron-common 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "omicron-uuid-kinds 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "omicron-workspace-hack", + "opte-ioctl", + "oxide-vpc", + "oxlog 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "oxnet", + "schemars", + "serde", + "slog", + "smf", + "thiserror", + "tokio", + "uuid", + "whoami", + "zone", +] + [[package]] name = "illumos-utils" version = "0.1.0" @@ -2200,17 +2409,17 @@ dependencies = [ "camino", "camino-tempfile", "cfg-if", - "crucible-smf", + "crucible-smf 0.0.0 (git+https://github.com/oxidecomputer/crucible?rev=eab46702b6a43ff558672462dea3eb5ff7b8a0e6)", "futures", "ipnetwork", "libc", "macaddr", - "omicron-common", - "omicron-uuid-kinds", + "omicron-common 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "omicron-uuid-kinds 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "omicron-workspace-hack", "opte-ioctl", "oxide-vpc", - "oxlog", + "oxlog 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "oxnet", "schemars", "serde", @@ -2235,6 +2444,12 @@ dependencies = [ "png", ] +[[package]] +name = "indent_write" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0cfe9645a18782869361d9c8732246be7b410ad4e919d3609ebabdac00ba12c3" + [[package]] name = "indexmap" version = "1.9.3" @@ -2288,6 +2503,26 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "internal-dns" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/omicron?branch=hyper-v1#ffbb6fc817f2d63eaffd25708ed6fc9a292033be" +dependencies = [ + "anyhow", + "chrono", + "dns-service-client 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "futures", + "hickory-resolver", + "hyper 1.4.1", + "omicron-common 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "omicron-uuid-kinds 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "omicron-workspace-hack", + "reqwest 0.12.5", + "slog", + "thiserror", + "uuid", +] + [[package]] name = "internal-dns" version = "0.1.0" @@ -2295,12 +2530,12 @@ source = "git+https://github.com/oxidecomputer/omicron?branch=main#5bf5f09545b7b dependencies = [ "anyhow", "chrono", - "dns-service-client", + "dns-service-client 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "futures", "hickory-resolver", "hyper 0.14.28", - "omicron-common", - "omicron-uuid-kinds", + "omicron-common 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "omicron-uuid-kinds 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "omicron-workspace-hack", "reqwest 0.11.27", "slog", @@ -2448,9 +2683,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libdlpi-sys" @@ -2532,6 +2767,15 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "libsw" +version = "3.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0673364c1ef7a1674241dbad9ba2415354103d6126451f01eeb7aaa25d6b4fce" +dependencies = [ + "tokio", +] + [[package]] name = "libz-sys" version = "1.1.16" @@ -2544,6 +2788,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "linear-map" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfae20f6b19ad527b550c223fddc3077a547fc70cda94b9b566575423fd303ee" + [[package]] name = "linked-hash-map" version = "0.5.6" @@ -2642,6 +2892,22 @@ dependencies = [ "autocfg", ] +[[package]] +name = "mg-admin-client" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/maghemite?branch=hyper-v1#1dbbe4944631efb962a311c13b70f883a6a845dc" +dependencies = [ + "anyhow", + "chrono", + "percent-encoding", + "progenitor", + "reqwest 0.12.5", + "schemars", + "serde", + "serde_json", + "slog", +] + [[package]] name = "mg-admin-client" version = "0.1.0" @@ -2777,6 +3043,30 @@ dependencies = [ "rustc_version 0.1.7", ] +[[package]] +name = "nexus-client" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/omicron?branch=hyper-v1#ffbb6fc817f2d63eaffd25708ed6fc9a292033be" +dependencies = [ + "chrono", + "futures", + "nexus-sled-agent-shared 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "nexus-types 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "omicron-common 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "omicron-passwords 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "omicron-uuid-kinds 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "omicron-workspace-hack", + "oxnet", + "progenitor", + "regress 0.9.1", + "reqwest 0.12.5", + "schemars", + "serde", + "serde_json", + "slog", + "uuid", +] + [[package]] name = "nexus-client" version = "0.1.0" @@ -2784,11 +3074,11 @@ source = "git+https://github.com/oxidecomputer/omicron?branch=main#5bf5f09545b7b dependencies = [ "chrono", "futures", - "nexus-sled-agent-shared", - "nexus-types", - "omicron-common", - "omicron-passwords", - "omicron-uuid-kinds", + "nexus-sled-agent-shared 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "nexus-types 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "omicron-common 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "omicron-passwords 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "omicron-uuid-kinds 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "omicron-workspace-hack", "oxnet", "progenitor", @@ -2802,20 +3092,85 @@ dependencies = [ ] [[package]] -name = "nexus-sled-agent-shared" +name = "nexus-sled-agent-shared" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/omicron?branch=hyper-v1#ffbb6fc817f2d63eaffd25708ed6fc9a292033be" +dependencies = [ + "illumos-utils 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "omicron-common 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "omicron-passwords 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "omicron-uuid-kinds 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "omicron-workspace-hack", + "schemars", + "serde", + "serde_json", + "sled-hardware-types 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "strum", + "thiserror", + "uuid", +] + +[[package]] +name = "nexus-sled-agent-shared" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/omicron?branch=main#5bf5f09545b7b74f809c099db5c0b315ea06f9be" +dependencies = [ + "omicron-common 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "omicron-passwords 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "omicron-uuid-kinds 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "omicron-workspace-hack", + "schemars", + "serde", + "serde_json", + "sled-hardware-types 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "strum", + "thiserror", + "uuid", +] + +[[package]] +name = "nexus-types" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/omicron?branch=main#5bf5f09545b7b74f809c099db5c0b315ea06f9be" +source = "git+https://github.com/oxidecomputer/omicron?branch=hyper-v1#ffbb6fc817f2d63eaffd25708ed6fc9a292033be" dependencies = [ - "omicron-common", - "omicron-passwords", - "omicron-uuid-kinds", + "anyhow", + "api_identity 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "async-trait", + "base64 0.22.1", + "chrono", + "clap", + "clickhouse-admin-types", + "cookie", + "derive-where", + "derive_more", + "dns-service-client 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "dropshot", + "futures", + "gateway-client 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "http 1.1.0", + "humantime", + "ipnetwork", + "newtype-uuid", + "newtype_derive", + "nexus-sled-agent-shared 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "omicron-common 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "omicron-passwords 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "omicron-uuid-kinds 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", "omicron-workspace-hack", + "openssl", + "oxnet", + "oxql-types 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "parse-display", "schemars", "serde", "serde_json", - "sled-hardware-types", + "serde_with", + "slog", + "slog-error-chain", + "steno", "strum", "thiserror", + "update-engine", "uuid", ] @@ -2825,7 +3180,7 @@ version = "0.1.0" source = "git+https://github.com/oxidecomputer/omicron?branch=main#5bf5f09545b7b74f809c099db5c0b315ea06f9be" dependencies = [ "anyhow", - "api_identity", + "api_identity 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "async-trait", "base64 0.22.1", "chrono", @@ -2833,23 +3188,23 @@ dependencies = [ "cookie", "derive-where", "derive_more", - "dns-service-client", + "dns-service-client 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "dropshot", "futures", - "gateway-client", + "gateway-client 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "http 0.2.12", "humantime", "ipnetwork", "newtype-uuid", "newtype_derive", - "nexus-sled-agent-shared", - "omicron-common", - "omicron-passwords", - "omicron-uuid-kinds", + "nexus-sled-agent-shared 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "omicron-common 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "omicron-passwords 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "omicron-uuid-kinds 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "omicron-workspace-hack", "openssl", "oxnet", - "oxql-types", + "oxql-types 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "parse-display", "schemars", "serde", @@ -3105,13 +3460,55 @@ dependencies = [ "memchr", ] +[[package]] +name = "omicron-common" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/omicron?branch=hyper-v1#ffbb6fc817f2d63eaffd25708ed6fc9a292033be" +dependencies = [ + "anyhow", + "api_identity 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "async-trait", + "backoff", + "camino", + "chrono", + "dropshot", + "futures", + "hex", + "http 1.1.0", + "ipnetwork", + "macaddr", + "mg-admin-client 0.1.0 (git+https://github.com/oxidecomputer/maghemite?branch=hyper-v1)", + "omicron-uuid-kinds 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "omicron-workspace-hack", + "once_cell", + "oxnet", + "parse-display", + "progenitor", + "progenitor-client", + "rand", + "regress 0.9.1", + "reqwest 0.12.5", + "schemars", + "semver 1.0.23", + "serde", + "serde_human_bytes", + "serde_json", + "serde_with", + "slog", + "slog-error-chain", + "strum", + "thiserror", + "tokio", + "uuid", +] + [[package]] name = "omicron-common" version = "0.1.0" source = "git+https://github.com/oxidecomputer/omicron?branch=main#5bf5f09545b7b74f809c099db5c0b315ea06f9be" dependencies = [ "anyhow", - "api_identity", + "api_identity 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "async-trait", "backoff", "camino", @@ -3122,8 +3519,8 @@ dependencies = [ "http 0.2.12", "ipnetwork", "macaddr", - "mg-admin-client", - "omicron-uuid-kinds", + "mg-admin-client 0.1.0 (git+https://github.com/oxidecomputer/maghemite?rev=9e0fe45ca3862176dc31ad8cc83f605f8a7e1a42)", + "omicron-uuid-kinds 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "omicron-workspace-hack", "once_cell", "oxnet", @@ -3147,6 +3544,20 @@ dependencies = [ "uuid", ] +[[package]] +name = "omicron-passwords" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/omicron?branch=hyper-v1#ffbb6fc817f2d63eaffd25708ed6fc9a292033be" +dependencies = [ + "argon2", + "omicron-workspace-hack", + "rand", + "schemars", + "serde", + "serde_with", + "thiserror", +] + [[package]] name = "omicron-passwords" version = "0.1.0" @@ -3161,6 +3572,16 @@ dependencies = [ "thiserror", ] +[[package]] +name = "omicron-uuid-kinds" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/omicron?branch=hyper-v1#ffbb6fc817f2d63eaffd25708ed6fc9a292033be" +dependencies = [ + "newtype-uuid", + "paste", + "schemars", +] + [[package]] name = "omicron-uuid-kinds" version = "0.1.0" @@ -3339,11 +3760,12 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "owo-colors" -version = "4.0.0" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f" +checksum = "fb37767f6569cd834a413442455e0f066d0d522de8630436e2a1761d9726ba56" dependencies = [ - "supports-color", + "supports-color 2.1.0", + "supports-color 3.0.1", ] [[package]] @@ -3361,6 +3783,25 @@ dependencies = [ "zerocopy 0.7.34", ] +[[package]] +name = "oximeter" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/omicron?branch=hyper-v1#ffbb6fc817f2d63eaffd25708ed6fc9a292033be" +dependencies = [ + "anyhow", + "chrono", + "clap", + "omicron-workspace-hack", + "oximeter-macro-impl 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "oximeter-schema 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "oximeter-timeseries-macro 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "oximeter-types 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "prettyplease", + "syn 2.0.77", + "toml 0.8.19", + "uuid", +] + [[package]] name = "oximeter" version = "0.1.0" @@ -3370,10 +3811,10 @@ dependencies = [ "chrono", "clap", "omicron-workspace-hack", - "oximeter-macro-impl", - "oximeter-schema", - "oximeter-timeseries-macro", - "oximeter-types", + "oximeter-macro-impl 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "oximeter-schema 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "oximeter-timeseries-macro 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "oximeter-types 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "prettyplease", "syn 2.0.77", "toml 0.8.19", @@ -3383,7 +3824,7 @@ dependencies = [ [[package]] name = "oximeter-instruments" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/omicron?branch=main#5bf5f09545b7b74f809c099db5c0b315ea06f9be" +source = "git+https://github.com/oxidecomputer/omicron?branch=hyper-v1#ffbb6fc817f2d63eaffd25708ed6fc9a292033be" dependencies = [ "cfg-if", "chrono", @@ -3391,13 +3832,24 @@ dependencies = [ "kstat-rs", "libc", "omicron-workspace-hack", - "oximeter", + "oximeter 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", "slog", "thiserror", "tokio", "uuid", ] +[[package]] +name = "oximeter-macro-impl" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/omicron?branch=hyper-v1#ffbb6fc817f2d63eaffd25708ed6fc9a292033be" +dependencies = [ + "omicron-workspace-hack", + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "oximeter-macro-impl" version = "0.1.0" @@ -3409,6 +3861,27 @@ dependencies = [ "syn 2.0.77", ] +[[package]] +name = "oximeter-producer" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/omicron?branch=hyper-v1#ffbb6fc817f2d63eaffd25708ed6fc9a292033be" +dependencies = [ + "chrono", + "dropshot", + "internal-dns 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "nexus-client 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "omicron-common 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "omicron-workspace-hack", + "oximeter 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "schemars", + "serde", + "slog", + "slog-dtrace", + "thiserror", + "tokio", + "uuid", +] + [[package]] name = "oximeter-producer" version = "0.1.0" @@ -3416,11 +3889,11 @@ source = "git+https://github.com/oxidecomputer/omicron?branch=main#5bf5f09545b7b dependencies = [ "chrono", "dropshot", - "internal-dns", - "nexus-client", - "omicron-common", + "internal-dns 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "nexus-client 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "omicron-common 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "omicron-workspace-hack", - "oximeter", + "oximeter 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "schemars", "serde", "slog", @@ -3430,6 +3903,27 @@ dependencies = [ "uuid", ] +[[package]] +name = "oximeter-schema" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/omicron?branch=hyper-v1#ffbb6fc817f2d63eaffd25708ed6fc9a292033be" +dependencies = [ + "anyhow", + "chrono", + "clap", + "heck 0.5.0", + "omicron-workspace-hack", + "oximeter-types 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "prettyplease", + "proc-macro2", + "quote", + "schemars", + "serde", + "slog-error-chain", + "syn 2.0.77", + "toml 0.8.19", +] + [[package]] name = "oximeter-schema" version = "0.1.0" @@ -3440,7 +3934,7 @@ dependencies = [ "clap", "heck 0.5.0", "omicron-workspace-hack", - "oximeter-types", + "oximeter-types 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "prettyplease", "proc-macro2", "quote", @@ -3451,19 +3945,51 @@ dependencies = [ "toml 0.8.19", ] +[[package]] +name = "oximeter-timeseries-macro" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/omicron?branch=hyper-v1#ffbb6fc817f2d63eaffd25708ed6fc9a292033be" +dependencies = [ + "omicron-workspace-hack", + "oximeter-schema 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "oximeter-types 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "oximeter-timeseries-macro" version = "0.1.0" source = "git+https://github.com/oxidecomputer/omicron?branch=main#5bf5f09545b7b74f809c099db5c0b315ea06f9be" dependencies = [ "omicron-workspace-hack", - "oximeter-schema", - "oximeter-types", + "oximeter-schema 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "oximeter-types 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "proc-macro2", "quote", "syn 2.0.77", ] +[[package]] +name = "oximeter-types" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/omicron?branch=hyper-v1#ffbb6fc817f2d63eaffd25708ed6fc9a292033be" +dependencies = [ + "bytes", + "chrono", + "float-ord", + "num", + "omicron-common 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "omicron-workspace-hack", + "regex", + "schemars", + "serde", + "strum", + "thiserror", + "uuid", +] + [[package]] name = "oximeter-types" version = "0.1.0" @@ -3473,7 +3999,7 @@ dependencies = [ "chrono", "float-ord", "num", - "omicron-common", + "omicron-common 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "omicron-workspace-hack", "regex", "schemars", @@ -3483,6 +4009,20 @@ dependencies = [ "uuid", ] +[[package]] +name = "oxlog" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/omicron?branch=hyper-v1#ffbb6fc817f2d63eaffd25708ed6fc9a292033be" +dependencies = [ + "anyhow", + "camino", + "chrono", + "clap", + "omicron-workspace-hack", + "sigpipe", + "uuid", +] + [[package]] name = "oxlog" version = "0.1.0" @@ -3508,6 +4048,21 @@ dependencies = [ "serde_json", ] +[[package]] +name = "oxql-types" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/omicron?branch=hyper-v1#ffbb6fc817f2d63eaffd25708ed6fc9a292033be" +dependencies = [ + "anyhow", + "chrono", + "highway", + "num", + "omicron-workspace-hack", + "oximeter-types 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "schemars", + "serde", +] + [[package]] name = "oxql-types" version = "0.1.0" @@ -3518,7 +4073,7 @@ dependencies = [ "highway", "num", "omicron-workspace-hack", - "oximeter-types", + "oximeter-types 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "schemars", "serde", ] @@ -3981,9 +4536,9 @@ checksum = "bbc83ee4a840062f368f9096d80077a9841ec117e17e7f700df81958f1451254" [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", "syn 2.0.77", @@ -4115,8 +4670,8 @@ dependencies = [ "lazy_static", "libc", "libloading", - "nexus-client", - "oximeter", + "nexus-client 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "oximeter 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", "p9ds", "pin-project-lite", "propolis_types", @@ -4242,15 +4797,15 @@ dependencies = [ "futures", "hex", "hyper 1.4.1", - "internal-dns", + "internal-dns 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", "kstat-rs", "lazy_static", "mockall", - "nexus-client", - "omicron-common", - "oximeter", + "nexus-client 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "omicron-common 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "oximeter 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", "oximeter-instruments", - "oximeter-producer", + "oximeter-producer 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", "propolis", "propolis-server-config", "propolis_api_types", @@ -4576,12 +5131,12 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.28", "hyper-rustls 0.24.2", - "hyper-tls", + "hyper-tls 0.5.0", "ipnet", "js-sys", "log", @@ -4619,19 +5174,23 @@ checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" dependencies = [ "base64 0.22.1", "bytes", + "encoding_rs", "futures-channel", "futures-core", "futures-util", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.1", "http-body-util", "hyper 1.4.1", "hyper-rustls 0.27.3", + "hyper-tls 0.6.0", "hyper-util", "ipnet", "js-sys", "log", "mime", + "native-tls", "once_cell", "percent-encoding", "pin-project-lite", @@ -4643,7 +5202,9 @@ dependencies = [ "serde_json", "serde_urlencoded", "sync_wrapper 1.0.1", + "system-configuration", "tokio", + "tokio-native-tls", "tokio-rustls 0.26.0", "tokio-util", "tower-service", @@ -5063,6 +5624,15 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-big-array" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11fc7cc2c76d73e0f27ee52abbd64eec84d46f370c88371120433196934e4b7f" +dependencies = [ + "serde", +] + [[package]] name = "serde_arrays" version = "0.1.0" @@ -5331,13 +5901,25 @@ dependencies = [ "autocfg", ] +[[package]] +name = "sled-hardware-types" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/omicron?branch=hyper-v1#ffbb6fc817f2d63eaffd25708ed6fc9a292033be" +dependencies = [ + "illumos-utils 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "omicron-common 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=hyper-v1)", + "omicron-workspace-hack", + "schemars", + "serde", +] + [[package]] name = "sled-hardware-types" version = "0.1.0" source = "git+https://github.com/oxidecomputer/omicron?branch=main#5bf5f09545b7b74f809c099db5c0b315ea06f9be" dependencies = [ - "illumos-utils", - "omicron-common", + "illumos-utils 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", + "omicron-common 0.1.0 (git+https://github.com/oxidecomputer/omicron?branch=main)", "omicron-workspace-hack", "schemars", "serde", @@ -5650,6 +6232,21 @@ dependencies = [ "is_ci", ] +[[package]] +name = "supports-color" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8775305acf21c96926c900ad056abeef436701108518cf890020387236ac5a77" +dependencies = [ + "is_ci", +] + +[[package]] +name = "swrite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f3fece30b2dc06d65ecbca97b602db15bf75f932711d60cc604534f1f8b7a03" + [[package]] name = "syn" version = "1.0.109" @@ -6351,9 +6948,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.12" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-xid" @@ -6389,6 +6986,36 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" +[[package]] +name = "update-engine" +version = "0.1.0" +source = "git+https://github.com/oxidecomputer/omicron?branch=hyper-v1#ffbb6fc817f2d63eaffd25708ed6fc9a292033be" +dependencies = [ + "anyhow", + "cancel-safe-futures", + "chrono", + "debug-ignore", + "derive-where", + "either", + "futures", + "indent_write", + "indexmap 2.5.0", + "libsw", + "linear-map", + "omicron-workspace-hack", + "owo-colors", + "petgraph", + "schemars", + "serde", + "serde_json", + "serde_with", + "slog", + "swrite", + "tokio", + "unicode-width", + "uuid", +] + [[package]] name = "url" version = "2.5.0" diff --git a/Cargo.toml b/Cargo.toml index e46e264e4..deab6d43a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -71,14 +71,14 @@ p9ds = { git = "https://github.com/oxidecomputer/p9fs" } softnpu = { git = "https://github.com/oxidecomputer/softnpu" } # Omicron-related -internal-dns = { git = "https://github.com/oxidecomputer/omicron", branch = "main" } -nexus-client = { git = "https://github.com/oxidecomputer/omicron", branch = "main" } -omicron-common = { git = "https://github.com/oxidecomputer/omicron", branch = "main" } +internal-dns = { git = "https://github.com/oxidecomputer/omicron", branch = "hyper-v1" } +nexus-client = { git = "https://github.com/oxidecomputer/omicron", branch = "hyper-v1" } +omicron-common = { git = "https://github.com/oxidecomputer/omicron", branch = "hyper-v1" } omicron-zone-package = "0.9.0" -oximeter-instruments = { git = "https://github.com/oxidecomputer/omicron", branch = "main", default-features = false, features = ["kstat"] } -oximeter-producer = { git = "https://github.com/oxidecomputer/omicron", branch = "main" } -oximeter = { git = "https://github.com/oxidecomputer/omicron", branch = "main" } -sled-agent-client = { git = "https://github.com/oxidecomputer/omicron", branch = "main" } +oximeter-instruments = { git = "https://github.com/oxidecomputer/omicron", branch = "hyper-v1", default-features = false, features = ["kstat"] } +oximeter-producer = { git = "https://github.com/oxidecomputer/omicron", branch = "hyper-v1" } +oximeter = { git = "https://github.com/oxidecomputer/omicron", branch = "hyper-v1" } +sled-agent-client = { git = "https://github.com/oxidecomputer/omicron", branch = "hyper-v1" } # Crucible crucible = { git = "https://github.com/oxidecomputer/crucible", rev = "9d82a99058e7f4d76ccc2141dcd78e7d4730cc78" }