nearest10 -> diskSizeNearest10

Author: david-crespo

app/components/form/fields/ImageSelectField.tsx

@@ -12,7 +12,7 @@ import type { Image } from '@oxide/api'
 import type { InstanceCreateInput } from '~/forms/instance-create'
 import type { ComboboxItem } from '~/ui/lib/Combobox'
 import { Slash } from '~/ui/lib/Slash'
-import { nearest10 } from '~/util/math'
+import { diskSizeNearest10 } from '~/util/math'
 import { bytesToGiB, GiB } from '~/util/units'
 
 import { ComboboxField } from './ComboboxField'
@@ -50,7 +50,7 @@ export function BootDiskImageSelectField({
         if (!image) return
         const imageSizeGiB = image.size / GiB
         if (diskSizeField.value < imageSizeGiB) {
-          diskSizeField.onChange(nearest10(imageSizeGiB))
+          diskSizeField.onChange(diskSizeNearest10(imageSizeGiB))
         }
       }}
     />

app/forms/disk-create.tsx

@@ -37,7 +37,7 @@ import { Radio } from '~/ui/lib/Radio'
 import { RadioGroup } from '~/ui/lib/RadioGroup'
 import { Slash } from '~/ui/lib/Slash'
 import { toLocaleDateString } from '~/util/date'
-import { roundUpDiskSize } from '~/util/math'
+import { diskSizeNearest10 } from '~/util/math'
 import { bytesToGiB, GiB } from '~/util/units'
 
 const blankDiskSource: DiskSource = {
@@ -228,7 +228,7 @@ const DiskSourceField = ({
               const image = images.find((i) => i.id === id)! // if it's selected, it must be present
               const imageSizeGiB = image.size / GiB
               if (diskSizeField.value < imageSizeGiB) {
-                diskSizeField.onChange(roundUpDiskSize(imageSizeGiB))
+                diskSizeField.onChange(diskSizeNearest10(imageSizeGiB))
               }
             }}
           />
@@ -288,7 +288,7 @@ const SnapshotSelectField = ({ control }: { control: Control<DiskCreate> }) => {
         const snapshot = snapshots.find((i) => i.id === id)! // if it's selected, it must be present
         const snapshotSizeGiB = snapshot.size / GiB
         if (diskSizeField.value < snapshotSizeGiB) {
-          diskSizeField.onChange(roundUpDiskSize(snapshotSizeGiB))
+          diskSizeField.onChange(diskSizeNearest10(snapshotSizeGiB))
         }
       }}
     />

app/forms/instance-create.tsx

@@ -78,7 +78,7 @@ import { TipIcon } from '~/ui/lib/TipIcon'
 import { ALL_ISH } from '~/util/consts'
 import { readBlobAsBase64 } from '~/util/file'
 import { docLinks, links } from '~/util/links'
-import { nearest10 } from '~/util/math'
+import { diskSizeNearest10 } from '~/util/math'
 import { pb } from '~/util/path-builder'
 import { GiB } from '~/util/units'
 
@@ -225,7 +225,7 @@ export function CreateInstanceForm() {
     ...baseDefaultValues,
     bootDiskSourceType: defaultSource,
     sshPublicKeys: allKeys,
-    bootDiskSize: nearest10(defaultImage?.size / GiB),
+    bootDiskSize: diskSizeNearest10(defaultImage?.size / GiB),
     externalIps: [{ type: 'ephemeral', pool: defaultPool }],
   }
 
@@ -474,7 +474,7 @@ export function CreateInstanceForm() {
           onValueChange={(val) => {
             setValue('bootDiskSourceType', val as BootDiskSourceType)
             if (imageSizeGiB && imageSizeGiB > bootDiskSize) {
-              setValue('bootDiskSize', nearest10(imageSizeGiB))
+              setValue('bootDiskSize', diskSizeNearest10(imageSizeGiB))
             }
           }}
         >

app/util/math.spec.ts

@@ -7,7 +7,7 @@
  */
 import { describe, expect, it } from 'vitest'
 
-import { displayBigNum, nearest10, percentage, round, splitDecimal } from './math'
+import { diskSizeNearest10, displayBigNum, percentage, round, splitDecimal } from './math'
 import { GiB } from './units'
 
 function roundTest() {
@@ -207,6 +207,9 @@ it.each([
   [109, 110],
   [110, 110],
   [111, 120],
-])('nearest10 %d → %d', (input, output) => {
-  expect(nearest10(input)).toEqual(output)
+  // clamped at max disk size
+  [1021, 1023],
+  [1023, 1023],
+])('diskSizeNearest10 %d → %d', (input, output) => {
+  expect(diskSizeNearest10(input)).toEqual(output)
 })

app/util/math.ts

@@ -95,17 +95,12 @@ export function displayBigNum(
   return [result, abbreviated]
 }
 
-/**
- * Gets the closest multiple of 10 larger than the passed-in number
- */
-export function nearest10(num: number): number {
-  return Math.ceil(num / 10) * 10
-}
-
 /**
  * Calculate disk size based on image or snapshot size. We round up to the
  * nearest 10, but also cap it at the max disk size so that, for example, a 1023
  * GiB image doesn't produce a 1030 GiB disk, which is not valid.
  */
-export const roundUpDiskSize = (imageSizeGiB: number) =>
-  Math.min(nearest10(imageSizeGiB), MAX_DISK_SIZE_GiB)
+export function diskSizeNearest10(imageSizeGiB: number) {
+  const nearest10 = Math.ceil(imageSizeGiB / 10) * 10
+  return Math.min(nearest10, MAX_DISK_SIZE_GiB)
+}