Skip to content

Commit 0263bd5

Browse files
author
lif
committed
Expose propolis' serial console channel in nexus
- Includes updates to progenitor and reqwest 0.11.12 for client support for Dropshot websocket channels. - Literally only passes through the websocket, does not yet include the serial output buffering done by its parent GET endpoint. - Adds support for ensuring a websocket endpoint gets upgraded in nexus integration tests (i.e. test_unauthorized). - Begins migrating sled-agent's propolis-client usage to the new progenitor-generated version (oxidecomputer/propolis#206)
1 parent 90c505a commit 0263bd5

File tree

26 files changed

+571
-112
lines changed

26 files changed

+571
-112
lines changed

Cargo.lock

+94-19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

common/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ hyper = "0.14"
1616
ipnetwork = "0.20"
1717
macaddr = { version = "1.0.1", features = [ "serde_std" ] }
1818
rand = "0.8.4"
19-
reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "stream"] }
19+
reqwest = { version = "0.11.12", default-features = false, features = ["rustls-tls", "stream"] }
2020
ring = "0.16"
2121
schemars = { version = "0.8.10", features = [ "chrono", "uuid1" ] }
2222
serde = { version = "1.0", features = [ "derive" ] }

ddm-admin-client/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2021"
55

66
[dependencies]
77
progenitor-client = { git = "https://github.com/oxidecomputer/progenitor" }
8-
reqwest = { version = "0.11", features = ["json", "stream", "rustls-tls"] }
8+
reqwest = { version = "0.11.12", features = ["json", "stream", "rustls-tls"] }
99
serde = { version = "1.0", features = ["derive"] }
1010
slog = "2.7"
1111

gateway-client/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ license = "MPL-2.0"
66

77
[dependencies]
88
progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
9-
reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "stream"] }
9+
reqwest = { version = "0.11.12", default-features = false, features = ["rustls-tls", "stream"] }
1010
serde_json = "1.0"
1111
futures = "0.3.24"
1212

internal-dns-client/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ license = "MPL-2.0"
88
futures = "0.3.24"
99
omicron-common = { path = "../common" }
1010
progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
11-
reqwest = { version = "0.11", features = ["json", "rustls-tls", "stream"] }
11+
reqwest = { version = "0.11.12", features = ["json", "rustls-tls", "stream"] }
1212
serde = { version = "1.0", features = [ "derive" ] }
1313
serde_json = "1.0"
1414
slog = { version = "2.5.0", features = [ "max_level_trace", "release_max_level_debug" ] }

nexus-client/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ license = "MPL-2.0"
66

77
[dependencies]
88
progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
9-
reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "stream"] }
9+
reqwest = { version = "0.11.12", default-features = false, features = ["rustls-tls", "stream"] }
1010
serde_json = "1.0"
1111

1212
[dependencies.chrono]

nexus/Cargo.toml

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ base64 = "0.13.0"
1515
bb8 = "0.8.0"
1616
clap = { version = "4.0", features = ["derive"] }
1717
cookie = "0.16"
18-
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "bacffd142fc38a01fe255407b0c8d5d0aacfe778" }
18+
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "144d8dafa41715e00b08a5929cc62140ff0eb561" }
1919
diesel = { version = "2.0.2", features = ["postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] }
2020
diesel-dtrace = { git = "https://github.com/oxidecomputer/diesel-dtrace", rev = "18748d9f76c94e1f4400fbec0859b3e77a221a8d" }
2121
fatfs = "0.3.5"
@@ -42,6 +42,7 @@ oximeter-db = { path = "../oximeter/db/" }
4242
parse-display = "0.6.0"
4343
# See omicron-rpaths for more about the "pq-sys" dependency.
4444
pq-sys = "*"
45+
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "da3cfc26e4a6239810e0c7904aefe68443627704", features = [ "generated" ] }
4546
rand = "0.8.5"
4647
ref-cast = "1.0"
4748
reqwest = { version = "0.11.12", features = [ "json" ] }
@@ -55,6 +56,7 @@ slog-dtrace = "0.2"
5556
steno = "0.2"
5657
tempfile = "3.3"
5758
thiserror = "1.0"
59+
tokio-tungstenite = "0.17.2"
5860
toml = "0.5.9"
5961
tough = { version = "0.12", features = [ "http" ] }
6062
usdt = "0.3.1"

0 commit comments

Comments
 (0)