update API again for non-optional instance update keys

Author: david-crespo

OMICRON_VERSION

@@ -1 +1 @@
-2d7479e297966b9fd486459d5865e8d958a78022
+af4a78e9cfcfeda9cf99156744c0efb913a9c1f8

app/api/__generated__/Api.ts

@@ -15,7 +15,6 @@ import type {
   DiskState,
   Instance,
   InstanceState,
-  InstanceUpdate,
   Measurement,
   SiloUtilization,
   Sled,
@@ -282,5 +281,3 @@ 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/api/__generated__/OMICRON_VERSION

@@ -17,7 +17,6 @@ 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'
@@ -76,18 +75,17 @@ export function AutoRestartCard() {
     instanceUpdate.mutate({
       path: { instance: instanceSelector.instance },
       query: { project: instanceSelector.project },
-      body: instanceUpdateBody({
+      body: {
         autoRestartPolicy: match(values.autoRestartPolicy)
           .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 || null,
         bootDisk: instance.bootDiskId || null,
-      }),
+      },
     })
   })
 

app/api/__generated__/validate.ts

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

app/api/util.ts

@@ -23,7 +23,6 @@ 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'
@@ -164,14 +163,13 @@ export default function StorageTab() {
             doAction: () =>
               instanceUpdate({
                 path: { instance: instance.id },
-                body: instanceUpdateBody({
+                body: {
                   bootDisk: null,
                   ncpus: instance.ncpus,
                   memory: instance.memory,
-                  // optional ones would be unset if we left them out
                   autoRestartPolicy: instance.autoRestartPolicy || null,
                   cpuPlatform: instance.cpuPlatform || null,
-                }),
+                },
               }),
             errorTitle: 'Could not unset boot disk',
             modalTitle: 'Confirm unset boot disk',
@@ -230,14 +228,13 @@ export default function StorageTab() {
             doAction: () =>
               instanceUpdate({
                 path: { instance: instance.id },
-                body: instanceUpdateBody({
+                body: {
                   bootDisk: disk.id,
                   ncpus: instance.ncpus,
                   memory: instance.memory,
-                  // optional ones would be unset if we left them out
                   autoRestartPolicy: instance.autoRestartPolicy || null,
                   cpuPlatform: instance.cpuPlatform || null,
-                }),
+                },
               }),
             errorTitle: `Could not ${verb} boot disk`,
             modalTitle: `Confirm ${verb} boot disk`,

app/pages/project/instances/AutoRestartCard.tsx

@@ -641,7 +641,7 @@ export const handlers = makeHandlers({
 
     // AUTO RESTART
 
-    // Undefined or missing is meaningful: it unsets the value
+    // null is meaningful: it unsets the value
     instance.auto_restart_policy = body.auto_restart_policy
     instance.cpu_platform = body.cpu_platform
 
@@ -652,7 +652,6 @@ export const handlers = makeHandlers({
 
     // https://github.com/oxidecomputer/omicron/blob/0c6ab099e/nexus/db-queries/src/db/datastore/instance.rs#L228-L239
     instance.auto_restart_enabled = match(instance.auto_restart_policy)
-      .with(undefined, () => true)
       .with(null, () => true)
       .with('best_effort', () => true)
       .with('never', () => false)