Instance CPU types (#2900)

* bump api for cpu types

* avoid unsetting optional fields in instance update

* helper to avoid instance update mistakes

* update API again for non-optional instance update keys

Author: david-crespo

OMICRON_VERSION

@@ -1 +1 @@
-1ee118395ed95450274fdde79f322b84c00e252e
+af4a78e9cfcfeda9cf99156744c0efb913a9c1f8

app/api/__generated__/Api.ts

@@ -76,14 +76,15 @@ export function AutoRestartCard() {
       path: { instance: instanceSelector.instance },
       query: { project: instanceSelector.project },
       body: {
-        ncpus: instance.ncpus,
-        memory: instance.memory,
-        bootDisk: instance.bootDiskId,
         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,
+        cpuPlatform: instance.cpuPlatform || null,
+        bootDisk: instance.bootDiskId || null,
       },
     })
   })

app/api/__generated__/OMICRON_VERSION

@@ -341,7 +341,13 @@ export function ResizeInstanceModal({
     instanceUpdate.mutate({
       path: { instance: instance.name },
       query: { project },
-      body: { ncpus, memory: memory * GiB, bootDisk: instance.bootDiskId },
+      body: {
+        ncpus,
+        memory: memory * GiB,
+        bootDisk: instance.bootDiskId || null,
+        cpuPlatform: instance.cpuPlatform || null,
+        autoRestartPolicy: instance.autoRestartPolicy || null,
+      },
     })
   })
   const formId = useId()

app/api/__generated__/validate.ts

@@ -164,11 +164,11 @@ export default function StorageTab() {
               instanceUpdate({
                 path: { instance: instance.id },
                 body: {
-                  bootDisk: undefined,
+                  bootDisk: null,
                   ncpus: instance.ncpus,
                   memory: instance.memory,
-                  // this would get unset if we left it out
-                  autoRestartPolicy: instance.autoRestartPolicy,
+                  autoRestartPolicy: instance.autoRestartPolicy || null,
+                  cpuPlatform: instance.cpuPlatform || null,
                 },
               }),
             errorTitle: 'Could not unset boot disk',
@@ -205,6 +205,7 @@ export default function StorageTab() {
       instance.autoRestartPolicy,
       instance.ncpus,
       instance.memory,
+      instance.cpuPlatform,
       getSnapshotAction,
     ]
   )
@@ -231,8 +232,8 @@ export default function StorageTab() {
                   bootDisk: disk.id,
                   ncpus: instance.ncpus,
                   memory: instance.memory,
-                  // this would get unset if we left it out
-                  autoRestartPolicy: instance.autoRestartPolicy,
+                  autoRestartPolicy: instance.autoRestartPolicy || null,
+                  cpuPlatform: instance.cpuPlatform || null,
                 },
               }),
             errorTitle: `Could not ${verb} boot disk`,
@@ -283,6 +284,7 @@ export default function StorageTab() {
       instance.autoRestartPolicy,
       instance.ncpus,
       instance.memory,
+      instance.cpuPlatform,
       getSnapshotAction,
       bootDisks,
     ]

app/pages/project/instances/AutoRestartCard.tsx

@@ -641,8 +641,9 @@ 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
 
     // 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
@@ -651,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)