Skip to content

Commit

Permalink
Expose propolis' serial console channel in nexus
Browse files Browse the repository at this point in the history
- 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)
  • Loading branch information
lif committed Oct 18, 2022
1 parent f4fb341 commit 2aba311
Show file tree
Hide file tree
Showing 25 changed files with 454 additions and 110 deletions.
113 changes: 94 additions & 19 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ hyper = "0.14"
ipnetwork = "0.20"
macaddr = { version = "1.0.1", features = [ "serde_std" ] }
rand = "0.8.4"
reqwest = { version = "0.11", default-features = false, features = ["rustls-tls", "stream"] }
reqwest = { version = "0.11.12", default-features = false, features = ["rustls-tls", "stream"] }
ring = "0.16"
schemars = { version = "0.8.10", features = [ "chrono", "uuid1" ] }
serde = { version = "1.0", features = [ "derive" ] }
Expand Down
2 changes: 1 addition & 1 deletion ddm-admin-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ edition = "2021"

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

Expand Down
2 changes: 1 addition & 1 deletion gateway-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license = "MPL-2.0"

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

Expand Down
2 changes: 1 addition & 1 deletion internal-dns-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license = "MPL-2.0"
futures = "0.3.24"
omicron-common = { path = "../common" }
progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
reqwest = { version = "0.11", features = ["json", "rustls-tls", "stream"] }
reqwest = { version = "0.11.12", features = ["json", "rustls-tls", "stream"] }
serde = { version = "1.0", features = [ "derive" ] }
serde_json = "1.0"
slog = { version = "2.5.0", features = [ "max_level_trace", "release_max_level_debug" ] }
Expand Down
2 changes: 1 addition & 1 deletion nexus-client/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ license = "MPL-2.0"

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

[dependencies.chrono]
Expand Down
4 changes: 3 additions & 1 deletion nexus/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ base64 = "0.13.0"
bb8 = "0.8.0"
clap = { version = "4.0", features = ["derive"] }
cookie = "0.16"
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "bacffd142fc38a01fe255407b0c8d5d0aacfe778" }
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "144d8dafa41715e00b08a5929cc62140ff0eb561" }
diesel = { version = "2.0.2", features = ["postgres", "r2d2", "chrono", "serde_json", "network-address", "uuid"] }
diesel-dtrace = { git = "https://github.com/oxidecomputer/diesel-dtrace", rev = "18748d9f76c94e1f4400fbec0859b3e77a221a8d" }
fatfs = "0.3.5"
Expand All @@ -42,6 +42,7 @@ oximeter-db = { path = "../oximeter/db/" }
parse-display = "0.6.0"
# See omicron-rpaths for more about the "pq-sys" dependency.
pq-sys = "*"
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "da3cfc26e4a6239810e0c7904aefe68443627704", features = [ "generated" ] }
rand = "0.8.5"
ref-cast = "1.0"
reqwest = { version = "0.11.12", features = [ "json" ] }
Expand All @@ -55,6 +56,7 @@ slog-dtrace = "0.2"
steno = "0.2"
tempfile = "3.3"
thiserror = "1.0"
tokio-tungstenite = "0.17.2"
toml = "0.5.9"
tough = { version = "0.12", features = [ "http" ] }
usdt = "0.3.1"
Expand Down

0 comments on commit 2aba311

Please sign in to comment.