Skip to content

Commit 22bef0b

Browse files
authored
Update generated api files with latest omicron version (#1833)
* Update generated api files with latest omicron version * Remove VPC Router code * Update some typescript to reflect some API updates
1 parent 2fe50f5 commit 22bef0b

File tree

15 files changed

+289
-1169
lines changed

15 files changed

+289
-1169
lines changed

OMICRON_VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
51b6b160c4913ee77685ab95dbfc50047d5503fe
1+
9b666e73dec06f2a645a714cdfbb21d63a2f3504

app/forms/vpc-router-create.tsx

Lines changed: 0 additions & 59 deletions
This file was deleted.

app/forms/vpc-router-edit.tsx

Lines changed: 0 additions & 53 deletions
This file was deleted.

app/pages/project/networking/VpcPage/VpcPage.tsx

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ import { getVpcSelector, useVpcSelector } from 'app/hooks'
1717
import { VpcFirewallRulesTab } from './tabs/VpcFirewallRulesTab'
1818
import { VpcSubnetsTab } from './tabs/VpcSubnetsTab'
1919

20-
// import { VpcRoutersTab } from './tabs/VpcRoutersTab'
21-
// import { VpcSystemRoutesTab } from './tabs/VpcSystemRoutesTab'
22-
2320
VpcPage.loader = async ({ params }: LoaderFunctionArgs) => {
2421
const { project, vpc } = getVpcSelector(params)
2522
await apiQueryClient.prefetchQuery('vpcView', { path: { vpc }, query: { project } })
@@ -56,19 +53,11 @@ export function VpcPage() {
5653
<QueryParamTabs id="tabs-vpc-sections" className="full-width" defaultValue="subnets">
5754
<Tabs.List>
5855
<Tabs.Trigger value="subnets">Subnets</Tabs.Trigger>
59-
{/* <Tabs.Trigger value="system-routes">System Routes</Tabs.Trigger>
60-
<Tabs.Trigger value="routers">Routers</Tabs.Trigger> */}
6156
<Tabs.Trigger value="firewall-rules">Firewall Rules</Tabs.Trigger>
6257
</Tabs.List>
6358
<Tabs.Content value="subnets">
6459
<VpcSubnetsTab />
6560
</Tabs.Content>
66-
{/* <Tabs.Content value="system-routes">
67-
<VpcSystemRoutesTab />
68-
</Tabs.Content>
69-
<Tabs.Content value="routers">
70-
<VpcRoutersTab />
71-
</Tabs.Content> */}
7261
<Tabs.Content value="firewall-rules">
7362
<VpcFirewallRulesTab />
7463
</Tabs.Content>

app/pages/project/networking/VpcPage/tabs/VpcRoutersTab.tsx

Lines changed: 0 additions & 60 deletions
This file was deleted.

app/pages/project/networking/VpcPage/tabs/VpcSystemRoutesTab.tsx

Lines changed: 0 additions & 36 deletions
This file was deleted.

libs/api-mocks/msw/db.ts

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -100,30 +100,6 @@ export const lookup = {
100100

101101
return vpc
102102
},
103-
vpcRouter({ router: id, ...vpcSelector }: PP.VpcRouter): Json<Api.VpcRouter> {
104-
if (!id) throw notFoundErr
105-
106-
if (isUuid(id)) return lookupById(db.vpcRouters, id)
107-
108-
const vpc = lookup.vpc(vpcSelector)
109-
const router = db.vpcRouters.find((s) => s.vpc_id === vpc.id && s.name === id)
110-
if (!router) throw notFoundErr
111-
112-
return router
113-
},
114-
vpcRouterRoute({ route: id, ...routerSelector }: PP.RouterRoute): Json<Api.RouterRoute> {
115-
if (!id) throw notFoundErr
116-
117-
if (isUuid(id)) return lookupById(db.vpcRouterRoutes, id)
118-
119-
const router = lookup.vpcRouter(routerSelector)
120-
const route = db.vpcRouterRoutes.find(
121-
(s) => s.vpc_router_id === router.id && s.name === id
122-
)
123-
if (!route) throw notFoundErr
124-
125-
return route
126-
},
127103
vpcSubnet({ subnet: id, ...vpcSelector }: PP.VpcSubnet): Json<Api.VpcSubnet> {
128104
if (!id) throw notFoundErr
129105

@@ -224,8 +200,6 @@ const initDb = {
224200
sshKeys: [...mock.sshKeys],
225201
users: [...mock.users],
226202
vpcFirewallRules: [...mock.defaultFirewallRules],
227-
vpcRouterRoutes: [mock.vpcRouterRoute],
228-
vpcRouters: [mock.vpcRouter],
229203
vpcs: [mock.vpc],
230204
vpcSubnets: [mock.vpcSubnet],
231205
}

0 commit comments

Comments
 (0)