From 9d5ffa4888ee237c3dd4acfdefff41a273774de9 Mon Sep 17 00:00:00 2001 From: "Adam H. Leventhal" Date: Mon, 4 Nov 2024 16:05:06 -0800 Subject: [PATCH] update progenitor --- Cargo.lock | 26 +-- sdk/src/generated_sdk.rs | 419 +++++++++++++++++++++++++++++++-------- 2 files changed, 352 insertions(+), 93 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 15390f03..04f5567b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -508,9 +508,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" +checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" [[package]] name = "camino" @@ -2076,7 +2076,7 @@ version = "5.0.0-rc.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23d385da3c602d29036d2f70beed71c36604df7570be17fed4c5b839616785bf" dependencies = [ - "base64 0.22.1", + "base64 0.21.7", "chrono", "getrandom", "http 1.1.0", @@ -2508,9 +2508,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.87" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] @@ -2518,7 +2518,7 @@ dependencies = [ [[package]] name = "progenitor" version = "0.8.0" -source = "git+https://github.com/oxidecomputer/progenitor#2f32cdefc28f4b0eb6b3fc53f6f32aaed24d755a" +source = "git+https://github.com/oxidecomputer/progenitor#e01a371d704c0946ff94f71f03ce6dc58e4ad730" dependencies = [ "progenitor-client 0.8.0 (git+https://github.com/oxidecomputer/progenitor)", "progenitor-impl", @@ -2543,7 +2543,7 @@ dependencies = [ [[package]] name = "progenitor-client" version = "0.8.0" -source = "git+https://github.com/oxidecomputer/progenitor#2f32cdefc28f4b0eb6b3fc53f6f32aaed24d755a" +source = "git+https://github.com/oxidecomputer/progenitor#e01a371d704c0946ff94f71f03ce6dc58e4ad730" dependencies = [ "bytes", "futures-core", @@ -2557,7 +2557,7 @@ dependencies = [ [[package]] name = "progenitor-impl" version = "0.8.0" -source = "git+https://github.com/oxidecomputer/progenitor#2f32cdefc28f4b0eb6b3fc53f6f32aaed24d755a" +source = "git+https://github.com/oxidecomputer/progenitor#e01a371d704c0946ff94f71f03ce6dc58e4ad730" dependencies = [ "heck", "http 1.1.0", @@ -2578,7 +2578,7 @@ dependencies = [ [[package]] name = "progenitor-macro" version = "0.8.0" -source = "git+https://github.com/oxidecomputer/progenitor#2f32cdefc28f4b0eb6b3fc53f6f32aaed24d755a" +source = "git+https://github.com/oxidecomputer/progenitor#e01a371d704c0946ff94f71f03ce6dc58e4ad730" dependencies = [ "openapiv3", "proc-macro2", @@ -3856,7 +3856,7 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typify" version = "0.2.0" -source = "git+https://github.com/oxidecomputer/typify#906c1dad154320958805dd57fa75ba9d954e634b" +source = "git+https://github.com/oxidecomputer/typify#412438f7f8c683ff3c2f19160fb67b856be562bf" dependencies = [ "typify-impl", "typify-macro", @@ -3865,7 +3865,7 @@ dependencies = [ [[package]] name = "typify-impl" version = "0.2.0" -source = "git+https://github.com/oxidecomputer/typify#906c1dad154320958805dd57fa75ba9d954e634b" +source = "git+https://github.com/oxidecomputer/typify#412438f7f8c683ff3c2f19160fb67b856be562bf" dependencies = [ "heck", "log", @@ -3884,7 +3884,7 @@ dependencies = [ [[package]] name = "typify-macro" version = "0.2.0" -source = "git+https://github.com/oxidecomputer/typify#906c1dad154320958805dd57fa75ba9d954e634b" +source = "git+https://github.com/oxidecomputer/typify#412438f7f8c683ff3c2f19160fb67b856be562bf" dependencies = [ "proc-macro2", "quote", @@ -4187,7 +4187,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] diff --git a/sdk/src/generated_sdk.rs b/sdk/src/generated_sdk.rs index 5d3332c9..48ef6cdf 100644 --- a/sdk/src/generated_sdk.rs +++ b/sdk/src/generated_sdk.rs @@ -1915,9 +1915,16 @@ pub mod types { /// "vrf": { /// "description": "Optional virtual routing and forwarding identifier /// for this BGP configuration.", - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/Name" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/Name" + /// } + /// ] /// } /// ] /// } @@ -6959,23 +6966,44 @@ pub mod types { /// "format": "double" /// }, /// "p50": { - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/Quantile" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/Quantile" + /// } + /// ] /// } /// ] /// }, /// "p90": { - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/Quantile" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/Quantile" + /// } + /// ] /// } /// ] /// }, /// "p99": { - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/Quantile" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/Quantile" + /// } + /// ] /// } /// ] /// }, @@ -7077,23 +7105,44 @@ pub mod types { /// "format": "int64" /// }, /// "p50": { - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/Quantile" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/Quantile" + /// } + /// ] /// } /// ] /// }, /// "p90": { - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/Quantile" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/Quantile" + /// } + /// ] /// } /// ] /// }, /// "p99": { - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/Quantile" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/Quantile" + /// } + /// ] /// } /// ] /// }, @@ -7154,9 +7203,16 @@ pub mod types { /// "pool": { /// "description": "Name or ID of the IP pool used to allocate an /// address", - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/NameOrId" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/NameOrId" + /// } + /// ] /// } /// ] /// } @@ -7403,9 +7459,16 @@ pub mod types { /// ], /// "properties": { /// "pool": { - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/NameOrId" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/NameOrId" + /// } + /// ] /// } /// ] /// }, @@ -8155,9 +8218,16 @@ pub mod types { /// with the given name during finalization. If not specified, a snapshot /// for the disk will _not_ be created. A snapshot can be manually created /// once the disk transitions into the `Detached` state.", - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/Name" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/Name" + /// } + /// ] /// } /// ] /// } @@ -8591,9 +8661,16 @@ pub mod types { /// "pool": { /// "description": "The parent IP pool that a floating IP is pulled /// from. If unset, the default pool is selected.", - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/NameOrId" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/NameOrId" + /// } + /// ] /// } /// ] /// } @@ -8779,9 +8856,16 @@ pub mod types { /// ] /// }, /// "name": { - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/Name" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/Name" + /// } + /// ] /// } /// ] /// } @@ -10939,9 +11023,16 @@ pub mod types { /// }, /// "digest": { /// "description": "Hash of the image contents, if applicable", - /// "allOf": [ + /// "oneOf": [ + /// { + /// "type": "null" + /// }, /// { - /// "$ref": "#/components/schemas/Digest" + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/Digest" + /// } + /// ] /// } /// ] /// }, @@ -11404,9 +11495,16 @@ pub mod types { /// which may or may not allow it to be restarted. The /// `auto_restart_enabled` field indicates whether the instance will be /// automatically restarted.", - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/InstanceAutoRestartPolicy" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/InstanceAutoRestartPolicy" + /// } + /// ] /// } /// ] /// }, @@ -11770,9 +11868,16 @@ pub mod types { /// indicates whether the instance should be automatically restarted by the /// control plane on failure. If this is `null`, no auto-restart policy has /// been configured for this instance by the user.", - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/InstanceAutoRestartPolicy" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/InstanceAutoRestartPolicy" + /// } + /// ] /// } /// ] /// }, @@ -11789,9 +11894,16 @@ pub mod types { /// may result in an instance that only boots to the EFI shell until the /// desired disk is set as an explicit boot disk and the instance /// rebooted.", - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/InstanceDiskAttachment" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/InstanceDiskAttachment" + /// } + /// ] /// } /// ] /// }, @@ -12482,9 +12594,16 @@ pub mod types { /// ] /// }, /// "name": { - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/Name" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/Name" + /// } + /// ] /// } /// ] /// }, @@ -12885,9 +13004,16 @@ pub mod types { /// "auto_restart_policy": { /// "description": "The auto-restart policy for this instance.\n\nIf /// not provided, unset the instance's auto-restart policy.", - /// "allOf": [ + /// "oneOf": [ + /// { + /// "type": "null" + /// }, /// { - /// "$ref": "#/components/schemas/InstanceAutoRestartPolicy" + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/InstanceAutoRestartPolicy" + /// } + /// ] /// } /// ] /// }, @@ -12895,9 +13021,16 @@ pub mod types { /// "description": "Name or ID of the disk the instance should be /// instructed to boot from.\n\nIf not provided, unset the instance's boot /// disk.", - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/NameOrId" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/NameOrId" + /// } + /// ] /// } /// ] /// } @@ -14119,9 +14252,16 @@ pub mod types { /// ] /// }, /// "name": { - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/Name" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/Name" + /// } + /// ] /// } /// ] /// } @@ -15234,9 +15374,16 @@ pub mod types { /// }, /// "management_ip": { /// "description": "The LLDP management IP TLV.", - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/IpNet" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/IpNet" + /// } + /// ] /// } /// ] /// }, @@ -17543,9 +17690,16 @@ pub mod types { /// "type": "string" /// }, /// "ip_pool": { - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/NameOrId" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/NameOrId" + /// } + /// ] /// } /// ] /// }, @@ -18226,9 +18380,16 @@ pub mod types { /// ] /// }, /// "name": { - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/Name" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/Name" + /// } + /// ] /// } /// ] /// } @@ -19498,9 +19659,16 @@ pub mod types { /// ] /// }, /// "name": { - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/Name" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/Name" + /// } + /// ] /// } /// ] /// }, @@ -19739,9 +19907,16 @@ pub mod types { /// }, /// "signing_keypair": { /// "description": "request signing key pair", - /// "allOf": [ + /// "oneOf": [ + /// { + /// "type": "null" + /// }, /// { - /// "$ref": "#/components/schemas/DerEncodedKeyPair" + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/DerEncodedKeyPair" + /// } + /// ] /// } /// ] /// }, @@ -20595,18 +20770,32 @@ pub mod types { /// "memory": { /// "description": "The amount of RAM (in bytes) available for running /// instances in the Silo", - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/ByteCount" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/ByteCount" + /// } + /// ] /// } /// ] /// }, /// "storage": { /// "description": "The amount of storage (in bytes) available for /// disks or snapshots", - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/ByteCount" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/ByteCount" + /// } + /// ] /// } /// ] /// } @@ -25719,9 +25908,16 @@ pub mod types { /// "values": { /// "type": "array", /// "items": { - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/Distributionint64" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/Distributionint64" + /// } + /// ] /// } /// ] /// } @@ -25744,9 +25940,16 @@ pub mod types { /// "values": { /// "type": "array", /// "items": { - /// "allOf": [ + /// "oneOf": [ + /// { + /// "type": "null" + /// }, /// { - /// "$ref": "#/components/schemas/Distributiondouble" + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/Distributiondouble" + /// } + /// ] /// } /// ] /// } @@ -25771,9 +25974,9 @@ pub mod types { #[serde(rename = "string")] String(Vec>), #[serde(rename = "integer_distribution")] - IntegerDistribution(Vec), + IntegerDistribution(Vec>), #[serde(rename = "double_distribution")] - DoubleDistribution(Vec), + DoubleDistribution(Vec>), } impl From<&ValueArray> for ValueArray { @@ -25806,14 +26009,14 @@ pub mod types { } } - impl From> for ValueArray { - fn from(value: Vec) -> Self { + impl From>> for ValueArray { + fn from(value: Vec>) -> Self { Self::IntegerDistribution(value) } } - impl From> for ValueArray { - fn from(value: Vec) -> Self { + impl From>> for ValueArray { + fn from(value: Vec>) -> Self { Self::DoubleDistribution(value) } } @@ -26157,9 +26360,16 @@ pub mod types { /// created from this VPC must be taken from this range, which should be a /// Unique Local Address in the range `fd00::/48`. The default VPC Subnet /// will have the first `/64` range from this prefix.", - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/Ipv6Net" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/Ipv6Net" + /// } + /// ] /// } /// ] /// }, @@ -27623,9 +27833,16 @@ pub mod types { /// ] /// }, /// "name": { - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/Name" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/Name" + /// } + /// ] /// } /// ] /// } @@ -27797,9 +28014,16 @@ pub mod types { /// apply in addition to the VPC-wide *system* router, and have higher /// priority than the system router for an otherwise equal-prefix-length /// match.", - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/NameOrId" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/NameOrId" + /// } + /// ] /// } /// ] /// }, @@ -27822,9 +28046,16 @@ pub mod types { /// prefix equal to the parent VPC's prefix. A random `/64` block will be /// assigned if one is not provided. It must not overlap with any existing /// subnet in the VPC.", - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/Ipv6Net" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/Ipv6Net" + /// } + /// ] /// } /// ] /// }, @@ -27942,9 +28173,16 @@ pub mod types { /// "custom_router": { /// "description": "An optional router, used to direct packets sent /// from hosts in this subnet to any destination address.", - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/NameOrId" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/NameOrId" + /// } + /// ] /// } /// ] /// }, @@ -27955,9 +28193,16 @@ pub mod types { /// ] /// }, /// "name": { - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/Name" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/Name" + /// } + /// ] /// } /// ] /// } @@ -28007,16 +28252,30 @@ pub mod types { /// ] /// }, /// "dns_name": { - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/Name" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/Name" + /// } + /// ] /// } /// ] /// }, /// "name": { - /// "allOf": [ + /// "oneOf": [ /// { - /// "$ref": "#/components/schemas/Name" + /// "type": "null" + /// }, + /// { + /// "allOf": [ + /// { + /// "$ref": "#/components/schemas/Name" + /// } + /// ] /// } /// ] /// }