Skip to content

Commit 6145e42

Browse files
committed
merge main
2 parents 5be3ca7 + a78eac9 commit 6145e42

File tree

6 files changed

+62
-60
lines changed

6 files changed

+62
-60
lines changed

.oxlintrc.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
"$schema": "./node_modules/oxlint/configuration_schema.json",
33
"plugins": [
44
"import",
5-
// defaults
65
"react",
6+
"jsx-a11y",
7+
"promise",
8+
// defaults (see https://oxc.rs/docs/guide/usage/linter/plugins.html#supported-plugins)
79
"unicorn",
810
"typescript",
911
"oxc"

app/api/util.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ import type {
2323
VpcFirewallRuleUpdate,
2424
} from './__generated__/Api'
2525

26-
// API limits encoded in https://github.com/oxidecomputer/omicron/blob/b7af5f8e/nexus/src/app/mod.rs
26+
// API limits encoded in https://github.com/oxidecomputer/omicron/blob/aec3cd8d/nexus/src/app/mod.rs
2727

2828
export const MAX_NICS_PER_INSTANCE = 8
2929

3030
export const INSTANCE_MAX_CPU = 64
3131
export const INSTANCE_MIN_RAM_GiB = 1
32-
export const INSTANCE_MAX_RAM_GiB = 1024
32+
export const INSTANCE_MAX_RAM_GiB = 1536
3333

3434
export const MIN_DISK_SIZE_GiB = 1
3535
/**
36-
* Disk size limited to 1023 as that's the maximum we can safely allocate right now
36+
* Disk size limited to 1023 as that's the maximum we can safely allocate right now
3737
* @see https://github.com/oxidecomputer/omicron/issues/3212#issuecomment-1634497344
3838
*/
3939
export const MAX_DISK_SIZE_GiB = 1023

app/components/MswBanner.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export function MswBanner({ disableButton }: Props) {
4949
return (
5050
<>
5151
{/* The [&+*]:pt-10 style is to ensure the page container isn't pushed out of screen as it uses 100vh for layout */}
52-
<label className="absolute z-topBar flex h-10 w-full items-center justify-center text-sans-md text-info-secondary bg-info-secondary [&+*]:pt-10">
52+
<aside className="absolute z-topBar flex h-10 w-full items-center justify-center text-sans-md text-info-secondary bg-info-secondary [&+*]:pt-10">
5353
<Info16Icon className="mr-2" /> This is a technical preview.
5454
<button
5555
type="button"
@@ -59,7 +59,7 @@ export function MswBanner({ disableButton }: Props) {
5959
>
6060
Learn more <NextArrow12Icon />
6161
</button>
62-
</label>
62+
</aside>
6363
<Modal isOpen={isOpen} onDismiss={closeModal} title="Console Technical Preview">
6464
<Modal.Section>
6565
<p>

package-lock.json

Lines changed: 49 additions & 49 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "0.0.0",
55
"license": "MPL-2.0",
66
"engines": {
7-
"node": ">=18"
7+
"node": ">=22"
88
},
99
"scripts": {
1010
"start": "API_MODE=msw vite",
@@ -80,7 +80,7 @@
8080
"@ianvs/prettier-plugin-sort-imports": "^4.4.1",
8181
"@mswjs/http-middleware": "^0.10.3",
8282
"@oxide/openapi-gen-ts": "~0.7.0",
83-
"@playwright/test": "^1.53.1",
83+
"@playwright/test": "^1.54.1",
8484
"@testing-library/dom": "^10.4.0",
8585
"@testing-library/jest-dom": "^6.6.3",
8686
"@testing-library/react": "^16.2.0",
@@ -111,7 +111,7 @@
111111
"ip-num": "^1.5.1",
112112
"jsdom": "^25.0.1",
113113
"msw": "^2.7.5",
114-
"oxlint": "^0.16.6",
114+
"oxlint": "^1.6.0",
115115
"patch-package": "^8.0.0",
116116
"postcss": "^8.4.49",
117117
"postcss-import": "^16.1.0",

test/e2e/instance-create.e2e.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -634,12 +634,12 @@ test('Validate CPU and RAM', async ({ page }) => {
634634
// make sure it's not clamping the value
635635
await expect(cpu).toHaveValue('999')
636636

637-
await memory.fill('1025')
637+
await memory.fill('1537')
638638

639639
const submitButton = page.getByRole('button', { name: 'Create instance' })
640640

641641
const cpuMsg = page.getByText('Can be at most 64').first()
642-
const memMsg = page.getByText('Can be at most 1024 GiB').first()
642+
const memMsg = page.getByText('Can be at most 1536 GiB').first()
643643

644644
await expect(cpuMsg).toBeHidden()
645645
await expect(memMsg).toBeHidden()

0 commit comments

Comments
 (0)