From c69ee3822d971b96a553efe9150f19d87e79beb3 Mon Sep 17 00:00:00 2001
From: Ryan Goodfellow <ryan.goodfellow@oxide.computer>
Date: Thu, 23 Nov 2023 13:59:09 -0800
Subject: [PATCH] from-image: disk_size -> size to match API (#443)

---
 Cargo.lock              | 6 +++---
 cli/docs/cli.json       | 8 ++++----
 cli/src/cmd_instance.rs | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ad41d527..f4c65555 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -656,9 +656,9 @@ dependencies = [
 
 [[package]]
 name = "curl-sys"
-version = "0.4.65+curl-8.2.1"
+version = "0.4.68+curl-8.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "961ba061c9ef2fe34bbd12b807152d96f0badd2bebe7b90ce6c8c8b7572a0986"
+checksum = "b4a0d18d88360e374b16b2273c832b5e57258ffc1d4aa4f96b108e0738d5752f"
 dependencies = [
  "cc",
  "libc",
@@ -667,7 +667,7 @@ dependencies = [
  "openssl-sys",
  "pkg-config",
  "vcpkg",
- "winapi",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
diff --git a/cli/docs/cli.json b/cli/docs/cli.json
index 68e75b8e..d8f42120 100644
--- a/cli/docs/cli.json
+++ b/cli/docs/cli.json
@@ -909,10 +909,6 @@
               "long": "description",
               "help": "Description of the instance to create"
             },
-            {
-              "long": "disk-size",
-              "help": "Boot disk size e.g. 512G. Suffix can be k,m,g,t"
-            },
             {
               "long": "hostname",
               "help": "Hostname of the instance to create"
@@ -937,6 +933,10 @@
               "long": "project",
               "help": "Project for image and instance"
             },
+            {
+              "long": "size",
+              "help": "Boot disk size e.g. 512G. Suffix can be k,m,g,t"
+            },
             {
               "long": "start",
               "help": "Start the instance immediately"
diff --git a/cli/src/cmd_instance.rs b/cli/src/cmd_instance.rs
index 511dcd63..caa18f79 100644
--- a/cli/src/cmd_instance.rs
+++ b/cli/src/cmd_instance.rs
@@ -233,7 +233,7 @@ pub struct CmdInstanceFromImage {
 
     /// Boot disk size e.g. 512G. Suffix can be k,m,g,t
     #[clap(long)]
-    disk_size: ByteCount,
+    size: ByteCount,
 
     /// Start the instance immediately
     #[clap(long)]
@@ -266,7 +266,7 @@ impl RunnableCmd for CmdInstanceFromImage {
                         name: format!("{}-disk", *self.name)
                             .parse()
                             .expect("valid disk name"),
-                        size: self.disk_size.clone(),
+                        size: self.size.clone(),
                     }])
                     .external_ips(vec![ExternalIpCreate::Ephemeral { pool_name: None }])
                     .hostname(self.hostname.clone())