Skip to content

Commit 5fce32c

Browse files
Bump, oxide.json to omicron:c65212d7 (#1158)
Co-authored-by: oxide-reflector-bot[bot] <130185838+oxide-reflector-bot[bot]@users.noreply.github.com>
1 parent 243181d commit 5fce32c

File tree

5 files changed

+40
-25
lines changed

5 files changed

+40
-25
lines changed

cli/docs/cli.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -701,7 +701,8 @@
701701
{
702702
"long": "sort-by",
703703
"values": [
704-
"id_ascending"
704+
"ascending",
705+
"descending"
705706
]
706707
}
707708
]

cli/src/generated_cli.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -596,9 +596,10 @@ impl<T: CliConfig> Cli<T> {
596596
.long("sort-by")
597597
.value_parser(::clap::builder::TypedValueParser::map(
598598
::clap::builder::PossibleValuesParser::new([
599-
types::IdSortMode::IdAscending.to_string(),
599+
types::TimeAndIdSortMode::Ascending.to_string(),
600+
types::TimeAndIdSortMode::Descending.to_string(),
600601
]),
601-
|s| types::IdSortMode::try_from(s).unwrap(),
602+
|s| types::TimeAndIdSortMode::try_from(s).unwrap(),
602603
))
603604
.required(false),
604605
)
@@ -9003,7 +9004,7 @@ impl<T: CliConfig> Cli<T> {
90039004
request = request.limit(value.clone());
90049005
}
90059006

9006-
if let Some(value) = matches.get_one::<types::IdSortMode>("sort-by") {
9007+
if let Some(value) = matches.get_one::<types::TimeAndIdSortMode>("sort-by") {
90079008
request = request.sort_by(value.clone());
90089009
}
90099010

oxide.json

Lines changed: 19 additions & 14 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": "20250604.0.0"
10+
"version": "20250730.0.0"
1111
},
1212
"paths": {
1313
"/device/auth": {
@@ -333,7 +333,7 @@
333333
"in": "query",
334334
"name": "sort_by",
335335
"schema": {
336-
"$ref": "#/components/schemas/IdSortMode"
336+
"$ref": "#/components/schemas/TimeAndIdSortMode"
337337
}
338338
}
339339
],
@@ -17580,6 +17580,10 @@
1758017580
"type": "string",
1758117581
"format": "ip"
1758217582
},
17583+
"ip_pool_id": {
17584+
"type": "string",
17585+
"format": "uuid"
17586+
},
1758317587
"kind": {
1758417588
"type": "string",
1758517589
"enum": [
@@ -17589,6 +17593,7 @@
1758917593
},
1759017594
"required": [
1759117595
"ip",
17596+
"ip_pool_id",
1759217597
"kind"
1759317598
]
1759417599
},
@@ -27142,18 +27147,6 @@
2714227147
}
2714327148
]
2714427149
},
27145-
"IdSortMode": {
27146-
"description": "Supported set of sort modes for scanning by id only.\n\nCurrently, we only support scanning in ascending order.",
27147-
"oneOf": [
27148-
{
27149-
"description": "sort in increasing order of \"id\"",
27150-
"type": "string",
27151-
"enum": [
27152-
"id_ascending"
27153-
]
27154-
}
27155-
]
27156-
},
2715727150
"TimeAndIdSortMode": {
2715827151
"description": "Supported set of sort modes for scanning by timestamp and ID",
2715927152
"oneOf": [
@@ -27192,6 +27185,18 @@
2719227185
"descending"
2719327186
]
2719427187
},
27188+
"IdSortMode": {
27189+
"description": "Supported set of sort modes for scanning by id only.\n\nCurrently, we only support scanning in ascending order.",
27190+
"oneOf": [
27191+
{
27192+
"description": "sort in increasing order of \"id\"",
27193+
"type": "string",
27194+
"enum": [
27195+
"id_ascending"
27196+
]
27197+
}
27198+
]
27199+
},
2719527200
"SystemMetricName": {
2719627201
"type": "string",
2719727202
"enum": [

sdk-httpmock/src/generated_httpmock.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ pub mod operations {
491491

492492
pub fn sort_by<T>(self, value: T) -> Self
493493
where
494-
T: Into<Option<types::IdSortMode>>,
494+
T: Into<Option<types::TimeAndIdSortMode>>,
495495
{
496496
if let Some(value) = value.into() {
497497
Self(self.0.query_param("sort_by", value.to_string()))

sdk/src/generated_sdk.rs

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9536,13 +9536,18 @@ pub mod types {
95369536
/// "type": "object",
95379537
/// "required": [
95389538
/// "ip",
9539+
/// "ip_pool_id",
95399540
/// "kind"
95409541
/// ],
95419542
/// "properties": {
95429543
/// "ip": {
95439544
/// "type": "string",
95449545
/// "format": "ip"
95459546
/// },
9547+
/// "ip_pool_id": {
9548+
/// "type": "string",
9549+
/// "format": "uuid"
9550+
/// },
95469551
/// "kind": {
95479552
/// "type": "string",
95489553
/// "enum": [
@@ -9641,7 +9646,10 @@ pub mod types {
96419646
#[serde(tag = "kind")]
96429647
pub enum ExternalIp {
96439648
#[serde(rename = "ephemeral")]
9644-
Ephemeral { ip: ::std::net::IpAddr },
9649+
Ephemeral {
9650+
ip: ::std::net::IpAddr,
9651+
ip_pool_id: ::uuid::Uuid,
9652+
},
96459653
/// A Floating IP is a well-known IP address which can be attached and
96469654
/// detached from instances.
96479655
#[serde(rename = "floating")]
@@ -60173,7 +60181,7 @@ pub mod types {
6017360181
///
6017460182
/// API for interacting with the Oxide control plane
6017560183
///
60176-
/// Version: 20250604.0.0
60184+
/// Version: 20250730.0.0
6017760185
pub struct Client {
6017860186
pub(crate) baseurl: String,
6017960187
pub(crate) client: reqwest::Client,
@@ -60214,7 +60222,7 @@ impl Client {
6021460222

6021560223
impl ClientInfo<()> for Client {
6021660224
fn api_version() -> &'static str {
60217-
"20250604.0.0"
60225+
"20250730.0.0"
6021860226
}
6021960227

6022060228
fn baseurl(&self) -> &str {
@@ -66726,7 +66734,7 @@ pub mod builder {
6672666734
client: &'a super::Client,
6672766735
limit: Result<Option<::std::num::NonZeroU32>, String>,
6672866736
page_token: Result<Option<::std::string::String>, String>,
66729-
sort_by: Result<Option<types::IdSortMode>, String>,
66737+
sort_by: Result<Option<types::TimeAndIdSortMode>, String>,
6673066738
}
6673166739

6673266740
impl<'a> SupportBundleList<'a> {
@@ -66761,12 +66769,12 @@ pub mod builder {
6676166769

6676266770
pub fn sort_by<V>(mut self, value: V) -> Self
6676366771
where
66764-
V: std::convert::TryInto<types::IdSortMode>,
66772+
V: std::convert::TryInto<types::TimeAndIdSortMode>,
6676566773
{
6676666774
self.sort_by = value
6676766775
.try_into()
6676866776
.map(Some)
66769-
.map_err(|_| "conversion to `IdSortMode` for sort_by failed".to_string());
66777+
.map_err(|_| "conversion to `TimeAndIdSortMode` for sort_by failed".to_string());
6677066778
self
6677166779
}
6677266780

0 commit comments

Comments
 (0)