diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 630ad1141..1f129490b 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -44,12 +44,21 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + # see https://github.com/oxidecomputer/omicron/issues/4461 + # (by default the action picks a merge commit with the target branch + # rather than the actual PR tip) + ref: ${{ github.event.pull_request.head.sha }} + # `test_apis_up_to_date` needs a full history for the gitstubs + fetch-depth: 0 - name: Build run: cargo build --verbose - name: Build mock-only server run: cargo build -p propolis-mock-server --verbose - name: Test Libraries run: cargo test --lib --verbose + - name: Test everything + run: cargo test --locked # Build and test propolis-the-library on its own; `cargo test --lib` as used # above builds the entire workspace, meaning propolis-server default features # are used to build and run propolis-lib tests. Instead, this check uses diff --git a/Cargo.lock b/Cargo.lock index c6320d360..790775c9e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -731,7 +731,7 @@ checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" dependencies = [ "camino", "cargo-platform 0.1.8", - "semver 1.0.27", + "semver 1.0.28", "serde", "serde_json", "thiserror 1.0.64", @@ -745,7 +745,7 @@ checksum = "ef987d17b0a113becdd19d3d0022d04d7ef41f9efe4f3fb63ac44ba61df3ade9" dependencies = [ "camino", "cargo-platform 0.3.2", - "semver 1.0.27", + "semver 1.0.28", "serde", "serde_json", "thiserror 2.0.18", @@ -1248,7 +1248,7 @@ dependencies = [ "reqwest 0.13.2", "ringbuffer", "schemars 0.8.22", - "semver 1.0.27", + "semver 1.0.28", "serde", "serde_json", "slog", @@ -1914,12 +1914,12 @@ checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" [[package]] name = "drift" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9ba64b39d5fd68e09169e63c8e82b7a50c9b6082f2c44f52db2a11e3b9d7dd4" +checksum = "44cc7f4e6337c9c0d0402e2dccaeaea63fc38467a3e5ab3f465372dafce2cd89" dependencies = [ "anyhow", - "indexmap 2.13.0", + "indexmap 2.14.0", "openapiv3", "regex", "serde", @@ -1947,7 +1947,7 @@ dependencies = [ "http-body-util", "hyper", "hyper-util", - "indexmap 2.13.0", + "indexmap 2.14.0", "multer", "openapiv3", "paste", @@ -1956,7 +1956,7 @@ dependencies = [ "rustls-pemfile 2.2.0", "schemars 0.8.22", "scopeguard", - "semver 1.0.27", + "semver 1.0.28", "serde", "serde_json", "serde_path_to_error", @@ -1999,7 +1999,7 @@ dependencies = [ "http-body-util", "hyper", "hyper-util", - "indexmap 2.13.0", + "indexmap 2.14.0", "multer", "openapiv3", "paste", @@ -2008,7 +2008,7 @@ dependencies = [ "rustls-pemfile 2.2.0", "schemars 0.8.22", "scopeguard", - "semver 1.0.27", + "semver 1.0.28", "serde", "serde_json", "serde_path_to_error", @@ -2032,9 +2032,9 @@ dependencies = [ [[package]] name = "dropshot-api-manager" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27edffb6c55e640e420fb4a03ac0a066449100e936457e2db074ab8f5f208c8a" +checksum = "be70eb4dae3362c25948bfbe95631d1b523b9bf6d61c70cf9cc18813be56384d" dependencies = [ "anyhow", "atomicwrites", @@ -2054,7 +2054,7 @@ dependencies = [ "owo-colors", "paste", "rayon", - "semver 1.0.27", + "semver 1.0.28", "serde_json", "sha2 0.10.9", "similar", @@ -2065,14 +2065,14 @@ dependencies = [ [[package]] name = "dropshot-api-manager-types" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63d655f88937cd3cc3a99b81f731af996084f2f16d0067b2cfad43411ad4317f" +checksum = "e55a9d5776911a1f7c44f79eed01417b3b0488878c82acda4e010262be4e6936" dependencies = [ "anyhow", "camino", "paste", - "semver 1.0.27", + "semver 1.0.28", "serde_json", ] @@ -2085,7 +2085,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "semver 1.0.27", + "semver 1.0.28", "serde", "serde_tokenstream", "syn 2.0.117", @@ -2100,7 +2100,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "semver 1.0.27", + "semver 1.0.28", "serde", "serde_tokenstream", "syn 2.0.117", @@ -2928,7 +2928,7 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.13.0", + "indexmap 2.14.0", "slab", "tokio", "tokio-util", @@ -2981,6 +2981,12 @@ dependencies = [ "foldhash 0.2.0", ] +[[package]] +name = "hashbrown" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51" + [[package]] name = "heapless" version = "0.8.0" @@ -3674,12 +3680,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.13.0" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" +checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", - "hashbrown 0.16.1", + "hashbrown 0.17.0", "serde", "serde_core", ] @@ -4517,7 +4523,7 @@ dependencies = [ "omicron-workspace-hack", "oxnet", "progenitor 0.10.0", - "regress", + "regress 0.10.5", "reqwest 0.12.23", "schemars 0.8.22", "serde", @@ -4596,7 +4602,7 @@ dependencies = [ "parse-display", "regex", "schemars 0.8.22", - "semver 1.0.27", + "semver 1.0.28", "serde", "serde_json", "serde_with", @@ -4932,10 +4938,10 @@ dependencies = [ "progenitor-client 0.10.0", "protocol", "rand 0.9.2", - "regress", + "regress 0.10.5", "reqwest 0.12.23", "schemars 0.8.22", - "semver 1.0.27", + "semver 1.0.28", "serde", "serde_human_bytes", "serde_json", @@ -4977,10 +4983,10 @@ dependencies = [ "progenitor-client 0.10.0", "protocol", "rand 0.9.2", - "regress", + "regress 0.10.5", "reqwest 0.12.23", "schemars 0.8.22", - "semver 1.0.27", + "semver 1.0.28", "serde", "serde_human_bytes", "serde_json", @@ -5072,7 +5078,7 @@ dependencies = [ "futures-util", "hex", "reqwest 0.12.23", - "semver 1.0.27", + "semver 1.0.28", "serde", "serde_derive", "serde_json", @@ -5108,7 +5114,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c8d427828b22ae1fff2833a03d8486c2c881367f1c336349f307f321e7f4d05" dependencies = [ - "indexmap 2.13.0", + "indexmap 2.14.0", "serde", "serde_json", ] @@ -5369,7 +5375,7 @@ dependencies = [ "gethostname 0.5.0", "highway", "iana-time-zone", - "indexmap 2.13.0", + "indexmap 2.14.0", "libc", "nom 7.1.3", "num", @@ -5767,7 +5773,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset 0.4.2", - "indexmap 2.13.0", + "indexmap 2.14.0", "serde", "serde_derive", ] @@ -5780,7 +5786,7 @@ checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455" dependencies = [ "fixedbitset 0.5.7", "hashbrown 0.15.2", - "indexmap 2.13.0", + "indexmap 2.14.0", "serde", ] @@ -6238,13 +6244,13 @@ dependencies = [ [[package]] name = "progenitor" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36315275b213c64c68dff684477ea7118a0f630832f737b550796a368f9962c" +checksum = "d8ba1d77160e6d5c95bdf0792527f76bf528791093fa83015bc2908a0ba9d076" dependencies = [ - "progenitor-client 0.13.0", - "progenitor-impl 0.13.0", - "progenitor-macro 0.13.0", + "progenitor-client 0.14.0", + "progenitor-impl 0.14.0", + "progenitor-macro 0.14.0", ] [[package]] @@ -6279,9 +6285,9 @@ dependencies = [ [[package]] name = "progenitor-client" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3999c302f5f2a42b7ca1cc39ad9e612c74cf2910ef6e58f869e45f3068b9659f" +checksum = "4e8a874cf25a33cac7a01b9c1de87bcfbc8aea93f3156d09dcc3bee516a78926" dependencies = [ "bytes", "futures-core", @@ -6300,7 +6306,7 @@ checksum = "b17e5363daa50bf1cccfade6b0fb970d2278758fd5cfa9ab69f25028e4b1afa3" dependencies = [ "heck 0.5.0", "http", - "indexmap 2.13.0", + "indexmap 2.14.0", "openapiv3", "proc-macro2", "quote", @@ -6322,7 +6328,7 @@ checksum = "8276d558f1dfd4cc7fc4cceee0a51dab482b5a4be2e69e7eab8c57fbfb1472f4" dependencies = [ "heck 0.5.0", "http", - "indexmap 2.13.0", + "indexmap 2.14.0", "openapiv3", "proc-macro2", "quote", @@ -6338,13 +6344,13 @@ dependencies = [ [[package]] name = "progenitor-impl" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de362a0477182f45accdbad4d43cd89a95a1db0a518a7c1ddf3e525e6896f0f0" +checksum = "f6e349eed84b9a1a6a5dbe478d335e3df73d32a93c5eefe571c9b8cb298aab5d" dependencies = [ "heck 0.5.0", "http", - "indexmap 2.13.0", + "indexmap 2.14.0", "openapiv3", "proc-macro2", "quote", @@ -6354,7 +6360,7 @@ dependencies = [ "serde_json", "syn 2.0.117", "thiserror 2.0.18", - "typify 0.6.1", + "typify 0.6.2", "unicode-ident", ] @@ -6396,13 +6402,13 @@ dependencies = [ [[package]] name = "progenitor-macro" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c98aeaaab266bf848a602c78e039e7d62c80ba36303ae4092ec65f17e7fd0eaa" +checksum = "efa969a1349979c5f64347f204e794781a86d738206d75672e6c9493f5910002" dependencies = [ "openapiv3", "proc-macro2", - "progenitor-impl 0.13.0", + "progenitor-impl 0.14.0", "quote", "schemars 0.8.22", "serde", @@ -6512,8 +6518,8 @@ dependencies = [ "base64 0.21.7", "crucible-client-types 0.1.0 (git+https://github.com/oxidecomputer/crucible?rev=ae1da83e66c648574827298f4bc444632bf4d047)", "futures", - "progenitor 0.13.0", - "progenitor-client 0.13.0", + "progenitor 0.14.0", + "progenitor-client 0.14.0", "propolis-api-types-versions", "rand 0.9.2", "reqwest 0.13.2", @@ -6574,7 +6580,7 @@ dependencies = [ "dropshot-api-manager", "dropshot-api-manager-types", "propolis-server-api", - "semver 1.0.27", + "semver 1.0.28", ] [[package]] @@ -6588,14 +6594,14 @@ dependencies = [ "dropshot 0.17.0", "futures", "hyper", - "progenitor 0.13.0", + "progenitor 0.14.0", "propolis-api-types-versions", "propolis_api_types 0.0.0", "propolis_types 0.0.0", "rand 0.9.2", "reqwest 0.13.2", "schemars 0.8.22", - "semver 1.0.27", + "semver 1.0.28", "serde", "serde_json", "slog", @@ -6668,7 +6674,7 @@ dependencies = [ "ring", "ron", "schemars 0.8.22", - "semver 1.0.27", + "semver 1.0.28", "serde", "serde_derive", "serde_json", @@ -6902,9 +6908,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.44" +version = "1.0.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" +checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" dependencies = [ "proc-macro2", ] @@ -7143,6 +7149,16 @@ dependencies = [ "memchr", ] +[[package]] +name = "regress" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "158a764437582235e3501f683b93a0a6f8d825d04a789dbe5ed30b8799b8908a" +dependencies = [ + "hashbrown 0.16.1", + "memchr", +] + [[package]] name = "reqwest" version = "0.12.23" @@ -7350,7 +7366,7 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ - "semver 1.0.27", + "semver 1.0.28", ] [[package]] @@ -7601,7 +7617,7 @@ dependencies = [ "chrono", "dyn-clone", "schemars_derive", - "semver 1.0.27", + "semver 1.0.28", "serde", "serde_json", "url", @@ -7782,9 +7798,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2" +checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" dependencies = [ "serde", "serde_core", @@ -7973,7 +7989,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.13.0", + "indexmap 2.14.0", "schemars 0.8.22", "schemars 0.9.0", "schemars 1.2.1", @@ -8001,7 +8017,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.13.0", + "indexmap 2.14.0", "itoa", "ryu", "serde", @@ -8156,7 +8172,7 @@ dependencies = [ "oxnet", "progenitor 0.10.0", "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=8ccddb47a4c93b7e3480919495dae851afc83782)", - "regress", + "regress 0.10.5", "reqwest 0.12.23", "schemars 0.8.22", "serde", @@ -8446,7 +8462,7 @@ version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1c97747dbf44bb1ca44a561ece23508e99cb592e862f22222dcf42f51d1e451" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.117", @@ -9249,7 +9265,7 @@ version = "0.9.12+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863" dependencies = [ - "indexmap 2.13.0", + "indexmap 2.14.0", "serde_core", "serde_spanned 1.0.4", "toml_datetime 0.7.5+spec-1.1.0", @@ -9264,7 +9280,7 @@ version = "1.0.6+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "399b1124a3c9e16766831c6bba21e50192572cdd98706ea114f9502509686ffc" dependencies = [ - "indexmap 2.13.0", + "indexmap 2.14.0", "serde_core", "serde_spanned 1.0.4", "toml_datetime 1.0.0+spec-1.1.0", @@ -9306,7 +9322,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.13.0", + "indexmap 2.14.0", "serde", "serde_spanned 0.6.9", "toml_datetime 0.6.11", @@ -9319,7 +9335,7 @@ version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap 2.13.0", + "indexmap 2.14.0", "serde", "serde_spanned 0.6.9", "toml_datetime 0.6.11", @@ -9583,7 +9599,7 @@ dependencies = [ "hex", "proptest", "schemars 0.8.22", - "semver 1.0.27", + "semver 1.0.28", "serde", "serde_human_bytes", "strum 0.26.3", @@ -9649,12 +9665,12 @@ dependencies = [ [[package]] name = "typify" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b715573a376585888b742ead9be5f4826105e622169180662e2c81bed4a149c3" +checksum = "bc0b89f47309feaeb23c4509c15c9a04234f7deccef6f96c3bfe95319819a304" dependencies = [ - "typify-impl 0.6.1", - "typify-macro 0.6.1", + "typify-impl 0.6.2", + "typify-macro 0.6.2", ] [[package]] @@ -9667,9 +9683,9 @@ dependencies = [ "log", "proc-macro2", "quote", - "regress", + "regress 0.10.5", "schemars 0.8.22", - "semver 1.0.27", + "semver 1.0.28", "serde", "serde_json", "syn 2.0.117", @@ -9679,17 +9695,17 @@ dependencies = [ [[package]] name = "typify-impl" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2fd0d27608a466d063d23b97cf2d26c25d838f01b4f7d5ff406a7446f16b6e3" +checksum = "fa7b026f540b148b81043c720889dbb942b08659aa8a43f624ac4f04dbfc1861" dependencies = [ "heck 0.5.0", "log", "proc-macro2", "quote", - "regress", + "regress 0.11.1", "schemars 0.8.22", - "semver 1.0.27", + "semver 1.0.28", "serde", "serde_json", "syn 2.0.117", @@ -9706,7 +9722,7 @@ dependencies = [ "proc-macro2", "quote", "schemars 0.8.22", - "semver 1.0.27", + "semver 1.0.28", "serde", "serde_json", "serde_tokenstream", @@ -9716,19 +9732,19 @@ dependencies = [ [[package]] name = "typify-macro" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd04bb1207cd4e250941cc1641f4c4815f7eaa2145f45c09dd49cb0a3691710a" +checksum = "39ed96c57f06ae0839416b986921a98f18b220da63bbb243a8570a00c8492183" dependencies = [ "proc-macro2", "quote", "schemars 0.8.22", - "semver 1.0.27", + "semver 1.0.28", "serde", "serde_json", "serde_tokenstream", "syn 2.0.117", - "typify-impl 0.6.1", + "typify-impl 0.6.2", ] [[package]] @@ -9829,7 +9845,7 @@ dependencies = [ "either", "futures", "indent_write", - "indexmap 2.13.0", + "indexmap 2.14.0", "libsw", "linear-map", "omicron-workspace-hack", @@ -10282,7 +10298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" dependencies = [ "anyhow", - "indexmap 2.13.0", + "indexmap 2.14.0", "wasm-encoder", "wasmparser", ] @@ -10321,8 +10337,8 @@ checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" dependencies = [ "bitflags 2.9.4", "hashbrown 0.15.2", - "indexmap 2.13.0", - "semver 1.0.27", + "indexmap 2.14.0", + "semver 1.0.28", ] [[package]] @@ -10971,7 +10987,7 @@ checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" dependencies = [ "anyhow", "heck 0.5.0", - "indexmap 2.13.0", + "indexmap 2.14.0", "prettyplease", "syn 2.0.117", "wasm-metadata", @@ -11002,7 +11018,7 @@ checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" dependencies = [ "anyhow", "bitflags 2.9.4", - "indexmap 2.13.0", + "indexmap 2.14.0", "log", "serde", "serde_derive", @@ -11021,9 +11037,9 @@ checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" dependencies = [ "anyhow", "id-arena", - "indexmap 2.13.0", + "indexmap 2.14.0", "log", - "semver 1.0.27", + "semver 1.0.28", "serde", "serde_derive", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index 83c87705c..a59c68a43 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -122,8 +122,8 @@ const_format = "0.2" crossbeam-channel = "0.5" ctrlc = "3.2" dropshot = "0.17.0" -dropshot-api-manager = "0.7.0" -dropshot-api-manager-types = "0.7.0" +dropshot-api-manager = "0.7.1" +dropshot-api-manager-types = "0.7.1" erased-serde = "0.4" errno = "0.2.8" escargot = "0.5.8" @@ -153,8 +153,8 @@ paste = "1.0.15" pin-project-lite = "0.2.13" proc-macro2 = "1.0" proc-macro-error = "1" -progenitor = "0.13.0" -progenitor-client = "0.13.0" +progenitor = "0.14.0" +progenitor-client = "0.14.0" proptest = "1.5.0" quote = "1.0" rand = "0.9.1" diff --git a/crates/propolis-server-api/src/lib.rs b/crates/propolis-server-api/src/lib.rs index e821c07b1..748ba425f 100644 --- a/crates/propolis-server-api/src/lib.rs +++ b/crates/propolis-server-api/src/lib.rs @@ -22,6 +22,7 @@ api_versions!([ // | example for the next person. // v // (next_int, IDENT), + (4, DROPSHOT_BUMP_WEBSOCKET), (3, ADD_VSOCK), (2, PROGRAMMABLE_SMBIOS), (1, INITIAL), diff --git a/openapi/propolis-server/propolis-server-3.0.0-10da2b.json.gitstub b/openapi/propolis-server/propolis-server-3.0.0-10da2b.json.gitstub new file mode 100644 index 000000000..90ed1d68f --- /dev/null +++ b/openapi/propolis-server/propolis-server-3.0.0-10da2b.json.gitstub @@ -0,0 +1 @@ +368a2225b79328514ce0ea9181d8f874019edaa2:openapi/propolis-server/propolis-server-3.0.0-10da2b.json diff --git a/openapi/propolis-server/propolis-server-3.0.0-10da2b.json b/openapi/propolis-server/propolis-server-4.0.0-5ce09a.json similarity index 99% rename from openapi/propolis-server/propolis-server-3.0.0-10da2b.json rename to openapi/propolis-server/propolis-server-4.0.0-5ce09a.json index 2b0b7c77f..1eed05bc2 100644 --- a/openapi/propolis-server/propolis-server-3.0.0-10da2b.json +++ b/openapi/propolis-server/propolis-server-4.0.0-5ce09a.json @@ -7,7 +7,7 @@ "url": "https://oxide.computer", "email": "api@oxide.computer" }, - "version": "3.0.0" + "version": "4.0.0" }, "paths": { "/instance": { @@ -206,13 +206,14 @@ } ], "responses": { - "default": { - "description": "", - "content": { - "*/*": { - "schema": {} - } - } + "101": { + "description": "Negotiating protocol upgrade from HTTP/1.1 to WebSocket" + }, + "4XX": { + "$ref": "#/components/responses/Error" + }, + "5XX": { + "$ref": "#/components/responses/Error" } }, "x-dropshot-websocket": {} @@ -297,13 +298,14 @@ } ], "responses": { - "default": { - "description": "", - "content": { - "*/*": { - "schema": {} - } - } + "101": { + "description": "Negotiating protocol upgrade from HTTP/1.1 to WebSocket" + }, + "4XX": { + "$ref": "#/components/responses/Error" + }, + "5XX": { + "$ref": "#/components/responses/Error" } }, "x-dropshot-websocket": {} diff --git a/openapi/propolis-server/propolis-server-latest.json b/openapi/propolis-server/propolis-server-latest.json index 0f7255733..827f14277 120000 --- a/openapi/propolis-server/propolis-server-latest.json +++ b/openapi/propolis-server/propolis-server-latest.json @@ -1 +1 @@ -propolis-server-3.0.0-10da2b.json \ No newline at end of file +propolis-server-4.0.0-5ce09a.json \ No newline at end of file