Accept fractional units as input to --compute-size and `--storage-s…

…ize` (#1206)

Also, recognize that `units_default` can be `null`.

src/cloud/ops.rs

@@ -102,8 +102,8 @@ pub struct Version {
 pub struct Price {
     pub billable: String,
     pub unit_price_cents: String,
-    pub units_bundled: String,
-    pub units_default: String,
+    pub units_bundled: Option<String>,
+    pub units_default: Option<String>,
 }
 
 pub type Prices = HashMap<CloudTier, HashMap<String, Vec<Price>>>;

src/portable/create.rs

@@ -257,20 +257,25 @@ fn create_cloud(
         .context(format!("could not download pricing information for the {} region", region))?;
     let default_compute = region_prices.into_iter()
         .find(|&price| price.billable == "compute")
-        .context("could not download pricing information for compute")?;
+        .context("could not download pricing information for compute")?
+        .units_default.clone()
+        .context("could not find default value for compute")?;
+
     let default_storage = region_prices.into_iter()
         .find(|&price| price.billable == "storage")
-        .context("could not download pricing information for compute")?;
+        .context("could not download pricing information for storage")?
+        .units_default.clone()
+        .context("could not find default value for storage")?;
 
     let mut req_resources: Vec<cloud::ops::CloudInstanceResourceRequest> = vec![];
 
     let compute_size_v = match compute_size {
-        None => default_compute.units_default.clone(),
+        None => default_compute,
         Some(v) => v.clone(),
     };
 
     let storage_size_v = match storage_size {
-        None => default_storage.units_default.clone(),
+        None => default_storage,
         Some(v) => v.clone(),
     };
 

src/portable/options.rs

@@ -147,11 +147,21 @@ pub enum InstanceName {
 }
 
 fn billable_unit(s: &str) -> Result<String, String> {
-    let unit: usize = s
+    let (numerator, denominator) = match s.split_once("/") {
+        Some(v) => v,
+        None => (s, "1"),
+    };
+
+    let n: u64 = numerator
+        .parse()
+        .map_err(|_| format!("`{s}` is not a positive number or valid fraction"))?;
+
+    let d: u64 = denominator
         .parse()
-        .map_err(|_| format!("`{s}` is not a positive number"))?;
-    if unit <= 0 {
-        Err(String::from("`{s}` is not a positive number"))
+        .map_err(|_| format!("`{s}` is not a positive number or valid fraction"))?;
+
+    if n <= 0 || d <= 0 {
+        Err(String::from("`{s}` is not a positive number or valid fraction"))
     } else {
         Ok(s.to_string())
     }

src/portable/resize.rs

@@ -97,13 +97,15 @@ fn resize_cloud_cmd(
                     compute_size = Some(region_prices.into_iter()
                         .find(|&price| price.billable == "compute")
                         .context("could not download pricing information for compute")?
-                        .units_default.clone());
+                        .units_default.clone()
+                        .context("could not find default value for compute")?);
                 }
                 if storage_size.is_none() {
                     storage_size = Some(region_prices.into_iter()
                         .find(|&price| price.billable == "storage")
-                        .context("could not download pricing information for compute")?
-                        .units_default.clone());
+                        .context("could not download pricing information for storage")?
+                        .units_default.clone()
+                        .context("could not find default value for storage")?);
                 }
             }
         }