Skip to content

Commit fef132a

Browse files
Bump dependencies, progenitor to 1a5b88f7, oxide.json to omicron:09c554d9 (#1433)
1 parent f2c236d commit fef132a

4 files changed

Lines changed: 54 additions & 25 deletions

File tree

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

oxide.json

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"url": "https://oxide.computer",
88
"email": "api@oxide.computer"
99
},
10-
"version": "2026041900.0.0"
10+
"version": "2026043000.0.0"
1111
},
1212
"paths": {
1313
"/device/auth": {
@@ -5039,13 +5039,14 @@
50395039
}
50405040
],
50415041
"responses": {
5042-
"default": {
5043-
"description": "",
5044-
"content": {
5045-
"*/*": {
5046-
"schema": {}
5047-
}
5048-
}
5042+
"101": {
5043+
"description": "Negotiating protocol upgrade from HTTP/1.1 to WebSocket"
5044+
},
5045+
"4XX": {
5046+
"$ref": "#/components/responses/Error"
5047+
},
5048+
"5XX": {
5049+
"$ref": "#/components/responses/Error"
50495050
}
50505051
},
50515052
"x-dropshot-websocket": {}
@@ -25748,7 +25749,7 @@
2574825749
]
2574925750
},
2575025751
"Probe": {
25751-
"description": "Identity-related metadata that's included in nearly all public API objects",
25752+
"description": "A networking probe",
2575225753
"type": "object",
2575325754
"properties": {
2575425755
"description": {
@@ -26752,7 +26753,7 @@
2675226753
]
2675326754
},
2675426755
"SamlIdentityProvider": {
26755-
"description": "Identity-related metadata that's included in nearly all public API objects",
26756+
"description": "A SAML identity provider",
2675626757
"type": "object",
2675726758
"properties": {
2675826759
"acs_url": {
@@ -29759,7 +29760,8 @@
2975929760
"volts",
2976029761
"amps",
2976129762
"watts",
29762-
"degrees_celsius"
29763+
"degrees_celsius",
29764+
"joules"
2976329765
]
2976429766
},
2976529767
{

sdk-httpmock/src/generated_httpmock.rs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7554,6 +7554,26 @@ pub mod operations {
75547554
pub fn switching_protocols(self) -> Self {
75557555
Self(self.0.status(101u16))
75567556
}
7557+
7558+
pub fn client_error(self, status: u16, value: &types::Error) -> Self {
7559+
assert_eq!(status / 100u16, 4u16);
7560+
Self(
7561+
self.0
7562+
.status(status)
7563+
.header("content-type", "application/json")
7564+
.json_body_obj(value),
7565+
)
7566+
}
7567+
7568+
pub fn server_error(self, status: u16, value: &types::Error) -> Self {
7569+
assert_eq!(status / 100u16, 5u16);
7570+
Self(
7571+
self.0
7572+
.status(status)
7573+
.header("content-type", "application/json")
7574+
.json_body_obj(value),
7575+
)
7576+
}
75577577
}
75587578

75597579
pub struct InstanceSshPublicKeyListWhen(::httpmock::When);

sdk/src/generated_sdk.rs

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22685,15 +22685,13 @@ pub mod types {
2268522685
}
2268622686
}
2268722687

22688-
/// Identity-related metadata that's included in nearly all public API
22689-
/// objects
22688+
/// A networking probe
2269022689
///
2269122690
/// <details><summary>JSON schema</summary>
2269222691
///
2269322692
/// ```json
2269422693
/// {
22695-
/// "description": "Identity-related metadata that's included in nearly all
22696-
/// public API objects",
22694+
/// "description": "A networking probe",
2269722695
/// "type": "object",
2269822696
/// "required": [
2269922697
/// "description",
@@ -24927,15 +24925,13 @@ pub mod types {
2492724925
}
2492824926
}
2492924927

24930-
/// Identity-related metadata that's included in nearly all public API
24931-
/// objects
24928+
/// A SAML identity provider
2493224929
///
2493324930
/// <details><summary>JSON schema</summary>
2493424931
///
2493524932
/// ```json
2493624933
/// {
24937-
/// "description": "Identity-related metadata that's included in nearly all
24938-
/// public API objects",
24934+
/// "description": "A SAML identity provider",
2493924935
/// "type": "object",
2494024936
/// "required": [
2494124937
/// "acs_url",
@@ -32478,7 +32474,8 @@ pub mod types {
3247832474
/// "volts",
3247932475
/// "amps",
3248032476
/// "watts",
32481-
/// "degrees_celsius"
32477+
/// "degrees_celsius",
32478+
/// "joules"
3248232479
/// ]
3248332480
/// },
3248432481
/// {
@@ -32530,6 +32527,8 @@ pub mod types {
3253032527
Watts,
3253132528
#[serde(rename = "degrees_celsius")]
3253232529
DegreesCelsius,
32530+
#[serde(rename = "joules")]
32531+
Joules,
3253332532
/// No meaningful units, e.g. a dimensionless quanity.
3253432533
#[serde(rename = "none")]
3253532534
None,
@@ -32549,6 +32548,7 @@ pub mod types {
3254932548
Self::Amps => f.write_str("amps"),
3255032549
Self::Watts => f.write_str("watts"),
3255132550
Self::DegreesCelsius => f.write_str("degrees_celsius"),
32551+
Self::Joules => f.write_str("joules"),
3255232552
Self::None => f.write_str("none"),
3255332553
Self::Rpm => f.write_str("rpm"),
3255432554
}
@@ -32567,6 +32567,7 @@ pub mod types {
3256732567
"amps" => Ok(Self::Amps),
3256832568
"watts" => Ok(Self::Watts),
3256932569
"degrees_celsius" => Ok(Self::DegreesCelsius),
32570+
"joules" => Ok(Self::Joules),
3257032571
"none" => Ok(Self::None),
3257132572
"rpm" => Ok(Self::Rpm),
3257232573
_ => Err("invalid value".into()),
@@ -65809,7 +65810,7 @@ pub mod types {
6580965810
///
6581065811
/// API for interacting with the Oxide control plane
6581165812
///
65812-
/// Version: 2026041900.0.0
65813+
/// Version: 2026043000.0.0
6581365814
pub struct Client {
6581465815
pub(crate) baseurl: String,
6581565816
pub(crate) client: reqwest::Client,
@@ -65850,7 +65851,7 @@ impl Client {
6585065851

6585165852
impl ClientInfo<()> for Client {
6585265853
fn api_version() -> &'static str {
65853-
"2026041900.0.0"
65854+
"2026043000.0.0"
6585465855
}
6585565856

6585665857
fn baseurl(&self) -> &str {
@@ -83991,7 +83992,7 @@ pub mod builder {
8399183992

8399283993
/// Sends a `GET` request to
8399383994
/// `/v1/instances/{instance}/serial-console/stream`
83994-
pub async fn send(self) -> Result<ResponseValue<reqwest::Upgraded>, Error<()>> {
83995+
pub async fn send(self) -> Result<ResponseValue<reqwest::Upgraded>, Error<types::Error>> {
8399583996
let Self {
8399683997
client,
8399783998
instance,
@@ -84041,6 +84042,12 @@ pub mod builder {
8404184042
let response = result?;
8404284043
match response.status().as_u16() {
8404384044
101u16 => ResponseValue::upgrade(response).await,
84045+
400u16..=499u16 => Err(Error::ErrorResponse(
84046+
ResponseValue::from_response(response).await?,
84047+
)),
84048+
500u16..=599u16 => Err(Error::ErrorResponse(
84049+
ResponseValue::from_response(response).await?,
84050+
)),
8404484051
_ => Err(Error::UnexpectedResponse(response)),
8404584052
}
8404684053
}

0 commit comments

Comments
 (0)