helper to avoid instance update mistakes

Author: david-crespo

app/api/util.ts

@@ -15,6 +15,7 @@ import type {
   DiskState,
   Instance,
   InstanceState,
+  InstanceUpdate,
   Measurement,
   SiloUtilization,
   Sled,
@@ -281,3 +282,5 @@ export function synthesizeData(
 }
 
 export const OXQL_GROUP_BY_ERROR = 'Input tables to a `group_by` must be aligned'
+
+export const instanceUpdateBody = (body: Required<InstanceUpdate>): InstanceUpdate => body

app/pages/project/instances/AutoRestartCard.tsx

@@ -17,6 +17,7 @@ import {
   useApiMutation,
   usePrefetchedApiQuery,
 } from '~/api'
+import { instanceUpdateBody } from '~/api/util'
 import { ListboxField } from '~/components/form/fields/ListboxField'
 import { useInstanceSelector } from '~/hooks/use-params'
 import { addToast } from '~/stores/toast'
@@ -75,18 +76,18 @@ export function AutoRestartCard() {
     instanceUpdate.mutate({
       path: { instance: instanceSelector.instance },
       query: { project: instanceSelector.project },
-      body: {
+      body: instanceUpdateBody({
         autoRestartPolicy: match(values.autoRestartPolicy)
-          .with('default', () => undefined)
+          .with('default', () => null)
           .with('never', () => 'never' as const)
           .with('best_effort', () => 'best_effort' as const)
           .exhaustive(),
         ncpus: instance.ncpus,
         memory: instance.memory,
         // optional ones would be unset if we left them out
-        cpuPlatform: instance.cpuPlatform,
-        bootDisk: instance.bootDiskId,
-      },
+        cpuPlatform: instance.cpuPlatform || null,
+        bootDisk: instance.bootDiskId || null,
+      }),
     })
   })
 

app/pages/project/instances/InstancePage.tsx

@@ -26,6 +26,7 @@ import {
   instanceAutoRestartingSoon,
   instanceCan,
   instanceTransitioning,
+  instanceUpdateBody,
 } from '~/api/util'
 import { CopyIdItem } from '~/components/CopyIdItem'
 import { ExternalIps } from '~/components/ExternalIps'
@@ -341,14 +342,14 @@ export function ResizeInstanceModal({
     instanceUpdate.mutate({
       path: { instance: instance.name },
       query: { project },
-      body: {
+      body: instanceUpdateBody({
         ncpus,
         memory: memory * GiB,
         // these need to be passed in or they'll be unset
-        bootDisk: instance.bootDiskId,
-        cpuPlatform: instance.cpuPlatform,
-        autoRestartPolicy: instance.autoRestartPolicy,
-      },
+        bootDisk: instance.bootDiskId || null,
+        cpuPlatform: instance.cpuPlatform || null,
+        autoRestartPolicy: instance.autoRestartPolicy || null,
+      }),
     })
   })
   const formId = useId()

app/pages/project/instances/StorageTab.tsx

@@ -23,6 +23,7 @@ import {
 } from '@oxide/api'
 import { Storage24Icon } from '@oxide/design-system/icons/react'
 
+import { instanceUpdateBody } from '~/api/util'
 import { HL } from '~/components/HL'
 import { DiskStateBadge } from '~/components/StateBadge'
 import { AttachDiskModalForm } from '~/forms/disk-attach'
@@ -163,14 +164,14 @@ export default function StorageTab() {
             doAction: () =>
               instanceUpdate({
                 path: { instance: instance.id },
-                body: {
-                  bootDisk: undefined,
+                body: instanceUpdateBody({
+                  bootDisk: null,
                   ncpus: instance.ncpus,
                   memory: instance.memory,
                   // optional ones would be unset if we left them out
-                  autoRestartPolicy: instance.autoRestartPolicy,
-                  cpuPlatform: instance.cpuPlatform,
-                },
+                  autoRestartPolicy: instance.autoRestartPolicy || null,
+                  cpuPlatform: instance.cpuPlatform || null,
+                }),
               }),
             errorTitle: 'Could not unset boot disk',
             modalTitle: 'Confirm unset boot disk',
@@ -229,14 +230,14 @@ export default function StorageTab() {
             doAction: () =>
               instanceUpdate({
                 path: { instance: instance.id },
-                body: {
+                body: instanceUpdateBody({
                   bootDisk: disk.id,
                   ncpus: instance.ncpus,
                   memory: instance.memory,
                   // optional ones would be unset if we left them out
-                  autoRestartPolicy: instance.autoRestartPolicy,
-                  cpuPlatform: instance.cpuPlatform,
-                },
+                  autoRestartPolicy: instance.autoRestartPolicy || null,
+                  cpuPlatform: instance.cpuPlatform || null,
+                }),
               }),
             errorTitle: `Could not ${verb} boot disk`,
             modalTitle: `Confirm ${verb} boot disk`,

mock-api/msw/handlers.ts

@@ -643,6 +643,7 @@ export const handlers = makeHandlers({
 
     // Undefined or missing is meaningful: it unsets the value
     instance.auto_restart_policy = body.auto_restart_policy
+    instance.cpu_platform = body.cpu_platform
 
     // We depart here from nexus in that nexus does both of the following
     // calculations at view time (when converting model to view). We can't