minor: max disks per instance = 12 (#2995)

* max disks per instance

* CLAUDE FIXED ANOTHER FLAKE

* turn on no floating promises lint for e2e tests

Author: david-crespo

.oxlintrc.json

@@ -69,6 +69,13 @@
       "rules": {
         "import/no-default-export": "off"
       }
+    },
+    {
+      // catch unawaited Playwright calls in e2e tests
+      "files": ["test/e2e/**/*.ts"],
+      "rules": {
+        "@typescript-eslint/no-floating-promises": "error"
+      }
     }
   ],
   "ignorePatterns": ["dist/", "node_modules/"]

app/api/util.ts

@@ -24,7 +24,10 @@ import type {
 
 // API limits encoded in https://github.com/oxidecomputer/omicron/blob/aec3cd8d/nexus/src/app/mod.rs
 
+// These are not actually used in app code, just the mock server. In the app we
+// can rely on API errors to communicate these limits.
 export const MAX_NICS_PER_INSTANCE = 8
+export const MAX_DISKS_PER_INSTANCE = 12
 
 export const INSTANCE_MAX_CPU = 64
 export const INSTANCE_MIN_RAM_GiB = 1

eslint.config.ts

@@ -161,5 +161,13 @@ export default defineConfig(
       ],
       'playwright/no-force-option': 'off',
     },
+  },
+
+  // Catch unawaited Playwright calls in e2e tests
+  {
+    files: ['test/e2e/**/*.ts'],
+    rules: {
+      '@typescript-eslint/no-floating-promises': 'error',
+    },
   }
 )

mock-api/msw/handlers.ts

@@ -18,6 +18,7 @@ import {
   INSTANCE_MAX_CPU,
   INSTANCE_MAX_RAM_GiB,
   INSTANCE_MIN_RAM_GiB,
+  MAX_DISKS_PER_INSTANCE,
   MAX_NICS_PER_INSTANCE,
   type AffinityGroupMember,
   type AntiAffinityGroupMember,
@@ -424,6 +425,10 @@ export const handlers = makeHandlers({
     if (body.disks) allDisks.push(...body.disks)
     if (body.boot_disk) allDisks.push(body.boot_disk)
 
+    if (allDisks.length > MAX_DISKS_PER_INSTANCE) {
+      throw `Cannot attach more than ${MAX_DISKS_PER_INSTANCE} disks to an instance`
+    }
+
     for (const diskParams of allDisks) {
       if (diskParams.type === 'create') {
         errIfExists(db.disks, { name: diskParams.name, project_id: project.id }, 'disk')
@@ -701,6 +706,12 @@ export const handlers = makeHandlers({
     if (instance.run_state !== 'stopped') {
       throw 'Cannot attach disk to instance that is not stopped'
     }
+    const attachedDisks = db.disks.filter(
+      (d) => 'instance' in d.state && d.state.instance === instance.id
+    )
+    if (attachedDisks.length >= MAX_DISKS_PER_INSTANCE) {
+      throw `Cannot attach more than ${MAX_DISKS_PER_INSTANCE} disks to an instance`
+    }
     const disk = lookup.disk({ ...projectParams, disk: body.disk })
     disk.state = {
       state: 'attached',

playwright.config.ts

@@ -19,7 +19,7 @@ export default {
   retries: process.env.CI ? 2 : 0,
   // use all available cores (2) on github actions. use fewer locally
   workers: process.env.CI ? '100%' : '66%',
-  timeout: 60 * 1000, // 1 minute
+  timeout: (process.env.CI ? 60 : 30) * 1000, // shorter timeout locally
   fullyParallel: true,
   // default is 5 seconds. somehow playwright really hates async route modules,
   // takes a long time to load them. https://playwright.dev/docs/test-timeouts

test/e2e/anti-affinity.e2e.ts

@@ -80,7 +80,7 @@ test('can add a new anti-affinity group', async ({ page }) => {
   // go disable db1
   await page.getByRole('button', { name: 'Cancel' }).click()
   await page.getByRole('link', { name: 'Instances' }).click()
-  clickRowAction(page, 'db1', 'Stop')
+  await clickRowAction(page, 'db1', 'Stop')
   await page.getByRole('button', { name: 'Confirm' }).click()
   await expectRowVisible(page.getByRole('table'), {
     name: 'db1',

test/e2e/firewall-rules.e2e.ts

@@ -630,7 +630,7 @@ test('arbitrary values combobox', async ({ page }) => {
   await expectOptions(page, ['Custom: d'])
 
   await vpcInput.blur()
-  page.getByRole('button', { name: 'Add target' }).click()
+  await page.getByRole('button', { name: 'Add target' }).click()
   await expect(vpcInput).toHaveValue('')
 
   await vpcInput.focus()

test/e2e/image-upload.e2e.ts

@@ -177,9 +177,9 @@ test.describe('Image upload', () => {
 
     let confirmCount = 0
 
-    page.on('dialog', (dialog) => {
+    page.on('dialog', async (dialog) => {
       confirmCount += 1
-      dialog.dismiss()
+      await dialog.dismiss()
     }) // click cancel on the are you sure prompt
 
     await progressModal.getByRole('button', { name: 'Cancel' }).click()

test/e2e/instance.e2e.ts

@@ -29,7 +29,7 @@ test('can delete a failed instance', async ({ page }) => {
 
   const cell = page.getByRole('cell', { name: 'you-fail' })
   await expect(cell).toBeVisible() // just to match hidden check at the end
-  expectInstanceState(page, 'you-fail', 'failed')
+  await expectInstanceState(page, 'you-fail', 'failed')
 
   await clickRowAction(page, 'you-fail', 'Delete')
   await page.getByRole('button', { name: 'Confirm' }).click()

test/e2e/utils.ts

@@ -259,7 +259,7 @@ export async function scrollTo(page: Page, to: number) {
 }
 
 export async function addTlsCert(page: Page) {
-  page.getByRole('button', { name: 'Add TLS certificate' }).click()
+  await page.getByRole('button', { name: 'Add TLS certificate' }).click()
   await page
     .getByRole('dialog', { name: 'Add TLS certificate' })
     .getByRole('textbox', { name: 'Name' })