Skip to content

Commit 8c1c950

Browse files
inicklesinickles
authored
Merge branch 'main' into inickles/rustls
2 parents 16aaf6d + 1ded7cc commit 8c1c950

3 files changed

Lines changed: 45 additions & 13 deletions

File tree

‎Cargo.toml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ resolver = "2"
1212

1313
[workspace.dependencies]
1414
anyhow = "1.0.102"
15-
assert_cmd = "2.2.0"
15+
assert_cmd = "2.2.1"
1616
async-trait = "0.1.89"
1717
base64 = "0.22.1"
1818
built = { version = "0.8.0", features = ["git2"] }
@@ -40,7 +40,7 @@ md5 = "0.8.0"
4040
newline-converter = "0.3.0"
4141
oauth2 = { version = "5.0.0", default-features = false }
4242
oauth2-reqwest = "0.1.0-alpha.3"
43-
open = "5.3.3"
43+
open = "5.3.4"
4444
oxide = { path = "sdk", version = "0.16.0" }
4545
oxide-httpmock = { path = "sdk-httpmock", version = "0.16.0" }
4646
oxnet = "0.1.4"
@@ -66,14 +66,14 @@ thiserror = "2.0.18"
6666
tempfile = "3.27.0"
6767
test-common = { path = "test-common" }
6868
thouart = { git = "https://github.com/oxidecomputer/thouart" }
69-
tokio = { version = "1.51.1", features = ["full"] }
69+
tokio = { version = "1.52.1", features = ["full"] }
7070
tokio-util = "0.7.18"
7171
toml = "1.0.7"
7272
toml_edit = "0.25.8"
7373
tracing = "0.1.44"
7474
tracing-subscriber = { version = "0.3.23", features = ["env-filter", "json"] }
7575
url = "2.5.8"
76-
uuid = { version = "1.23.0", features = ["serde", "v4"] }
76+
uuid = { version = "1.23.1", features = ["serde", "v4"] }
7777

7878
# The profile that 'cargo dist' will build with
7979
[profile.dist]

‎sdk/src/generated_sdk.rs‎

Lines changed: 41 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12012,7 +12012,9 @@ pub mod types {
1201212012
pub struct Histogramdouble {
1201312013
/// The bins of the histogram.
1201412014
pub bins: ::std::vec::Vec<Bindouble>,
12015+
/// The maximum value of all samples in the histogram.
1201512016
pub max: f64,
12017+
/// The minimum value of all samples in the histogram.
1201612018
pub min: f64,
1201712019
/// The total number of samples in the histogram.
1201812020
pub n_samples: u64,
@@ -12022,9 +12024,13 @@ pub mod types {
1202212024
pub p90: Quantile,
1202312025
/// p99 Quantile
1202412026
pub p99: Quantile,
12027+
/// M2 for Welford's algorithm for variance calculation.
12028+
///
12029+
/// Read about [Welford's algorithm](https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Welford's_online_algorithm) for more information on the algorithm.
1202512030
pub squared_mean: f64,
1202612031
/// The start time of the histogram.
1202712032
pub start_time: ::chrono::DateTime<::chrono::offset::Utc>,
12033+
/// The sum of all samples in the histogram.
1202812034
pub sum_of_samples: f64,
1202912035
}
1203012036

@@ -12144,7 +12150,9 @@ pub mod types {
1214412150
pub struct Histogramfloat {
1214512151
/// The bins of the histogram.
1214612152
pub bins: ::std::vec::Vec<Binfloat>,
12153+
/// The maximum value of all samples in the histogram.
1214712154
pub max: f32,
12155+
/// The minimum value of all samples in the histogram.
1214812156
pub min: f32,
1214912157
/// The total number of samples in the histogram.
1215012158
pub n_samples: u64,
@@ -12154,9 +12162,13 @@ pub mod types {
1215412162
pub p90: Quantile,
1215512163
/// p99 Quantile
1215612164
pub p99: Quantile,
12165+
/// M2 for Welford's algorithm for variance calculation.
12166+
///
12167+
/// Read about [Welford's algorithm](https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Welford's_online_algorithm) for more information on the algorithm.
1215712168
pub squared_mean: f64,
1215812169
/// The start time of the histogram.
1215912170
pub start_time: ::chrono::DateTime<::chrono::offset::Utc>,
12171+
/// The sum of all samples in the histogram.
1216012172
pub sum_of_samples: f64,
1216112173
}
1216212174

@@ -12288,6 +12300,9 @@ pub mod types {
1228812300
pub p90: Quantile,
1228912301
/// p99 Quantile
1229012302
pub p99: Quantile,
12303+
/// M2 for Welford's algorithm for variance calculation.
12304+
///
12305+
/// Read about [Welford's algorithm](https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Welford's_online_algorithm) for more information on the algorithm.
1229112306
pub squared_mean: f64,
1229212307
/// The start time of the histogram.
1229312308
pub start_time: ::chrono::DateTime<::chrono::offset::Utc>,
@@ -12423,6 +12438,9 @@ pub mod types {
1242312438
pub p90: Quantile,
1242412439
/// p99 Quantile
1242512440
pub p99: Quantile,
12441+
/// M2 for Welford's algorithm for variance calculation.
12442+
///
12443+
/// Read about [Welford's algorithm](https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Welford's_online_algorithm) for more information on the algorithm.
1242612444
pub squared_mean: f64,
1242712445
/// The start time of the histogram.
1242812446
pub start_time: ::chrono::DateTime<::chrono::offset::Utc>,
@@ -12558,6 +12576,9 @@ pub mod types {
1255812576
pub p90: Quantile,
1255912577
/// p99 Quantile
1256012578
pub p99: Quantile,
12579+
/// M2 for Welford's algorithm for variance calculation.
12580+
///
12581+
/// Read about [Welford's algorithm](https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Welford's_online_algorithm) for more information on the algorithm.
1256112582
pub squared_mean: f64,
1256212583
/// The start time of the histogram.
1256312584
pub start_time: ::chrono::DateTime<::chrono::offset::Utc>,
@@ -12693,6 +12714,9 @@ pub mod types {
1269312714
pub p90: Quantile,
1269412715
/// p99 Quantile
1269512716
pub p99: Quantile,
12717+
/// M2 for Welford's algorithm for variance calculation.
12718+
///
12719+
/// Read about [Welford's algorithm](https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Welford's_online_algorithm) for more information on the algorithm.
1269612720
pub squared_mean: f64,
1269712721
/// The start time of the histogram.
1269812722
pub start_time: ::chrono::DateTime<::chrono::offset::Utc>,
@@ -12830,6 +12854,9 @@ pub mod types {
1283012854
pub p90: Quantile,
1283112855
/// p99 Quantile
1283212856
pub p99: Quantile,
12857+
/// M2 for Welford's algorithm for variance calculation.
12858+
///
12859+
/// Read about [Welford's algorithm](https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Welford's_online_algorithm) for more information on the algorithm.
1283312860
pub squared_mean: f64,
1283412861
/// The start time of the histogram.
1283512862
pub start_time: ::chrono::DateTime<::chrono::offset::Utc>,
@@ -12967,6 +12994,9 @@ pub mod types {
1296712994
pub p90: Quantile,
1296812995
/// p99 Quantile
1296912996
pub p99: Quantile,
12997+
/// M2 for Welford's algorithm for variance calculation.
12998+
///
12999+
/// Read about [Welford's algorithm](https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Welford's_online_algorithm) for more information on the algorithm.
1297013000
pub squared_mean: f64,
1297113001
/// The start time of the histogram.
1297213002
pub start_time: ::chrono::DateTime<::chrono::offset::Utc>,
@@ -13104,6 +13134,9 @@ pub mod types {
1310413134
pub p90: Quantile,
1310513135
/// p99 Quantile
1310613136
pub p99: Quantile,
13137+
/// M2 for Welford's algorithm for variance calculation.
13138+
///
13139+
/// Read about [Welford's algorithm](https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Welford's_online_algorithm) for more information on the algorithm.
1310713140
pub squared_mean: f64,
1310813141
/// The start time of the histogram.
1310913142
pub start_time: ::chrono::DateTime<::chrono::offset::Utc>,
@@ -13241,6 +13274,9 @@ pub mod types {
1324113274
pub p90: Quantile,
1324213275
/// p99 Quantile
1324313276
pub p99: Quantile,
13277+
/// M2 for Welford's algorithm for variance calculation.
13278+
///
13279+
/// Read about [Welford's algorithm](https://en.wikipedia.org/wiki/Algorithms_for_calculating_variance#Welford's_online_algorithm) for more information on the algorithm.
1324413280
pub squared_mean: f64,
1324513281
/// The start time of the histogram.
1324613282
pub start_time: ::chrono::DateTime<::chrono::offset::Utc>,
@@ -17758,7 +17794,9 @@ pub mod types {
1775817794
:: serde :: Deserialize, :: serde :: Serialize, Clone, Debug, schemars :: JsonSchema,
1775917795
)]
1776017796
pub struct IpPoolUtilization {
17797+
/// The total number of addresses in the pool.
1776117798
pub capacity: f64,
17799+
/// The number of remaining addresses in the pool.
1776217800
pub remaining: f64,
1776317801
}
1776417802

@@ -23506,6 +23544,7 @@ pub mod types {
2350623544
/// This does deviate from the paper, but it's a more useful
2350723545
/// representation that works according to the paper's algorithm.
2350823546
pub marker_positions: [u64; 5usize],
23547+
/// The p value for the quantile.
2350923548
pub p: f64,
2351023549
}
2351123550

@@ -28725,7 +28764,9 @@ pub mod types {
2872528764
:: serde :: Deserialize, :: serde :: Serialize, Clone, Debug, schemars :: JsonSchema,
2872628765
)]
2872728766
pub struct SubnetPoolUtilization {
28767+
/// The total number of addresses in the pool.
2872828768
pub capacity: f64,
28769+
/// The number of remaining addresses in the pool.
2872928770
pub remaining: f64,
2873028771
}
2873128772

@@ -65693,14 +65734,6 @@ pub mod types {
6569365734
V
6569465735
}
6569565736

65696-
pub(super) fn default_nzu64<T, const V: u64>() -> T
65697-
where
65698-
T: ::std::convert::TryFrom<::std::num::NonZeroU64>,
65699-
<T as ::std::convert::TryFrom<::std::num::NonZeroU64>>::Error: ::std::fmt::Debug,
65700-
{
65701-
T::try_from(::std::num::NonZeroU64::try_from(V).unwrap()).unwrap()
65702-
}
65703-
6570465737
pub(super) fn address_allocator_auto_pool_selector() -> super::PoolSelector {
6570565738
super::PoolSelector::Auto {
6570665739
ip_version: ::std::option::Option::None,

‎sdk/src/lib.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ mod auth;
2222
mod clap_feature;
2323
#[cfg(feature = "extras")]
2424
pub mod extras;
25-
#[allow(unused)]
2625
mod generated_sdk;
2726

2827
pub use auth::*;

0 commit comments

Comments
 (0)