Bump dependencies, progenitor to e507f30e, oxide.json to omicron:2dcf…

…8962 (#872)
oxidecomputer · Oct 8, 2024 · a64dbfe · a64dbfe
1 parent 63f83be
commit a64dbfe
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 41 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/docs/cli.json b/cli/docs/cli.json
@@ -2190,7 +2190,7 @@
           "subcommands": [
             {
               "name": "create",
-              "about": "Attach IP pool to internet gateway",
+              "about": "Attach IP address to internet gateway",
               "args": [
                 {
                   "long": "address"
@@ -2199,7 +2199,8 @@
                   "long": "description"
                 },
                 {
-                  "long": "gateway"
+                  "long": "gateway",
+                  "help": "Name or ID of the internet gateway"
                 },
                 {
                   "long": "json-body",
@@ -2229,7 +2230,7 @@
             },
             {
               "name": "delete",
-              "about": "Detach IP pool from internet gateway",
+              "about": "Detach IP address from internet gateway",
               "args": [
                 {
                   "long": "address",

diff --git a/cli/src/generated_cli.rs b/cli/src/generated_cli.rs
@@ -2069,7 +2069,8 @@ impl<T: CliConfig> Cli<T> {
                 clap::Arg::new("gateway")
                     .long("gateway")
                     .value_parser(clap::value_parser!(types::NameOrId))
-                    .required_unless_present("json-body"),
+                    .required(true)
+                    .help("Name or ID of the internet gateway"),
             )
             .arg(
                 clap::Arg::new("name")
@@ -2109,7 +2110,7 @@ impl<T: CliConfig> Cli<T> {
                     .action(clap::ArgAction::SetTrue)
                     .help("XXX"),
             )
-            .about("Attach IP pool to internet gateway")
+            .about("Attach IP address to internet gateway")
     }
 
     pub fn cli_internet_gateway_ip_address_delete() -> clap::Command {
@@ -2153,7 +2154,7 @@ impl<T: CliConfig> Cli<T> {
                         "Name or ID of the VPC, only required if `gateway` is provided as a `Name`",
                     ),
             )
-            .about("Detach IP pool from internet gateway")
+            .about("Detach IP address from internet gateway")
     }
 
     pub fn cli_internet_gateway_ip_pool_list() -> clap::Command {
@@ -8753,7 +8754,7 @@ impl<T: CliConfig> Cli<T> {
         }
 
         if let Some(value) = matches.get_one::<types::NameOrId>("gateway") {
-            request = request.body_map(|body| body.gateway(value.clone()))
+            request = request.gateway(value.clone());
         }
 
         if let Some(value) = matches.get_one::<types::Name>("name") {

diff --git a/oxide.json b/oxide.json
@@ -2764,7 +2764,7 @@
         "tags": [
           "vpcs"
         ],
-        "summary": "Attach IP pool to internet gateway",
+        "summary": "Attach IP address to internet gateway",
         "operationId": "internet_gateway_ip_address_create",
         "parameters": [
           {
@@ -2828,7 +2828,7 @@
         "tags": [
           "vpcs"
         ],
-        "summary": "Detach IP pool from internet gateway",
+        "summary": "Detach IP address from internet gateway",
         "operationId": "internet_gateway_ip_address_delete",
         "parameters": [
           {
@@ -16619,17 +16619,13 @@
           "description": {
             "type": "string"
           },
-          "gateway": {
-            "$ref": "#/components/schemas/NameOrId"
-          },
           "name": {
             "$ref": "#/components/schemas/Name"
           }
         },
         "required": [
           "address",
           "description",
-          "gateway",
           "name"
         ]
       },

diff --git a/sdk/src/generated_sdk.rs b/sdk/src/generated_sdk.rs
@@ -13168,7 +13168,6 @@ pub mod types {
     ///  "required": [
     ///    "address",
     ///    "description",
-    ///    "gateway",
     ///    "name"
     ///  ],
     ///  "properties": {
@@ -13179,9 +13178,6 @@ pub mod types {
     ///    "description": {
     ///      "type": "string"
     ///    },
-    ///    "gateway": {
-    ///      "$ref": "#/components/schemas/NameOrId"
-    ///    },
     ///    "name": {
     ///      "$ref": "#/components/schemas/Name"
     ///    }
@@ -13195,7 +13191,6 @@ pub mod types {
     pub struct InternetGatewayIpAddressCreate {
         pub address: std::net::IpAddr,
         pub description: String,
-        pub gateway: NameOrId,
         pub name: Name,
     }
 
@@ -37121,7 +37116,6 @@ pub mod types {
         pub struct InternetGatewayIpAddressCreate {
             address: Result<std::net::IpAddr, String>,
             description: Result<String, String>,
-            gateway: Result<super::NameOrId, String>,
             name: Result<super::Name, String>,
         }
 
@@ -37130,7 +37124,6 @@ pub mod types {
                 Self {
                     address: Err("no value supplied for address".to_string()),
                     description: Err("no value supplied for description".to_string()),
-                    gateway: Err("no value supplied for gateway".to_string()),
                     name: Err("no value supplied for name".to_string()),
                 }
             }
@@ -37157,16 +37150,6 @@ pub mod types {
                     .map_err(|e| format!("error converting supplied value for description: {}", e));
                 self
             }
-            pub fn gateway<T>(mut self, value: T) -> Self
-            where
-                T: std::convert::TryInto<super::NameOrId>,
-                T::Error: std::fmt::Display,
-            {
-                self.gateway = value
-                    .try_into()
-                    .map_err(|e| format!("error converting supplied value for gateway: {}", e));
-                self
-            }
             pub fn name<T>(mut self, value: T) -> Self
             where
                 T: std::convert::TryInto<super::Name>,
@@ -37189,7 +37172,6 @@ pub mod types {
                 Ok(Self {
                     address: value.address?,
                     description: value.description?,
-                    gateway: value.gateway?,
                     name: value.name?,
                 })
             }
@@ -37200,7 +37182,6 @@ pub mod types {
                 Self {
                     address: Ok(value.address),
                     description: Ok(value.description),
-                    gateway: Ok(value.gateway),
                     name: Ok(value.name),
                 }
             }
@@ -52377,7 +52358,7 @@ pub trait ClientVpcsExt {
     ///    .await;
     /// ```
     fn internet_gateway_ip_address_list(&self) -> builder::InternetGatewayIpAddressList;
-    /// Attach IP pool to internet gateway
+    /// Attach IP address to internet gateway
     ///
     /// Sends a `POST` request to `/v1/internet-gateway-ip-addresses`
     ///
@@ -52398,7 +52379,7 @@ pub trait ClientVpcsExt {
     ///    .await;
     /// ```
     fn internet_gateway_ip_address_create(&self) -> builder::InternetGatewayIpAddressCreate;
-    /// Detach IP pool from internet gateway
+    /// Detach IP address from internet gateway
     ///
     /// Sends a `DELETE` request to
     /// `/v1/internet-gateway-ip-addresses/{address}`