From a8b0767f9864d88c095efbc9ecea55cb71aa897d Mon Sep 17 00:00:00 2001
From: David Crespo <crespo.dm@gmail.com>
Date: Sat, 27 Nov 2021 16:06:46 -0600
Subject: [PATCH 01/21] working get projects request

---
 app/pages/ProjectsPage.tsx    |   11 +-
 libs/api/__generated__/Api.ts | 2517 +++++++++++++++++++++++++++++++++
 libs/api/index.ts             |    4 +
 tools/generate_api_client.sh  |   15 +-
 4 files changed, 2530 insertions(+), 17 deletions(-)
 create mode 100644 libs/api/__generated__/Api.ts

diff --git a/app/pages/ProjectsPage.tsx b/app/pages/ProjectsPage.tsx
index c0ab1b679d..f8138a9b36 100644
--- a/app/pages/ProjectsPage.tsx
+++ b/app/pages/ProjectsPage.tsx
@@ -1,8 +1,9 @@
 import React from 'react'
 import { Link } from 'react-router-dom'
 import { formatDistanceToNowStrict } from 'date-fns'
+import { useQuery } from 'react-query'
 
-import { useApiQuery } from '@oxide/api'
+import { api2 } from '@oxide/api'
 import {
   buttonStyle,
   PageHeader,
@@ -35,9 +36,9 @@ const Metric = ({ label, value, className }: MetricProps) => (
 
 const ProjectsPage = () => {
   const { orgName } = useParams('orgName')
-  const { data } = useApiQuery('organizationProjectsGet', {
-    organizationName: orgName,
-  })
+  const data = useQuery('organizationProjectsGet', () =>
+    api2.organizations.organizationProjectsGet({ organizationName: orgName })
+  ).data?.data
 
   if (!data) return <div>loading</div>
 
@@ -76,7 +77,7 @@ const ProjectsPage = () => {
             </section>
             <footer className="p-4 border-t border-gray-400 text-xs">
               <span className="uppercase">
-                {formatDistanceToNowStrict(item.timeCreated, {
+                {formatDistanceToNowStrict(new Date(item.timeCreated), {
                   addSuffix: true,
                 })}
               </span>
diff --git a/libs/api/__generated__/Api.ts b/libs/api/__generated__/Api.ts
new file mode 100644
index 0000000000..ce06cae0ab
--- /dev/null
+++ b/libs/api/__generated__/Api.ts
@@ -0,0 +1,2517 @@
+/* eslint-disable */
+/* tslint:disable */
+/*
+ * ---------------------------------------------------------------
+ * ## THIS FILE WAS GENERATED VIA SWAGGER-TYPESCRIPT-API        ##
+ * ##                                                           ##
+ * ## AUTHOR: acacode                                           ##
+ * ## SOURCE: https://github.com/acacode/swagger-typescript-api ##
+ * ---------------------------------------------------------------
+ */
+
+/**
+* A count of bytes, typically used either for memory or storage capacity
+
+The maximum supported byte count is [`i64::MAX`].  This makes it somewhat inconvenient to define constructors: a u32 constructor can be infallible, but an i64 constructor can fail (if the value is negative) and a u64 constructor can fail (if the value is larger than i64::MAX).  We provide all of these for consumers' convenience.
+* @format uint64
+* @min 0
+*/
+export type ByteCount = number
+
+/**
+ * Client view of an [`Disk`]
+ */
+export interface Disk {
+  /** human-readable free-form text about a resource */
+  description: string
+  devicePath: string
+
+  /**
+   * unique, immutable, system-controlled identifier for each resource
+   * @format uuid
+   */
+  id: string
+
+  /** unique, mutable, user-controlled identifier for each resource */
+  name: Name
+
+  /** @format uuid */
+  projectId: string
+
+  /**
+   * A count of bytes, typically used either for memory or storage capacity
+   *
+   * The maximum supported byte count is [`i64::MAX`].  This makes it somewhat inconvenient to define constructors: a u32 constructor can be infallible, but an i64 constructor can fail (if the value is negative) and a u64 constructor can fail (if the value is larger than i64::MAX).  We provide all of these for consumers' convenience.
+   */
+  size: ByteCount
+
+  /** @format uuid */
+  snapshotId?: string | null
+
+  /** State of a Disk (primarily: attached or not) */
+  state: DiskState
+
+  /**
+   * timestamp when this resource was created
+   * @format date-time
+   */
+  timeCreated: string
+
+  /**
+   * timestamp when this resource was last modified
+   * @format date-time
+   */
+  timeModified: string
+}
+
+/**
+ * Describes a Disk's attachment to an Instance
+ */
+export interface DiskAttachment {
+  /** @format uuid */
+  diskId: string
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  diskName: Name
+
+  /** State of a Disk (primarily: attached or not) */
+  diskState: DiskState
+
+  /** @format uuid */
+  instanceId: string
+}
+
+/**
+ * Create-time parameters for an [`Disk`]
+ */
+export interface DiskCreateParams {
+  description: string
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  name: Name
+
+  /** size of the Disk */
+  size: ByteCount
+
+  /**
+   * id for snapshot from which the Disk should be created, if any
+   * @format uuid
+   */
+  snapshotId?: string | null
+}
+
+/**
+ * A single page of results
+ */
+export interface DiskResultsPage {
+  /** list of items on this page of results */
+  items: Disk[]
+
+  /** token used to fetch the next page of results (if any) */
+  next_page?: string | null
+}
+
+/**
+ * State of a Disk (primarily: attached or not)
+ */
+export type DiskState =
+  | { state: 'creating' }
+  | { state: 'detached' }
+  | { instance: string; state: 'attaching' }
+  | { instance: string; state: 'attached' }
+  | { instance: string; state: 'detaching' }
+  | { state: 'destroyed' }
+  | { state: 'faulted' }
+
+/**
+ * Identity-related metadata that's included in nearly all public API objects
+ */
+export interface IdentityMetadata {
+  /** human-readable free-form text about a resource */
+  description: string
+
+  /**
+   * unique, immutable, system-controlled identifier for each resource
+   * @format uuid
+   */
+  id: string
+
+  /** unique, mutable, user-controlled identifier for each resource */
+  name: Name
+
+  /**
+   * timestamp when this resource was created
+   * @format date-time
+   */
+  timeCreated: string
+
+  /**
+   * timestamp when this resource was last modified
+   * @format date-time
+   */
+  timeModified: string
+}
+
+/**
+ * Client view of an [`Instance`]
+ */
+export interface Instance {
+  /** human-readable free-form text about a resource */
+  description: string
+
+  /** RFC1035-compliant hostname for the Instance. */
+  hostname: string
+
+  /**
+   * unique, immutable, system-controlled identifier for each resource
+   * @format uuid
+   */
+  id: string
+
+  /** memory allocated for this Instance */
+  memory: ByteCount
+
+  /** unique, mutable, user-controlled identifier for each resource */
+  name: Name
+
+  /** number of CPUs allocated for this Instance */
+  ncpus: InstanceCpuCount
+
+  /**
+   * id for the project containing this Instance
+   * @format uuid
+   */
+  projectId: string
+
+  /**
+   * Running state of an Instance (primarily: booted or stopped)
+   *
+   * This typically reflects whether it's starting, running, stopping, or stopped, but also includes states related to the Instance's lifecycle
+   */
+  runState: InstanceState
+
+  /**
+   * timestamp when this resource was created
+   * @format date-time
+   */
+  timeCreated: string
+
+  /**
+   * timestamp when this resource was last modified
+   * @format date-time
+   */
+  timeModified: string
+
+  /** @format date-time */
+  timeRunStateUpdated: string
+}
+
+/**
+ * The number of CPUs in an Instance
+ * @format uint16
+ * @min 0
+ */
+export type InstanceCpuCount = number
+
+/**
+ * Create-time parameters for an [`Instance`]
+ */
+export interface InstanceCreateParams {
+  description: string
+  hostname: string
+
+  /**
+   * A count of bytes, typically used either for memory or storage capacity
+   *
+   * The maximum supported byte count is [`i64::MAX`].  This makes it somewhat inconvenient to define constructors: a u32 constructor can be infallible, but an i64 constructor can fail (if the value is negative) and a u64 constructor can fail (if the value is larger than i64::MAX).  We provide all of these for consumers' convenience.
+   */
+  memory: ByteCount
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  name: Name
+
+  /** The number of CPUs in an Instance */
+  ncpus: InstanceCpuCount
+}
+
+/**
+ * A single page of results
+ */
+export interface InstanceResultsPage {
+  /** list of items on this page of results */
+  items: Instance[]
+
+  /** token used to fetch the next page of results (if any) */
+  next_page?: string | null
+}
+
+/**
+* Running state of an Instance (primarily: booted or stopped)
+
+This typically reflects whether it's starting, running, stopping, or stopped, but also includes states related to the Instance's lifecycle
+*/
+export enum InstanceState {
+  Creating = 'creating',
+  Starting = 'starting',
+  Running = 'running',
+  Stopping = 'stopping',
+  Stopped = 'stopped',
+  Rebooting = 'rebooting',
+  Repairing = 'repairing',
+  Failed = 'failed',
+  Destroyed = 'destroyed',
+}
+
+/**
+ * An IPv4 subnet, including prefix and subnet mask
+ * @pattern ^(10\.(25[0-5]|[1-2][0-4][0-9]|[1-9][0-9]|[0-9]\.){2}(25[0-5]|[1-2][0-4][0-9]|[1-9][0-9]|[0-9])/(1[0-9]|2[0-8]|[8-9]))$^(172\.16\.(25[0-5]|[1-2][0-4][0-9]|[1-9][0-9]|[0-9])\.(25[0-5]|[1-2][0-4][0-9]|[1-9][0-9]|[0-9])/(1[2-9]|2[0-8]))$^(192\.168\.(25[0-5]|[1-2][0-4][0-9]|[1-9][0-9]|[0-9])\.(25[0-5]|[1-2][0-4][0-9]|[1-9][0-9]|[0-9])/(1[6-9]|2[0-8]))$
+ */
+export type Ipv4Net = string
+
+/**
+ * An IPv6 subnet, including prefix and subnet mask
+ * @pattern ^(fd|FD)00:((([0-9a-fA-F]{1,4}\:){6}[0-9a-fA-F]{1,4})|(([0-9a-fA-F]{1,4}:){1,6}:))/(6[4-9]|[7-9][0-9]|1[0-1][0-9]|12[0-6])$
+ */
+export type Ipv6Net = string
+
+/**
+ * An inclusive-inclusive range of IP ports. The second port may be omitted to represent a single port
+ * @pattern ^[0-9]{1,5}(-[0-9]{1,5})?$
+ */
+export type L4PortRange = string
+
+export interface LoginParams {
+  username: string
+}
+
+/**
+ * Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'.
+ * @pattern [a-z](|[a-zA-Z0-9-]*[a-zA-Z0-9])
+ */
+export type Name = string
+
+/**
+ * Client view of an [`Organization`]
+ */
+export interface Organization {
+  /** human-readable free-form text about a resource */
+  description: string
+
+  /**
+   * unique, immutable, system-controlled identifier for each resource
+   * @format uuid
+   */
+  id: string
+
+  /** unique, mutable, user-controlled identifier for each resource */
+  name: Name
+
+  /**
+   * timestamp when this resource was created
+   * @format date-time
+   */
+  timeCreated: string
+
+  /**
+   * timestamp when this resource was last modified
+   * @format date-time
+   */
+  timeModified: string
+}
+
+/**
+ * Create-time parameters for an [`Organization`]
+ */
+export interface OrganizationCreate {
+  description: string
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  name: Name
+}
+
+/**
+ * A single page of results
+ */
+export interface OrganizationResultsPage {
+  /** list of items on this page of results */
+  items: Organization[]
+
+  /** token used to fetch the next page of results (if any) */
+  next_page?: string | null
+}
+
+/**
+ * Updateable properties of an [`Organization`]
+ */
+export interface OrganizationUpdate {
+  description?: string | null
+  name?: Name | null
+}
+
+/**
+ * Client view of an [`Project`]
+ */
+export interface Project {
+  /** human-readable free-form text about a resource */
+  description: string
+
+  /**
+   * unique, immutable, system-controlled identifier for each resource
+   * @format uuid
+   */
+  id: string
+
+  /** unique, mutable, user-controlled identifier for each resource */
+  name: Name
+
+  /** @format uuid */
+  organizationId: string
+
+  /**
+   * timestamp when this resource was created
+   * @format date-time
+   */
+  timeCreated: string
+
+  /**
+   * timestamp when this resource was last modified
+   * @format date-time
+   */
+  timeModified: string
+}
+
+/**
+ * Create-time parameters for an [`Project`]
+ */
+export interface ProjectCreate {
+  description: string
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  name: Name
+}
+
+/**
+ * A single page of results
+ */
+export interface ProjectResultsPage {
+  /** list of items on this page of results */
+  items: Project[]
+
+  /** token used to fetch the next page of results (if any) */
+  next_page?: string | null
+}
+
+/**
+ * Updateable properties of an [`Project`]
+ */
+export interface ProjectUpdate {
+  description?: string | null
+  name?: Name | null
+}
+
+/**
+ * Client view of an [`Rack`]
+ */
+export interface Rack {
+  /** Identity-related metadata that's included in nearly all public API objects */
+  identity: IdentityMetadata
+}
+
+/**
+ * A single page of results
+ */
+export interface RackResultsPage {
+  /** list of items on this page of results */
+  items: Rack[]
+
+  /** token used to fetch the next page of results (if any) */
+  next_page?: string | null
+}
+
+/**
+ * A subset of [`NetworkTarget`], `RouteDestination` specifies the kind of network traffic that will be matched to be forwarded to the [`RouteTarget`].
+ */
+export type RouteDestination =
+  | { type: 'ip'; value: string }
+  | { type: 'vpc'; value: Name }
+  | { type: 'subnet'; value: Name }
+
+/**
+ * A subset of [`NetworkTarget`], `RouteTarget` specifies all possible targets that a route can forward to.
+ */
+export type RouteTarget =
+  | { type: 'ip'; value: string }
+  | { type: 'vpc'; value: Name }
+  | { type: 'subnet'; value: Name }
+  | { type: 'instance'; value: Name }
+  | { type: 'internetGateway'; value: Name }
+
+/**
+ * A route defines a rule that governs where traffic should be sent based on its destination.
+ */
+export interface RouterRoute {
+  /** A subset of [`NetworkTarget`], `RouteDestination` specifies the kind of network traffic that will be matched to be forwarded to the [`RouteTarget`]. */
+  destination: RouteDestination
+
+  /** common identifying metadata */
+  identity: IdentityMetadata
+
+  /** Describes the kind of router. Set at creation. `read-only` */
+  kind: RouterRouteKind
+
+  /**
+   * The VPC Router to which the route belongs.
+   * @format uuid
+   */
+  router_id: string
+
+  /** A subset of [`NetworkTarget`], `RouteTarget` specifies all possible targets that a route can forward to. */
+  target: RouteTarget
+}
+
+/**
+ * Create-time parameters for a [`RouterRoute`]
+ */
+export interface RouterRouteCreateParams {
+  description: string
+
+  /** A subset of [`NetworkTarget`], `RouteDestination` specifies the kind of network traffic that will be matched to be forwarded to the [`RouteTarget`]. */
+  destination: RouteDestination
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  name: Name
+
+  /** A subset of [`NetworkTarget`], `RouteTarget` specifies all possible targets that a route can forward to. */
+  target: RouteTarget
+}
+
+/**
+* The classification of a [`RouterRoute`] as defined by the system. The kind determines certain attributes such as if the route is modifiable and describes how or where the route was created.
+
+See [RFD-21](https://rfd.shared.oxide.computer/rfd/0021#concept-router) for more context
+*/
+export enum RouterRouteKind {
+  Default = 'Default',
+  VpcSubnet = 'VpcSubnet',
+  VpcPeering = 'VpcPeering',
+  Custom = 'Custom',
+}
+
+/**
+ * A single page of results
+ */
+export interface RouterRouteResultsPage {
+  /** list of items on this page of results */
+  items: RouterRoute[]
+
+  /** token used to fetch the next page of results (if any) */
+  next_page?: string | null
+}
+
+/**
+ * Updateable properties of a [`RouterRoute`]
+ */
+export interface RouterRouteUpdateParams {
+  description?: string | null
+
+  /** A subset of [`NetworkTarget`], `RouteDestination` specifies the kind of network traffic that will be matched to be forwarded to the [`RouteTarget`]. */
+  destination: RouteDestination
+  name?: Name | null
+
+  /** A subset of [`NetworkTarget`], `RouteTarget` specifies all possible targets that a route can forward to. */
+  target: RouteTarget
+}
+
+export interface Saga {
+  /** @format uuid */
+  id: string
+  state: SagaState
+}
+
+export type SagaErrorInfo =
+  | { error: 'actionFailed'; source_error: any }
+  | { error: 'deserializeFailed'; message: string }
+  | { error: 'injectedError' }
+  | { error: 'serializeFailed'; message: string }
+  | { error: 'subsagaCreateFailed'; message: string }
+
+/**
+ * A single page of results
+ */
+export interface SagaResultsPage {
+  /** list of items on this page of results */
+  items: Saga[]
+
+  /** token used to fetch the next page of results (if any) */
+  next_page?: string | null
+}
+
+export type SagaState =
+  | { state: 'running' }
+  | { state: 'succeeded' }
+  | { error_info: SagaErrorInfo; error_node_name: string; state: 'failed' }
+
+/**
+ * Client view of an [`Sled`]
+ */
+export interface Sled {
+  /** human-readable free-form text about a resource */
+  description: string
+
+  /**
+   * unique, immutable, system-controlled identifier for each resource
+   * @format uuid
+   */
+  id: string
+
+  /** unique, mutable, user-controlled identifier for each resource */
+  name: Name
+  serviceAddress: string
+
+  /**
+   * timestamp when this resource was created
+   * @format date-time
+   */
+  timeCreated: string
+
+  /**
+   * timestamp when this resource was last modified
+   * @format date-time
+   */
+  timeModified: string
+}
+
+/**
+ * A single page of results
+ */
+export interface SledResultsPage {
+  /** list of items on this page of results */
+  items: Sled[]
+
+  /** token used to fetch the next page of results (if any) */
+  next_page?: string | null
+}
+
+/**
+ * Identity-related metadata that's included in nearly all public API objects
+ */
+export interface Vpc {
+  /** human-readable free-form text about a resource */
+  description: string
+
+  /** The name used for the VPC in DNS. */
+  dnsName: Name
+
+  /**
+   * unique, immutable, system-controlled identifier for each resource
+   * @format uuid
+   */
+  id: string
+
+  /** unique, mutable, user-controlled identifier for each resource */
+  name: Name
+
+  /**
+   * id for the project containing this VPC
+   * @format uuid
+   */
+  projectId: string
+
+  /**
+   * id for the system router where subnet default routes are registered
+   * @format uuid
+   */
+  systemRouterId: string
+
+  /**
+   * timestamp when this resource was created
+   * @format date-time
+   */
+  timeCreated: string
+
+  /**
+   * timestamp when this resource was last modified
+   * @format date-time
+   */
+  timeModified: string
+}
+
+/**
+ * Create-time parameters for a [`Vpc`]
+ */
+export interface VpcCreateParams {
+  description: string
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  dnsName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  name: Name
+}
+
+/**
+ * A single rule in a VPC firewall
+ */
+export interface VpcFirewallRule {
+  /** whether traffic matching the rule should be allowed or dropped */
+  action: VpcFirewallRuleAction
+
+  /** whether this rule is for incoming or outgoing traffic */
+  direction: VpcFirewallRuleDirection
+
+  /** reductions on the scope of the rule */
+  filters: VpcFirewallRuleFilter
+
+  /** common identifying metadata */
+  identity: IdentityMetadata
+
+  /**
+   * the relative priority of this rule
+   * @format uint16
+   * @min 0
+   */
+  priority: number
+
+  /** whether this rule is in effect */
+  status: VpcFirewallRuleStatus
+
+  /** list of sets of instances that the rule applies to */
+  targets: VpcFirewallRuleTarget[]
+}
+
+export enum VpcFirewallRuleAction {
+  Allow = 'allow',
+  Deny = 'deny',
+}
+
+export enum VpcFirewallRuleDirection {
+  Inbound = 'inbound',
+  Outbound = 'outbound',
+}
+
+/**
+ * Filter for a firewall rule. A given packet must match every field that is present for the rule to apply to it. A packet matches a field if any entry in that field matches the packet.
+ */
+export interface VpcFirewallRuleFilter {
+  /** If present, the sources (if incoming) or destinations (if outgoing) this rule applies to. */
+  hosts?: VpcFirewallRuleHostFilter[] | null
+
+  /** If present, the destination ports this rule applies to. */
+  ports?: L4PortRange[] | null
+
+  /** If present, the networking protocols this rule applies to. */
+  protocols?: VpcFirewallRuleProtocol[] | null
+}
+
+/**
+ * A subset of [`NetworkTarget`], `VpcFirewallRuleHostFilter` specifies all possible targets that a route can forward to.
+ */
+export type VpcFirewallRuleHostFilter =
+  | { type: 'vpc'; value: Name }
+  | { type: 'subnet'; value: Name }
+  | { type: 'instance'; value: Name }
+  | { type: 'ip'; value: string }
+  | { type: 'internetGateway'; value: Name }
+
+/**
+ * The protocols that may be specified in a firewall rule's filter
+ */
+export enum VpcFirewallRuleProtocol {
+  TCP = 'TCP',
+  UDP = 'UDP',
+  ICMP = 'ICMP',
+}
+
+/**
+ * A single page of results
+ */
+export interface VpcFirewallRuleResultsPage {
+  /** list of items on this page of results */
+  items: VpcFirewallRule[]
+
+  /** token used to fetch the next page of results (if any) */
+  next_page?: string | null
+}
+
+export enum VpcFirewallRuleStatus {
+  Disabled = 'disabled',
+  Enabled = 'enabled',
+}
+
+/**
+ * A subset of [`NetworkTarget`], `VpcFirewallRuleTarget` specifies all possible targets that a firewall rule can be attached to.
+ */
+export type VpcFirewallRuleTarget =
+  | { type: 'vpc'; value: Name }
+  | { type: 'subnet'; value: Name }
+  | { type: 'instance'; value: Name }
+
+/**
+ * A single rule in a VPC firewall
+ */
+export interface VpcFirewallRuleUpdate {
+  /** whether traffic matching the rule should be allowed or dropped */
+  action: VpcFirewallRuleAction
+
+  /** human-readable free-form text about a resource */
+  description: string
+
+  /** whether this rule is for incoming or outgoing traffic */
+  direction: VpcFirewallRuleDirection
+
+  /** reductions on the scope of the rule */
+  filters: VpcFirewallRuleFilter
+
+  /**
+   * the relative priority of this rule
+   * @format uint16
+   * @min 0
+   */
+  priority: number
+
+  /** whether this rule is in effect */
+  status: VpcFirewallRuleStatus
+
+  /** list of sets of instances that the rule applies to */
+  targets: VpcFirewallRuleTarget[]
+}
+
+/**
+ * Updateable properties of a [`Vpc`]'s firewall Note that VpcFirewallRules are implicitly created along with a Vpc, so there is no explicit creation.
+ */
+export type VpcFirewallRuleUpdateParams = Record<string, VpcFirewallRuleUpdate>
+
+/**
+ * Response to an update replacing [`Vpc`]'s firewall
+ */
+export type VpcFirewallRuleUpdateResult = Record<string, VpcFirewallRule>
+
+/**
+ * A single page of results
+ */
+export interface VpcResultsPage {
+  /** list of items on this page of results */
+  items: Vpc[]
+
+  /** token used to fetch the next page of results (if any) */
+  next_page?: string | null
+}
+
+/**
+ * A VPC router defines a series of rules that indicate where traffic should be sent depending on its destination.
+ */
+export interface VpcRouter {
+  /** common identifying metadata */
+  identity: IdentityMetadata
+  kind: VpcRouterKind
+
+  /**
+   * The VPC to which the router belongs.
+   * @format uuid
+   */
+  vpc_id: string
+}
+
+/**
+ * Create-time parameters for a [`VpcRouter`]
+ */
+export interface VpcRouterCreateParams {
+  description: string
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  name: Name
+}
+
+export enum VpcRouterKind {
+  System = 'system',
+  Custom = 'custom',
+}
+
+/**
+ * A single page of results
+ */
+export interface VpcRouterResultsPage {
+  /** list of items on this page of results */
+  items: VpcRouter[]
+
+  /** token used to fetch the next page of results (if any) */
+  next_page?: string | null
+}
+
+/**
+ * Updateable properties of a [`VpcRouter`]
+ */
+export interface VpcRouterUpdateParams {
+  description?: string | null
+  name?: Name | null
+}
+
+/**
+ * A VPC subnet represents a logical grouping for instances that allows network traffic between them, within a IPv4 subnetwork or optionall an IPv6 subnetwork.
+ */
+export interface VpcSubnet {
+  /** common identifying metadata */
+  identity: IdentityMetadata
+
+  /** The IPv4 subnet CIDR block. */
+  ipv4_block?: Ipv4Net | null
+
+  /** The IPv6 subnet CIDR block. */
+  ipv6_block?: Ipv6Net | null
+
+  /**
+   * The VPC to which the subnet belongs.
+   * @format uuid
+   */
+  vpc_id: string
+}
+
+/**
+ * Create-time parameters for a [`VpcSubnet`]
+ */
+export interface VpcSubnetCreateParams {
+  description: string
+  ipv4Block?: Ipv4Net | null
+  ipv6Block?: Ipv6Net | null
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  name: Name
+}
+
+/**
+ * A single page of results
+ */
+export interface VpcSubnetResultsPage {
+  /** list of items on this page of results */
+  items: VpcSubnet[]
+
+  /** token used to fetch the next page of results (if any) */
+  next_page?: string | null
+}
+
+/**
+ * Updateable properties of a [`VpcSubnet`]
+ */
+export interface VpcSubnetUpdateParams {
+  description?: string | null
+  ipv4Block?: Ipv4Net | null
+  ipv6Block?: Ipv6Net | null
+  name?: Name | null
+}
+
+/**
+ * Updateable properties of a [`Vpc`]
+ */
+export interface VpcUpdateParams {
+  description?: string | null
+  dnsName?: Name | null
+  name?: Name | null
+}
+
+/**
+* Supported set of sort modes for scanning by id only.
+
+Currently, we only support scanning in ascending order.
+*/
+export enum IdSortMode {
+  IdAscending = 'id-ascending',
+}
+
+/**
+ * Supported set of sort modes for scanning by name or id
+ */
+export enum NameOrIdSortMode {
+  NameAscending = 'name-ascending',
+  NameDescending = 'name-descending',
+  IdAscending = 'id-ascending',
+}
+
+/**
+* Supported set of sort modes for scanning by name only
+
+Currently, we only support scanning in ascending order.
+*/
+export enum NameSortMode {
+  NameAscending = 'name-ascending',
+}
+
+export interface HardwareRacksGetParams {
+  /**
+   * Maximum number of items returned by a single call
+   * @format uint32
+   * @min 1
+   */
+  limit?: number | null
+
+  /** Token returned by previous call to retreive the subsequent page */
+  page_token?: string | null
+
+  /**
+   * Supported set of sort modes for scanning by id only.
+   *
+   * Currently, we only support scanning in ascending order.
+   */
+  sort_by?: IdSortMode
+}
+
+export interface HardwareSledsGetParams {
+  /**
+   * Maximum number of items returned by a single call
+   * @format uint32
+   * @min 1
+   */
+  limit?: number | null
+
+  /** Token returned by previous call to retreive the subsequent page */
+  page_token?: string | null
+
+  /**
+   * Supported set of sort modes for scanning by id only.
+   *
+   * Currently, we only support scanning in ascending order.
+   */
+  sort_by?: IdSortMode
+}
+
+export interface OrganizationsGetParams {
+  /**
+   * Maximum number of items returned by a single call
+   * @format uint32
+   * @min 1
+   */
+  limit?: number | null
+
+  /** Token returned by previous call to retreive the subsequent page */
+  page_token?: string | null
+
+  /** Supported set of sort modes for scanning by name or id */
+  sort_by?: NameOrIdSortMode
+}
+
+export interface OrganizationProjectsGetParams {
+  /**
+   * Maximum number of items returned by a single call
+   * @format uint32
+   * @min 1
+   */
+  limit?: number | null
+
+  /** Token returned by previous call to retreive the subsequent page */
+  page_token?: string | null
+
+  /** Supported set of sort modes for scanning by name or id */
+  sort_by?: NameOrIdSortMode
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+}
+
+export interface ProjectDisksGetParams {
+  /**
+   * Maximum number of items returned by a single call
+   * @format uint32
+   * @min 1
+   */
+  limit?: number | null
+
+  /** Token returned by previous call to retreive the subsequent page */
+  page_token?: string | null
+
+  /**
+   * Supported set of sort modes for scanning by name only
+   *
+   * Currently, we only support scanning in ascending order.
+   */
+  sort_by?: NameSortMode
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+}
+
+export interface ProjectInstancesGetParams {
+  /**
+   * Maximum number of items returned by a single call
+   * @format uint32
+   * @min 1
+   */
+  limit?: number | null
+
+  /** Token returned by previous call to retreive the subsequent page */
+  page_token?: string | null
+
+  /**
+   * Supported set of sort modes for scanning by name only
+   *
+   * Currently, we only support scanning in ascending order.
+   */
+  sort_by?: NameSortMode
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+}
+
+export interface ProjectVpcsGetParams {
+  /**
+   * Maximum number of items returned by a single call
+   * @format uint32
+   * @min 1
+   */
+  limit?: number | null
+
+  /** Token returned by previous call to retreive the subsequent page */
+  page_token?: string | null
+
+  /**
+   * Supported set of sort modes for scanning by name only
+   *
+   * Currently, we only support scanning in ascending order.
+   */
+  sort_by?: NameSortMode
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+}
+
+export interface VpcFirewallRulesGetParams {
+  /**
+   * Maximum number of items returned by a single call
+   * @format uint32
+   * @min 1
+   */
+  limit?: number | null
+
+  /** Token returned by previous call to retreive the subsequent page */
+  page_token?: string | null
+
+  /**
+   * Supported set of sort modes for scanning by name only
+   *
+   * Currently, we only support scanning in ascending order.
+   */
+  sort_by?: NameSortMode
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  vpcName: Name
+}
+
+export interface VpcRoutersGetParams {
+  /**
+   * Maximum number of items returned by a single call
+   * @format uint32
+   * @min 1
+   */
+  limit?: number | null
+
+  /** Token returned by previous call to retreive the subsequent page */
+  page_token?: string | null
+
+  /**
+   * Supported set of sort modes for scanning by name only
+   *
+   * Currently, we only support scanning in ascending order.
+   */
+  sort_by?: NameSortMode
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  vpcName: Name
+}
+
+export interface RoutersRoutesGetParams {
+  /**
+   * Maximum number of items returned by a single call
+   * @format uint32
+   * @min 1
+   */
+  limit?: number | null
+
+  /** Token returned by previous call to retreive the subsequent page */
+  page_token?: string | null
+
+  /**
+   * Supported set of sort modes for scanning by name only
+   *
+   * Currently, we only support scanning in ascending order.
+   */
+  sort_by?: NameSortMode
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  routerName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  vpcName: Name
+}
+
+export interface VpcSubnetsGetParams {
+  /**
+   * Maximum number of items returned by a single call
+   * @format uint32
+   * @min 1
+   */
+  limit?: number | null
+
+  /** Token returned by previous call to retreive the subsequent page */
+  page_token?: string | null
+
+  /**
+   * Supported set of sort modes for scanning by name only
+   *
+   * Currently, we only support scanning in ascending order.
+   */
+  sort_by?: NameSortMode
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  vpcName: Name
+}
+
+export interface SagasGetParams {
+  /**
+   * Maximum number of items returned by a single call
+   * @format uint32
+   * @min 1
+   */
+  limit?: number | null
+
+  /** Token returned by previous call to retreive the subsequent page */
+  page_token?: string | null
+
+  /**
+   * Supported set of sort modes for scanning by id only.
+   *
+   * Currently, we only support scanning in ascending order.
+   */
+  sort_by?: IdSortMode
+}
+
+export type QueryParamsType = Record<string | number, any>
+export type ResponseFormat = keyof Omit<Body, 'body' | 'bodyUsed'>
+
+export interface FullRequestParams extends Omit<RequestInit, 'body'> {
+  /** set parameter to `true` for call `securityWorker` for this request */
+  secure?: boolean
+  /** request path */
+  path: string
+  /** content type of request body */
+  type?: ContentType
+  /** query params */
+  query?: QueryParamsType
+  /** format of response (i.e. response.json() -> format: "json") */
+  format?: ResponseFormat
+  /** request body */
+  body?: unknown
+  /** base url */
+  baseUrl?: string
+  /** request cancellation token */
+  cancelToken?: CancelToken
+}
+
+export type RequestParams = Omit<
+  FullRequestParams,
+  'body' | 'method' | 'query' | 'path'
+>
+
+export interface ApiConfig<SecurityDataType = unknown> {
+  baseUrl?: string
+  baseApiParams?: Omit<RequestParams, 'baseUrl' | 'cancelToken' | 'signal'>
+  securityWorker?: (
+    securityData: SecurityDataType | null
+  ) => Promise<RequestParams | void> | RequestParams | void
+  customFetch?: typeof fetch
+}
+
+export interface HttpResponse<D extends unknown, E extends unknown = unknown>
+  extends Response {
+  data: D
+  error: E
+}
+
+type CancelToken = Symbol | string | number
+
+export enum ContentType {
+  Json = 'application/json',
+  FormData = 'multipart/form-data',
+  UrlEncoded = 'application/x-www-form-urlencoded',
+}
+
+export class HttpClient<SecurityDataType = unknown> {
+  public baseUrl: string = ''
+  private securityData: SecurityDataType | null = null
+  private securityWorker?: ApiConfig<SecurityDataType>['securityWorker']
+  private abortControllers = new Map<CancelToken, AbortController>()
+  private customFetch = (...fetchParams: Parameters<typeof fetch>) =>
+    fetch(...fetchParams)
+
+  private baseApiParams: RequestParams = {
+    credentials: 'same-origin',
+    headers: {},
+    redirect: 'follow',
+    referrerPolicy: 'no-referrer',
+  }
+
+  constructor(apiConfig: ApiConfig<SecurityDataType> = {}) {
+    Object.assign(this, apiConfig)
+  }
+
+  public setSecurityData = (data: SecurityDataType | null) => {
+    this.securityData = data
+  }
+
+  private encodeQueryParam(key: string, value: any) {
+    const encodedKey = encodeURIComponent(key)
+    return `${encodedKey}=${encodeURIComponent(
+      typeof value === 'number' ? value : `${value}`
+    )}`
+  }
+
+  private addQueryParam(query: QueryParamsType, key: string) {
+    return this.encodeQueryParam(key, query[key])
+  }
+
+  private addArrayQueryParam(query: QueryParamsType, key: string) {
+    const value = query[key]
+    return value.map((v: any) => this.encodeQueryParam(key, v)).join('&')
+  }
+
+  protected toQueryString(rawQuery?: QueryParamsType): string {
+    const query = rawQuery || {}
+    const keys = Object.keys(query).filter(
+      (key) => 'undefined' !== typeof query[key]
+    )
+    return keys
+      .map((key) =>
+        Array.isArray(query[key])
+          ? this.addArrayQueryParam(query, key)
+          : this.addQueryParam(query, key)
+      )
+      .join('&')
+  }
+
+  protected addQueryParams(rawQuery?: QueryParamsType): string {
+    const queryString = this.toQueryString(rawQuery)
+    return queryString ? `?${queryString}` : ''
+  }
+
+  private contentFormatters: Record<ContentType, (input: any) => any> = {
+    [ContentType.Json]: (input: any) =>
+      input !== null && (typeof input === 'object' || typeof input === 'string')
+        ? JSON.stringify(input)
+        : input,
+    [ContentType.FormData]: (input: any) =>
+      Object.keys(input || {}).reduce((formData, key) => {
+        const property = input[key]
+        formData.append(
+          key,
+          property instanceof Blob
+            ? property
+            : typeof property === 'object' && property !== null
+            ? JSON.stringify(property)
+            : `${property}`
+        )
+        return formData
+      }, new FormData()),
+    [ContentType.UrlEncoded]: (input: any) => this.toQueryString(input),
+  }
+
+  private mergeRequestParams(
+    params1: RequestParams,
+    params2?: RequestParams
+  ): RequestParams {
+    return {
+      ...this.baseApiParams,
+      ...params1,
+      ...(params2 || {}),
+      headers: {
+        ...(this.baseApiParams.headers || {}),
+        ...(params1.headers || {}),
+        ...((params2 && params2.headers) || {}),
+      },
+    }
+  }
+
+  private createAbortSignal = (
+    cancelToken: CancelToken
+  ): AbortSignal | undefined => {
+    if (this.abortControllers.has(cancelToken)) {
+      const abortController = this.abortControllers.get(cancelToken)
+      if (abortController) {
+        return abortController.signal
+      }
+      return void 0
+    }
+
+    const abortController = new AbortController()
+    this.abortControllers.set(cancelToken, abortController)
+    return abortController.signal
+  }
+
+  public abortRequest = (cancelToken: CancelToken) => {
+    const abortController = this.abortControllers.get(cancelToken)
+
+    if (abortController) {
+      abortController.abort()
+      this.abortControllers.delete(cancelToken)
+    }
+  }
+
+  public request = async <T = any, E = any>({
+    body,
+    secure,
+    path,
+    type,
+    query,
+    format,
+    baseUrl,
+    cancelToken,
+    ...params
+  }: FullRequestParams): Promise<HttpResponse<T, E>> => {
+    const secureParams =
+      ((typeof secure === 'boolean' ? secure : this.baseApiParams.secure) &&
+        this.securityWorker &&
+        (await this.securityWorker(this.securityData))) ||
+      {}
+    const requestParams = this.mergeRequestParams(params, secureParams)
+    const queryString = query && this.toQueryString(query)
+    const payloadFormatter = this.contentFormatters[type || ContentType.Json]
+    const responseFormat = format || requestParams.format
+
+    return this.customFetch(
+      `${baseUrl || this.baseUrl || ''}${path}${
+        queryString ? `?${queryString}` : ''
+      }`,
+      {
+        ...requestParams,
+        headers: {
+          ...(type && type !== ContentType.FormData
+            ? { 'Content-Type': type }
+            : {}),
+          ...(requestParams.headers || {}),
+        },
+        signal: cancelToken ? this.createAbortSignal(cancelToken) : void 0,
+        body:
+          typeof body === 'undefined' || body === null
+            ? null
+            : payloadFormatter(body),
+      }
+    ).then(async (response) => {
+      const r = response as HttpResponse<T, E>
+      r.data = null as unknown as T
+      r.error = null as unknown as E
+
+      const data = !responseFormat
+        ? r
+        : await response[responseFormat]()
+            .then((data) => {
+              if (r.ok) {
+                r.data = data
+              } else {
+                r.error = data
+              }
+              return r
+            })
+            .catch((e) => {
+              r.error = e
+              return r
+            })
+
+      if (cancelToken) {
+        this.abortControllers.delete(cancelToken)
+      }
+
+      if (!response.ok) throw data
+      return data
+    })
+  }
+}
+
+/**
+ * @title Oxide Region API
+ * @version 0.0.1
+ * @contact <api@oxide.computer> (https://oxide.computer)
+ *
+ * API for interacting with the Oxide control plane
+ */
+export class Api<
+  SecurityDataType extends unknown
+> extends HttpClient<SecurityDataType> {
+  hardware = {
+    /**
+     * @description List racks in the system.
+     *
+     * @name HardwareRacksGet
+     * @request GET:/hardware/racks
+     */
+    hardwareRacksGet: (
+      query: HardwareRacksGetParams,
+      params: RequestParams = {}
+    ) =>
+      this.request<RackResultsPage, any>({
+        path: `/hardware/racks`,
+        method: 'GET',
+        query: query,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Fetch information about a particular rack.
+     *
+     * @name HardwareRacksGetRack
+     * @request GET:/hardware/racks/{rack_id}
+     */
+    hardwareRacksGetRack: (rackId: string, params: RequestParams = {}) =>
+      this.request<Rack, any>({
+        path: `/hardware/racks/${rackId}`,
+        method: 'GET',
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description List sleds in the system.
+     *
+     * @name HardwareSledsGet
+     * @request GET:/hardware/sleds
+     */
+    hardwareSledsGet: (
+      query: HardwareSledsGetParams,
+      params: RequestParams = {}
+    ) =>
+      this.request<SledResultsPage, any>({
+        path: `/hardware/sleds`,
+        method: 'GET',
+        query: query,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Fetch information about a sled in the system.
+     *
+     * @name HardwareSledsGetSled
+     * @request GET:/hardware/sleds/{sled_id}
+     */
+    hardwareSledsGetSled: (sledId: string, params: RequestParams = {}) =>
+      this.request<Sled, any>({
+        path: `/hardware/sleds/${sledId}`,
+        method: 'GET',
+        format: 'json',
+        ...params,
+      }),
+  }
+  login = {
+    /**
+     * No description
+     *
+     * @name SpoofLogin
+     * @request POST:/login
+     */
+    spoofLogin: (data: LoginParams, params: RequestParams = {}) =>
+      this.request<any, any>({
+        path: `/login`,
+        method: 'POST',
+        body: data,
+        type: ContentType.Json,
+        ...params,
+      }),
+  }
+  logout = {
+    /**
+     * No description
+     *
+     * @name Logout
+     * @request POST:/logout
+     */
+    logout: (params: RequestParams = {}) =>
+      this.request<any, any>({
+        path: `/logout`,
+        method: 'POST',
+        ...params,
+      }),
+  }
+  organizations = {
+    /**
+     * @description List all organizations.
+     *
+     * @name OrganizationsGet
+     * @request GET:/organizations
+     */
+    organizationsGet: (
+      query: OrganizationsGetParams,
+      params: RequestParams = {}
+    ) =>
+      this.request<OrganizationResultsPage, any>({
+        path: `/organizations`,
+        method: 'GET',
+        query: query,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Create a new organization.
+     *
+     * @name OrganizationsPost
+     * @request POST:/organizations
+     */
+    organizationsPost: (data: OrganizationCreate, params: RequestParams = {}) =>
+      this.request<Organization, any>({
+        path: `/organizations`,
+        method: 'POST',
+        body: data,
+        type: ContentType.Json,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Fetch a specific organization
+     *
+     * @name OrganizationsGetOrganization
+     * @request GET:/organizations/{organization_name}
+     */
+    organizationsGetOrganization: (
+      organizationName: Name,
+      params: RequestParams = {}
+    ) =>
+      this.request<Organization, any>({
+        path: `/organizations/${organizationName}`,
+        method: 'GET',
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Update a specific organization. * TODO-correctness: Is it valid for PUT to accept application/json that's a subset of what the resource actually represents?  If not, is that a problem? (HTTP may require that this be idempotent.)  If so, can we get around that having this be a slightly different content-type (e.g., "application/json-patch")?  We should see what other APIs do.
+     *
+     * @name OrganizationsPutOrganization
+     * @request PUT:/organizations/{organization_name}
+     */
+    organizationsPutOrganization: (
+      organizationName: Name,
+      data: OrganizationUpdate,
+      params: RequestParams = {}
+    ) =>
+      this.request<Organization, any>({
+        path: `/organizations/${organizationName}`,
+        method: 'PUT',
+        body: data,
+        type: ContentType.Json,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Delete a specific organization.
+     *
+     * @name OrganizationsDeleteOrganization
+     * @request DELETE:/organizations/{organization_name}
+     */
+    organizationsDeleteOrganization: (
+      organizationName: Name,
+      params: RequestParams = {}
+    ) =>
+      this.request<void, any>({
+        path: `/organizations/${organizationName}`,
+        method: 'DELETE',
+        ...params,
+      }),
+
+    /**
+     * @description List all projects.
+     *
+     * @name OrganizationProjectsGet
+     * @request GET:/organizations/{organization_name}/projects
+     */
+    organizationProjectsGet: (
+      { organizationName, ...query }: OrganizationProjectsGetParams,
+      params: RequestParams = {}
+    ) =>
+      this.request<ProjectResultsPage, any>({
+        path: `/organizations/${organizationName}/projects`,
+        method: 'GET',
+        query: query,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Create a new project.
+     *
+     * @name OrganizationProjectsPost
+     * @request POST:/organizations/{organization_name}/projects
+     */
+    organizationProjectsPost: (
+      organizationName: Name,
+      data: ProjectCreate,
+      params: RequestParams = {}
+    ) =>
+      this.request<Project, any>({
+        path: `/organizations/${organizationName}/projects`,
+        method: 'POST',
+        body: data,
+        type: ContentType.Json,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Fetch a specific project
+     *
+     * @name OrganizationProjectsGetProject
+     * @request GET:/organizations/{organization_name}/projects/{project_name}
+     */
+    organizationProjectsGetProject: (
+      organizationName: Name,
+      projectName: Name,
+      params: RequestParams = {}
+    ) =>
+      this.request<Project, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}`,
+        method: 'GET',
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Update a specific project. * TODO-correctness: Is it valid for PUT to accept application/json that's a subset of what the resource actually represents?  If not, is that a problem? (HTTP may require that this be idempotent.)  If so, can we get around that having this be a slightly different content-type (e.g., "application/json-patch")?  We should see what other APIs do.
+     *
+     * @name OrganizationProjectsPutProject
+     * @request PUT:/organizations/{organization_name}/projects/{project_name}
+     */
+    organizationProjectsPutProject: (
+      organizationName: Name,
+      projectName: Name,
+      data: ProjectUpdate,
+      params: RequestParams = {}
+    ) =>
+      this.request<Project, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}`,
+        method: 'PUT',
+        body: data,
+        type: ContentType.Json,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Delete a specific project.
+     *
+     * @name OrganizationProjectsDeleteProject
+     * @request DELETE:/organizations/{organization_name}/projects/{project_name}
+     */
+    organizationProjectsDeleteProject: (
+      organizationName: Name,
+      projectName: Name,
+      params: RequestParams = {}
+    ) =>
+      this.request<void, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}`,
+        method: 'DELETE',
+        ...params,
+      }),
+
+    /**
+     * @description List disks in a project.
+     *
+     * @name ProjectDisksGet
+     * @request GET:/organizations/{organization_name}/projects/{project_name}/disks
+     */
+    projectDisksGet: (
+      { organizationName, projectName, ...query }: ProjectDisksGetParams,
+      params: RequestParams = {}
+    ) =>
+      this.request<DiskResultsPage, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/disks`,
+        method: 'GET',
+        query: query,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Create a disk in a project. * TODO-correctness See note about instance create.  This should be async.
+     *
+     * @name ProjectDisksPost
+     * @request POST:/organizations/{organization_name}/projects/{project_name}/disks
+     */
+    projectDisksPost: (
+      organizationName: Name,
+      projectName: Name,
+      data: DiskCreateParams,
+      params: RequestParams = {}
+    ) =>
+      this.request<Disk, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/disks`,
+        method: 'POST',
+        body: data,
+        type: ContentType.Json,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Fetch a single disk in a project.
+     *
+     * @name ProjectDisksGetDisk
+     * @request GET:/organizations/{organization_name}/projects/{project_name}/disks/{disk_name}
+     */
+    projectDisksGetDisk: (
+      diskName: Name,
+      organizationName: Name,
+      projectName: Name,
+      params: RequestParams = {}
+    ) =>
+      this.request<Disk, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/disks/${diskName}`,
+        method: 'GET',
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Delete a disk from a project.
+     *
+     * @name ProjectDisksDeleteDisk
+     * @request DELETE:/organizations/{organization_name}/projects/{project_name}/disks/{disk_name}
+     */
+    projectDisksDeleteDisk: (
+      diskName: Name,
+      organizationName: Name,
+      projectName: Name,
+      params: RequestParams = {}
+    ) =>
+      this.request<void, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/disks/${diskName}`,
+        method: 'DELETE',
+        ...params,
+      }),
+
+    /**
+     * @description List instances in a project.
+     *
+     * @name ProjectInstancesGet
+     * @request GET:/organizations/{organization_name}/projects/{project_name}/instances
+     */
+    projectInstancesGet: (
+      { organizationName, projectName, ...query }: ProjectInstancesGetParams,
+      params: RequestParams = {}
+    ) =>
+      this.request<InstanceResultsPage, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/instances`,
+        method: 'GET',
+        query: query,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Create an instance in a project. * TODO-correctness This is supposed to be async.  Is that right?  We can create the instance immediately -- it's just not booted yet.  Maybe the boot operation is what's a separate operation_id.  What about the response code (201 Created vs 202 Accepted)?  Is that orthogonal?  Things can return a useful response, including an operation id, with either response code.  Maybe a "reboot" operation would return a 202 Accepted because there's no actual resource created?
+     *
+     * @name ProjectInstancesPost
+     * @request POST:/organizations/{organization_name}/projects/{project_name}/instances
+     */
+    projectInstancesPost: (
+      organizationName: Name,
+      projectName: Name,
+      data: InstanceCreateParams,
+      params: RequestParams = {}
+    ) =>
+      this.request<Instance, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/instances`,
+        method: 'POST',
+        body: data,
+        type: ContentType.Json,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Get an instance in a project.
+     *
+     * @name ProjectInstancesGetInstance
+     * @request GET:/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}
+     */
+    projectInstancesGetInstance: (
+      instanceName: Name,
+      organizationName: Name,
+      projectName: Name,
+      params: RequestParams = {}
+    ) =>
+      this.request<Instance, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/instances/${instanceName}`,
+        method: 'GET',
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Delete an instance from a project.
+     *
+     * @name ProjectInstancesDeleteInstance
+     * @request DELETE:/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}
+     */
+    projectInstancesDeleteInstance: (
+      instanceName: Name,
+      organizationName: Name,
+      projectName: Name,
+      params: RequestParams = {}
+    ) =>
+      this.request<void, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/instances/${instanceName}`,
+        method: 'DELETE',
+        ...params,
+      }),
+
+    /**
+     * @description List disks attached to this instance.
+     *
+     * @name InstanceDisksGet
+     * @request GET:/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}/disks
+     */
+    instanceDisksGet: (
+      instanceName: Name,
+      organizationName: Name,
+      projectName: Name,
+      params: RequestParams = {}
+    ) =>
+      this.request<DiskAttachment[], any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/instances/${instanceName}/disks`,
+        method: 'GET',
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Fetch a description of the attachment of this disk to this instance.
+     *
+     * @name InstanceDisksGetDisk
+     * @request GET:/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}/disks/{disk_name}
+     */
+    instanceDisksGetDisk: (
+      diskName: Name,
+      instanceName: Name,
+      organizationName: Name,
+      projectName: Name,
+      params: RequestParams = {}
+    ) =>
+      this.request<DiskAttachment, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/instances/${instanceName}/disks/${diskName}`,
+        method: 'GET',
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Attach a disk to this instance.
+     *
+     * @name InstanceDisksPutDisk
+     * @request PUT:/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}/disks/{disk_name}
+     */
+    instanceDisksPutDisk: (
+      diskName: Name,
+      instanceName: Name,
+      organizationName: Name,
+      projectName: Name,
+      params: RequestParams = {}
+    ) =>
+      this.request<DiskAttachment, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/instances/${instanceName}/disks/${diskName}`,
+        method: 'PUT',
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Detach a disk from this instance.
+     *
+     * @name InstanceDisksDeleteDisk
+     * @request DELETE:/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}/disks/{disk_name}
+     */
+    instanceDisksDeleteDisk: (
+      diskName: Name,
+      instanceName: Name,
+      organizationName: Name,
+      projectName: Name,
+      params: RequestParams = {}
+    ) =>
+      this.request<void, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/instances/${instanceName}/disks/${diskName}`,
+        method: 'DELETE',
+        ...params,
+      }),
+
+    /**
+     * @description Reboot an instance.
+     *
+     * @name ProjectInstancesInstanceReboot
+     * @request POST:/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}/reboot
+     */
+    projectInstancesInstanceReboot: (
+      instanceName: Name,
+      organizationName: Name,
+      projectName: Name,
+      params: RequestParams = {}
+    ) =>
+      this.request<Instance, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/instances/${instanceName}/reboot`,
+        method: 'POST',
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Boot an instance.
+     *
+     * @name ProjectInstancesInstanceStart
+     * @request POST:/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}/start
+     */
+    projectInstancesInstanceStart: (
+      instanceName: Name,
+      organizationName: Name,
+      projectName: Name,
+      params: RequestParams = {}
+    ) =>
+      this.request<Instance, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/instances/${instanceName}/start`,
+        method: 'POST',
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Halt an instance.
+     *
+     * @name ProjectInstancesInstanceStop
+     * @request POST:/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}/stop
+     */
+    projectInstancesInstanceStop: (
+      instanceName: Name,
+      organizationName: Name,
+      projectName: Name,
+      params: RequestParams = {}
+    ) =>
+      this.request<Instance, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/instances/${instanceName}/stop`,
+        method: 'POST',
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description List VPCs in a project.
+     *
+     * @name ProjectVpcsGet
+     * @request GET:/organizations/{organization_name}/projects/{project_name}/vpcs
+     */
+    projectVpcsGet: (
+      { organizationName, projectName, ...query }: ProjectVpcsGetParams,
+      params: RequestParams = {}
+    ) =>
+      this.request<VpcResultsPage, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/vpcs`,
+        method: 'GET',
+        query: query,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Create a VPC in a project.
+     *
+     * @name ProjectVpcsPost
+     * @request POST:/organizations/{organization_name}/projects/{project_name}/vpcs
+     */
+    projectVpcsPost: (
+      organizationName: Name,
+      projectName: Name,
+      data: VpcCreateParams,
+      params: RequestParams = {}
+    ) =>
+      this.request<Vpc, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/vpcs`,
+        method: 'POST',
+        body: data,
+        type: ContentType.Json,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Get a VPC in a project.
+     *
+     * @name ProjectVpcsGetVpc
+     * @request GET:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}
+     */
+    projectVpcsGetVpc: (
+      organizationName: Name,
+      projectName: Name,
+      vpcName: Name,
+      params: RequestParams = {}
+    ) =>
+      this.request<Vpc, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/vpcs/${vpcName}`,
+        method: 'GET',
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Update a VPC.
+     *
+     * @name ProjectVpcsPutVpc
+     * @request PUT:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}
+     */
+    projectVpcsPutVpc: (
+      organizationName: Name,
+      projectName: Name,
+      vpcName: Name,
+      data: VpcUpdateParams,
+      params: RequestParams = {}
+    ) =>
+      this.request<void, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/vpcs/${vpcName}`,
+        method: 'PUT',
+        body: data,
+        type: ContentType.Json,
+        ...params,
+      }),
+
+    /**
+     * @description Delete a vpc from a project.
+     *
+     * @name ProjectVpcsDeleteVpc
+     * @request DELETE:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}
+     */
+    projectVpcsDeleteVpc: (
+      organizationName: Name,
+      projectName: Name,
+      vpcName: Name,
+      params: RequestParams = {}
+    ) =>
+      this.request<void, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/vpcs/${vpcName}`,
+        method: 'DELETE',
+        ...params,
+      }),
+
+    /**
+     * @description List firewall rules for a VPC.
+     *
+     * @name VpcFirewallRulesGet
+     * @request GET:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/firewall/rules
+     */
+    vpcFirewallRulesGet: (
+      {
+        organizationName,
+        projectName,
+        vpcName,
+        ...query
+      }: VpcFirewallRulesGetParams,
+      params: RequestParams = {}
+    ) =>
+      this.request<VpcFirewallRuleResultsPage, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/vpcs/${vpcName}/firewall/rules`,
+        method: 'GET',
+        query: query,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Replace the firewall rules for a VPC
+     *
+     * @name VpcFirewallRulesPut
+     * @request PUT:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/firewall/rules
+     */
+    vpcFirewallRulesPut: (
+      organizationName: Name,
+      projectName: Name,
+      vpcName: Name,
+      data: VpcFirewallRuleUpdateParams,
+      params: RequestParams = {}
+    ) =>
+      this.request<VpcFirewallRuleUpdateResult, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/vpcs/${vpcName}/firewall/rules`,
+        method: 'PUT',
+        body: data,
+        type: ContentType.Json,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description List VPC Custom and System Routers
+     *
+     * @name VpcRoutersGet
+     * @request GET:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers
+     */
+    vpcRoutersGet: (
+      { organizationName, projectName, vpcName, ...query }: VpcRoutersGetParams,
+      params: RequestParams = {}
+    ) =>
+      this.request<VpcRouterResultsPage, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/vpcs/${vpcName}/routers`,
+        method: 'GET',
+        query: query,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Create a VPC Router
+     *
+     * @name VpcRoutersPost
+     * @request POST:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers
+     */
+    vpcRoutersPost: (
+      organizationName: Name,
+      projectName: Name,
+      vpcName: Name,
+      data: VpcRouterCreateParams,
+      params: RequestParams = {}
+    ) =>
+      this.request<VpcRouter, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/vpcs/${vpcName}/routers`,
+        method: 'POST',
+        body: data,
+        type: ContentType.Json,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Get a VPC Router
+     *
+     * @name VpcRoutersGetRouter
+     * @request GET:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers/{router_name}
+     */
+    vpcRoutersGetRouter: (
+      organizationName: Name,
+      projectName: Name,
+      routerName: Name,
+      vpcName: Name,
+      params: RequestParams = {}
+    ) =>
+      this.request<VpcRouter, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/vpcs/${vpcName}/routers/${routerName}`,
+        method: 'GET',
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Update a VPC Router
+     *
+     * @name VpcRoutersPutRouter
+     * @request PUT:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers/{router_name}
+     */
+    vpcRoutersPutRouter: (
+      organizationName: Name,
+      projectName: Name,
+      routerName: Name,
+      vpcName: Name,
+      data: VpcRouterUpdateParams,
+      params: RequestParams = {}
+    ) =>
+      this.request<void, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/vpcs/${vpcName}/routers/${routerName}`,
+        method: 'PUT',
+        body: data,
+        type: ContentType.Json,
+        ...params,
+      }),
+
+    /**
+     * @description Delete a router from its VPC
+     *
+     * @name VpcRoutersDeleteRouter
+     * @request DELETE:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers/{router_name}
+     */
+    vpcRoutersDeleteRouter: (
+      organizationName: Name,
+      projectName: Name,
+      routerName: Name,
+      vpcName: Name,
+      params: RequestParams = {}
+    ) =>
+      this.request<void, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/vpcs/${vpcName}/routers/${routerName}`,
+        method: 'DELETE',
+        ...params,
+      }),
+
+    /**
+     * @description List a Router's routes
+     *
+     * @name RoutersRoutesGet
+     * @request GET:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers/{router_name}/routes
+     */
+    routersRoutesGet: (
+      {
+        organizationName,
+        projectName,
+        routerName,
+        vpcName,
+        ...query
+      }: RoutersRoutesGetParams,
+      params: RequestParams = {}
+    ) =>
+      this.request<RouterRouteResultsPage, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/vpcs/${vpcName}/routers/${routerName}/routes`,
+        method: 'GET',
+        query: query,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Create a VPC Router
+     *
+     * @name RoutersRoutesPost
+     * @request POST:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers/{router_name}/routes
+     */
+    routersRoutesPost: (
+      organizationName: Name,
+      projectName: Name,
+      routerName: Name,
+      vpcName: Name,
+      data: RouterRouteCreateParams,
+      params: RequestParams = {}
+    ) =>
+      this.request<RouterRoute, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/vpcs/${vpcName}/routers/${routerName}/routes`,
+        method: 'POST',
+        body: data,
+        type: ContentType.Json,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Get a VPC Router route
+     *
+     * @name RoutersRoutesGetRoute
+     * @request GET:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers/{router_name}/routes/{route_name}
+     */
+    routersRoutesGetRoute: (
+      organizationName: Name,
+      projectName: Name,
+      routeName: Name,
+      routerName: Name,
+      vpcName: Name,
+      params: RequestParams = {}
+    ) =>
+      this.request<RouterRoute, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/vpcs/${vpcName}/routers/${routerName}/routes/${routeName}`,
+        method: 'GET',
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Update a Router route
+     *
+     * @name RoutersRoutesPutRoute
+     * @request PUT:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers/{router_name}/routes/{route_name}
+     */
+    routersRoutesPutRoute: (
+      organizationName: Name,
+      projectName: Name,
+      routeName: Name,
+      routerName: Name,
+      vpcName: Name,
+      data: RouterRouteUpdateParams,
+      params: RequestParams = {}
+    ) =>
+      this.request<void, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/vpcs/${vpcName}/routers/${routerName}/routes/${routeName}`,
+        method: 'PUT',
+        body: data,
+        type: ContentType.Json,
+        ...params,
+      }),
+
+    /**
+     * @description Delete a route from its router
+     *
+     * @name RoutersRoutesDeleteRoute
+     * @request DELETE:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers/{router_name}/routes/{route_name}
+     */
+    routersRoutesDeleteRoute: (
+      organizationName: Name,
+      projectName: Name,
+      routeName: Name,
+      routerName: Name,
+      vpcName: Name,
+      params: RequestParams = {}
+    ) =>
+      this.request<void, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/vpcs/${vpcName}/routers/${routerName}/routes/${routeName}`,
+        method: 'DELETE',
+        ...params,
+      }),
+
+    /**
+     * @description List subnets in a VPC.
+     *
+     * @name VpcSubnetsGet
+     * @request GET:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/subnets
+     */
+    vpcSubnetsGet: (
+      { organizationName, projectName, vpcName, ...query }: VpcSubnetsGetParams,
+      params: RequestParams = {}
+    ) =>
+      this.request<VpcSubnetResultsPage, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/vpcs/${vpcName}/subnets`,
+        method: 'GET',
+        query: query,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Create a subnet in a VPC.
+     *
+     * @name VpcSubnetsPost
+     * @request POST:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/subnets
+     */
+    vpcSubnetsPost: (
+      organizationName: Name,
+      projectName: Name,
+      vpcName: Name,
+      data: VpcSubnetCreateParams,
+      params: RequestParams = {}
+    ) =>
+      this.request<VpcSubnet, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/vpcs/${vpcName}/subnets`,
+        method: 'POST',
+        body: data,
+        type: ContentType.Json,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Get subnet in a VPC.
+     *
+     * @name VpcSubnetsGetSubnet
+     * @request GET:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/subnets/{subnet_name}
+     */
+    vpcSubnetsGetSubnet: (
+      organizationName: Name,
+      projectName: Name,
+      subnetName: Name,
+      vpcName: Name,
+      params: RequestParams = {}
+    ) =>
+      this.request<VpcSubnet, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/vpcs/${vpcName}/subnets/${subnetName}`,
+        method: 'GET',
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Update a VPC Subnet.
+     *
+     * @name VpcSubnetsPutSubnet
+     * @request PUT:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/subnets/{subnet_name}
+     */
+    vpcSubnetsPutSubnet: (
+      organizationName: Name,
+      projectName: Name,
+      subnetName: Name,
+      vpcName: Name,
+      data: VpcSubnetUpdateParams,
+      params: RequestParams = {}
+    ) =>
+      this.request<void, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/vpcs/${vpcName}/subnets/${subnetName}`,
+        method: 'PUT',
+        body: data,
+        type: ContentType.Json,
+        ...params,
+      }),
+
+    /**
+     * @description Delete a subnet from a VPC.
+     *
+     * @name VpcSubnetsDeleteSubnet
+     * @request DELETE:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/subnets/{subnet_name}
+     */
+    vpcSubnetsDeleteSubnet: (
+      organizationName: Name,
+      projectName: Name,
+      subnetName: Name,
+      vpcName: Name,
+      params: RequestParams = {}
+    ) =>
+      this.request<void, any>({
+        path: `/organizations/${organizationName}/projects/${projectName}/vpcs/${vpcName}/subnets/${subnetName}`,
+        method: 'DELETE',
+        ...params,
+      }),
+  }
+  sagas = {
+    /**
+     * @description List all sagas (for debugging)
+     *
+     * @name SagasGet
+     * @request GET:/sagas
+     */
+    sagasGet: (query: SagasGetParams, params: RequestParams = {}) =>
+      this.request<SagaResultsPage, any>({
+        path: `/sagas`,
+        method: 'GET',
+        query: query,
+        format: 'json',
+        ...params,
+      }),
+
+    /**
+     * @description Fetch information about a single saga (for debugging)
+     *
+     * @name SagasGetSaga
+     * @request GET:/sagas/{saga_id}
+     */
+    sagasGetSaga: (sagaId: string, params: RequestParams = {}) =>
+      this.request<Saga, any>({
+        path: `/sagas/${sagaId}`,
+        method: 'GET',
+        format: 'json',
+        ...params,
+      }),
+  }
+}
diff --git a/libs/api/index.ts b/libs/api/index.ts
index 4c625592e3..18699820bf 100644
--- a/libs/api/index.ts
+++ b/libs/api/index.ts
@@ -18,3 +18,7 @@ export const useApiQueryClient = getUseApiQueryClient<DefaultApi>()
 export type { ApiError } from './hooks'
 export * from './__generated__/models'
 export * from './instance-can'
+
+import * as sta from './__generated__/Api'
+
+export const api2 = new sta.Api<null>({ baseUrl: '/api' })
diff --git a/tools/generate_api_client.sh b/tools/generate_api_client.sh
index 47ca2fa91a..3f59ec48da 100755
--- a/tools/generate_api_client.sh
+++ b/tools/generate_api_client.sh
@@ -7,7 +7,6 @@ set -o xtrace
 API_VERSION=$(awk '/API_VERSION/ {print $2}' .github/workflows/packer.yaml)
 GEN_DIR='libs/api/__generated__'
 SPEC_FILE='app/docs/nexus-openapi.json'
-CODEMOD_DIR="codemods"
 
 # assumes omicron is in the same dir as as the console repo 
 git -C '../omicron' fetch --all
@@ -16,17 +15,9 @@ git -C '../omicron' checkout "$API_VERSION"
 cp ../omicron/openapi/nexus.json $SPEC_FILE
 cp ../omicron/tools/oxapi_demo packer/oxapi_demo
 
-rm -rf "$GEN_DIR/apis" "$GEN_DIR/models"
-
-# prereq: brew install openapi-generator
-openapi-generator generate -i $SPEC_FILE \
-  -o $GEN_DIR \
-  -g typescript-fetch \
-  -p typescriptThreePlus=true
-
-for file in $CODEMOD_DIR/*.api.js; do
-    yarn jscodeshift -t $file --extensions=ts,tsx --parser=tsx './libs/api'
-done
+npx swagger-typescript-api -p $SPEC_FILE -o $GEN_DIR \
+  --extract-request-params \
+  --extract-request-body
 
 yarn fmt --loglevel error
 

From 79d157c5cdd87690d6a6203ac0a5f48c49decefb Mon Sep 17 00:00:00 2001
From: David Crespo <crespo.dm@gmail.com>
Date: Sat, 27 Nov 2021 17:23:54 -0600
Subject: [PATCH 02/21] basically functioning typed hook

---
 app/layouts/OrgLayout.tsx    |  4 ++--
 app/pages/ProjectsPage.tsx   |  9 ++++-----
 libs/api/hooks2.ts           | 35 +++++++++++++++++++++++++++++++++++
 libs/api/index.ts            | 12 ++++++++++--
 tools/generate_api_client.sh |  2 +-
 5 files changed, 52 insertions(+), 10 deletions(-)
 create mode 100644 libs/api/hooks2.ts

diff --git a/app/layouts/OrgLayout.tsx b/app/layouts/OrgLayout.tsx
index 249fe9a391..972e77094e 100644
--- a/app/layouts/OrgLayout.tsx
+++ b/app/layouts/OrgLayout.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import { Link, NavLink, Outlet } from 'react-router-dom'
 import cn from 'classnames'
 
-import { useApiQuery } from '@oxide/api'
+import { useApiQuery2 } from '@oxide/api'
 import { SkipLinkTarget, Add12Icon } from '@oxide/ui'
 
 import { ContentPane, PageContainer, Sidebar } from './helpers'
@@ -11,7 +11,7 @@ import { useParams } from '../hooks'
 
 const ProjectList = (props: { className?: string }) => {
   const { orgName } = useParams('orgName')
-  const { data: projects } = useApiQuery('organizationProjectsGet', {
+  const { data: projects } = useApiQuery2('organizationProjectsGet', {
     organizationName: orgName,
   })
   return (
diff --git a/app/pages/ProjectsPage.tsx b/app/pages/ProjectsPage.tsx
index f8138a9b36..6a3c5e0193 100644
--- a/app/pages/ProjectsPage.tsx
+++ b/app/pages/ProjectsPage.tsx
@@ -1,9 +1,8 @@
 import React from 'react'
 import { Link } from 'react-router-dom'
 import { formatDistanceToNowStrict } from 'date-fns'
-import { useQuery } from 'react-query'
 
-import { api2 } from '@oxide/api'
+import { useApiQuery2 } from '@oxide/api'
 import {
   buttonStyle,
   PageHeader,
@@ -36,9 +35,9 @@ const Metric = ({ label, value, className }: MetricProps) => (
 
 const ProjectsPage = () => {
   const { orgName } = useParams('orgName')
-  const data = useQuery('organizationProjectsGet', () =>
-    api2.organizations.organizationProjectsGet({ organizationName: orgName })
-  ).data?.data
+  const { data } = useApiQuery2('organizationProjectsGet', {
+    organizationName: orgName,
+  })
 
   if (!data) return <div>loading</div>
 
diff --git a/libs/api/hooks2.ts b/libs/api/hooks2.ts
new file mode 100644
index 0000000000..ec8ec44498
--- /dev/null
+++ b/libs/api/hooks2.ts
@@ -0,0 +1,35 @@
+import type { UseQueryOptions } from 'react-query'
+import { useQuery } from 'react-query'
+
+import type { HttpResponse } from './__generated__/Api'
+import type { ApiError } from './hooks'
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+// this doesn't work for all methods. there appears to be a bug where
+// --extract-request-params only works on some methods. it's supposed to put
+// path params in an object, but there are a bunch of methods where the path
+// params are separate string arguments
+type Params<F> = F extends (p: infer P, r: any) => any ? P : never
+type Result<F> = F extends (p: any, r: any) => Promise<HttpResponse<infer R>>
+  ? R
+  : never
+
+type ApiClient = Record<string, (...args: any) => Promise<HttpResponse<any>>>
+/* eslint-enable @typescript-eslint/no-explicit-any */
+
+export const getUseApiQuery2 =
+  <A extends ApiClient>(api: A) =>
+  <M extends keyof A>(
+    method: M,
+    params: Params<A[M]>,
+    options?: UseQueryOptions<Result<A[M]>, ApiError['data']>
+  ) =>
+    useQuery(
+      [method, params],
+      () =>
+        api[method](params)
+          .then(({ data }) => data)
+          .catch(({ error }) => Promise.reject(error)),
+      options
+    )
diff --git a/libs/api/index.ts b/libs/api/index.ts
index 18699820bf..b565429811 100644
--- a/libs/api/index.ts
+++ b/libs/api/index.ts
@@ -19,6 +19,14 @@ export type { ApiError } from './hooks'
 export * from './__generated__/models'
 export * from './instance-can'
 
-import * as sta from './__generated__/Api'
+import { getUseApiQuery2 } from './hooks2'
+import { Api } from './__generated__/Api'
 
-export const api2 = new sta.Api<null>({ baseUrl: '/api' })
+const api2 = new Api<null>({ baseUrl: basePath })
+
+// The fact that the route functions are groups under keys corresponding to the
+// first segment of the path is weird and sort of annoying. It might be the kind
+// of the thing I'd want to use a custom template to override. On the other hand
+// it's not so bad since all we care about in the console for now is the
+// organzations ones.
+export const useApiQuery2 = getUseApiQuery2(api2.organizations)
diff --git a/tools/generate_api_client.sh b/tools/generate_api_client.sh
index 3f59ec48da..31a9e0055a 100755
--- a/tools/generate_api_client.sh
+++ b/tools/generate_api_client.sh
@@ -17,7 +17,7 @@ cp ../omicron/tools/oxapi_demo packer/oxapi_demo
 
 npx swagger-typescript-api -p $SPEC_FILE -o $GEN_DIR \
   --extract-request-params \
-  --extract-request-body
+  --extract-request-body # weirdly this doesn't do anything
 
 yarn fmt --loglevel error
 

From 9f407ed88d0cffa5ea0690629ae10373e1953041 Mon Sep 17 00:00:00 2001
From: David Crespo <crespo.dm@gmail.com>
Date: Sat, 27 Nov 2021 23:24:18 -0600
Subject: [PATCH 03/21] simpler error handling, nicer comment

---
 libs/api/hooks2.ts | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/libs/api/hooks2.ts b/libs/api/hooks2.ts
index ec8ec44498..02addf66ef 100644
--- a/libs/api/hooks2.ts
+++ b/libs/api/hooks2.ts
@@ -2,7 +2,6 @@ import type { UseQueryOptions } from 'react-query'
 import { useQuery } from 'react-query'
 
 import type { HttpResponse } from './__generated__/Api'
-import type { ApiError } from './hooks'
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
@@ -18,18 +17,37 @@ type Result<F> = F extends (p: any, r: any) => Promise<HttpResponse<infer R>>
 type ApiClient = Record<string, (...args: any) => Promise<HttpResponse<any>>>
 /* eslint-enable @typescript-eslint/no-explicit-any */
 
+type ErrorData = {
+  request_id: string
+  error_code: string | null
+  message: string
+}
+
 export const getUseApiQuery2 =
   <A extends ApiClient>(api: A) =>
   <M extends keyof A>(
     method: M,
     params: Params<A[M]>,
-    options?: UseQueryOptions<Result<A[M]>, ApiError['data']>
+    options?: UseQueryOptions<Result<A[M]>, HttpResponse<null, ErrorData>>
   ) =>
     useQuery(
       [method, params],
-      () =>
-        api[method](params)
-          .then(({ data }) => data)
-          .catch(({ error }) => Promise.reject(error)),
+      // The generated client parses the json and sticks it in `data` for us, so
+      // that's what we want to return from the fetcher. Note that while there
+      // is an --unwrap-response-data CLI flag for the generator that pulls out
+      // the data key for us, something about the types is weird or wrong, so
+      // we're doing it ourselves here instead.
+      //
+      // In the case of an error, it does the same thing with the `error` key,
+      // but since there may not always be parseable json in an error response
+      // (I think?) it seems more reasonable in that case to take the whole
+      // `HttpResponse` instead of plucking out error with
+      //
+      //   .catch((resp) => resp.error)
+      //
+      // The generated client already throws on error responses, which is what
+      // react-query wants, so we don't have to handle the error case explicitly
+      // here.
+      () => api[method](params).then((resp) => resp.data),
       options
     )

From db6236d7a9cad2ede8e73d5a082e4c5a7e54dc3d Mon Sep 17 00:00:00 2001
From: David Crespo <crespo.dm@gmail.com>
Date: Sun, 28 Nov 2021 15:33:38 -0600
Subject: [PATCH 04/21] be sneaky with imports to show it's a drop-in
 replacement

---
 app/layouts/OrgLayout.tsx  | 4 ++--
 app/pages/ProjectsPage.tsx | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/layouts/OrgLayout.tsx b/app/layouts/OrgLayout.tsx
index 972e77094e..501939a266 100644
--- a/app/layouts/OrgLayout.tsx
+++ b/app/layouts/OrgLayout.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import { Link, NavLink, Outlet } from 'react-router-dom'
 import cn from 'classnames'
 
-import { useApiQuery2 } from '@oxide/api'
+import { useApiQuery2 as useApiQuery } from '@oxide/api'
 import { SkipLinkTarget, Add12Icon } from '@oxide/ui'
 
 import { ContentPane, PageContainer, Sidebar } from './helpers'
@@ -11,7 +11,7 @@ import { useParams } from '../hooks'
 
 const ProjectList = (props: { className?: string }) => {
   const { orgName } = useParams('orgName')
-  const { data: projects } = useApiQuery2('organizationProjectsGet', {
+  const { data: projects } = useApiQuery('organizationProjectsGet', {
     organizationName: orgName,
   })
   return (
diff --git a/app/pages/ProjectsPage.tsx b/app/pages/ProjectsPage.tsx
index 6a3c5e0193..059144a942 100644
--- a/app/pages/ProjectsPage.tsx
+++ b/app/pages/ProjectsPage.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import { Link } from 'react-router-dom'
 import { formatDistanceToNowStrict } from 'date-fns'
 
-import { useApiQuery2 } from '@oxide/api'
+import { useApiQuery2 as useApiQuery } from '@oxide/api'
 import {
   buttonStyle,
   PageHeader,
@@ -35,7 +35,7 @@ const Metric = ({ label, value, className }: MetricProps) => (
 
 const ProjectsPage = () => {
   const { orgName } = useParams('orgName')
-  const { data } = useApiQuery2('organizationProjectsGet', {
+  const { data } = useApiQuery('organizationProjectsGet', {
     organizationName: orgName,
   })
 

From d7deee0e38f6c8e90bad21a77a977ae0f65da43a Mon Sep 17 00:00:00 2001
From: David Crespo <crespo.dm@gmail.com>
Date: Mon, 29 Nov 2021 10:31:45 -0600
Subject: [PATCH 05/21] make STA a dev dep instead of using npx

---
 package.json                 |   1 +
 tools/generate_api_client.sh |   2 +-
 yarn.lock                    | 219 ++++++++++++++++++++++++++++++++++-
 3 files changed, 218 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 8e906a3a91..bc4e611d59 100644
--- a/package.json
+++ b/package.json
@@ -108,6 +108,7 @@
     "postcss-nesting": "^8.0.1",
     "prettier": "2.4.0",
     "rollup": "^2.52.7",
+    "swagger-typescript-api": "^9.3.1",
     "tailwindcss": "^3.0.0-alpha.2",
     "ts-node": "^9.1.1",
     "tsconfig-paths-webpack-plugin": "^3.5.1",
diff --git a/tools/generate_api_client.sh b/tools/generate_api_client.sh
index 31a9e0055a..60905f2f7e 100755
--- a/tools/generate_api_client.sh
+++ b/tools/generate_api_client.sh
@@ -15,7 +15,7 @@ git -C '../omicron' checkout "$API_VERSION"
 cp ../omicron/openapi/nexus.json $SPEC_FILE
 cp ../omicron/tools/oxapi_demo packer/oxapi_demo
 
-npx swagger-typescript-api -p $SPEC_FILE -o $GEN_DIR \
+yarn swagger-typescript-api -p $SPEC_FILE -o $GEN_DIR \
   --extract-request-params \
   --extract-request-body # weirdly this doesn't do anything
 
diff --git a/yarn.lock b/yarn.lock
index 6c97650751..917ae513f0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1299,6 +1299,11 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
+"@exodus/schemasafe@^1.0.0-rc.2":
+  version "1.0.0-rc.6"
+  resolved "https://registry.yarnpkg.com/@exodus/schemasafe/-/schemasafe-1.0.0-rc.6.tgz#7985f681564cff4ffaebb5896eb4be20af3aae7a"
+  integrity sha512-dDnQizD94EdBwEj/fh3zPRa/HWCS9O5au2PuHhZBbuM3xWHxuaKzPBOEWze7Nn0xW68MIpZ7Xdyn1CoCpjKCuQ==
+
 "@figma-export/cli@^3.5.0":
   version "3.5.0"
   resolved "https://registry.npmjs.org/@figma-export/cli/-/cli-3.5.0.tgz"
@@ -3428,6 +3433,11 @@
   resolved "https://registry.npmjs.org/@types/svgo/-/svgo-1.3.6.tgz"
   integrity sha512-AZU7vQcy/4WFEuwnwsNsJnFwupIpbllH1++LXScN6uxT1Z4zPzdrWG97w4/I7eFKFTvfy/bHFStWjdBAg2Vjug==
 
+"@types/swagger-schema-official@2.0.21":
+  version "2.0.21"
+  resolved "https://registry.yarnpkg.com/@types/swagger-schema-official/-/swagger-schema-official-2.0.21.tgz#56812a86dcd57ba60e5c51705ee96a2b2dc9b374"
+  integrity sha512-n9BbLOjR4Hre7B4TSGGMPohOgOg8tcp00uxqsIE00uuWQC0QuX57G1bqC1csLsk2DpTGtHkd0dEb3ipsCZ9dAA==
+
 "@types/tapable@^1", "@types/tapable@^1.0.5":
   version "1.0.8"
   resolved "https://registry.npmjs.org/@types/tapable/-/tapable-1.0.8.tgz"
@@ -4138,6 +4148,11 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
 aria-query@^4.2.2:
   version "4.2.2"
   resolved "https://registry.npmjs.org/aria-query/-/aria-query-4.2.2.tgz"
@@ -4333,7 +4348,7 @@ axe-core@^4.0.2:
   resolved "https://registry.npmjs.org/axe-core/-/axe-core-4.3.1.tgz"
   integrity sha512-3WVgVPs/7OnKU3s+lqMtkv3wQlg3WxK1YifmpJSDO0E1aPBrZWlrrTO6cxRqCXLuX2aYgCljqXIQd0VnRidV0g==
 
-axios@^0.21.1, axios@~0.21.4:
+axios@^0.21.1, axios@^0.21.4, axios@~0.21.4:
   version "0.21.4"
   resolved "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz"
   integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
@@ -6493,6 +6508,11 @@ es5-shim@^4.5.13:
   resolved "https://registry.npmjs.org/es5-shim/-/es5-shim-4.6.2.tgz"
   integrity sha512-n0XTVMGps+Deyr38jtqKPR5F5hb9owYeRQcKJW39eFvzUk/u/9Ww315werRzbiNMnHCUw/YHDPBphTlEnzdi+A==
 
+es6-promise@^3.2.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz#a08cdde84ccdbf34d027a1451bc91d4bcd28a613"
+  integrity sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM=
+
 es6-shim@^0.35.5:
   version "0.35.6"
   resolved "https://registry.npmjs.org/es6-shim/-/es6-shim-0.35.6.tgz"
@@ -6850,6 +6870,11 @@ esutils@^2.0.2:
   resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
+eta@^1.12.1:
+  version "1.12.3"
+  resolved "https://registry.yarnpkg.com/eta/-/eta-1.12.3.tgz#2982d08adfbef39f9fa50e2fbd42d7337e7338b1"
+  integrity sha512-qHixwbDLtekO/d51Yr4glcaUJCIjGVJyTzuqV4GPlgZo1YpgOKG+avQynErZIYrfM6JIJdtiG2Kox8tbb+DoGg==
+
 etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"
@@ -7087,6 +7112,11 @@ fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
+fast-safe-stringify@^2.0.7:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884"
+  integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==
+
 fastq@^1.6.0:
   version "1.11.0"
   resolved "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz"
@@ -8172,6 +8202,11 @@ http-proxy-agent@^4.0.1:
     agent-base "6"
     debug "4"
 
+http2-client@^1.2.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/http2-client/-/http2-client-1.3.5.tgz#20c9dc909e3cc98284dd20af2432c524086df181"
+  integrity sha512-EC2utToWl4RKfs5zd36Mxq7nzHHBuomZboI0yYL6Y0RmBgT7Sgkq4rQ0ezFTYoIsSs7Tm9SJe+o2FcAg6GBhGA==
+
 https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz"
@@ -9304,6 +9339,13 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
 jscodeshift@^0.13.0:
   version "0.13.0"
   resolved "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.13.0.tgz"
@@ -10177,7 +10219,7 @@ nano-time@1.0.0:
   dependencies:
     big-integer "^1.6.16"
 
-nanoid@^3.1.23, nanoid@^3.1.30:
+nanoid@^3.1.22, nanoid@^3.1.23, nanoid@^3.1.30:
   version "3.1.30"
   resolved "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz"
   integrity sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==
@@ -10251,6 +10293,20 @@ node-dir@^0.1.10, node-dir@^0.1.17:
   dependencies:
     minimatch "^3.0.2"
 
+node-emoji@^1.10.0:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c"
+  integrity sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==
+  dependencies:
+    lodash "^4.17.21"
+
+node-fetch-h2@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/node-fetch-h2/-/node-fetch-h2-2.3.0.tgz#c6188325f9bd3d834020bf0f2d6dc17ced2241ac"
+  integrity sha512-ofRW94Ab0T4AOh5Fk8t0h8OBWrmjb0SSB20xh1H8YnPV9EJ+f5AMoYSUQ2zgJ4Iq2HAK0I2l5/Nequ8YzFS3Hg==
+  dependencies:
+    http2-client "^1.2.5"
+
 node-fetch@^2.6.1:
   version "2.6.1"
   resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz"
@@ -10324,6 +10380,13 @@ node-plop@^0.26.3:
     mkdirp "^0.5.1"
     resolve "^1.12.0"
 
+node-readfiles@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/node-readfiles/-/node-readfiles-0.2.0.tgz#dbbd4af12134e2e635c245ef93ffcf6f60673a5d"
+  integrity sha1-271K8SE04uY1wkXvk//Pb2BnOl0=
+  dependencies:
+    es6-promise "^3.2.1"
+
 node-releases@^1.1.61, node-releases@^1.1.71:
   version "1.1.73"
   resolved "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz"
@@ -10419,6 +10482,52 @@ nwsapi@^2.2.0:
   resolved "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz"
   integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
 
+oas-kit-common@^1.0.8:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/oas-kit-common/-/oas-kit-common-1.0.8.tgz#6d8cacf6e9097967a4c7ea8bcbcbd77018e1f535"
+  integrity sha512-pJTS2+T0oGIwgjGpw7sIRU8RQMcUoKCDWFLdBqKB2BNmGpbBMH2sdqAaOXUg8OzonZHU0L7vfJu1mJFEiYDWOQ==
+  dependencies:
+    fast-safe-stringify "^2.0.7"
+
+oas-linter@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/oas-linter/-/oas-linter-3.2.2.tgz#ab6a33736313490659035ca6802dc4b35d48aa1e"
+  integrity sha512-KEGjPDVoU5K6swgo9hJVA/qYGlwfbFx+Kg2QB/kd7rzV5N8N5Mg6PlsoCMohVnQmo+pzJap/F610qTodKzecGQ==
+  dependencies:
+    "@exodus/schemasafe" "^1.0.0-rc.2"
+    should "^13.2.1"
+    yaml "^1.10.0"
+
+oas-resolver@^2.5.6:
+  version "2.5.6"
+  resolved "https://registry.yarnpkg.com/oas-resolver/-/oas-resolver-2.5.6.tgz#10430569cb7daca56115c915e611ebc5515c561b"
+  integrity sha512-Yx5PWQNZomfEhPPOphFbZKi9W93CocQj18NlD2Pa4GWZzdZpSJvYwoiuurRI7m3SpcChrnO08hkuQDL3FGsVFQ==
+  dependencies:
+    node-fetch-h2 "^2.3.0"
+    oas-kit-common "^1.0.8"
+    reftools "^1.1.9"
+    yaml "^1.10.0"
+    yargs "^17.0.1"
+
+oas-schema-walker@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/oas-schema-walker/-/oas-schema-walker-1.1.5.tgz#74c3cd47b70ff8e0b19adada14455b5d3ac38a22"
+  integrity sha512-2yucenq1a9YPmeNExoUa9Qwrt9RFkjqaMAA1X+U7sbb0AqBeTIdMHky9SQQ6iN94bO5NW0W4TRYXerG+BdAvAQ==
+
+oas-validator@^5.0.8:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/oas-validator/-/oas-validator-5.0.8.tgz#387e90df7cafa2d3ffc83b5fb976052b87e73c28"
+  integrity sha512-cu20/HE5N5HKqVygs3dt94eYJfBi0TsZvPVXDhbXQHiEityDN+RROTleefoKRKKJ9dFAF2JBkDHgvWj0sjKGmw==
+  dependencies:
+    call-me-maybe "^1.0.1"
+    oas-kit-common "^1.0.8"
+    oas-linter "^3.2.2"
+    oas-resolver "^2.5.6"
+    oas-schema-walker "^1.1.5"
+    reftools "^1.1.9"
+    should "^13.2.1"
+    yaml "^1.10.0"
+
 object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
@@ -11977,6 +12086,11 @@ refractor@^3.1.0:
     parse-entities "^2.0.0"
     prismjs "~1.23.0"
 
+reftools@^1.1.9:
+  version "1.1.9"
+  resolved "https://registry.yarnpkg.com/reftools/-/reftools-1.1.9.tgz#e16e19f662ccd4648605312c06d34e5da3a2b77e"
+  integrity sha512-OVede/NQE13xBQ+ob5CKd5KyeJYU2YInb1bmV4nRoOfquZPkAkxuOXicSe1PvqIuZZ4kD13sPKBbR7UFDmli6w==
+
 regenerate-unicode-properties@^8.2.0:
   version "8.2.0"
   resolved "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz"
@@ -12582,6 +12696,50 @@ shellwords@^0.1.1:
   resolved "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz"
   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
+should-equal@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/should-equal/-/should-equal-2.0.0.tgz#6072cf83047360867e68e98b09d71143d04ee0c3"
+  integrity sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==
+  dependencies:
+    should-type "^1.4.0"
+
+should-format@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/should-format/-/should-format-3.0.3.tgz#9bfc8f74fa39205c53d38c34d717303e277124f1"
+  integrity sha1-m/yPdPo5IFxT04w01xcwPidxJPE=
+  dependencies:
+    should-type "^1.3.0"
+    should-type-adaptors "^1.0.1"
+
+should-type-adaptors@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/should-type-adaptors/-/should-type-adaptors-1.1.0.tgz#401e7f33b5533033944d5cd8bf2b65027792e27a"
+  integrity sha512-JA4hdoLnN+kebEp2Vs8eBe9g7uy0zbRo+RMcU0EsNy+R+k049Ki+N5tT5Jagst2g7EAja+euFuoXFCa8vIklfA==
+  dependencies:
+    should-type "^1.3.0"
+    should-util "^1.0.0"
+
+should-type@^1.3.0, should-type@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/should-type/-/should-type-1.4.0.tgz#0756d8ce846dfd09843a6947719dfa0d4cff5cf3"
+  integrity sha1-B1bYzoRt/QmEOmlHcZ36DUz/XPM=
+
+should-util@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/should-util/-/should-util-1.0.1.tgz#fb0d71338f532a3a149213639e2d32cbea8bcb28"
+  integrity sha512-oXF8tfxx5cDk8r2kYqlkUJzZpDBqVY/II2WhvU0n9Y3XYvAYRmeaf1PvvIvTgPnv4KJ+ES5M0PyDq5Jp+Ygy2g==
+
+should@^13.2.1:
+  version "13.2.3"
+  resolved "https://registry.yarnpkg.com/should/-/should-13.2.3.tgz#96d8e5acf3e97b49d89b51feaa5ae8d07ef58f10"
+  integrity sha512-ggLesLtu2xp+ZxI+ysJTmNjh2U0TsC+rQ/pfED9bUZZ4DKefP27D+7YJVVTvKsmjLpIi9jAa7itwDGkDDmt1GQ==
+  dependencies:
+    should-equal "^2.0.0"
+    should-format "^3.0.3"
+    should-type "^1.4.0"
+    should-type-adaptors "^1.0.1"
+    should-util "^1.0.0"
+
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"
@@ -13101,6 +13259,48 @@ svgo@^1.2.2, svgo@~1.3.2:
     unquote "~1.1.1"
     util.promisify "~1.0.0"
 
+swagger-schema-official@2.0.0-bab6bed:
+  version "2.0.0-bab6bed"
+  resolved "https://registry.yarnpkg.com/swagger-schema-official/-/swagger-schema-official-2.0.0-bab6bed.tgz#70070468d6d2977ca5237b2e519ca7d06a2ea3fd"
+  integrity sha1-cAcEaNbSl3ylI3suUZyn0Gouo/0=
+
+swagger-typescript-api@^9.3.1:
+  version "9.3.1"
+  resolved "https://registry.yarnpkg.com/swagger-typescript-api/-/swagger-typescript-api-9.3.1.tgz#07df3aa8e83a3897356a6e820e88b8348830aa6b"
+  integrity sha512-vtarFELmXmDKrtY2FvU2OjNvN1BqOj3kHWzz7mAresNKRgRubZpjlopECxbBekrLeX3lezAYSNcrFMVRGJAD4A==
+  dependencies:
+    "@types/swagger-schema-official" "2.0.21"
+    axios "^0.21.4"
+    commander "^6.2.1"
+    cosmiconfig "^7.0.0"
+    eta "^1.12.1"
+    js-yaml "^4.0.0"
+    lodash "^4.17.21"
+    make-dir "^3.1.0"
+    nanoid "^3.1.22"
+    node-emoji "^1.10.0"
+    prettier "^2.2.1"
+    swagger-schema-official "2.0.0-bab6bed"
+    swagger2openapi "^7.0.5"
+    typescript "^4.2.4"
+
+swagger2openapi@^7.0.5:
+  version "7.0.8"
+  resolved "https://registry.yarnpkg.com/swagger2openapi/-/swagger2openapi-7.0.8.tgz#12c88d5de776cb1cbba758994930f40ad0afac59"
+  integrity sha512-upi/0ZGkYgEcLeGieoz8gT74oWHA0E7JivX7aN9mAf+Tc7BQoRBvnIGHoPDw+f9TXTW4s6kGYCZJtauP6OYp7g==
+  dependencies:
+    call-me-maybe "^1.0.1"
+    node-fetch "^2.6.1"
+    node-fetch-h2 "^2.3.0"
+    node-readfiles "^0.2.0"
+    oas-kit-common "^1.0.8"
+    oas-resolver "^2.5.6"
+    oas-schema-walker "^1.1.5"
+    oas-validator "^5.0.8"
+    reftools "^1.1.9"
+    yaml "^1.10.0"
+    yargs "^17.0.1"
+
 swap-case@^1.1.0:
   version "1.1.2"
   resolved "https://registry.npmjs.org/swap-case/-/swap-case-1.1.2.tgz"
@@ -13590,7 +13790,7 @@ typedarray@^0.0.6:
   resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@^4.5.2:
+typescript@^4.2.4, typescript@^4.5.2:
   version "4.5.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.2.tgz#8ac1fba9f52256fdb06fb89e4122fa6a346c2998"
   integrity sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==
@@ -14469,6 +14669,19 @@ yargs@^16.2.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
+yargs@^17.0.1:
+  version "17.2.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.2.1.tgz#e2c95b9796a0e1f7f3bf4427863b42e0418191ea"
+  integrity sha512-XfR8du6ua4K6uLGm5S6fA+FIJom/MdJcFNVY8geLlp2v8GYbOXD4EB1tPNZsRn4vBzKGMgb5DRZMeWuFc2GO8Q==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
 yn@3.1.1:
   version "3.1.1"
   resolved "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz"

From f5aba99bcc00365a693746aae7d12b570728e00d Mon Sep 17 00:00:00 2001
From: David Crespo <crespo.dm@gmail.com>
Date: Mon, 29 Nov 2021 13:21:19 -0600
Subject: [PATCH 06/21] show corrected params output with forked STA

---
 libs/api/__generated__/Api.ts | 710 ++++++++++++++++++++++++++++------
 package.json                  |   2 +-
 yarn.lock                     |   5 +-
 3 files changed, 594 insertions(+), 123 deletions(-)

diff --git a/libs/api/__generated__/Api.ts b/libs/api/__generated__/Api.ts
index ce06cae0ab..adc380beea 100644
--- a/libs/api/__generated__/Api.ts
+++ b/libs/api/__generated__/Api.ts
@@ -954,6 +954,14 @@ export interface HardwareRacksGetParams {
   sort_by?: IdSortMode
 }
 
+export interface HardwareRacksGetRackParams {
+  /**
+   * The rack's unique ID.
+   * @format uuid
+   */
+  rackId: string
+}
+
 export interface HardwareSledsGetParams {
   /**
    * Maximum number of items returned by a single call
@@ -973,6 +981,18 @@ export interface HardwareSledsGetParams {
   sort_by?: IdSortMode
 }
 
+export interface HardwareSledsGetSledParams {
+  /**
+   * The sled's unique ID.
+   * @format uuid
+   */
+  sledId: string
+}
+
+export type SpoofLoginParams = object
+
+export type LogoutParams = object
+
 export interface OrganizationsGetParams {
   /**
    * Maximum number of items returned by a single call
@@ -988,6 +1008,23 @@ export interface OrganizationsGetParams {
   sort_by?: NameOrIdSortMode
 }
 
+export type OrganizationsPostParams = object
+
+export interface OrganizationsGetOrganizationParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+}
+
+export interface OrganizationsPutOrganizationParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+}
+
+export interface OrganizationsDeleteOrganizationParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+}
+
 export interface OrganizationProjectsGetParams {
   /**
    * Maximum number of items returned by a single call
@@ -1006,6 +1043,35 @@ export interface OrganizationProjectsGetParams {
   organizationName: Name
 }
 
+export interface OrganizationProjectsPostParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+}
+
+export interface OrganizationProjectsGetProjectParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+}
+
+export interface OrganizationProjectsPutProjectParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+}
+
+export interface OrganizationProjectsDeleteProjectParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+}
+
 export interface ProjectDisksGetParams {
   /**
    * Maximum number of items returned by a single call
@@ -1031,6 +1097,36 @@ export interface ProjectDisksGetParams {
   projectName: Name
 }
 
+export interface ProjectDisksPostParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+}
+
+export interface ProjectDisksGetDiskParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  diskName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+}
+
+export interface ProjectDisksDeleteDiskParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  diskName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+}
+
 export interface ProjectInstancesGetParams {
   /**
    * Maximum number of items returned by a single call
@@ -1056,6 +1152,122 @@ export interface ProjectInstancesGetParams {
   projectName: Name
 }
 
+export interface ProjectInstancesPostParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+}
+
+export interface ProjectInstancesGetInstanceParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  instanceName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+}
+
+export interface ProjectInstancesDeleteInstanceParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  instanceName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+}
+
+export interface InstanceDisksGetParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  instanceName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+}
+
+export interface InstanceDisksGetDiskParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  diskName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  instanceName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+}
+
+export interface InstanceDisksPutDiskParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  diskName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  instanceName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+}
+
+export interface InstanceDisksDeleteDiskParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  diskName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  instanceName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+}
+
+export interface ProjectInstancesInstanceRebootParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  instanceName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+}
+
+export interface ProjectInstancesInstanceStartParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  instanceName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+}
+
+export interface ProjectInstancesInstanceStopParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  instanceName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+}
+
 export interface ProjectVpcsGetParams {
   /**
    * Maximum number of items returned by a single call
@@ -1081,6 +1293,47 @@ export interface ProjectVpcsGetParams {
   projectName: Name
 }
 
+export interface ProjectVpcsPostParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+}
+
+export interface ProjectVpcsGetVpcParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  vpcName: Name
+}
+
+export interface ProjectVpcsPutVpcParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  vpcName: Name
+}
+
+export interface ProjectVpcsDeleteVpcParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  vpcName: Name
+}
+
 export interface VpcFirewallRulesGetParams {
   /**
    * Maximum number of items returned by a single call
@@ -1109,6 +1362,17 @@ export interface VpcFirewallRulesGetParams {
   vpcName: Name
 }
 
+export interface VpcFirewallRulesPutParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  vpcName: Name
+}
+
 export interface VpcRoutersGetParams {
   /**
    * Maximum number of items returned by a single call
@@ -1137,6 +1401,59 @@ export interface VpcRoutersGetParams {
   vpcName: Name
 }
 
+export interface VpcRoutersPostParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  vpcName: Name
+}
+
+export interface VpcRoutersGetRouterParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  routerName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  vpcName: Name
+}
+
+export interface VpcRoutersPutRouterParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  routerName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  vpcName: Name
+}
+
+export interface VpcRoutersDeleteRouterParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  routerName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  vpcName: Name
+}
+
 export interface RoutersRoutesGetParams {
   /**
    * Maximum number of items returned by a single call
@@ -1168,6 +1485,71 @@ export interface RoutersRoutesGetParams {
   vpcName: Name
 }
 
+export interface RoutersRoutesPostParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  routerName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  vpcName: Name
+}
+
+export interface RoutersRoutesGetRouteParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  routeName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  routerName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  vpcName: Name
+}
+
+export interface RoutersRoutesPutRouteParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  routeName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  routerName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  vpcName: Name
+}
+
+export interface RoutersRoutesDeleteRouteParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  routeName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  routerName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  vpcName: Name
+}
+
 export interface VpcSubnetsGetParams {
   /**
    * Maximum number of items returned by a single call
@@ -1196,6 +1578,59 @@ export interface VpcSubnetsGetParams {
   vpcName: Name
 }
 
+export interface VpcSubnetsPostParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  vpcName: Name
+}
+
+export interface VpcSubnetsGetSubnetParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  subnetName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  vpcName: Name
+}
+
+export interface VpcSubnetsPutSubnetParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  subnetName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  vpcName: Name
+}
+
+export interface VpcSubnetsDeleteSubnetParams {
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  organizationName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  projectName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  subnetName: Name
+
+  /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
+  vpcName: Name
+}
+
 export interface SagasGetParams {
   /**
    * Maximum number of items returned by a single call
@@ -1215,6 +1650,11 @@ export interface SagasGetParams {
   sort_by?: IdSortMode
 }
 
+export interface SagasGetSagaParams {
+  /** @format uuid */
+  sagaId: string
+}
+
 export type QueryParamsType = Record<string | number, any>
 export type ResponseFormat = keyof Omit<Body, 'body' | 'bodyUsed'>
 
@@ -1490,7 +1930,10 @@ export class Api<
      * @name HardwareRacksGetRack
      * @request GET:/hardware/racks/{rack_id}
      */
-    hardwareRacksGetRack: (rackId: string, params: RequestParams = {}) =>
+    hardwareRacksGetRack: (
+      { rackId }: HardwareRacksGetRackParams,
+      params: RequestParams = {}
+    ) =>
       this.request<Rack, any>({
         path: `/hardware/racks/${rackId}`,
         method: 'GET',
@@ -1522,7 +1965,10 @@ export class Api<
      * @name HardwareSledsGetSled
      * @request GET:/hardware/sleds/{sled_id}
      */
-    hardwareSledsGetSled: (sledId: string, params: RequestParams = {}) =>
+    hardwareSledsGetSled: (
+      { sledId }: HardwareSledsGetSledParams,
+      params: RequestParams = {}
+    ) =>
       this.request<Sled, any>({
         path: `/hardware/sleds/${sledId}`,
         method: 'GET',
@@ -1537,7 +1983,11 @@ export class Api<
      * @name SpoofLogin
      * @request POST:/login
      */
-    spoofLogin: (data: LoginParams, params: RequestParams = {}) =>
+    spoofLogin: (
+      query: SpoofLoginParams,
+      data: LoginParams,
+      params: RequestParams = {}
+    ) =>
       this.request<any, any>({
         path: `/login`,
         method: 'POST',
@@ -1553,7 +2003,7 @@ export class Api<
      * @name Logout
      * @request POST:/logout
      */
-    logout: (params: RequestParams = {}) =>
+    logout: (query: LogoutParams, params: RequestParams = {}) =>
       this.request<any, any>({
         path: `/logout`,
         method: 'POST',
@@ -1585,7 +2035,11 @@ export class Api<
      * @name OrganizationsPost
      * @request POST:/organizations
      */
-    organizationsPost: (data: OrganizationCreate, params: RequestParams = {}) =>
+    organizationsPost: (
+      query: OrganizationsPostParams,
+      data: OrganizationCreate,
+      params: RequestParams = {}
+    ) =>
       this.request<Organization, any>({
         path: `/organizations`,
         method: 'POST',
@@ -1602,7 +2056,7 @@ export class Api<
      * @request GET:/organizations/{organization_name}
      */
     organizationsGetOrganization: (
-      organizationName: Name,
+      { organizationName }: OrganizationsGetOrganizationParams,
       params: RequestParams = {}
     ) =>
       this.request<Organization, any>({
@@ -1619,7 +2073,7 @@ export class Api<
      * @request PUT:/organizations/{organization_name}
      */
     organizationsPutOrganization: (
-      organizationName: Name,
+      { organizationName }: OrganizationsPutOrganizationParams,
       data: OrganizationUpdate,
       params: RequestParams = {}
     ) =>
@@ -1639,7 +2093,7 @@ export class Api<
      * @request DELETE:/organizations/{organization_name}
      */
     organizationsDeleteOrganization: (
-      organizationName: Name,
+      { organizationName }: OrganizationsDeleteOrganizationParams,
       params: RequestParams = {}
     ) =>
       this.request<void, any>({
@@ -1673,7 +2127,7 @@ export class Api<
      * @request POST:/organizations/{organization_name}/projects
      */
     organizationProjectsPost: (
-      organizationName: Name,
+      { organizationName }: OrganizationProjectsPostParams,
       data: ProjectCreate,
       params: RequestParams = {}
     ) =>
@@ -1693,8 +2147,7 @@ export class Api<
      * @request GET:/organizations/{organization_name}/projects/{project_name}
      */
     organizationProjectsGetProject: (
-      organizationName: Name,
-      projectName: Name,
+      { organizationName, projectName }: OrganizationProjectsGetProjectParams,
       params: RequestParams = {}
     ) =>
       this.request<Project, any>({
@@ -1711,8 +2164,7 @@ export class Api<
      * @request PUT:/organizations/{organization_name}/projects/{project_name}
      */
     organizationProjectsPutProject: (
-      organizationName: Name,
-      projectName: Name,
+      { organizationName, projectName }: OrganizationProjectsPutProjectParams,
       data: ProjectUpdate,
       params: RequestParams = {}
     ) =>
@@ -1732,8 +2184,10 @@ export class Api<
      * @request DELETE:/organizations/{organization_name}/projects/{project_name}
      */
     organizationProjectsDeleteProject: (
-      organizationName: Name,
-      projectName: Name,
+      {
+        organizationName,
+        projectName,
+      }: OrganizationProjectsDeleteProjectParams,
       params: RequestParams = {}
     ) =>
       this.request<void, any>({
@@ -1767,8 +2221,7 @@ export class Api<
      * @request POST:/organizations/{organization_name}/projects/{project_name}/disks
      */
     projectDisksPost: (
-      organizationName: Name,
-      projectName: Name,
+      { organizationName, projectName }: ProjectDisksPostParams,
       data: DiskCreateParams,
       params: RequestParams = {}
     ) =>
@@ -1788,9 +2241,7 @@ export class Api<
      * @request GET:/organizations/{organization_name}/projects/{project_name}/disks/{disk_name}
      */
     projectDisksGetDisk: (
-      diskName: Name,
-      organizationName: Name,
-      projectName: Name,
+      { diskName, organizationName, projectName }: ProjectDisksGetDiskParams,
       params: RequestParams = {}
     ) =>
       this.request<Disk, any>({
@@ -1807,9 +2258,7 @@ export class Api<
      * @request DELETE:/organizations/{organization_name}/projects/{project_name}/disks/{disk_name}
      */
     projectDisksDeleteDisk: (
-      diskName: Name,
-      organizationName: Name,
-      projectName: Name,
+      { diskName, organizationName, projectName }: ProjectDisksDeleteDiskParams,
       params: RequestParams = {}
     ) =>
       this.request<void, any>({
@@ -1843,8 +2292,7 @@ export class Api<
      * @request POST:/organizations/{organization_name}/projects/{project_name}/instances
      */
     projectInstancesPost: (
-      organizationName: Name,
-      projectName: Name,
+      { organizationName, projectName }: ProjectInstancesPostParams,
       data: InstanceCreateParams,
       params: RequestParams = {}
     ) =>
@@ -1864,9 +2312,11 @@ export class Api<
      * @request GET:/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}
      */
     projectInstancesGetInstance: (
-      instanceName: Name,
-      organizationName: Name,
-      projectName: Name,
+      {
+        instanceName,
+        organizationName,
+        projectName,
+      }: ProjectInstancesGetInstanceParams,
       params: RequestParams = {}
     ) =>
       this.request<Instance, any>({
@@ -1883,9 +2333,11 @@ export class Api<
      * @request DELETE:/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}
      */
     projectInstancesDeleteInstance: (
-      instanceName: Name,
-      organizationName: Name,
-      projectName: Name,
+      {
+        instanceName,
+        organizationName,
+        projectName,
+      }: ProjectInstancesDeleteInstanceParams,
       params: RequestParams = {}
     ) =>
       this.request<void, any>({
@@ -1901,9 +2353,7 @@ export class Api<
      * @request GET:/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}/disks
      */
     instanceDisksGet: (
-      instanceName: Name,
-      organizationName: Name,
-      projectName: Name,
+      { instanceName, organizationName, projectName }: InstanceDisksGetParams,
       params: RequestParams = {}
     ) =>
       this.request<DiskAttachment[], any>({
@@ -1920,10 +2370,12 @@ export class Api<
      * @request GET:/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}/disks/{disk_name}
      */
     instanceDisksGetDisk: (
-      diskName: Name,
-      instanceName: Name,
-      organizationName: Name,
-      projectName: Name,
+      {
+        diskName,
+        instanceName,
+        organizationName,
+        projectName,
+      }: InstanceDisksGetDiskParams,
       params: RequestParams = {}
     ) =>
       this.request<DiskAttachment, any>({
@@ -1940,10 +2392,12 @@ export class Api<
      * @request PUT:/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}/disks/{disk_name}
      */
     instanceDisksPutDisk: (
-      diskName: Name,
-      instanceName: Name,
-      organizationName: Name,
-      projectName: Name,
+      {
+        diskName,
+        instanceName,
+        organizationName,
+        projectName,
+      }: InstanceDisksPutDiskParams,
       params: RequestParams = {}
     ) =>
       this.request<DiskAttachment, any>({
@@ -1960,10 +2414,12 @@ export class Api<
      * @request DELETE:/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}/disks/{disk_name}
      */
     instanceDisksDeleteDisk: (
-      diskName: Name,
-      instanceName: Name,
-      organizationName: Name,
-      projectName: Name,
+      {
+        diskName,
+        instanceName,
+        organizationName,
+        projectName,
+      }: InstanceDisksDeleteDiskParams,
       params: RequestParams = {}
     ) =>
       this.request<void, any>({
@@ -1979,9 +2435,11 @@ export class Api<
      * @request POST:/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}/reboot
      */
     projectInstancesInstanceReboot: (
-      instanceName: Name,
-      organizationName: Name,
-      projectName: Name,
+      {
+        instanceName,
+        organizationName,
+        projectName,
+      }: ProjectInstancesInstanceRebootParams,
       params: RequestParams = {}
     ) =>
       this.request<Instance, any>({
@@ -1998,9 +2456,11 @@ export class Api<
      * @request POST:/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}/start
      */
     projectInstancesInstanceStart: (
-      instanceName: Name,
-      organizationName: Name,
-      projectName: Name,
+      {
+        instanceName,
+        organizationName,
+        projectName,
+      }: ProjectInstancesInstanceStartParams,
       params: RequestParams = {}
     ) =>
       this.request<Instance, any>({
@@ -2017,9 +2477,11 @@ export class Api<
      * @request POST:/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}/stop
      */
     projectInstancesInstanceStop: (
-      instanceName: Name,
-      organizationName: Name,
-      projectName: Name,
+      {
+        instanceName,
+        organizationName,
+        projectName,
+      }: ProjectInstancesInstanceStopParams,
       params: RequestParams = {}
     ) =>
       this.request<Instance, any>({
@@ -2054,8 +2516,7 @@ export class Api<
      * @request POST:/organizations/{organization_name}/projects/{project_name}/vpcs
      */
     projectVpcsPost: (
-      organizationName: Name,
-      projectName: Name,
+      { organizationName, projectName }: ProjectVpcsPostParams,
       data: VpcCreateParams,
       params: RequestParams = {}
     ) =>
@@ -2075,9 +2536,7 @@ export class Api<
      * @request GET:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}
      */
     projectVpcsGetVpc: (
-      organizationName: Name,
-      projectName: Name,
-      vpcName: Name,
+      { organizationName, projectName, vpcName }: ProjectVpcsGetVpcParams,
       params: RequestParams = {}
     ) =>
       this.request<Vpc, any>({
@@ -2094,9 +2553,7 @@ export class Api<
      * @request PUT:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}
      */
     projectVpcsPutVpc: (
-      organizationName: Name,
-      projectName: Name,
-      vpcName: Name,
+      { organizationName, projectName, vpcName }: ProjectVpcsPutVpcParams,
       data: VpcUpdateParams,
       params: RequestParams = {}
     ) =>
@@ -2115,9 +2572,7 @@ export class Api<
      * @request DELETE:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}
      */
     projectVpcsDeleteVpc: (
-      organizationName: Name,
-      projectName: Name,
-      vpcName: Name,
+      { organizationName, projectName, vpcName }: ProjectVpcsDeleteVpcParams,
       params: RequestParams = {}
     ) =>
       this.request<void, any>({
@@ -2156,9 +2611,7 @@ export class Api<
      * @request PUT:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/firewall/rules
      */
     vpcFirewallRulesPut: (
-      organizationName: Name,
-      projectName: Name,
-      vpcName: Name,
+      { organizationName, projectName, vpcName }: VpcFirewallRulesPutParams,
       data: VpcFirewallRuleUpdateParams,
       params: RequestParams = {}
     ) =>
@@ -2196,9 +2649,7 @@ export class Api<
      * @request POST:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers
      */
     vpcRoutersPost: (
-      organizationName: Name,
-      projectName: Name,
-      vpcName: Name,
+      { organizationName, projectName, vpcName }: VpcRoutersPostParams,
       data: VpcRouterCreateParams,
       params: RequestParams = {}
     ) =>
@@ -2218,10 +2669,12 @@ export class Api<
      * @request GET:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers/{router_name}
      */
     vpcRoutersGetRouter: (
-      organizationName: Name,
-      projectName: Name,
-      routerName: Name,
-      vpcName: Name,
+      {
+        organizationName,
+        projectName,
+        routerName,
+        vpcName,
+      }: VpcRoutersGetRouterParams,
       params: RequestParams = {}
     ) =>
       this.request<VpcRouter, any>({
@@ -2238,10 +2691,12 @@ export class Api<
      * @request PUT:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers/{router_name}
      */
     vpcRoutersPutRouter: (
-      organizationName: Name,
-      projectName: Name,
-      routerName: Name,
-      vpcName: Name,
+      {
+        organizationName,
+        projectName,
+        routerName,
+        vpcName,
+      }: VpcRoutersPutRouterParams,
       data: VpcRouterUpdateParams,
       params: RequestParams = {}
     ) =>
@@ -2260,10 +2715,12 @@ export class Api<
      * @request DELETE:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers/{router_name}
      */
     vpcRoutersDeleteRouter: (
-      organizationName: Name,
-      projectName: Name,
-      routerName: Name,
-      vpcName: Name,
+      {
+        organizationName,
+        projectName,
+        routerName,
+        vpcName,
+      }: VpcRoutersDeleteRouterParams,
       params: RequestParams = {}
     ) =>
       this.request<void, any>({
@@ -2303,10 +2760,12 @@ export class Api<
      * @request POST:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers/{router_name}/routes
      */
     routersRoutesPost: (
-      organizationName: Name,
-      projectName: Name,
-      routerName: Name,
-      vpcName: Name,
+      {
+        organizationName,
+        projectName,
+        routerName,
+        vpcName,
+      }: RoutersRoutesPostParams,
       data: RouterRouteCreateParams,
       params: RequestParams = {}
     ) =>
@@ -2326,11 +2785,13 @@ export class Api<
      * @request GET:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers/{router_name}/routes/{route_name}
      */
     routersRoutesGetRoute: (
-      organizationName: Name,
-      projectName: Name,
-      routeName: Name,
-      routerName: Name,
-      vpcName: Name,
+      {
+        organizationName,
+        projectName,
+        routeName,
+        routerName,
+        vpcName,
+      }: RoutersRoutesGetRouteParams,
       params: RequestParams = {}
     ) =>
       this.request<RouterRoute, any>({
@@ -2347,11 +2808,13 @@ export class Api<
      * @request PUT:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers/{router_name}/routes/{route_name}
      */
     routersRoutesPutRoute: (
-      organizationName: Name,
-      projectName: Name,
-      routeName: Name,
-      routerName: Name,
-      vpcName: Name,
+      {
+        organizationName,
+        projectName,
+        routeName,
+        routerName,
+        vpcName,
+      }: RoutersRoutesPutRouteParams,
       data: RouterRouteUpdateParams,
       params: RequestParams = {}
     ) =>
@@ -2370,11 +2833,13 @@ export class Api<
      * @request DELETE:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers/{router_name}/routes/{route_name}
      */
     routersRoutesDeleteRoute: (
-      organizationName: Name,
-      projectName: Name,
-      routeName: Name,
-      routerName: Name,
-      vpcName: Name,
+      {
+        organizationName,
+        projectName,
+        routeName,
+        routerName,
+        vpcName,
+      }: RoutersRoutesDeleteRouteParams,
       params: RequestParams = {}
     ) =>
       this.request<void, any>({
@@ -2408,9 +2873,7 @@ export class Api<
      * @request POST:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/subnets
      */
     vpcSubnetsPost: (
-      organizationName: Name,
-      projectName: Name,
-      vpcName: Name,
+      { organizationName, projectName, vpcName }: VpcSubnetsPostParams,
       data: VpcSubnetCreateParams,
       params: RequestParams = {}
     ) =>
@@ -2430,10 +2893,12 @@ export class Api<
      * @request GET:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/subnets/{subnet_name}
      */
     vpcSubnetsGetSubnet: (
-      organizationName: Name,
-      projectName: Name,
-      subnetName: Name,
-      vpcName: Name,
+      {
+        organizationName,
+        projectName,
+        subnetName,
+        vpcName,
+      }: VpcSubnetsGetSubnetParams,
       params: RequestParams = {}
     ) =>
       this.request<VpcSubnet, any>({
@@ -2450,10 +2915,12 @@ export class Api<
      * @request PUT:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/subnets/{subnet_name}
      */
     vpcSubnetsPutSubnet: (
-      organizationName: Name,
-      projectName: Name,
-      subnetName: Name,
-      vpcName: Name,
+      {
+        organizationName,
+        projectName,
+        subnetName,
+        vpcName,
+      }: VpcSubnetsPutSubnetParams,
       data: VpcSubnetUpdateParams,
       params: RequestParams = {}
     ) =>
@@ -2472,10 +2939,12 @@ export class Api<
      * @request DELETE:/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/subnets/{subnet_name}
      */
     vpcSubnetsDeleteSubnet: (
-      organizationName: Name,
-      projectName: Name,
-      subnetName: Name,
-      vpcName: Name,
+      {
+        organizationName,
+        projectName,
+        subnetName,
+        vpcName,
+      }: VpcSubnetsDeleteSubnetParams,
       params: RequestParams = {}
     ) =>
       this.request<void, any>({
@@ -2506,7 +2975,10 @@ export class Api<
      * @name SagasGetSaga
      * @request GET:/sagas/{saga_id}
      */
-    sagasGetSaga: (sagaId: string, params: RequestParams = {}) =>
+    sagasGetSaga: (
+      { sagaId }: SagasGetSagaParams,
+      params: RequestParams = {}
+    ) =>
       this.request<Saga, any>({
         path: `/sagas/${sagaId}`,
         method: 'GET',
diff --git a/package.json b/package.json
index bc4e611d59..16ee7fa067 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "postcss-nesting": "^8.0.1",
     "prettier": "2.4.0",
     "rollup": "^2.52.7",
-    "swagger-typescript-api": "^9.3.1",
+    "swagger-typescript-api": "https://github.com/oxidecomputer/swagger-typescript-api#27cf1ddc59a17e19ecc0fdb707db2f854c6d729e",
     "tailwindcss": "^3.0.0-alpha.2",
     "ts-node": "^9.1.1",
     "tsconfig-paths-webpack-plugin": "^3.5.1",
diff --git a/yarn.lock b/yarn.lock
index 917ae513f0..d8951f0a97 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13264,10 +13264,9 @@ swagger-schema-official@2.0.0-bab6bed:
   resolved "https://registry.yarnpkg.com/swagger-schema-official/-/swagger-schema-official-2.0.0-bab6bed.tgz#70070468d6d2977ca5237b2e519ca7d06a2ea3fd"
   integrity sha1-cAcEaNbSl3ylI3suUZyn0Gouo/0=
 
-swagger-typescript-api@^9.3.1:
+"swagger-typescript-api@https://github.com/oxidecomputer/swagger-typescript-api#27cf1ddc59a17e19ecc0fdb707db2f854c6d729e":
   version "9.3.1"
-  resolved "https://registry.yarnpkg.com/swagger-typescript-api/-/swagger-typescript-api-9.3.1.tgz#07df3aa8e83a3897356a6e820e88b8348830aa6b"
-  integrity sha512-vtarFELmXmDKrtY2FvU2OjNvN1BqOj3kHWzz7mAresNKRgRubZpjlopECxbBekrLeX3lezAYSNcrFMVRGJAD4A==
+  resolved "https://github.com/oxidecomputer/swagger-typescript-api#27cf1ddc59a17e19ecc0fdb707db2f854c6d729e"
   dependencies:
     "@types/swagger-schema-official" "2.0.21"
     axios "^0.21.4"

From 057a7db1ae502a54608147e45e15abba9e05f64c Mon Sep 17 00:00:00 2001
From: David Crespo <crespo.dm@gmail.com>
Date: Mon, 29 Nov 2021 15:52:41 -0600
Subject: [PATCH 07/21] everything works except the login page

---
 app/components/InstancePageHeader.tsx | 26 ++++++----
 app/components/InstancesTable.tsx     | 18 ++++---
 app/layouts/OrgLayout.tsx             |  2 +-
 app/pages/LoginPage.tsx               |  1 +
 app/pages/ProjectCreatePage.tsx       |  4 +-
 app/pages/ProjectsPage.tsx            |  2 +-
 app/pages/instances/create/index.tsx  |  8 +--
 app/util/errors.spec.ts               | 13 +++--
 app/util/errors.ts                    |  8 +--
 libs/api-mocks/instance.ts            |  6 +--
 libs/api-mocks/org.ts                 |  4 +-
 libs/api-mocks/project.ts             |  4 +-
 libs/api/__tests__/hooks.spec.tsx     | 13 ++---
 libs/api/hooks.ts                     | 72 +++++++++++++++------------
 libs/api/hooks2.ts                    | 53 --------------------
 libs/api/index.ts                     | 29 ++++-------
 libs/api/instance-can.ts              |  2 +-
 17 files changed, 112 insertions(+), 153 deletions(-)
 delete mode 100644 libs/api/hooks2.ts

diff --git a/app/components/InstancePageHeader.tsx b/app/components/InstancePageHeader.tsx
index b94fd24189..bd87f49352 100644
--- a/app/components/InstancePageHeader.tsx
+++ b/app/components/InstancePageHeader.tsx
@@ -65,7 +65,7 @@ export const InstancePageHeader = () => {
   })
 
   if (error) {
-    if (error.raw.status === 404) {
+    if (error.status === 404) {
       return <div>Instance not found</div>
     } else {
       return <div>loading</div>
@@ -76,9 +76,11 @@ export const InstancePageHeader = () => {
   const handleStop = () => {
     if (instanceCan.stop(instance)) {
       stopInstance.mutate({
-        organizationName: orgName,
-        projectName,
-        instanceName: instance.name,
+        params: {
+          organizationName: orgName,
+          projectName,
+          instanceName: instance.name,
+        },
       })
     } else {
       addToast({
@@ -94,9 +96,11 @@ export const InstancePageHeader = () => {
   const handleDelete = () => {
     if (instanceCan.delete(instance)) {
       deleteInstance.mutate({
-        organizationName: orgName,
-        projectName,
-        instanceName: instance.name,
+        params: {
+          organizationName: orgName,
+          projectName,
+          instanceName: instance.name,
+        },
       })
     } else {
       addToast({
@@ -111,9 +115,11 @@ export const InstancePageHeader = () => {
   const handleReboot = () => {
     if (instanceCan.reboot(instance)) {
       rebootInstance.mutate({
-        organizationName: orgName,
-        projectName,
-        instanceName: instance.name,
+        params: {
+          organizationName: orgName,
+          projectName,
+          instanceName: instance.name,
+        },
       })
     } else {
       addToast({
diff --git a/app/components/InstancesTable.tsx b/app/components/InstancesTable.tsx
index 35c570b2b9..1facd55ed7 100644
--- a/app/components/InstancesTable.tsx
+++ b/app/components/InstancesTable.tsx
@@ -60,7 +60,7 @@ const columns = [
           className="text-xs !no-underline"
           title={value.timeRunStateUpdated.toLocaleString()}
         >
-          {timeAgoAbbr(value.timeRunStateUpdated)}
+          {timeAgoAbbr(new Date(value.timeRunStateUpdated))}
         </abbr>
       </span>
     ),
@@ -119,9 +119,11 @@ const menuCol = {
     })
 
     const instanceLookup = {
-      organizationName: orgName,
-      projectName,
-      instanceName,
+      params: {
+        organizationName: orgName,
+        projectName,
+        instanceName,
+      },
     }
 
     return (
@@ -167,7 +169,7 @@ export const InstancesTable = ({ className }: { className?: string }) => {
     {
       organizationName: orgName,
       projectName,
-      pageToken: currentPage,
+      page_token: currentPage,
       limit: PAGE_SIZE,
     },
     { refetchInterval: 5000, keepPreviousData: true }
@@ -203,13 +205,13 @@ export const InstancesTable = ({ className }: { className?: string }) => {
           </PageButton>
           <PageButton
             onClick={() =>
-              instances.nextPage && goToNextPage(instances.nextPage)
+              instances.next_page && goToNextPage(instances.next_page)
             }
-            disabled={!instances.nextPage}
+            disabled={!instances.next_page}
             aria-label="Next"
           >
             {/* filled triangle right, outline triangle right */}
-            {instances.nextPage ? '\u25B6' : '\u25B7'}
+            {instances.next_page ? '\u25B6' : '\u25B7'}
           </PageButton>
         </span>
       </div>
diff --git a/app/layouts/OrgLayout.tsx b/app/layouts/OrgLayout.tsx
index 501939a266..249fe9a391 100644
--- a/app/layouts/OrgLayout.tsx
+++ b/app/layouts/OrgLayout.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import { Link, NavLink, Outlet } from 'react-router-dom'
 import cn from 'classnames'
 
-import { useApiQuery2 as useApiQuery } from '@oxide/api'
+import { useApiQuery } from '@oxide/api'
 import { SkipLinkTarget, Add12Icon } from '@oxide/ui'
 
 import { ContentPane, PageContainer, Sidebar } from './helpers'
diff --git a/app/pages/LoginPage.tsx b/app/pages/LoginPage.tsx
index d34b6183ba..cb0542dc2c 100644
--- a/app/pages/LoginPage.tsx
+++ b/app/pages/LoginPage.tsx
@@ -21,6 +21,7 @@ import { useToast } from '../hooks'
 export default function LoginPage() {
   const navigate = useNavigate()
   const addToast = useToast()
+  // TODO these are not under organizations. annoying. should really just use plain react-query
   const loginPost = useApiMutation('spoofLogin', {
     onSuccess: () => {
       addToast({
diff --git a/app/pages/ProjectCreatePage.tsx b/app/pages/ProjectCreatePage.tsx
index 897ba2978d..89d0061add 100644
--- a/app/pages/ProjectCreatePage.tsx
+++ b/app/pages/ProjectCreatePage.tsx
@@ -56,8 +56,8 @@ export function ProjectCreateForm({ orgName }: { orgName: string }) {
       initialValues={{ name: '', description: '' }}
       onSubmit={({ name, description }) => {
         createProject.mutate({
-          organizationName: orgName,
-          projectCreate: { name, description },
+          params: { organizationName: orgName },
+          body: { name, description },
         })
       }}
     >
diff --git a/app/pages/ProjectsPage.tsx b/app/pages/ProjectsPage.tsx
index 059144a942..01bace434f 100644
--- a/app/pages/ProjectsPage.tsx
+++ b/app/pages/ProjectsPage.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import { Link } from 'react-router-dom'
 import { formatDistanceToNowStrict } from 'date-fns'
 
-import { useApiQuery2 as useApiQuery } from '@oxide/api'
+import { useApiQuery } from '@oxide/api'
 import {
   buttonStyle,
   PageHeader,
diff --git a/app/pages/instances/create/index.tsx b/app/pages/instances/create/index.tsx
index a89f5b95a9..fb8d1e015d 100644
--- a/app/pages/instances/create/index.tsx
+++ b/app/pages/instances/create/index.tsx
@@ -93,9 +93,11 @@ export function InstanceCreateForm({
           ) || { memory: 0, ncpus: 0 }
 
           createInstance.mutate({
-            organizationName: orgName,
-            projectName,
-            instanceCreateParams: {
+            params: {
+              organizationName: orgName,
+              projectName,
+            },
+            body: {
               name: values['instance-name'],
               hostname: values.hostname,
               description: `An instance in project: ${projectName}`,
diff --git a/app/util/errors.spec.ts b/app/util/errors.spec.ts
index 62cdd5405e..bac7df94a4 100644
--- a/app/util/errors.spec.ts
+++ b/app/util/errors.spec.ts
@@ -1,27 +1,26 @@
+import type { ErrorResponse } from '@oxide/api'
 import { getServerParseError, getServerError } from './errors'
 
 const parseError = {
-  raw: {} as Response,
-  data: {
+  error: {
     request_id: '1',
     error_code: null,
     message:
       'unable to parse body: hello there, you have an error at line 129 column 4',
   },
-}
+} as ErrorResponse
 
 const alreadyExists = {
-  raw: {} as Response,
-  data: {
+  error: {
     request_id: '2',
     error_code: 'ObjectAlreadyExists',
     message: 'whatever',
   },
-}
+} as ErrorResponse
 
 describe('getServerParseError', () => {
   it('extracts nice part of error message', () => {
-    expect(getServerParseError(parseError.data.message)).toEqual(
+    expect(getServerParseError(parseError.error.message)).toEqual(
       'Hello there, you have an error'
     )
   })
diff --git a/app/util/errors.ts b/app/util/errors.ts
index e34514ea62..128f617a29 100644
--- a/app/util/errors.ts
+++ b/app/util/errors.ts
@@ -1,4 +1,4 @@
-import type { ApiError } from '@oxide/api'
+import type { ErrorResponse } from '@oxide/api'
 
 import { capitalize } from '@oxide/util'
 
@@ -10,10 +10,10 @@ export const getServerParseError = (message: string | undefined) => {
 }
 
 export const getServerError = (
-  error: ApiError | null,
+  error: ErrorResponse | null,
   codeMap: Record<string, string> = {}
 ) => {
   if (!error) return null
-  const code = error.data?.error_code
-  return (code && codeMap[code]) || getServerParseError(error.data?.message)
+  const code = error.error?.error_code
+  return (code && codeMap[code]) || getServerParseError(error.error?.message)
 }
diff --git a/libs/api-mocks/instance.ts b/libs/api-mocks/instance.ts
index a2d85645cf..374009b09c 100644
--- a/libs/api-mocks/instance.ts
+++ b/libs/api-mocks/instance.ts
@@ -10,7 +10,7 @@ export const instance: Instance = {
   hostname: 'oxide.com',
   projectId: 'def456',
   runState: InstanceState.Running,
-  timeCreated: new Date(),
-  timeModified: new Date(),
-  timeRunStateUpdated: new Date(),
+  timeCreated: new Date().toISOString(),
+  timeModified: new Date().toISOString(),
+  timeRunStateUpdated: new Date().toISOString(),
 }
diff --git a/libs/api-mocks/org.ts b/libs/api-mocks/org.ts
index 86c4320a38..c15dec377c 100644
--- a/libs/api-mocks/org.ts
+++ b/libs/api-mocks/org.ts
@@ -4,8 +4,8 @@ export const org: Organization = {
   id: 'mock-org-uuid',
   name: 'mock-org',
   description: 'a fake org',
-  timeCreated: new Date(2021, 0, 1),
-  timeModified: new Date(2021, 0, 2),
+  timeCreated: new Date(2021, 0, 1).toISOString(),
+  timeModified: new Date(2021, 0, 2).toISOString(),
 }
 
 export const orgs: OrganizationResultsPage = { items: [org] }
diff --git a/libs/api-mocks/project.ts b/libs/api-mocks/project.ts
index beeff157e2..1ac67e801f 100644
--- a/libs/api-mocks/project.ts
+++ b/libs/api-mocks/project.ts
@@ -4,8 +4,8 @@ export const project: Project = {
   id: 'mock-project-uuid',
   name: 'mock-project',
   description: 'a fake project',
-  timeCreated: new Date(2021, 0, 1),
-  timeModified: new Date(2021, 0, 2),
+  timeCreated: new Date(2021, 0, 1).toISOString(),
+  timeModified: new Date(2021, 0, 2).toISOString(),
   organizationId: 'org-id',
 }
 
diff --git a/libs/api/__tests__/hooks.spec.tsx b/libs/api/__tests__/hooks.spec.tsx
index 26b049cb07..307dd0f2fa 100644
--- a/libs/api/__tests__/hooks.spec.tsx
+++ b/libs/api/__tests__/hooks.spec.tsx
@@ -28,10 +28,11 @@ const renderGetOrgs = () =>
   renderHook(() => useApiQuery('organizationsGet', {}), wrapper())
 
 const renderCreateOrg = () =>
-  renderHook(() => useApiMutation('organizationsPost', {}), wrapper())
+  renderHook(() => useApiMutation('organizationsPost'), wrapper())
 
 const createParams = {
-  organizationCreate: { name: 'abc', description: '' },
+  params: {},
+  body: { name: 'abc', description: '', hello: 'a' },
 }
 
 afterEach(() => {
@@ -54,7 +55,7 @@ describe('useApiQuery', () => {
 
       const { result } = renderGetOrgs()
 
-      await waitFor(() => expect(result.current.error?.raw).toEqual(response))
+      await waitFor(() => expect(result.current.error).toEqual(response))
     })
 
     it('parses error json if possible', async () => {
@@ -64,7 +65,7 @@ describe('useApiQuery', () => {
 
       const { result } = renderGetOrgs()
 
-      await waitFor(() => expect(result.current.error?.data).toEqual(error))
+      await waitFor(() => expect(result.current.error?.error).toEqual(error))
     })
 
     it('sets error.data to null if error body is not json', async () => {
@@ -109,7 +110,7 @@ describe('useApiMutation', () => {
       const { result } = renderCreateOrg()
       act(() => result.current.mutate(createParams))
 
-      await waitFor(() => expect(result.current.error?.raw).toEqual(response))
+      await waitFor(() => expect(result.current.error).toEqual(response))
     })
 
     it('parses error json if possible', async () => {
@@ -120,7 +121,7 @@ describe('useApiMutation', () => {
       const { result } = renderCreateOrg()
       act(() => result.current.mutate(createParams))
 
-      await waitFor(() => expect(result.current.error?.data).toEqual(error))
+      await waitFor(() => expect(result.current.error?.error).toEqual(error))
     })
 
     it('sets error.data to null if error body is not json', async () => {
diff --git a/libs/api/hooks.ts b/libs/api/hooks.ts
index d700c8ce9a..8fcc950140 100644
--- a/libs/api/hooks.ts
+++ b/libs/api/hooks.ts
@@ -3,66 +3,74 @@ import type {
   UseMutationOptions,
   UseQueryOptions,
 } from 'react-query'
-import { useQuery, useMutation, useQueryClient } from 'react-query'
+import { useMutation, useQuery, useQueryClient } from 'react-query'
 
-import type { ApiResponse } from './__generated__'
+import type { HttpResponse } from './__generated__/Api'
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
+type Params<F> = F extends (p: infer P, r: any) => any ? P : never
+type Body<F> = F extends (p: any, r: infer R) => any ? R : never
+type Result<F> = F extends (p: any, r: any) => Promise<HttpResponse<infer R>>
+  ? R
+  : never
 
-type Params<F> = F extends (p: infer P) => any ? P : never
-type Result<F> = F extends (p: any) => Promise<infer R> ? R : never
-
-// even though the api object has other properties on it, as far as
-// getUseApiQuery is concerned it only has the fetcher functions
-type ApiClient<A> = OmitByValue<
-  PickByValue<A, (p: any) => Promise<any>>,
-  (p: any) => Promise<ApiResponse<any>> // exclude "-Raw" fetchers
->
+type ApiClient = Record<string, (...args: any) => Promise<HttpResponse<any>>>
 /* eslint-enable @typescript-eslint/no-explicit-any */
 
-export interface ApiError {
-  raw: Response
-  data: {
-    request_id: string
-    error_code: string | null
-    message: string
-  } | null
+type ErrorData = {
+  request_id: string
+  error_code: string | null
+  message: string
 }
 
-// we need to rethrow so react-query knows the request in question is a
-// failure and uses the result to populate `error` rather than `data`
-const parseJsonAndRethrow = async (error: Response): Promise<ApiError> =>
-  error
-    .json()
-    .catch(() => null) // if json parse fails, data is null
-    .then((data) => Promise.reject({ raw: error, data }))
+export type ErrorResponse = HttpResponse<null, ErrorData>
 
 export const getUseApiQuery =
-  <A extends ApiClient<A>>(api: A) =>
+  <A extends ApiClient>(api: A) =>
   <M extends keyof A>(
     method: M,
     params: Params<A[M]>,
-    options?: UseQueryOptions<Result<A[M]>, ApiError>
+    options?: UseQueryOptions<Result<A[M]>, ErrorResponse>
   ) =>
     useQuery(
       [method, params],
-      () => api[method](params).catch(parseJsonAndRethrow),
+      // The generated client parses the json and sticks it in `data` for us, so
+      // that's what we want to return from the fetcher. Note that while there
+      // is an --unwrap-response-data CLI flag for the generator that pulls out
+      // the data key for us, something about the types is weird or wrong, so
+      // we're doing it ourselves here instead.
+      //
+      // In the case of an error, it does the same thing with the `error` key,
+      // but since there may not always be parseable json in an error response
+      // (I think?) it seems more reasonable in that case to take the whole
+      // `HttpResponse` instead of plucking out error with
+      //
+      //   .catch((resp) => resp.error)
+      //
+      // The generated client already throws on error responses, which is what
+      // react-query wants, so we don't have to handle the error case explicitly
+      // here.
+      () => api[method](params).then((resp) => resp.data),
       options
     )
 
 export const getUseApiMutation =
-  <A extends ApiClient<A>>(api: A) =>
+  <A extends ApiClient>(api: A) =>
   <M extends keyof A>(
     method: M,
-    options?: UseMutationOptions<Result<A[M]>, ApiError, Params<A[M]>>
+    options?: UseMutationOptions<
+      Result<A[M]>,
+      ErrorResponse,
+      { params: Params<A[M]>; body?: Body<A[M]> }
+    >
   ) =>
     useMutation(
-      (params) => api[method](params).catch(parseJsonAndRethrow),
+      (arg) => api[method](arg.params, arg.body).then((resp) => resp.data),
       options
     )
 
 export const getUseApiQueryClient =
-  <A extends ApiClient<A>>() =>
+  <A extends ApiClient>() =>
   () => {
     const queryClient = useQueryClient()
     return {
diff --git a/libs/api/hooks2.ts b/libs/api/hooks2.ts
deleted file mode 100644
index 02addf66ef..0000000000
--- a/libs/api/hooks2.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import type { UseQueryOptions } from 'react-query'
-import { useQuery } from 'react-query'
-
-import type { HttpResponse } from './__generated__/Api'
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
-// this doesn't work for all methods. there appears to be a bug where
-// --extract-request-params only works on some methods. it's supposed to put
-// path params in an object, but there are a bunch of methods where the path
-// params are separate string arguments
-type Params<F> = F extends (p: infer P, r: any) => any ? P : never
-type Result<F> = F extends (p: any, r: any) => Promise<HttpResponse<infer R>>
-  ? R
-  : never
-
-type ApiClient = Record<string, (...args: any) => Promise<HttpResponse<any>>>
-/* eslint-enable @typescript-eslint/no-explicit-any */
-
-type ErrorData = {
-  request_id: string
-  error_code: string | null
-  message: string
-}
-
-export const getUseApiQuery2 =
-  <A extends ApiClient>(api: A) =>
-  <M extends keyof A>(
-    method: M,
-    params: Params<A[M]>,
-    options?: UseQueryOptions<Result<A[M]>, HttpResponse<null, ErrorData>>
-  ) =>
-    useQuery(
-      [method, params],
-      // The generated client parses the json and sticks it in `data` for us, so
-      // that's what we want to return from the fetcher. Note that while there
-      // is an --unwrap-response-data CLI flag for the generator that pulls out
-      // the data key for us, something about the types is weird or wrong, so
-      // we're doing it ourselves here instead.
-      //
-      // In the case of an error, it does the same thing with the `error` key,
-      // but since there may not always be parseable json in an error response
-      // (I think?) it seems more reasonable in that case to take the whole
-      // `HttpResponse` instead of plucking out error with
-      //
-      //   .catch((resp) => resp.error)
-      //
-      // The generated client already throws on error responses, which is what
-      // react-query wants, so we don't have to handle the error case explicitly
-      // here.
-      () => api[method](params).then((resp) => resp.data),
-      options
-    )
diff --git a/libs/api/index.ts b/libs/api/index.ts
index b565429811..106907e404 100644
--- a/libs/api/index.ts
+++ b/libs/api/index.ts
@@ -1,32 +1,25 @@
-import { DefaultApi, Configuration } from './__generated__'
 import {
-  getUseApiQuery,
   getUseApiMutation,
+  getUseApiQuery,
   getUseApiQueryClient,
 } from './hooks'
+import { Api } from './__generated__/Api'
 
-const basePath =
-  process.env.NODE_ENV === 'production' ? process.env.API_URL : '/api'
-
-const config = new Configuration({ basePath })
-const api = new DefaultApi(config)
-
-export const useApiQuery = getUseApiQuery(api)
-export const useApiMutation = getUseApiMutation(api)
-export const useApiQueryClient = getUseApiQueryClient<DefaultApi>()
-
-export type { ApiError } from './hooks'
-export * from './__generated__/models'
 export * from './instance-can'
+export * from './__generated__/Api'
+export type { ErrorResponse } from './hooks'
 
-import { getUseApiQuery2 } from './hooks2'
-import { Api } from './__generated__/Api'
+const basePath =
+  process.env.NODE_ENV === 'production' ? process.env.API_URL : '/api'
 
-const api2 = new Api<null>({ baseUrl: basePath })
+const api = new Api({ baseUrl: basePath })
 
 // The fact that the route functions are groups under keys corresponding to the
 // first segment of the path is weird and sort of annoying. It might be the kind
 // of the thing I'd want to use a custom template to override. On the other hand
 // it's not so bad since all we care about in the console for now is the
 // organzations ones.
-export const useApiQuery2 = getUseApiQuery2(api2.organizations)
+export const useApiQuery = getUseApiQuery(api.organizations)
+export const useApiMutation = getUseApiMutation(api.organizations)
+export const useApiQueryClient =
+  getUseApiQueryClient<typeof api.organizations>()
diff --git a/libs/api/instance-can.ts b/libs/api/instance-can.ts
index 98e9a3e5bc..78d32acdff 100644
--- a/libs/api/instance-can.ts
+++ b/libs/api/instance-can.ts
@@ -1,4 +1,4 @@
-import type { Instance } from './__generated__'
+import type { Instance } from '.'
 
 export const instanceCan: Record<string, (i: Instance) => boolean> = {
   reboot: (i) => i.runState === 'running',

From d2b6ca6e41653958760901e658e8c9c4dc83adbc Mon Sep 17 00:00:00 2001
From: David Crespo <crespo.dm@gmail.com>
Date: Mon, 29 Nov 2021 15:55:19 -0600
Subject: [PATCH 08/21] delete openapi-generator client

---
 .../__generated__/.openapi-generator-ignore   |   25 -
 .../__generated__/.openapi-generator/FILES    |   85 -
 .../__generated__/.openapi-generator/VERSION  |    1 -
 libs/api/__generated__/apis/DefaultApi.ts     | 4874 -----------------
 libs/api/__generated__/apis/index.ts          |    3 -
 libs/api/__generated__/index.ts               |    5 -
 libs/api/__generated__/models/Disk.ts         |  137 -
 .../__generated__/models/DiskAttachment.ts    |   87 -
 .../__generated__/models/DiskCreateParams.ts  |   80 -
 .../__generated__/models/DiskResultsPage.ts   |   66 -
 libs/api/__generated__/models/DiskState.ts    |   91 -
 .../__generated__/models/DiskStateOneOf.ts    |   56 -
 .../__generated__/models/DiskStateOneOf1.ts   |   56 -
 .../__generated__/models/DiskStateOneOf2.ts   |   64 -
 .../__generated__/models/DiskStateOneOf3.ts   |   64 -
 .../__generated__/models/DiskStateOneOf4.ts   |   64 -
 .../__generated__/models/DiskStateOneOf5.ts   |   56 -
 .../__generated__/models/DiskStateOneOf6.ts   |   56 -
 libs/api/__generated__/models/IdSortMode.ts   |   39 -
 .../__generated__/models/IdentityMetadata.ts  |   88 -
 libs/api/__generated__/models/Instance.ts     |  143 -
 .../models/InstanceCreateParams.ts            |   92 -
 .../models/InstanceResultsPage.ts             |   73 -
 .../api/__generated__/models/InstanceState.ts |   47 -
 libs/api/__generated__/models/LoginParams.ts  |   56 -
 .../__generated__/models/NameOrIdSortMode.ts  |   39 -
 libs/api/__generated__/models/NameSortMode.ts |   39 -
 libs/api/__generated__/models/Organization.ts |   88 -
 .../models/OrganizationCreate.ts              |   66 -
 .../models/OrganizationResultsPage.ts         |   75 -
 .../models/OrganizationUpdate.ts              |   66 -
 libs/api/__generated__/models/Project.ts      |   96 -
 .../api/__generated__/models/ProjectCreate.ts |   64 -
 .../models/ProjectResultsPage.ts              |   73 -
 .../api/__generated__/models/ProjectUpdate.ts |   64 -
 libs/api/__generated__/models/Rack.ts         |   63 -
 .../__generated__/models/RackResultsPage.ts   |   66 -
 .../__generated__/models/RouteDestination.ts  |   67 -
 .../models/RouteDestinationOneOf.ts           |   68 -
 .../models/RouteDestinationOneOf1.ts          |   68 -
 .../models/RouteDestinationOneOf2.ts          |   68 -
 libs/api/__generated__/models/RouteTarget.ts  |   79 -
 .../__generated__/models/RouteTargetOneOf.ts  |   64 -
 .../__generated__/models/RouteTargetOneOf1.ts |   64 -
 libs/api/__generated__/models/RouterRoute.ts  |  107 -
 .../models/RouterRouteCreateParams.ts         |   95 -
 .../__generated__/models/RouterRouteKind.ts   |   42 -
 .../models/RouterRouteResultsPage.ts          |   75 -
 .../models/RouterRouteUpdateParams.ts         |   95 -
 libs/api/__generated__/models/Saga.ts         |   71 -
 .../api/__generated__/models/SagaErrorInfo.ts |   79 -
 .../models/SagaErrorInfoOneOf.ts              |   66 -
 .../models/SagaErrorInfoOneOf1.ts             |   66 -
 .../models/SagaErrorInfoOneOf2.ts             |   58 -
 .../models/SagaErrorInfoOneOf3.ts             |   66 -
 .../models/SagaErrorInfoOneOf4.ts             |   66 -
 .../__generated__/models/SagaResultsPage.ts   |   66 -
 libs/api/__generated__/models/SagaState.ts    |   64 -
 .../__generated__/models/SagaStateOneOf.ts    |   56 -
 .../__generated__/models/SagaStateOneOf1.ts   |   56 -
 .../__generated__/models/SagaStateOneOf2.ts   |   79 -
 libs/api/__generated__/models/Sled.ts         |   96 -
 .../__generated__/models/SledResultsPage.ts   |   66 -
 libs/api/__generated__/models/Vpc.ts          |  109 -
 .../__generated__/models/VpcCreateParams.ts   |   72 -
 .../__generated__/models/VpcFirewallRule.ts   |  131 -
 .../models/VpcFirewallRuleAction.ts           |   42 -
 .../models/VpcFirewallRuleDirection.ts        |   42 -
 .../models/VpcFirewallRuleFilter.ts           |  105 -
 .../models/VpcFirewallRuleHostFilter.ts       |   83 -
 .../models/VpcFirewallRuleProtocol.ts         |   43 -
 .../models/VpcFirewallRuleResultsPage.ts      |   75 -
 .../models/VpcFirewallRuleStatus.ts           |   42 -
 .../models/VpcFirewallRuleTarget.ts           |   71 -
 .../models/VpcFirewallRuleUpdate.ts           |  131 -
 .../__generated__/models/VpcResultsPage.ts    |   66 -
 libs/api/__generated__/models/VpcRouter.ts    |   83 -
 .../models/VpcRouterCreateParams.ts           |   68 -
 .../api/__generated__/models/VpcRouterKind.ts |   38 -
 .../models/VpcRouterResultsPage.ts            |   73 -
 .../models/VpcRouterUpdateParams.ts           |   68 -
 libs/api/__generated__/models/VpcSubnet.ts    |   87 -
 .../models/VpcSubnetCreateParams.ts           |   84 -
 .../models/VpcSubnetResultsPage.ts            |   73 -
 .../models/VpcSubnetUpdateParams.ts           |   84 -
 .../__generated__/models/VpcUpdateParams.ts   |   72 -
 libs/api/__generated__/models/index.ts        |   82 -
 libs/api/__generated__/runtime.ts             |  379 --
 88 files changed, 11257 deletions(-)
 delete mode 100644 libs/api/__generated__/.openapi-generator-ignore
 delete mode 100644 libs/api/__generated__/.openapi-generator/FILES
 delete mode 100644 libs/api/__generated__/.openapi-generator/VERSION
 delete mode 100644 libs/api/__generated__/apis/DefaultApi.ts
 delete mode 100644 libs/api/__generated__/apis/index.ts
 delete mode 100644 libs/api/__generated__/index.ts
 delete mode 100644 libs/api/__generated__/models/Disk.ts
 delete mode 100644 libs/api/__generated__/models/DiskAttachment.ts
 delete mode 100644 libs/api/__generated__/models/DiskCreateParams.ts
 delete mode 100644 libs/api/__generated__/models/DiskResultsPage.ts
 delete mode 100644 libs/api/__generated__/models/DiskState.ts
 delete mode 100644 libs/api/__generated__/models/DiskStateOneOf.ts
 delete mode 100644 libs/api/__generated__/models/DiskStateOneOf1.ts
 delete mode 100644 libs/api/__generated__/models/DiskStateOneOf2.ts
 delete mode 100644 libs/api/__generated__/models/DiskStateOneOf3.ts
 delete mode 100644 libs/api/__generated__/models/DiskStateOneOf4.ts
 delete mode 100644 libs/api/__generated__/models/DiskStateOneOf5.ts
 delete mode 100644 libs/api/__generated__/models/DiskStateOneOf6.ts
 delete mode 100644 libs/api/__generated__/models/IdSortMode.ts
 delete mode 100644 libs/api/__generated__/models/IdentityMetadata.ts
 delete mode 100644 libs/api/__generated__/models/Instance.ts
 delete mode 100644 libs/api/__generated__/models/InstanceCreateParams.ts
 delete mode 100644 libs/api/__generated__/models/InstanceResultsPage.ts
 delete mode 100644 libs/api/__generated__/models/InstanceState.ts
 delete mode 100644 libs/api/__generated__/models/LoginParams.ts
 delete mode 100644 libs/api/__generated__/models/NameOrIdSortMode.ts
 delete mode 100644 libs/api/__generated__/models/NameSortMode.ts
 delete mode 100644 libs/api/__generated__/models/Organization.ts
 delete mode 100644 libs/api/__generated__/models/OrganizationCreate.ts
 delete mode 100644 libs/api/__generated__/models/OrganizationResultsPage.ts
 delete mode 100644 libs/api/__generated__/models/OrganizationUpdate.ts
 delete mode 100644 libs/api/__generated__/models/Project.ts
 delete mode 100644 libs/api/__generated__/models/ProjectCreate.ts
 delete mode 100644 libs/api/__generated__/models/ProjectResultsPage.ts
 delete mode 100644 libs/api/__generated__/models/ProjectUpdate.ts
 delete mode 100644 libs/api/__generated__/models/Rack.ts
 delete mode 100644 libs/api/__generated__/models/RackResultsPage.ts
 delete mode 100644 libs/api/__generated__/models/RouteDestination.ts
 delete mode 100644 libs/api/__generated__/models/RouteDestinationOneOf.ts
 delete mode 100644 libs/api/__generated__/models/RouteDestinationOneOf1.ts
 delete mode 100644 libs/api/__generated__/models/RouteDestinationOneOf2.ts
 delete mode 100644 libs/api/__generated__/models/RouteTarget.ts
 delete mode 100644 libs/api/__generated__/models/RouteTargetOneOf.ts
 delete mode 100644 libs/api/__generated__/models/RouteTargetOneOf1.ts
 delete mode 100644 libs/api/__generated__/models/RouterRoute.ts
 delete mode 100644 libs/api/__generated__/models/RouterRouteCreateParams.ts
 delete mode 100644 libs/api/__generated__/models/RouterRouteKind.ts
 delete mode 100644 libs/api/__generated__/models/RouterRouteResultsPage.ts
 delete mode 100644 libs/api/__generated__/models/RouterRouteUpdateParams.ts
 delete mode 100644 libs/api/__generated__/models/Saga.ts
 delete mode 100644 libs/api/__generated__/models/SagaErrorInfo.ts
 delete mode 100644 libs/api/__generated__/models/SagaErrorInfoOneOf.ts
 delete mode 100644 libs/api/__generated__/models/SagaErrorInfoOneOf1.ts
 delete mode 100644 libs/api/__generated__/models/SagaErrorInfoOneOf2.ts
 delete mode 100644 libs/api/__generated__/models/SagaErrorInfoOneOf3.ts
 delete mode 100644 libs/api/__generated__/models/SagaErrorInfoOneOf4.ts
 delete mode 100644 libs/api/__generated__/models/SagaResultsPage.ts
 delete mode 100644 libs/api/__generated__/models/SagaState.ts
 delete mode 100644 libs/api/__generated__/models/SagaStateOneOf.ts
 delete mode 100644 libs/api/__generated__/models/SagaStateOneOf1.ts
 delete mode 100644 libs/api/__generated__/models/SagaStateOneOf2.ts
 delete mode 100644 libs/api/__generated__/models/Sled.ts
 delete mode 100644 libs/api/__generated__/models/SledResultsPage.ts
 delete mode 100644 libs/api/__generated__/models/Vpc.ts
 delete mode 100644 libs/api/__generated__/models/VpcCreateParams.ts
 delete mode 100644 libs/api/__generated__/models/VpcFirewallRule.ts
 delete mode 100644 libs/api/__generated__/models/VpcFirewallRuleAction.ts
 delete mode 100644 libs/api/__generated__/models/VpcFirewallRuleDirection.ts
 delete mode 100644 libs/api/__generated__/models/VpcFirewallRuleFilter.ts
 delete mode 100644 libs/api/__generated__/models/VpcFirewallRuleHostFilter.ts
 delete mode 100644 libs/api/__generated__/models/VpcFirewallRuleProtocol.ts
 delete mode 100644 libs/api/__generated__/models/VpcFirewallRuleResultsPage.ts
 delete mode 100644 libs/api/__generated__/models/VpcFirewallRuleStatus.ts
 delete mode 100644 libs/api/__generated__/models/VpcFirewallRuleTarget.ts
 delete mode 100644 libs/api/__generated__/models/VpcFirewallRuleUpdate.ts
 delete mode 100644 libs/api/__generated__/models/VpcResultsPage.ts
 delete mode 100644 libs/api/__generated__/models/VpcRouter.ts
 delete mode 100644 libs/api/__generated__/models/VpcRouterCreateParams.ts
 delete mode 100644 libs/api/__generated__/models/VpcRouterKind.ts
 delete mode 100644 libs/api/__generated__/models/VpcRouterResultsPage.ts
 delete mode 100644 libs/api/__generated__/models/VpcRouterUpdateParams.ts
 delete mode 100644 libs/api/__generated__/models/VpcSubnet.ts
 delete mode 100644 libs/api/__generated__/models/VpcSubnetCreateParams.ts
 delete mode 100644 libs/api/__generated__/models/VpcSubnetResultsPage.ts
 delete mode 100644 libs/api/__generated__/models/VpcSubnetUpdateParams.ts
 delete mode 100644 libs/api/__generated__/models/VpcUpdateParams.ts
 delete mode 100644 libs/api/__generated__/models/index.ts
 delete mode 100644 libs/api/__generated__/runtime.ts

diff --git a/libs/api/__generated__/.openapi-generator-ignore b/libs/api/__generated__/.openapi-generator-ignore
deleted file mode 100644
index 46af1d7d9f..0000000000
--- a/libs/api/__generated__/.openapi-generator-ignore
+++ /dev/null
@@ -1,25 +0,0 @@
-# OpenAPI Generator Ignore
-# Generated by openapi-generator https://github.com/openapitools/openapi-generator
-
-# Use this file to prevent files from being overwritten by the generator.
-# The patterns follow closely to .gitignore or .dockerignore.
-
-# As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
-#ApiClient.cs
-
-# You can match any string of characters against a directory, file or extension with a single asterisk (*):
-#foo/*/qux
-# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
-
-# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
-#foo/**/qux
-# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
-
-# You can also negate patterns with an exclamation (!).
-# For example, you can ignore all files in a docs folder with the file extension .md:
-#docs/*.md
-# Then explicitly reverse the ignore rule for a single file:
-#!docs/README.md
-
-OMICRON_VERSION
\ No newline at end of file
diff --git a/libs/api/__generated__/.openapi-generator/FILES b/libs/api/__generated__/.openapi-generator/FILES
deleted file mode 100644
index 7a9656b0c3..0000000000
--- a/libs/api/__generated__/.openapi-generator/FILES
+++ /dev/null
@@ -1,85 +0,0 @@
-apis/DefaultApi.ts
-apis/index.ts
-index.ts
-models/Disk.ts
-models/DiskAttachment.ts
-models/DiskCreateParams.ts
-models/DiskResultsPage.ts
-models/DiskState.ts
-models/DiskStateOneOf.ts
-models/DiskStateOneOf1.ts
-models/DiskStateOneOf2.ts
-models/DiskStateOneOf3.ts
-models/DiskStateOneOf4.ts
-models/DiskStateOneOf5.ts
-models/DiskStateOneOf6.ts
-models/IdSortMode.ts
-models/IdentityMetadata.ts
-models/Instance.ts
-models/InstanceCreateParams.ts
-models/InstanceResultsPage.ts
-models/InstanceState.ts
-models/LoginParams.ts
-models/NameOrIdSortMode.ts
-models/NameSortMode.ts
-models/Organization.ts
-models/OrganizationCreate.ts
-models/OrganizationResultsPage.ts
-models/OrganizationUpdate.ts
-models/Project.ts
-models/ProjectCreate.ts
-models/ProjectResultsPage.ts
-models/ProjectUpdate.ts
-models/Rack.ts
-models/RackResultsPage.ts
-models/RouteDestination.ts
-models/RouteDestinationOneOf.ts
-models/RouteDestinationOneOf1.ts
-models/RouteDestinationOneOf2.ts
-models/RouteTarget.ts
-models/RouteTargetOneOf.ts
-models/RouteTargetOneOf1.ts
-models/RouterRoute.ts
-models/RouterRouteCreateParams.ts
-models/RouterRouteKind.ts
-models/RouterRouteResultsPage.ts
-models/RouterRouteUpdateParams.ts
-models/Saga.ts
-models/SagaErrorInfo.ts
-models/SagaErrorInfoOneOf.ts
-models/SagaErrorInfoOneOf1.ts
-models/SagaErrorInfoOneOf2.ts
-models/SagaErrorInfoOneOf3.ts
-models/SagaErrorInfoOneOf4.ts
-models/SagaResultsPage.ts
-models/SagaState.ts
-models/SagaStateOneOf.ts
-models/SagaStateOneOf1.ts
-models/SagaStateOneOf2.ts
-models/Sled.ts
-models/SledResultsPage.ts
-models/Vpc.ts
-models/VpcCreateParams.ts
-models/VpcFirewallRule.ts
-models/VpcFirewallRuleAction.ts
-models/VpcFirewallRuleDirection.ts
-models/VpcFirewallRuleFilter.ts
-models/VpcFirewallRuleHostFilter.ts
-models/VpcFirewallRuleProtocol.ts
-models/VpcFirewallRuleResultsPage.ts
-models/VpcFirewallRuleStatus.ts
-models/VpcFirewallRuleTarget.ts
-models/VpcFirewallRuleUpdate.ts
-models/VpcResultsPage.ts
-models/VpcRouter.ts
-models/VpcRouterCreateParams.ts
-models/VpcRouterKind.ts
-models/VpcRouterResultsPage.ts
-models/VpcRouterUpdateParams.ts
-models/VpcSubnet.ts
-models/VpcSubnetCreateParams.ts
-models/VpcSubnetResultsPage.ts
-models/VpcSubnetUpdateParams.ts
-models/VpcUpdateParams.ts
-models/index.ts
-runtime.ts
diff --git a/libs/api/__generated__/.openapi-generator/VERSION b/libs/api/__generated__/.openapi-generator/VERSION
deleted file mode 100644
index 804440660c..0000000000
--- a/libs/api/__generated__/.openapi-generator/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-5.2.1
\ No newline at end of file
diff --git a/libs/api/__generated__/apis/DefaultApi.ts b/libs/api/__generated__/apis/DefaultApi.ts
deleted file mode 100644
index 3f5c7f54d3..0000000000
--- a/libs/api/__generated__/apis/DefaultApi.ts
+++ /dev/null
@@ -1,4874 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import * as runtime from '../runtime'
-import {
-  Disk,
-  DiskFromJSON,
-  DiskToJSON,
-  DiskAttachment,
-  DiskAttachmentFromJSON,
-  DiskAttachmentToJSON,
-  DiskCreateParams,
-  DiskCreateParamsFromJSON,
-  DiskCreateParamsToJSON,
-  DiskResultsPage,
-  DiskResultsPageFromJSON,
-  DiskResultsPageToJSON,
-  IdSortMode,
-  IdSortModeFromJSON,
-  IdSortModeToJSON,
-  Instance,
-  InstanceFromJSON,
-  InstanceToJSON,
-  InstanceCreateParams,
-  InstanceCreateParamsFromJSON,
-  InstanceCreateParamsToJSON,
-  InstanceResultsPage,
-  InstanceResultsPageFromJSON,
-  InstanceResultsPageToJSON,
-  LoginParams,
-  LoginParamsFromJSON,
-  LoginParamsToJSON,
-  NameOrIdSortMode,
-  NameOrIdSortModeFromJSON,
-  NameOrIdSortModeToJSON,
-  NameSortMode,
-  NameSortModeFromJSON,
-  NameSortModeToJSON,
-  Organization,
-  OrganizationFromJSON,
-  OrganizationToJSON,
-  OrganizationCreate,
-  OrganizationCreateFromJSON,
-  OrganizationCreateToJSON,
-  OrganizationResultsPage,
-  OrganizationResultsPageFromJSON,
-  OrganizationResultsPageToJSON,
-  OrganizationUpdate,
-  OrganizationUpdateFromJSON,
-  OrganizationUpdateToJSON,
-  Project,
-  ProjectFromJSON,
-  ProjectToJSON,
-  ProjectCreate,
-  ProjectCreateFromJSON,
-  ProjectCreateToJSON,
-  ProjectResultsPage,
-  ProjectResultsPageFromJSON,
-  ProjectResultsPageToJSON,
-  ProjectUpdate,
-  ProjectUpdateFromJSON,
-  ProjectUpdateToJSON,
-  Rack,
-  RackFromJSON,
-  RackToJSON,
-  RackResultsPage,
-  RackResultsPageFromJSON,
-  RackResultsPageToJSON,
-  RouterRoute,
-  RouterRouteFromJSON,
-  RouterRouteToJSON,
-  RouterRouteCreateParams,
-  RouterRouteCreateParamsFromJSON,
-  RouterRouteCreateParamsToJSON,
-  RouterRouteResultsPage,
-  RouterRouteResultsPageFromJSON,
-  RouterRouteResultsPageToJSON,
-  RouterRouteUpdateParams,
-  RouterRouteUpdateParamsFromJSON,
-  RouterRouteUpdateParamsToJSON,
-  Saga,
-  SagaFromJSON,
-  SagaToJSON,
-  SagaResultsPage,
-  SagaResultsPageFromJSON,
-  SagaResultsPageToJSON,
-  Sled,
-  SledFromJSON,
-  SledToJSON,
-  SledResultsPage,
-  SledResultsPageFromJSON,
-  SledResultsPageToJSON,
-  Vpc,
-  VpcFromJSON,
-  VpcToJSON,
-  VpcCreateParams,
-  VpcCreateParamsFromJSON,
-  VpcCreateParamsToJSON,
-  VpcFirewallRule,
-  VpcFirewallRuleFromJSON,
-  VpcFirewallRuleToJSON,
-  VpcFirewallRuleResultsPage,
-  VpcFirewallRuleResultsPageFromJSON,
-  VpcFirewallRuleResultsPageToJSON,
-  VpcFirewallRuleUpdate,
-  VpcFirewallRuleUpdateFromJSON,
-  VpcFirewallRuleUpdateToJSON,
-  VpcResultsPage,
-  VpcResultsPageFromJSON,
-  VpcResultsPageToJSON,
-  VpcRouter,
-  VpcRouterFromJSON,
-  VpcRouterToJSON,
-  VpcRouterCreateParams,
-  VpcRouterCreateParamsFromJSON,
-  VpcRouterCreateParamsToJSON,
-  VpcRouterResultsPage,
-  VpcRouterResultsPageFromJSON,
-  VpcRouterResultsPageToJSON,
-  VpcRouterUpdateParams,
-  VpcRouterUpdateParamsFromJSON,
-  VpcRouterUpdateParamsToJSON,
-  VpcSubnet,
-  VpcSubnetFromJSON,
-  VpcSubnetToJSON,
-  VpcSubnetCreateParams,
-  VpcSubnetCreateParamsFromJSON,
-  VpcSubnetCreateParamsToJSON,
-  VpcSubnetResultsPage,
-  VpcSubnetResultsPageFromJSON,
-  VpcSubnetResultsPageToJSON,
-  VpcSubnetUpdateParams,
-  VpcSubnetUpdateParamsFromJSON,
-  VpcSubnetUpdateParamsToJSON,
-  VpcUpdateParams,
-  VpcUpdateParamsFromJSON,
-  VpcUpdateParamsToJSON,
-} from '../models'
-
-export interface HardwareRacksGetRequest {
-  limit?: number | null
-  pageToken?: string | null
-  sortBy?: IdSortMode
-}
-
-export interface HardwareRacksGetRackRequest {
-  rackId: string
-}
-
-export interface HardwareSledsGetRequest {
-  limit?: number | null
-  pageToken?: string | null
-  sortBy?: IdSortMode
-}
-
-export interface HardwareSledsGetSledRequest {
-  sledId: string
-}
-
-export interface InstanceDisksDeleteDiskRequest {
-  diskName: string
-  instanceName: string
-  organizationName: string
-  projectName: string
-}
-
-export interface InstanceDisksGetRequest {
-  instanceName: string
-  organizationName: string
-  projectName: string
-}
-
-export interface InstanceDisksGetDiskRequest {
-  diskName: string
-  instanceName: string
-  organizationName: string
-  projectName: string
-}
-
-export interface InstanceDisksPutDiskRequest {
-  diskName: string
-  instanceName: string
-  organizationName: string
-  projectName: string
-}
-
-export interface OrganizationProjectsDeleteProjectRequest {
-  organizationName: string
-  projectName: string
-}
-
-export interface OrganizationProjectsGetRequest {
-  organizationName: string
-  limit?: number | null
-  pageToken?: string | null
-  sortBy?: NameOrIdSortMode
-}
-
-export interface OrganizationProjectsGetProjectRequest {
-  organizationName: string
-  projectName: string
-}
-
-export interface OrganizationProjectsPostRequest {
-  organizationName: string
-  projectCreate: ProjectCreate
-}
-
-export interface OrganizationProjectsPutProjectRequest {
-  organizationName: string
-  projectName: string
-  projectUpdate: ProjectUpdate
-}
-
-export interface OrganizationsDeleteOrganizationRequest {
-  organizationName: string
-}
-
-export interface OrganizationsGetRequest {
-  limit?: number | null
-  pageToken?: string | null
-  sortBy?: NameOrIdSortMode
-}
-
-export interface OrganizationsGetOrganizationRequest {
-  organizationName: string
-}
-
-export interface OrganizationsPostRequest {
-  organizationCreate: OrganizationCreate
-}
-
-export interface OrganizationsPutOrganizationRequest {
-  organizationName: string
-  organizationUpdate: OrganizationUpdate
-}
-
-export interface ProjectDisksDeleteDiskRequest {
-  diskName: string
-  organizationName: string
-  projectName: string
-}
-
-export interface ProjectDisksGetRequest {
-  organizationName: string
-  projectName: string
-  limit?: number | null
-  pageToken?: string | null
-  sortBy?: NameSortMode
-}
-
-export interface ProjectDisksGetDiskRequest {
-  diskName: string
-  organizationName: string
-  projectName: string
-}
-
-export interface ProjectDisksPostRequest {
-  organizationName: string
-  projectName: string
-  diskCreateParams: DiskCreateParams
-}
-
-export interface ProjectInstancesDeleteInstanceRequest {
-  instanceName: string
-  organizationName: string
-  projectName: string
-}
-
-export interface ProjectInstancesGetRequest {
-  organizationName: string
-  projectName: string
-  limit?: number | null
-  pageToken?: string | null
-  sortBy?: NameSortMode
-}
-
-export interface ProjectInstancesGetInstanceRequest {
-  instanceName: string
-  organizationName: string
-  projectName: string
-}
-
-export interface ProjectInstancesInstanceRebootRequest {
-  instanceName: string
-  organizationName: string
-  projectName: string
-}
-
-export interface ProjectInstancesInstanceStartRequest {
-  instanceName: string
-  organizationName: string
-  projectName: string
-}
-
-export interface ProjectInstancesInstanceStopRequest {
-  instanceName: string
-  organizationName: string
-  projectName: string
-}
-
-export interface ProjectInstancesPostRequest {
-  organizationName: string
-  projectName: string
-  instanceCreateParams: InstanceCreateParams
-}
-
-export interface ProjectVpcsDeleteVpcRequest {
-  organizationName: string
-  projectName: string
-  vpcName: string
-}
-
-export interface ProjectVpcsGetRequest {
-  organizationName: string
-  projectName: string
-  limit?: number | null
-  pageToken?: string | null
-  sortBy?: NameSortMode
-}
-
-export interface ProjectVpcsGetVpcRequest {
-  organizationName: string
-  projectName: string
-  vpcName: string
-}
-
-export interface ProjectVpcsPostRequest {
-  organizationName: string
-  projectName: string
-  vpcCreateParams: VpcCreateParams
-}
-
-export interface ProjectVpcsPutVpcRequest {
-  organizationName: string
-  projectName: string
-  vpcName: string
-  vpcUpdateParams: VpcUpdateParams
-}
-
-export interface RoutersRoutesDeleteRouteRequest {
-  organizationName: string
-  projectName: string
-  routeName: string
-  routerName: string
-  vpcName: string
-}
-
-export interface RoutersRoutesGetRequest {
-  organizationName: string
-  projectName: string
-  routerName: string
-  vpcName: string
-  limit?: number | null
-  pageToken?: string | null
-  sortBy?: NameSortMode
-}
-
-export interface RoutersRoutesGetRouteRequest {
-  organizationName: string
-  projectName: string
-  routeName: string
-  routerName: string
-  vpcName: string
-}
-
-export interface RoutersRoutesPostRequest {
-  organizationName: string
-  projectName: string
-  routerName: string
-  vpcName: string
-  routerRouteCreateParams: RouterRouteCreateParams
-}
-
-export interface RoutersRoutesPutRouteRequest {
-  organizationName: string
-  projectName: string
-  routeName: string
-  routerName: string
-  vpcName: string
-  routerRouteUpdateParams: RouterRouteUpdateParams
-}
-
-export interface SagasGetRequest {
-  limit?: number | null
-  pageToken?: string | null
-  sortBy?: IdSortMode
-}
-
-export interface SagasGetSagaRequest {
-  sagaId: string
-}
-
-export interface SpoofLoginRequest {
-  loginParams: LoginParams
-}
-
-export interface VpcFirewallRulesGetRequest {
-  organizationName: string
-  projectName: string
-  vpcName: string
-  limit?: number | null
-  pageToken?: string | null
-  sortBy?: NameSortMode
-}
-
-export interface VpcFirewallRulesPutRequest {
-  organizationName: string
-  projectName: string
-  vpcName: string
-  requestBody: { [key: string]: VpcFirewallRuleUpdate }
-}
-
-export interface VpcRoutersDeleteRouterRequest {
-  organizationName: string
-  projectName: string
-  routerName: string
-  vpcName: string
-}
-
-export interface VpcRoutersGetRequest {
-  organizationName: string
-  projectName: string
-  vpcName: string
-  limit?: number | null
-  pageToken?: string | null
-  sortBy?: NameSortMode
-}
-
-export interface VpcRoutersGetRouterRequest {
-  organizationName: string
-  projectName: string
-  routerName: string
-  vpcName: string
-}
-
-export interface VpcRoutersPostRequest {
-  organizationName: string
-  projectName: string
-  vpcName: string
-  vpcRouterCreateParams: VpcRouterCreateParams
-}
-
-export interface VpcRoutersPutRouterRequest {
-  organizationName: string
-  projectName: string
-  routerName: string
-  vpcName: string
-  vpcRouterUpdateParams: VpcRouterUpdateParams
-}
-
-export interface VpcSubnetsDeleteSubnetRequest {
-  organizationName: string
-  projectName: string
-  subnetName: string
-  vpcName: string
-}
-
-export interface VpcSubnetsGetRequest {
-  organizationName: string
-  projectName: string
-  vpcName: string
-  limit?: number | null
-  pageToken?: string | null
-  sortBy?: NameSortMode
-}
-
-export interface VpcSubnetsGetSubnetRequest {
-  organizationName: string
-  projectName: string
-  subnetName: string
-  vpcName: string
-}
-
-export interface VpcSubnetsPostRequest {
-  organizationName: string
-  projectName: string
-  vpcName: string
-  vpcSubnetCreateParams: VpcSubnetCreateParams
-}
-
-export interface VpcSubnetsPutSubnetRequest {
-  organizationName: string
-  projectName: string
-  subnetName: string
-  vpcName: string
-  vpcSubnetUpdateParams: VpcSubnetUpdateParams
-}
-
-/**
- *
- */
-export class DefaultApi extends runtime.BaseAPI {
-  /**
-   * List racks in the system.
-   */
-  async hardwareRacksGetRaw(
-    requestParameters: HardwareRacksGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<RackResultsPage>> {
-    const queryParameters: any = {}
-
-    if (requestParameters.limit !== undefined) {
-      queryParameters['limit'] = requestParameters.limit
-    }
-
-    if (requestParameters.pageToken !== undefined) {
-      queryParameters['page_token'] = requestParameters.pageToken
-    }
-
-    if (requestParameters.sortBy !== undefined) {
-      queryParameters['sort_by'] = requestParameters.sortBy
-    }
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/hardware/racks`,
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      RackResultsPageFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * List racks in the system.
-   */
-  async hardwareRacksGet(
-    requestParameters: HardwareRacksGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<RackResultsPage> {
-    const response = await this.hardwareRacksGetRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Fetch information about a particular rack.
-   */
-  async hardwareRacksGetRackRaw(
-    requestParameters: HardwareRacksGetRackRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<Rack>> {
-    if (
-      requestParameters.rackId === null ||
-      requestParameters.rackId === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'rackId',
-        'Required parameter requestParameters.rackId was null or undefined when calling hardwareRacksGetRack.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/hardware/racks/{rack_id}`.replace(
-          `{${'rack_id'}}`,
-          encodeURIComponent(String(requestParameters.rackId))
-        ),
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      RackFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Fetch information about a particular rack.
-   */
-  async hardwareRacksGetRack(
-    requestParameters: HardwareRacksGetRackRequest,
-    initOverrides?: RequestInit
-  ): Promise<Rack> {
-    const response = await this.hardwareRacksGetRackRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * List sleds in the system.
-   */
-  async hardwareSledsGetRaw(
-    requestParameters: HardwareSledsGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<SledResultsPage>> {
-    const queryParameters: any = {}
-
-    if (requestParameters.limit !== undefined) {
-      queryParameters['limit'] = requestParameters.limit
-    }
-
-    if (requestParameters.pageToken !== undefined) {
-      queryParameters['page_token'] = requestParameters.pageToken
-    }
-
-    if (requestParameters.sortBy !== undefined) {
-      queryParameters['sort_by'] = requestParameters.sortBy
-    }
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/hardware/sleds`,
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      SledResultsPageFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * List sleds in the system.
-   */
-  async hardwareSledsGet(
-    requestParameters: HardwareSledsGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<SledResultsPage> {
-    const response = await this.hardwareSledsGetRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Fetch information about a sled in the system.
-   */
-  async hardwareSledsGetSledRaw(
-    requestParameters: HardwareSledsGetSledRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<Sled>> {
-    if (
-      requestParameters.sledId === null ||
-      requestParameters.sledId === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'sledId',
-        'Required parameter requestParameters.sledId was null or undefined when calling hardwareSledsGetSled.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/hardware/sleds/{sled_id}`.replace(
-          `{${'sled_id'}}`,
-          encodeURIComponent(String(requestParameters.sledId))
-        ),
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      SledFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Fetch information about a sled in the system.
-   */
-  async hardwareSledsGetSled(
-    requestParameters: HardwareSledsGetSledRequest,
-    initOverrides?: RequestInit
-  ): Promise<Sled> {
-    const response = await this.hardwareSledsGetSledRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Detach a disk from this instance.
-   */
-  async instanceDisksDeleteDiskRaw(
-    requestParameters: InstanceDisksDeleteDiskRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<void>> {
-    if (
-      requestParameters.diskName === null ||
-      requestParameters.diskName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'diskName',
-        'Required parameter requestParameters.diskName was null or undefined when calling instanceDisksDeleteDisk.'
-      )
-    }
-
-    if (
-      requestParameters.instanceName === null ||
-      requestParameters.instanceName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'instanceName',
-        'Required parameter requestParameters.instanceName was null or undefined when calling instanceDisksDeleteDisk.'
-      )
-    }
-
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling instanceDisksDeleteDisk.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling instanceDisksDeleteDisk.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}/disks/{disk_name}`
-          .replace(
-            `{${'disk_name'}}`,
-            encodeURIComponent(String(requestParameters.diskName))
-          )
-          .replace(
-            `{${'instance_name'}}`,
-            encodeURIComponent(String(requestParameters.instanceName))
-          )
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          ),
-        method: 'DELETE',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.VoidApiResponse(response)
-  }
-
-  /**
-   * Detach a disk from this instance.
-   */
-  async instanceDisksDeleteDisk(
-    requestParameters: InstanceDisksDeleteDiskRequest,
-    initOverrides?: RequestInit
-  ): Promise<void> {
-    await this.instanceDisksDeleteDiskRaw(requestParameters, initOverrides)
-  }
-
-  /**
-   * List disks attached to this instance.
-   */
-  async instanceDisksGetRaw(
-    requestParameters: InstanceDisksGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<Array<DiskAttachment>>> {
-    if (
-      requestParameters.instanceName === null ||
-      requestParameters.instanceName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'instanceName',
-        'Required parameter requestParameters.instanceName was null or undefined when calling instanceDisksGet.'
-      )
-    }
-
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling instanceDisksGet.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling instanceDisksGet.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}/disks`
-          .replace(
-            `{${'instance_name'}}`,
-            encodeURIComponent(String(requestParameters.instanceName))
-          )
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          ),
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      jsonValue.map(DiskAttachmentFromJSON)
-    )
-  }
-
-  /**
-   * List disks attached to this instance.
-   */
-  async instanceDisksGet(
-    requestParameters: InstanceDisksGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<Array<DiskAttachment>> {
-    const response = await this.instanceDisksGetRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Fetch a description of the attachment of this disk to this instance.
-   */
-  async instanceDisksGetDiskRaw(
-    requestParameters: InstanceDisksGetDiskRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<DiskAttachment>> {
-    if (
-      requestParameters.diskName === null ||
-      requestParameters.diskName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'diskName',
-        'Required parameter requestParameters.diskName was null or undefined when calling instanceDisksGetDisk.'
-      )
-    }
-
-    if (
-      requestParameters.instanceName === null ||
-      requestParameters.instanceName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'instanceName',
-        'Required parameter requestParameters.instanceName was null or undefined when calling instanceDisksGetDisk.'
-      )
-    }
-
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling instanceDisksGetDisk.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling instanceDisksGetDisk.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}/disks/{disk_name}`
-          .replace(
-            `{${'disk_name'}}`,
-            encodeURIComponent(String(requestParameters.diskName))
-          )
-          .replace(
-            `{${'instance_name'}}`,
-            encodeURIComponent(String(requestParameters.instanceName))
-          )
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          ),
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      DiskAttachmentFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Fetch a description of the attachment of this disk to this instance.
-   */
-  async instanceDisksGetDisk(
-    requestParameters: InstanceDisksGetDiskRequest,
-    initOverrides?: RequestInit
-  ): Promise<DiskAttachment> {
-    const response = await this.instanceDisksGetDiskRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Attach a disk to this instance.
-   */
-  async instanceDisksPutDiskRaw(
-    requestParameters: InstanceDisksPutDiskRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<DiskAttachment>> {
-    if (
-      requestParameters.diskName === null ||
-      requestParameters.diskName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'diskName',
-        'Required parameter requestParameters.diskName was null or undefined when calling instanceDisksPutDisk.'
-      )
-    }
-
-    if (
-      requestParameters.instanceName === null ||
-      requestParameters.instanceName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'instanceName',
-        'Required parameter requestParameters.instanceName was null or undefined when calling instanceDisksPutDisk.'
-      )
-    }
-
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling instanceDisksPutDisk.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling instanceDisksPutDisk.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}/disks/{disk_name}`
-          .replace(
-            `{${'disk_name'}}`,
-            encodeURIComponent(String(requestParameters.diskName))
-          )
-          .replace(
-            `{${'instance_name'}}`,
-            encodeURIComponent(String(requestParameters.instanceName))
-          )
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          ),
-        method: 'PUT',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      DiskAttachmentFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Attach a disk to this instance.
-   */
-  async instanceDisksPutDisk(
-    requestParameters: InstanceDisksPutDiskRequest,
-    initOverrides?: RequestInit
-  ): Promise<DiskAttachment> {
-    const response = await this.instanceDisksPutDiskRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   */
-  async logoutRaw(
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<void>> {
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/logout`,
-        method: 'POST',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.VoidApiResponse(response)
-  }
-
-  /**
-   */
-  async logout(initOverrides?: RequestInit): Promise<void> {
-    await this.logoutRaw(initOverrides)
-  }
-
-  /**
-   * Delete a specific project.
-   */
-  async organizationProjectsDeleteProjectRaw(
-    requestParameters: OrganizationProjectsDeleteProjectRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<void>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling organizationProjectsDeleteProject.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling organizationProjectsDeleteProject.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          ),
-        method: 'DELETE',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.VoidApiResponse(response)
-  }
-
-  /**
-   * Delete a specific project.
-   */
-  async organizationProjectsDeleteProject(
-    requestParameters: OrganizationProjectsDeleteProjectRequest,
-    initOverrides?: RequestInit
-  ): Promise<void> {
-    await this.organizationProjectsDeleteProjectRaw(
-      requestParameters,
-      initOverrides
-    )
-  }
-
-  /**
-   * List all projects.
-   */
-  async organizationProjectsGetRaw(
-    requestParameters: OrganizationProjectsGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<ProjectResultsPage>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling organizationProjectsGet.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    if (requestParameters.limit !== undefined) {
-      queryParameters['limit'] = requestParameters.limit
-    }
-
-    if (requestParameters.pageToken !== undefined) {
-      queryParameters['page_token'] = requestParameters.pageToken
-    }
-
-    if (requestParameters.sortBy !== undefined) {
-      queryParameters['sort_by'] = requestParameters.sortBy
-    }
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects`.replace(
-          `{${'organization_name'}}`,
-          encodeURIComponent(String(requestParameters.organizationName))
-        ),
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      ProjectResultsPageFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * List all projects.
-   */
-  async organizationProjectsGet(
-    requestParameters: OrganizationProjectsGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<ProjectResultsPage> {
-    const response = await this.organizationProjectsGetRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Fetch a specific project
-   */
-  async organizationProjectsGetProjectRaw(
-    requestParameters: OrganizationProjectsGetProjectRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<Project>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling organizationProjectsGetProject.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling organizationProjectsGetProject.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          ),
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      ProjectFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Fetch a specific project
-   */
-  async organizationProjectsGetProject(
-    requestParameters: OrganizationProjectsGetProjectRequest,
-    initOverrides?: RequestInit
-  ): Promise<Project> {
-    const response = await this.organizationProjectsGetProjectRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Create a new project.
-   */
-  async organizationProjectsPostRaw(
-    requestParameters: OrganizationProjectsPostRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<Project>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling organizationProjectsPost.'
-      )
-    }
-
-    if (
-      requestParameters.projectCreate === null ||
-      requestParameters.projectCreate === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectCreate',
-        'Required parameter requestParameters.projectCreate was null or undefined when calling organizationProjectsPost.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    headerParameters['Content-Type'] = 'application/json'
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects`.replace(
-          `{${'organization_name'}}`,
-          encodeURIComponent(String(requestParameters.organizationName))
-        ),
-        method: 'POST',
-        headers: headerParameters,
-        query: queryParameters,
-        body: ProjectCreateToJSON(requestParameters.projectCreate),
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      ProjectFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Create a new project.
-   */
-  async organizationProjectsPost(
-    requestParameters: OrganizationProjectsPostRequest,
-    initOverrides?: RequestInit
-  ): Promise<Project> {
-    const response = await this.organizationProjectsPostRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Update a specific project.  * TODO-correctness: Is it valid for PUT to accept application/json that\'s a subset of what the resource actually represents?  If not, is that a problem? (HTTP may require that this be idempotent.)  If so, can we get around that having this be a slightly different content-type (e.g., \"application/json-patch\")?  We should see what other APIs do.
-   */
-  async organizationProjectsPutProjectRaw(
-    requestParameters: OrganizationProjectsPutProjectRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<Project>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling organizationProjectsPutProject.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling organizationProjectsPutProject.'
-      )
-    }
-
-    if (
-      requestParameters.projectUpdate === null ||
-      requestParameters.projectUpdate === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectUpdate',
-        'Required parameter requestParameters.projectUpdate was null or undefined when calling organizationProjectsPutProject.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    headerParameters['Content-Type'] = 'application/json'
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          ),
-        method: 'PUT',
-        headers: headerParameters,
-        query: queryParameters,
-        body: ProjectUpdateToJSON(requestParameters.projectUpdate),
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      ProjectFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Update a specific project.  * TODO-correctness: Is it valid for PUT to accept application/json that\'s a subset of what the resource actually represents?  If not, is that a problem? (HTTP may require that this be idempotent.)  If so, can we get around that having this be a slightly different content-type (e.g., \"application/json-patch\")?  We should see what other APIs do.
-   */
-  async organizationProjectsPutProject(
-    requestParameters: OrganizationProjectsPutProjectRequest,
-    initOverrides?: RequestInit
-  ): Promise<Project> {
-    const response = await this.organizationProjectsPutProjectRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Delete a specific organization.
-   */
-  async organizationsDeleteOrganizationRaw(
-    requestParameters: OrganizationsDeleteOrganizationRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<void>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling organizationsDeleteOrganization.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}`.replace(
-          `{${'organization_name'}}`,
-          encodeURIComponent(String(requestParameters.organizationName))
-        ),
-        method: 'DELETE',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.VoidApiResponse(response)
-  }
-
-  /**
-   * Delete a specific organization.
-   */
-  async organizationsDeleteOrganization(
-    requestParameters: OrganizationsDeleteOrganizationRequest,
-    initOverrides?: RequestInit
-  ): Promise<void> {
-    await this.organizationsDeleteOrganizationRaw(
-      requestParameters,
-      initOverrides
-    )
-  }
-
-  /**
-   * List all organizations.
-   */
-  async organizationsGetRaw(
-    requestParameters: OrganizationsGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<OrganizationResultsPage>> {
-    const queryParameters: any = {}
-
-    if (requestParameters.limit !== undefined) {
-      queryParameters['limit'] = requestParameters.limit
-    }
-
-    if (requestParameters.pageToken !== undefined) {
-      queryParameters['page_token'] = requestParameters.pageToken
-    }
-
-    if (requestParameters.sortBy !== undefined) {
-      queryParameters['sort_by'] = requestParameters.sortBy
-    }
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations`,
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      OrganizationResultsPageFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * List all organizations.
-   */
-  async organizationsGet(
-    requestParameters: OrganizationsGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<OrganizationResultsPage> {
-    const response = await this.organizationsGetRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Fetch a specific organization
-   */
-  async organizationsGetOrganizationRaw(
-    requestParameters: OrganizationsGetOrganizationRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<Organization>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling organizationsGetOrganization.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}`.replace(
-          `{${'organization_name'}}`,
-          encodeURIComponent(String(requestParameters.organizationName))
-        ),
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      OrganizationFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Fetch a specific organization
-   */
-  async organizationsGetOrganization(
-    requestParameters: OrganizationsGetOrganizationRequest,
-    initOverrides?: RequestInit
-  ): Promise<Organization> {
-    const response = await this.organizationsGetOrganizationRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Create a new organization.
-   */
-  async organizationsPostRaw(
-    requestParameters: OrganizationsPostRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<Organization>> {
-    if (
-      requestParameters.organizationCreate === null ||
-      requestParameters.organizationCreate === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationCreate',
-        'Required parameter requestParameters.organizationCreate was null or undefined when calling organizationsPost.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    headerParameters['Content-Type'] = 'application/json'
-
-    const response = await this.request(
-      {
-        path: `/organizations`,
-        method: 'POST',
-        headers: headerParameters,
-        query: queryParameters,
-        body: OrganizationCreateToJSON(requestParameters.organizationCreate),
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      OrganizationFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Create a new organization.
-   */
-  async organizationsPost(
-    requestParameters: OrganizationsPostRequest,
-    initOverrides?: RequestInit
-  ): Promise<Organization> {
-    const response = await this.organizationsPostRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Update a specific organization.  * TODO-correctness: Is it valid for PUT to accept application/json that\'s a subset of what the resource actually represents?  If not, is that a problem? (HTTP may require that this be idempotent.)  If so, can we get around that having this be a slightly different content-type (e.g., \"application/json-patch\")?  We should see what other APIs do.
-   */
-  async organizationsPutOrganizationRaw(
-    requestParameters: OrganizationsPutOrganizationRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<Organization>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling organizationsPutOrganization.'
-      )
-    }
-
-    if (
-      requestParameters.organizationUpdate === null ||
-      requestParameters.organizationUpdate === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationUpdate',
-        'Required parameter requestParameters.organizationUpdate was null or undefined when calling organizationsPutOrganization.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    headerParameters['Content-Type'] = 'application/json'
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}`.replace(
-          `{${'organization_name'}}`,
-          encodeURIComponent(String(requestParameters.organizationName))
-        ),
-        method: 'PUT',
-        headers: headerParameters,
-        query: queryParameters,
-        body: OrganizationUpdateToJSON(requestParameters.organizationUpdate),
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      OrganizationFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Update a specific organization.  * TODO-correctness: Is it valid for PUT to accept application/json that\'s a subset of what the resource actually represents?  If not, is that a problem? (HTTP may require that this be idempotent.)  If so, can we get around that having this be a slightly different content-type (e.g., \"application/json-patch\")?  We should see what other APIs do.
-   */
-  async organizationsPutOrganization(
-    requestParameters: OrganizationsPutOrganizationRequest,
-    initOverrides?: RequestInit
-  ): Promise<Organization> {
-    const response = await this.organizationsPutOrganizationRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Delete a disk from a project.
-   */
-  async projectDisksDeleteDiskRaw(
-    requestParameters: ProjectDisksDeleteDiskRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<void>> {
-    if (
-      requestParameters.diskName === null ||
-      requestParameters.diskName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'diskName',
-        'Required parameter requestParameters.diskName was null or undefined when calling projectDisksDeleteDisk.'
-      )
-    }
-
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling projectDisksDeleteDisk.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling projectDisksDeleteDisk.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/disks/{disk_name}`
-          .replace(
-            `{${'disk_name'}}`,
-            encodeURIComponent(String(requestParameters.diskName))
-          )
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          ),
-        method: 'DELETE',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.VoidApiResponse(response)
-  }
-
-  /**
-   * Delete a disk from a project.
-   */
-  async projectDisksDeleteDisk(
-    requestParameters: ProjectDisksDeleteDiskRequest,
-    initOverrides?: RequestInit
-  ): Promise<void> {
-    await this.projectDisksDeleteDiskRaw(requestParameters, initOverrides)
-  }
-
-  /**
-   * List disks in a project.
-   */
-  async projectDisksGetRaw(
-    requestParameters: ProjectDisksGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<DiskResultsPage>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling projectDisksGet.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling projectDisksGet.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    if (requestParameters.limit !== undefined) {
-      queryParameters['limit'] = requestParameters.limit
-    }
-
-    if (requestParameters.pageToken !== undefined) {
-      queryParameters['page_token'] = requestParameters.pageToken
-    }
-
-    if (requestParameters.sortBy !== undefined) {
-      queryParameters['sort_by'] = requestParameters.sortBy
-    }
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/disks`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          ),
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      DiskResultsPageFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * List disks in a project.
-   */
-  async projectDisksGet(
-    requestParameters: ProjectDisksGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<DiskResultsPage> {
-    const response = await this.projectDisksGetRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Fetch a single disk in a project.
-   */
-  async projectDisksGetDiskRaw(
-    requestParameters: ProjectDisksGetDiskRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<Disk>> {
-    if (
-      requestParameters.diskName === null ||
-      requestParameters.diskName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'diskName',
-        'Required parameter requestParameters.diskName was null or undefined when calling projectDisksGetDisk.'
-      )
-    }
-
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling projectDisksGetDisk.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling projectDisksGetDisk.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/disks/{disk_name}`
-          .replace(
-            `{${'disk_name'}}`,
-            encodeURIComponent(String(requestParameters.diskName))
-          )
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          ),
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      DiskFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Fetch a single disk in a project.
-   */
-  async projectDisksGetDisk(
-    requestParameters: ProjectDisksGetDiskRequest,
-    initOverrides?: RequestInit
-  ): Promise<Disk> {
-    const response = await this.projectDisksGetDiskRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Create a disk in a project.  * TODO-correctness See note about instance create.  This should be async.
-   */
-  async projectDisksPostRaw(
-    requestParameters: ProjectDisksPostRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<Disk>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling projectDisksPost.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling projectDisksPost.'
-      )
-    }
-
-    if (
-      requestParameters.diskCreateParams === null ||
-      requestParameters.diskCreateParams === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'diskCreateParams',
-        'Required parameter requestParameters.diskCreateParams was null or undefined when calling projectDisksPost.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    headerParameters['Content-Type'] = 'application/json'
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/disks`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          ),
-        method: 'POST',
-        headers: headerParameters,
-        query: queryParameters,
-        body: DiskCreateParamsToJSON(requestParameters.diskCreateParams),
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      DiskFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Create a disk in a project.  * TODO-correctness See note about instance create.  This should be async.
-   */
-  async projectDisksPost(
-    requestParameters: ProjectDisksPostRequest,
-    initOverrides?: RequestInit
-  ): Promise<Disk> {
-    const response = await this.projectDisksPostRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Delete an instance from a project.
-   */
-  async projectInstancesDeleteInstanceRaw(
-    requestParameters: ProjectInstancesDeleteInstanceRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<void>> {
-    if (
-      requestParameters.instanceName === null ||
-      requestParameters.instanceName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'instanceName',
-        'Required parameter requestParameters.instanceName was null or undefined when calling projectInstancesDeleteInstance.'
-      )
-    }
-
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling projectInstancesDeleteInstance.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling projectInstancesDeleteInstance.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}`
-          .replace(
-            `{${'instance_name'}}`,
-            encodeURIComponent(String(requestParameters.instanceName))
-          )
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          ),
-        method: 'DELETE',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.VoidApiResponse(response)
-  }
-
-  /**
-   * Delete an instance from a project.
-   */
-  async projectInstancesDeleteInstance(
-    requestParameters: ProjectInstancesDeleteInstanceRequest,
-    initOverrides?: RequestInit
-  ): Promise<void> {
-    await this.projectInstancesDeleteInstanceRaw(
-      requestParameters,
-      initOverrides
-    )
-  }
-
-  /**
-   * List instances in a project.
-   */
-  async projectInstancesGetRaw(
-    requestParameters: ProjectInstancesGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<InstanceResultsPage>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling projectInstancesGet.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling projectInstancesGet.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    if (requestParameters.limit !== undefined) {
-      queryParameters['limit'] = requestParameters.limit
-    }
-
-    if (requestParameters.pageToken !== undefined) {
-      queryParameters['page_token'] = requestParameters.pageToken
-    }
-
-    if (requestParameters.sortBy !== undefined) {
-      queryParameters['sort_by'] = requestParameters.sortBy
-    }
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/instances`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          ),
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      InstanceResultsPageFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * List instances in a project.
-   */
-  async projectInstancesGet(
-    requestParameters: ProjectInstancesGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<InstanceResultsPage> {
-    const response = await this.projectInstancesGetRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Get an instance in a project.
-   */
-  async projectInstancesGetInstanceRaw(
-    requestParameters: ProjectInstancesGetInstanceRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<Instance>> {
-    if (
-      requestParameters.instanceName === null ||
-      requestParameters.instanceName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'instanceName',
-        'Required parameter requestParameters.instanceName was null or undefined when calling projectInstancesGetInstance.'
-      )
-    }
-
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling projectInstancesGetInstance.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling projectInstancesGetInstance.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}`
-          .replace(
-            `{${'instance_name'}}`,
-            encodeURIComponent(String(requestParameters.instanceName))
-          )
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          ),
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      InstanceFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Get an instance in a project.
-   */
-  async projectInstancesGetInstance(
-    requestParameters: ProjectInstancesGetInstanceRequest,
-    initOverrides?: RequestInit
-  ): Promise<Instance> {
-    const response = await this.projectInstancesGetInstanceRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Reboot an instance.
-   */
-  async projectInstancesInstanceRebootRaw(
-    requestParameters: ProjectInstancesInstanceRebootRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<Instance>> {
-    if (
-      requestParameters.instanceName === null ||
-      requestParameters.instanceName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'instanceName',
-        'Required parameter requestParameters.instanceName was null or undefined when calling projectInstancesInstanceReboot.'
-      )
-    }
-
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling projectInstancesInstanceReboot.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling projectInstancesInstanceReboot.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}/reboot`
-          .replace(
-            `{${'instance_name'}}`,
-            encodeURIComponent(String(requestParameters.instanceName))
-          )
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          ),
-        method: 'POST',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      InstanceFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Reboot an instance.
-   */
-  async projectInstancesInstanceReboot(
-    requestParameters: ProjectInstancesInstanceRebootRequest,
-    initOverrides?: RequestInit
-  ): Promise<Instance> {
-    const response = await this.projectInstancesInstanceRebootRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Boot an instance.
-   */
-  async projectInstancesInstanceStartRaw(
-    requestParameters: ProjectInstancesInstanceStartRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<Instance>> {
-    if (
-      requestParameters.instanceName === null ||
-      requestParameters.instanceName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'instanceName',
-        'Required parameter requestParameters.instanceName was null or undefined when calling projectInstancesInstanceStart.'
-      )
-    }
-
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling projectInstancesInstanceStart.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling projectInstancesInstanceStart.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}/start`
-          .replace(
-            `{${'instance_name'}}`,
-            encodeURIComponent(String(requestParameters.instanceName))
-          )
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          ),
-        method: 'POST',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      InstanceFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Boot an instance.
-   */
-  async projectInstancesInstanceStart(
-    requestParameters: ProjectInstancesInstanceStartRequest,
-    initOverrides?: RequestInit
-  ): Promise<Instance> {
-    const response = await this.projectInstancesInstanceStartRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Halt an instance.
-   */
-  async projectInstancesInstanceStopRaw(
-    requestParameters: ProjectInstancesInstanceStopRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<Instance>> {
-    if (
-      requestParameters.instanceName === null ||
-      requestParameters.instanceName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'instanceName',
-        'Required parameter requestParameters.instanceName was null or undefined when calling projectInstancesInstanceStop.'
-      )
-    }
-
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling projectInstancesInstanceStop.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling projectInstancesInstanceStop.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/instances/{instance_name}/stop`
-          .replace(
-            `{${'instance_name'}}`,
-            encodeURIComponent(String(requestParameters.instanceName))
-          )
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          ),
-        method: 'POST',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      InstanceFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Halt an instance.
-   */
-  async projectInstancesInstanceStop(
-    requestParameters: ProjectInstancesInstanceStopRequest,
-    initOverrides?: RequestInit
-  ): Promise<Instance> {
-    const response = await this.projectInstancesInstanceStopRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Create an instance in a project.  * TODO-correctness This is supposed to be async.  Is that right?  We can create the instance immediately -- it\'s just not booted yet.  Maybe the boot operation is what\'s a separate operation_id.  What about the response code (201 Created vs 202 Accepted)?  Is that orthogonal?  Things can return a useful response, including an operation id, with either response code.  Maybe a \"reboot\" operation would return a 202 Accepted because there\'s no actual resource created?
-   */
-  async projectInstancesPostRaw(
-    requestParameters: ProjectInstancesPostRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<Instance>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling projectInstancesPost.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling projectInstancesPost.'
-      )
-    }
-
-    if (
-      requestParameters.instanceCreateParams === null ||
-      requestParameters.instanceCreateParams === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'instanceCreateParams',
-        'Required parameter requestParameters.instanceCreateParams was null or undefined when calling projectInstancesPost.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    headerParameters['Content-Type'] = 'application/json'
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/instances`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          ),
-        method: 'POST',
-        headers: headerParameters,
-        query: queryParameters,
-        body: InstanceCreateParamsToJSON(
-          requestParameters.instanceCreateParams
-        ),
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      InstanceFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Create an instance in a project.  * TODO-correctness This is supposed to be async.  Is that right?  We can create the instance immediately -- it\'s just not booted yet.  Maybe the boot operation is what\'s a separate operation_id.  What about the response code (201 Created vs 202 Accepted)?  Is that orthogonal?  Things can return a useful response, including an operation id, with either response code.  Maybe a \"reboot\" operation would return a 202 Accepted because there\'s no actual resource created?
-   */
-  async projectInstancesPost(
-    requestParameters: ProjectInstancesPostRequest,
-    initOverrides?: RequestInit
-  ): Promise<Instance> {
-    const response = await this.projectInstancesPostRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Delete a vpc from a project.
-   */
-  async projectVpcsDeleteVpcRaw(
-    requestParameters: ProjectVpcsDeleteVpcRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<void>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling projectVpcsDeleteVpc.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling projectVpcsDeleteVpc.'
-      )
-    }
-
-    if (
-      requestParameters.vpcName === null ||
-      requestParameters.vpcName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcName',
-        'Required parameter requestParameters.vpcName was null or undefined when calling projectVpcsDeleteVpc.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          )
-          .replace(
-            `{${'vpc_name'}}`,
-            encodeURIComponent(String(requestParameters.vpcName))
-          ),
-        method: 'DELETE',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.VoidApiResponse(response)
-  }
-
-  /**
-   * Delete a vpc from a project.
-   */
-  async projectVpcsDeleteVpc(
-    requestParameters: ProjectVpcsDeleteVpcRequest,
-    initOverrides?: RequestInit
-  ): Promise<void> {
-    await this.projectVpcsDeleteVpcRaw(requestParameters, initOverrides)
-  }
-
-  /**
-   * List VPCs in a project.
-   */
-  async projectVpcsGetRaw(
-    requestParameters: ProjectVpcsGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<VpcResultsPage>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling projectVpcsGet.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling projectVpcsGet.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    if (requestParameters.limit !== undefined) {
-      queryParameters['limit'] = requestParameters.limit
-    }
-
-    if (requestParameters.pageToken !== undefined) {
-      queryParameters['page_token'] = requestParameters.pageToken
-    }
-
-    if (requestParameters.sortBy !== undefined) {
-      queryParameters['sort_by'] = requestParameters.sortBy
-    }
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/vpcs`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          ),
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      VpcResultsPageFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * List VPCs in a project.
-   */
-  async projectVpcsGet(
-    requestParameters: ProjectVpcsGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<VpcResultsPage> {
-    const response = await this.projectVpcsGetRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Get a VPC in a project.
-   */
-  async projectVpcsGetVpcRaw(
-    requestParameters: ProjectVpcsGetVpcRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<Vpc>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling projectVpcsGetVpc.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling projectVpcsGetVpc.'
-      )
-    }
-
-    if (
-      requestParameters.vpcName === null ||
-      requestParameters.vpcName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcName',
-        'Required parameter requestParameters.vpcName was null or undefined when calling projectVpcsGetVpc.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          )
-          .replace(
-            `{${'vpc_name'}}`,
-            encodeURIComponent(String(requestParameters.vpcName))
-          ),
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      VpcFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Get a VPC in a project.
-   */
-  async projectVpcsGetVpc(
-    requestParameters: ProjectVpcsGetVpcRequest,
-    initOverrides?: RequestInit
-  ): Promise<Vpc> {
-    const response = await this.projectVpcsGetVpcRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Create a VPC in a project.
-   */
-  async projectVpcsPostRaw(
-    requestParameters: ProjectVpcsPostRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<Vpc>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling projectVpcsPost.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling projectVpcsPost.'
-      )
-    }
-
-    if (
-      requestParameters.vpcCreateParams === null ||
-      requestParameters.vpcCreateParams === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcCreateParams',
-        'Required parameter requestParameters.vpcCreateParams was null or undefined when calling projectVpcsPost.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    headerParameters['Content-Type'] = 'application/json'
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/vpcs`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          ),
-        method: 'POST',
-        headers: headerParameters,
-        query: queryParameters,
-        body: VpcCreateParamsToJSON(requestParameters.vpcCreateParams),
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      VpcFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Create a VPC in a project.
-   */
-  async projectVpcsPost(
-    requestParameters: ProjectVpcsPostRequest,
-    initOverrides?: RequestInit
-  ): Promise<Vpc> {
-    const response = await this.projectVpcsPostRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Update a VPC.
-   */
-  async projectVpcsPutVpcRaw(
-    requestParameters: ProjectVpcsPutVpcRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<void>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling projectVpcsPutVpc.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling projectVpcsPutVpc.'
-      )
-    }
-
-    if (
-      requestParameters.vpcName === null ||
-      requestParameters.vpcName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcName',
-        'Required parameter requestParameters.vpcName was null or undefined when calling projectVpcsPutVpc.'
-      )
-    }
-
-    if (
-      requestParameters.vpcUpdateParams === null ||
-      requestParameters.vpcUpdateParams === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcUpdateParams',
-        'Required parameter requestParameters.vpcUpdateParams was null or undefined when calling projectVpcsPutVpc.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    headerParameters['Content-Type'] = 'application/json'
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          )
-          .replace(
-            `{${'vpc_name'}}`,
-            encodeURIComponent(String(requestParameters.vpcName))
-          ),
-        method: 'PUT',
-        headers: headerParameters,
-        query: queryParameters,
-        body: VpcUpdateParamsToJSON(requestParameters.vpcUpdateParams),
-      },
-      initOverrides
-    )
-
-    return new runtime.VoidApiResponse(response)
-  }
-
-  /**
-   * Update a VPC.
-   */
-  async projectVpcsPutVpc(
-    requestParameters: ProjectVpcsPutVpcRequest,
-    initOverrides?: RequestInit
-  ): Promise<void> {
-    await this.projectVpcsPutVpcRaw(requestParameters, initOverrides)
-  }
-
-  /**
-   * Delete a route from its router
-   */
-  async routersRoutesDeleteRouteRaw(
-    requestParameters: RoutersRoutesDeleteRouteRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<void>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling routersRoutesDeleteRoute.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling routersRoutesDeleteRoute.'
-      )
-    }
-
-    if (
-      requestParameters.routeName === null ||
-      requestParameters.routeName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'routeName',
-        'Required parameter requestParameters.routeName was null or undefined when calling routersRoutesDeleteRoute.'
-      )
-    }
-
-    if (
-      requestParameters.routerName === null ||
-      requestParameters.routerName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'routerName',
-        'Required parameter requestParameters.routerName was null or undefined when calling routersRoutesDeleteRoute.'
-      )
-    }
-
-    if (
-      requestParameters.vpcName === null ||
-      requestParameters.vpcName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcName',
-        'Required parameter requestParameters.vpcName was null or undefined when calling routersRoutesDeleteRoute.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers/{router_name}/routes/{route_name}`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          )
-          .replace(
-            `{${'route_name'}}`,
-            encodeURIComponent(String(requestParameters.routeName))
-          )
-          .replace(
-            `{${'router_name'}}`,
-            encodeURIComponent(String(requestParameters.routerName))
-          )
-          .replace(
-            `{${'vpc_name'}}`,
-            encodeURIComponent(String(requestParameters.vpcName))
-          ),
-        method: 'DELETE',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.VoidApiResponse(response)
-  }
-
-  /**
-   * Delete a route from its router
-   */
-  async routersRoutesDeleteRoute(
-    requestParameters: RoutersRoutesDeleteRouteRequest,
-    initOverrides?: RequestInit
-  ): Promise<void> {
-    await this.routersRoutesDeleteRouteRaw(requestParameters, initOverrides)
-  }
-
-  /**
-   * List a Router\'s routes
-   */
-  async routersRoutesGetRaw(
-    requestParameters: RoutersRoutesGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<RouterRouteResultsPage>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling routersRoutesGet.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling routersRoutesGet.'
-      )
-    }
-
-    if (
-      requestParameters.routerName === null ||
-      requestParameters.routerName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'routerName',
-        'Required parameter requestParameters.routerName was null or undefined when calling routersRoutesGet.'
-      )
-    }
-
-    if (
-      requestParameters.vpcName === null ||
-      requestParameters.vpcName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcName',
-        'Required parameter requestParameters.vpcName was null or undefined when calling routersRoutesGet.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    if (requestParameters.limit !== undefined) {
-      queryParameters['limit'] = requestParameters.limit
-    }
-
-    if (requestParameters.pageToken !== undefined) {
-      queryParameters['page_token'] = requestParameters.pageToken
-    }
-
-    if (requestParameters.sortBy !== undefined) {
-      queryParameters['sort_by'] = requestParameters.sortBy
-    }
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers/{router_name}/routes`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          )
-          .replace(
-            `{${'router_name'}}`,
-            encodeURIComponent(String(requestParameters.routerName))
-          )
-          .replace(
-            `{${'vpc_name'}}`,
-            encodeURIComponent(String(requestParameters.vpcName))
-          ),
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      RouterRouteResultsPageFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * List a Router\'s routes
-   */
-  async routersRoutesGet(
-    requestParameters: RoutersRoutesGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<RouterRouteResultsPage> {
-    const response = await this.routersRoutesGetRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Get a VPC Router route
-   */
-  async routersRoutesGetRouteRaw(
-    requestParameters: RoutersRoutesGetRouteRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<RouterRoute>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling routersRoutesGetRoute.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling routersRoutesGetRoute.'
-      )
-    }
-
-    if (
-      requestParameters.routeName === null ||
-      requestParameters.routeName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'routeName',
-        'Required parameter requestParameters.routeName was null or undefined when calling routersRoutesGetRoute.'
-      )
-    }
-
-    if (
-      requestParameters.routerName === null ||
-      requestParameters.routerName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'routerName',
-        'Required parameter requestParameters.routerName was null or undefined when calling routersRoutesGetRoute.'
-      )
-    }
-
-    if (
-      requestParameters.vpcName === null ||
-      requestParameters.vpcName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcName',
-        'Required parameter requestParameters.vpcName was null or undefined when calling routersRoutesGetRoute.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers/{router_name}/routes/{route_name}`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          )
-          .replace(
-            `{${'route_name'}}`,
-            encodeURIComponent(String(requestParameters.routeName))
-          )
-          .replace(
-            `{${'router_name'}}`,
-            encodeURIComponent(String(requestParameters.routerName))
-          )
-          .replace(
-            `{${'vpc_name'}}`,
-            encodeURIComponent(String(requestParameters.vpcName))
-          ),
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      RouterRouteFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Get a VPC Router route
-   */
-  async routersRoutesGetRoute(
-    requestParameters: RoutersRoutesGetRouteRequest,
-    initOverrides?: RequestInit
-  ): Promise<RouterRoute> {
-    const response = await this.routersRoutesGetRouteRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Create a VPC Router
-   */
-  async routersRoutesPostRaw(
-    requestParameters: RoutersRoutesPostRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<RouterRoute>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling routersRoutesPost.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling routersRoutesPost.'
-      )
-    }
-
-    if (
-      requestParameters.routerName === null ||
-      requestParameters.routerName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'routerName',
-        'Required parameter requestParameters.routerName was null or undefined when calling routersRoutesPost.'
-      )
-    }
-
-    if (
-      requestParameters.vpcName === null ||
-      requestParameters.vpcName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcName',
-        'Required parameter requestParameters.vpcName was null or undefined when calling routersRoutesPost.'
-      )
-    }
-
-    if (
-      requestParameters.routerRouteCreateParams === null ||
-      requestParameters.routerRouteCreateParams === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'routerRouteCreateParams',
-        'Required parameter requestParameters.routerRouteCreateParams was null or undefined when calling routersRoutesPost.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    headerParameters['Content-Type'] = 'application/json'
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers/{router_name}/routes`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          )
-          .replace(
-            `{${'router_name'}}`,
-            encodeURIComponent(String(requestParameters.routerName))
-          )
-          .replace(
-            `{${'vpc_name'}}`,
-            encodeURIComponent(String(requestParameters.vpcName))
-          ),
-        method: 'POST',
-        headers: headerParameters,
-        query: queryParameters,
-        body: RouterRouteCreateParamsToJSON(
-          requestParameters.routerRouteCreateParams
-        ),
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      RouterRouteFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Create a VPC Router
-   */
-  async routersRoutesPost(
-    requestParameters: RoutersRoutesPostRequest,
-    initOverrides?: RequestInit
-  ): Promise<RouterRoute> {
-    const response = await this.routersRoutesPostRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Update a Router route
-   */
-  async routersRoutesPutRouteRaw(
-    requestParameters: RoutersRoutesPutRouteRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<void>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling routersRoutesPutRoute.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling routersRoutesPutRoute.'
-      )
-    }
-
-    if (
-      requestParameters.routeName === null ||
-      requestParameters.routeName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'routeName',
-        'Required parameter requestParameters.routeName was null or undefined when calling routersRoutesPutRoute.'
-      )
-    }
-
-    if (
-      requestParameters.routerName === null ||
-      requestParameters.routerName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'routerName',
-        'Required parameter requestParameters.routerName was null or undefined when calling routersRoutesPutRoute.'
-      )
-    }
-
-    if (
-      requestParameters.vpcName === null ||
-      requestParameters.vpcName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcName',
-        'Required parameter requestParameters.vpcName was null or undefined when calling routersRoutesPutRoute.'
-      )
-    }
-
-    if (
-      requestParameters.routerRouteUpdateParams === null ||
-      requestParameters.routerRouteUpdateParams === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'routerRouteUpdateParams',
-        'Required parameter requestParameters.routerRouteUpdateParams was null or undefined when calling routersRoutesPutRoute.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    headerParameters['Content-Type'] = 'application/json'
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers/{router_name}/routes/{route_name}`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          )
-          .replace(
-            `{${'route_name'}}`,
-            encodeURIComponent(String(requestParameters.routeName))
-          )
-          .replace(
-            `{${'router_name'}}`,
-            encodeURIComponent(String(requestParameters.routerName))
-          )
-          .replace(
-            `{${'vpc_name'}}`,
-            encodeURIComponent(String(requestParameters.vpcName))
-          ),
-        method: 'PUT',
-        headers: headerParameters,
-        query: queryParameters,
-        body: RouterRouteUpdateParamsToJSON(
-          requestParameters.routerRouteUpdateParams
-        ),
-      },
-      initOverrides
-    )
-
-    return new runtime.VoidApiResponse(response)
-  }
-
-  /**
-   * Update a Router route
-   */
-  async routersRoutesPutRoute(
-    requestParameters: RoutersRoutesPutRouteRequest,
-    initOverrides?: RequestInit
-  ): Promise<void> {
-    await this.routersRoutesPutRouteRaw(requestParameters, initOverrides)
-  }
-
-  /**
-   * List all sagas (for debugging)
-   */
-  async sagasGetRaw(
-    requestParameters: SagasGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<SagaResultsPage>> {
-    const queryParameters: any = {}
-
-    if (requestParameters.limit !== undefined) {
-      queryParameters['limit'] = requestParameters.limit
-    }
-
-    if (requestParameters.pageToken !== undefined) {
-      queryParameters['page_token'] = requestParameters.pageToken
-    }
-
-    if (requestParameters.sortBy !== undefined) {
-      queryParameters['sort_by'] = requestParameters.sortBy
-    }
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/sagas`,
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      SagaResultsPageFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * List all sagas (for debugging)
-   */
-  async sagasGet(
-    requestParameters: SagasGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<SagaResultsPage> {
-    const response = await this.sagasGetRaw(requestParameters, initOverrides)
-    return await response.value()
-  }
-
-  /**
-   * Fetch information about a single saga (for debugging)
-   */
-  async sagasGetSagaRaw(
-    requestParameters: SagasGetSagaRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<Saga>> {
-    if (
-      requestParameters.sagaId === null ||
-      requestParameters.sagaId === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'sagaId',
-        'Required parameter requestParameters.sagaId was null or undefined when calling sagasGetSaga.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/sagas/{saga_id}`.replace(
-          `{${'saga_id'}}`,
-          encodeURIComponent(String(requestParameters.sagaId))
-        ),
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      SagaFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Fetch information about a single saga (for debugging)
-   */
-  async sagasGetSaga(
-    requestParameters: SagasGetSagaRequest,
-    initOverrides?: RequestInit
-  ): Promise<Saga> {
-    const response = await this.sagasGetSagaRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   */
-  async spoofLoginRaw(
-    requestParameters: SpoofLoginRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<void>> {
-    if (
-      requestParameters.loginParams === null ||
-      requestParameters.loginParams === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'loginParams',
-        'Required parameter requestParameters.loginParams was null or undefined when calling spoofLogin.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    headerParameters['Content-Type'] = 'application/json'
-
-    const response = await this.request(
-      {
-        path: `/login`,
-        method: 'POST',
-        headers: headerParameters,
-        query: queryParameters,
-        body: LoginParamsToJSON(requestParameters.loginParams),
-      },
-      initOverrides
-    )
-
-    return new runtime.VoidApiResponse(response)
-  }
-
-  /**
-   */
-  async spoofLogin(
-    requestParameters: SpoofLoginRequest,
-    initOverrides?: RequestInit
-  ): Promise<void> {
-    await this.spoofLoginRaw(requestParameters, initOverrides)
-  }
-
-  /**
-   * List firewall rules for a VPC.
-   */
-  async vpcFirewallRulesGetRaw(
-    requestParameters: VpcFirewallRulesGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<VpcFirewallRuleResultsPage>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling vpcFirewallRulesGet.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling vpcFirewallRulesGet.'
-      )
-    }
-
-    if (
-      requestParameters.vpcName === null ||
-      requestParameters.vpcName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcName',
-        'Required parameter requestParameters.vpcName was null or undefined when calling vpcFirewallRulesGet.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    if (requestParameters.limit !== undefined) {
-      queryParameters['limit'] = requestParameters.limit
-    }
-
-    if (requestParameters.pageToken !== undefined) {
-      queryParameters['page_token'] = requestParameters.pageToken
-    }
-
-    if (requestParameters.sortBy !== undefined) {
-      queryParameters['sort_by'] = requestParameters.sortBy
-    }
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/firewall/rules`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          )
-          .replace(
-            `{${'vpc_name'}}`,
-            encodeURIComponent(String(requestParameters.vpcName))
-          ),
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      VpcFirewallRuleResultsPageFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * List firewall rules for a VPC.
-   */
-  async vpcFirewallRulesGet(
-    requestParameters: VpcFirewallRulesGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<VpcFirewallRuleResultsPage> {
-    const response = await this.vpcFirewallRulesGetRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Replace the firewall rules for a VPC
-   */
-  async vpcFirewallRulesPutRaw(
-    requestParameters: VpcFirewallRulesPutRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<{ [key: string]: VpcFirewallRule }>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling vpcFirewallRulesPut.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling vpcFirewallRulesPut.'
-      )
-    }
-
-    if (
-      requestParameters.vpcName === null ||
-      requestParameters.vpcName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcName',
-        'Required parameter requestParameters.vpcName was null or undefined when calling vpcFirewallRulesPut.'
-      )
-    }
-
-    if (
-      requestParameters.requestBody === null ||
-      requestParameters.requestBody === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'requestBody',
-        'Required parameter requestParameters.requestBody was null or undefined when calling vpcFirewallRulesPut.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    headerParameters['Content-Type'] = 'application/json'
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/firewall/rules`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          )
-          .replace(
-            `{${'vpc_name'}}`,
-            encodeURIComponent(String(requestParameters.vpcName))
-          ),
-        method: 'PUT',
-        headers: headerParameters,
-        query: queryParameters,
-        body: requestParameters.requestBody,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      runtime.mapValues(jsonValue, VpcFirewallRuleFromJSON)
-    )
-  }
-
-  /**
-   * Replace the firewall rules for a VPC
-   */
-  async vpcFirewallRulesPut(
-    requestParameters: VpcFirewallRulesPutRequest,
-    initOverrides?: RequestInit
-  ): Promise<{ [key: string]: VpcFirewallRule }> {
-    const response = await this.vpcFirewallRulesPutRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Delete a router from its VPC
-   */
-  async vpcRoutersDeleteRouterRaw(
-    requestParameters: VpcRoutersDeleteRouterRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<void>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling vpcRoutersDeleteRouter.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling vpcRoutersDeleteRouter.'
-      )
-    }
-
-    if (
-      requestParameters.routerName === null ||
-      requestParameters.routerName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'routerName',
-        'Required parameter requestParameters.routerName was null or undefined when calling vpcRoutersDeleteRouter.'
-      )
-    }
-
-    if (
-      requestParameters.vpcName === null ||
-      requestParameters.vpcName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcName',
-        'Required parameter requestParameters.vpcName was null or undefined when calling vpcRoutersDeleteRouter.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers/{router_name}`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          )
-          .replace(
-            `{${'router_name'}}`,
-            encodeURIComponent(String(requestParameters.routerName))
-          )
-          .replace(
-            `{${'vpc_name'}}`,
-            encodeURIComponent(String(requestParameters.vpcName))
-          ),
-        method: 'DELETE',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.VoidApiResponse(response)
-  }
-
-  /**
-   * Delete a router from its VPC
-   */
-  async vpcRoutersDeleteRouter(
-    requestParameters: VpcRoutersDeleteRouterRequest,
-    initOverrides?: RequestInit
-  ): Promise<void> {
-    await this.vpcRoutersDeleteRouterRaw(requestParameters, initOverrides)
-  }
-
-  /**
-   * List VPC Custom and System Routers
-   */
-  async vpcRoutersGetRaw(
-    requestParameters: VpcRoutersGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<VpcRouterResultsPage>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling vpcRoutersGet.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling vpcRoutersGet.'
-      )
-    }
-
-    if (
-      requestParameters.vpcName === null ||
-      requestParameters.vpcName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcName',
-        'Required parameter requestParameters.vpcName was null or undefined when calling vpcRoutersGet.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    if (requestParameters.limit !== undefined) {
-      queryParameters['limit'] = requestParameters.limit
-    }
-
-    if (requestParameters.pageToken !== undefined) {
-      queryParameters['page_token'] = requestParameters.pageToken
-    }
-
-    if (requestParameters.sortBy !== undefined) {
-      queryParameters['sort_by'] = requestParameters.sortBy
-    }
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          )
-          .replace(
-            `{${'vpc_name'}}`,
-            encodeURIComponent(String(requestParameters.vpcName))
-          ),
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      VpcRouterResultsPageFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * List VPC Custom and System Routers
-   */
-  async vpcRoutersGet(
-    requestParameters: VpcRoutersGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<VpcRouterResultsPage> {
-    const response = await this.vpcRoutersGetRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Get a VPC Router
-   */
-  async vpcRoutersGetRouterRaw(
-    requestParameters: VpcRoutersGetRouterRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<VpcRouter>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling vpcRoutersGetRouter.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling vpcRoutersGetRouter.'
-      )
-    }
-
-    if (
-      requestParameters.routerName === null ||
-      requestParameters.routerName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'routerName',
-        'Required parameter requestParameters.routerName was null or undefined when calling vpcRoutersGetRouter.'
-      )
-    }
-
-    if (
-      requestParameters.vpcName === null ||
-      requestParameters.vpcName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcName',
-        'Required parameter requestParameters.vpcName was null or undefined when calling vpcRoutersGetRouter.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers/{router_name}`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          )
-          .replace(
-            `{${'router_name'}}`,
-            encodeURIComponent(String(requestParameters.routerName))
-          )
-          .replace(
-            `{${'vpc_name'}}`,
-            encodeURIComponent(String(requestParameters.vpcName))
-          ),
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      VpcRouterFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Get a VPC Router
-   */
-  async vpcRoutersGetRouter(
-    requestParameters: VpcRoutersGetRouterRequest,
-    initOverrides?: RequestInit
-  ): Promise<VpcRouter> {
-    const response = await this.vpcRoutersGetRouterRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Create a VPC Router
-   */
-  async vpcRoutersPostRaw(
-    requestParameters: VpcRoutersPostRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<VpcRouter>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling vpcRoutersPost.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling vpcRoutersPost.'
-      )
-    }
-
-    if (
-      requestParameters.vpcName === null ||
-      requestParameters.vpcName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcName',
-        'Required parameter requestParameters.vpcName was null or undefined when calling vpcRoutersPost.'
-      )
-    }
-
-    if (
-      requestParameters.vpcRouterCreateParams === null ||
-      requestParameters.vpcRouterCreateParams === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcRouterCreateParams',
-        'Required parameter requestParameters.vpcRouterCreateParams was null or undefined when calling vpcRoutersPost.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    headerParameters['Content-Type'] = 'application/json'
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          )
-          .replace(
-            `{${'vpc_name'}}`,
-            encodeURIComponent(String(requestParameters.vpcName))
-          ),
-        method: 'POST',
-        headers: headerParameters,
-        query: queryParameters,
-        body: VpcRouterCreateParamsToJSON(
-          requestParameters.vpcRouterCreateParams
-        ),
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      VpcRouterFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Create a VPC Router
-   */
-  async vpcRoutersPost(
-    requestParameters: VpcRoutersPostRequest,
-    initOverrides?: RequestInit
-  ): Promise<VpcRouter> {
-    const response = await this.vpcRoutersPostRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Update a VPC Router
-   */
-  async vpcRoutersPutRouterRaw(
-    requestParameters: VpcRoutersPutRouterRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<void>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling vpcRoutersPutRouter.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling vpcRoutersPutRouter.'
-      )
-    }
-
-    if (
-      requestParameters.routerName === null ||
-      requestParameters.routerName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'routerName',
-        'Required parameter requestParameters.routerName was null or undefined when calling vpcRoutersPutRouter.'
-      )
-    }
-
-    if (
-      requestParameters.vpcName === null ||
-      requestParameters.vpcName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcName',
-        'Required parameter requestParameters.vpcName was null or undefined when calling vpcRoutersPutRouter.'
-      )
-    }
-
-    if (
-      requestParameters.vpcRouterUpdateParams === null ||
-      requestParameters.vpcRouterUpdateParams === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcRouterUpdateParams',
-        'Required parameter requestParameters.vpcRouterUpdateParams was null or undefined when calling vpcRoutersPutRouter.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    headerParameters['Content-Type'] = 'application/json'
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/routers/{router_name}`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          )
-          .replace(
-            `{${'router_name'}}`,
-            encodeURIComponent(String(requestParameters.routerName))
-          )
-          .replace(
-            `{${'vpc_name'}}`,
-            encodeURIComponent(String(requestParameters.vpcName))
-          ),
-        method: 'PUT',
-        headers: headerParameters,
-        query: queryParameters,
-        body: VpcRouterUpdateParamsToJSON(
-          requestParameters.vpcRouterUpdateParams
-        ),
-      },
-      initOverrides
-    )
-
-    return new runtime.VoidApiResponse(response)
-  }
-
-  /**
-   * Update a VPC Router
-   */
-  async vpcRoutersPutRouter(
-    requestParameters: VpcRoutersPutRouterRequest,
-    initOverrides?: RequestInit
-  ): Promise<void> {
-    await this.vpcRoutersPutRouterRaw(requestParameters, initOverrides)
-  }
-
-  /**
-   * Delete a subnet from a VPC.
-   */
-  async vpcSubnetsDeleteSubnetRaw(
-    requestParameters: VpcSubnetsDeleteSubnetRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<void>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling vpcSubnetsDeleteSubnet.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling vpcSubnetsDeleteSubnet.'
-      )
-    }
-
-    if (
-      requestParameters.subnetName === null ||
-      requestParameters.subnetName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'subnetName',
-        'Required parameter requestParameters.subnetName was null or undefined when calling vpcSubnetsDeleteSubnet.'
-      )
-    }
-
-    if (
-      requestParameters.vpcName === null ||
-      requestParameters.vpcName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcName',
-        'Required parameter requestParameters.vpcName was null or undefined when calling vpcSubnetsDeleteSubnet.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/subnets/{subnet_name}`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          )
-          .replace(
-            `{${'subnet_name'}}`,
-            encodeURIComponent(String(requestParameters.subnetName))
-          )
-          .replace(
-            `{${'vpc_name'}}`,
-            encodeURIComponent(String(requestParameters.vpcName))
-          ),
-        method: 'DELETE',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.VoidApiResponse(response)
-  }
-
-  /**
-   * Delete a subnet from a VPC.
-   */
-  async vpcSubnetsDeleteSubnet(
-    requestParameters: VpcSubnetsDeleteSubnetRequest,
-    initOverrides?: RequestInit
-  ): Promise<void> {
-    await this.vpcSubnetsDeleteSubnetRaw(requestParameters, initOverrides)
-  }
-
-  /**
-   * List subnets in a VPC.
-   */
-  async vpcSubnetsGetRaw(
-    requestParameters: VpcSubnetsGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<VpcSubnetResultsPage>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling vpcSubnetsGet.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling vpcSubnetsGet.'
-      )
-    }
-
-    if (
-      requestParameters.vpcName === null ||
-      requestParameters.vpcName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcName',
-        'Required parameter requestParameters.vpcName was null or undefined when calling vpcSubnetsGet.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    if (requestParameters.limit !== undefined) {
-      queryParameters['limit'] = requestParameters.limit
-    }
-
-    if (requestParameters.pageToken !== undefined) {
-      queryParameters['page_token'] = requestParameters.pageToken
-    }
-
-    if (requestParameters.sortBy !== undefined) {
-      queryParameters['sort_by'] = requestParameters.sortBy
-    }
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/subnets`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          )
-          .replace(
-            `{${'vpc_name'}}`,
-            encodeURIComponent(String(requestParameters.vpcName))
-          ),
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      VpcSubnetResultsPageFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * List subnets in a VPC.
-   */
-  async vpcSubnetsGet(
-    requestParameters: VpcSubnetsGetRequest,
-    initOverrides?: RequestInit
-  ): Promise<VpcSubnetResultsPage> {
-    const response = await this.vpcSubnetsGetRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Get subnet in a VPC.
-   */
-  async vpcSubnetsGetSubnetRaw(
-    requestParameters: VpcSubnetsGetSubnetRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<VpcSubnet>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling vpcSubnetsGetSubnet.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling vpcSubnetsGetSubnet.'
-      )
-    }
-
-    if (
-      requestParameters.subnetName === null ||
-      requestParameters.subnetName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'subnetName',
-        'Required parameter requestParameters.subnetName was null or undefined when calling vpcSubnetsGetSubnet.'
-      )
-    }
-
-    if (
-      requestParameters.vpcName === null ||
-      requestParameters.vpcName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcName',
-        'Required parameter requestParameters.vpcName was null or undefined when calling vpcSubnetsGetSubnet.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/subnets/{subnet_name}`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          )
-          .replace(
-            `{${'subnet_name'}}`,
-            encodeURIComponent(String(requestParameters.subnetName))
-          )
-          .replace(
-            `{${'vpc_name'}}`,
-            encodeURIComponent(String(requestParameters.vpcName))
-          ),
-        method: 'GET',
-        headers: headerParameters,
-        query: queryParameters,
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      VpcSubnetFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Get subnet in a VPC.
-   */
-  async vpcSubnetsGetSubnet(
-    requestParameters: VpcSubnetsGetSubnetRequest,
-    initOverrides?: RequestInit
-  ): Promise<VpcSubnet> {
-    const response = await this.vpcSubnetsGetSubnetRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Create a subnet in a VPC.
-   */
-  async vpcSubnetsPostRaw(
-    requestParameters: VpcSubnetsPostRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<VpcSubnet>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling vpcSubnetsPost.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling vpcSubnetsPost.'
-      )
-    }
-
-    if (
-      requestParameters.vpcName === null ||
-      requestParameters.vpcName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcName',
-        'Required parameter requestParameters.vpcName was null or undefined when calling vpcSubnetsPost.'
-      )
-    }
-
-    if (
-      requestParameters.vpcSubnetCreateParams === null ||
-      requestParameters.vpcSubnetCreateParams === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcSubnetCreateParams',
-        'Required parameter requestParameters.vpcSubnetCreateParams was null or undefined when calling vpcSubnetsPost.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    headerParameters['Content-Type'] = 'application/json'
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/subnets`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          )
-          .replace(
-            `{${'vpc_name'}}`,
-            encodeURIComponent(String(requestParameters.vpcName))
-          ),
-        method: 'POST',
-        headers: headerParameters,
-        query: queryParameters,
-        body: VpcSubnetCreateParamsToJSON(
-          requestParameters.vpcSubnetCreateParams
-        ),
-      },
-      initOverrides
-    )
-
-    return new runtime.JSONApiResponse(response, (jsonValue) =>
-      VpcSubnetFromJSON(jsonValue)
-    )
-  }
-
-  /**
-   * Create a subnet in a VPC.
-   */
-  async vpcSubnetsPost(
-    requestParameters: VpcSubnetsPostRequest,
-    initOverrides?: RequestInit
-  ): Promise<VpcSubnet> {
-    const response = await this.vpcSubnetsPostRaw(
-      requestParameters,
-      initOverrides
-    )
-    return await response.value()
-  }
-
-  /**
-   * Update a VPC Subnet.
-   */
-  async vpcSubnetsPutSubnetRaw(
-    requestParameters: VpcSubnetsPutSubnetRequest,
-    initOverrides?: RequestInit
-  ): Promise<runtime.ApiResponse<void>> {
-    if (
-      requestParameters.organizationName === null ||
-      requestParameters.organizationName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'organizationName',
-        'Required parameter requestParameters.organizationName was null or undefined when calling vpcSubnetsPutSubnet.'
-      )
-    }
-
-    if (
-      requestParameters.projectName === null ||
-      requestParameters.projectName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'projectName',
-        'Required parameter requestParameters.projectName was null or undefined when calling vpcSubnetsPutSubnet.'
-      )
-    }
-
-    if (
-      requestParameters.subnetName === null ||
-      requestParameters.subnetName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'subnetName',
-        'Required parameter requestParameters.subnetName was null or undefined when calling vpcSubnetsPutSubnet.'
-      )
-    }
-
-    if (
-      requestParameters.vpcName === null ||
-      requestParameters.vpcName === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcName',
-        'Required parameter requestParameters.vpcName was null or undefined when calling vpcSubnetsPutSubnet.'
-      )
-    }
-
-    if (
-      requestParameters.vpcSubnetUpdateParams === null ||
-      requestParameters.vpcSubnetUpdateParams === undefined
-    ) {
-      throw new runtime.RequiredError(
-        'vpcSubnetUpdateParams',
-        'Required parameter requestParameters.vpcSubnetUpdateParams was null or undefined when calling vpcSubnetsPutSubnet.'
-      )
-    }
-
-    const queryParameters: any = {}
-
-    const headerParameters: runtime.HTTPHeaders = {}
-
-    headerParameters['Content-Type'] = 'application/json'
-
-    const response = await this.request(
-      {
-        path: `/organizations/{organization_name}/projects/{project_name}/vpcs/{vpc_name}/subnets/{subnet_name}`
-          .replace(
-            `{${'organization_name'}}`,
-            encodeURIComponent(String(requestParameters.organizationName))
-          )
-          .replace(
-            `{${'project_name'}}`,
-            encodeURIComponent(String(requestParameters.projectName))
-          )
-          .replace(
-            `{${'subnet_name'}}`,
-            encodeURIComponent(String(requestParameters.subnetName))
-          )
-          .replace(
-            `{${'vpc_name'}}`,
-            encodeURIComponent(String(requestParameters.vpcName))
-          ),
-        method: 'PUT',
-        headers: headerParameters,
-        query: queryParameters,
-        body: VpcSubnetUpdateParamsToJSON(
-          requestParameters.vpcSubnetUpdateParams
-        ),
-      },
-      initOverrides
-    )
-
-    return new runtime.VoidApiResponse(response)
-  }
-
-  /**
-   * Update a VPC Subnet.
-   */
-  async vpcSubnetsPutSubnet(
-    requestParameters: VpcSubnetsPutSubnetRequest,
-    initOverrides?: RequestInit
-  ): Promise<void> {
-    await this.vpcSubnetsPutSubnetRaw(requestParameters, initOverrides)
-  }
-}
diff --git a/libs/api/__generated__/apis/index.ts b/libs/api/__generated__/apis/index.ts
deleted file mode 100644
index 9f3073ac6e..0000000000
--- a/libs/api/__generated__/apis/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-export * from './DefaultApi'
diff --git a/libs/api/__generated__/index.ts b/libs/api/__generated__/index.ts
deleted file mode 100644
index 0f29085ce7..0000000000
--- a/libs/api/__generated__/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-export * from './runtime'
-export * from './apis'
-export * from './models'
diff --git a/libs/api/__generated__/models/Disk.ts b/libs/api/__generated__/models/Disk.ts
deleted file mode 100644
index b0e2938786..0000000000
--- a/libs/api/__generated__/models/Disk.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import {
-  DiskState,
-  DiskStateFromJSON,
-  DiskStateFromJSONTyped,
-  DiskStateToJSON,
-} from './'
-
-/**
- * Client view of an [`Disk`]
- * @export
- * @interface Disk
- */
-export interface Disk {
-  /**
-   * human-readable free-form text about a resource
-   * @type {string}
-   * @memberof Disk
-   */
-  description: string
-  /**
-   *
-   * @type {string}
-   * @memberof Disk
-   */
-  devicePath: string
-  /**
-   * unique, immutable, system-controlled identifier for each resource
-   * @type {string}
-   * @memberof Disk
-   */
-  id: string
-  /**
-   * unique, mutable, user-controlled identifier for each resource
-   * @type {string}
-   * @memberof Disk
-   */
-  name: string
-  /**
-   *
-   * @type {string}
-   * @memberof Disk
-   */
-  projectId: string
-  /**
-   * A count of bytes, typically used either for memory or storage capacity
-   *
-   * The maximum supported byte count is [`i64::MAX`].  This makes it somewhat inconvenient to define constructors: a u32 constructor can be infallible, but an i64 constructor can fail (if the value is negative) and a u64 constructor can fail (if the value is larger than i64::MAX).  We provide all of these for consumers' convenience.
-   * @type {number}
-   * @memberof Disk
-   */
-  size: number
-  /**
-   *
-   * @type {string}
-   * @memberof Disk
-   */
-  snapshotId?: string | null
-  /**
-   *
-   * @type {DiskState}
-   * @memberof Disk
-   */
-  state: DiskState
-  /**
-   * timestamp when this resource was created
-   * @type {Date}
-   * @memberof Disk
-   */
-  timeCreated: Date
-  /**
-   * timestamp when this resource was last modified
-   * @type {Date}
-   * @memberof Disk
-   */
-  timeModified: Date
-}
-
-export function DiskFromJSON(json: any): Disk {
-  return DiskFromJSONTyped(json, false)
-}
-
-export function DiskFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): Disk {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    description: json['description'],
-    devicePath: json['devicePath'],
-    id: json['id'],
-    name: json['name'],
-    projectId: json['projectId'],
-    size: json['size'],
-    snapshotId: !exists(json, 'snapshotId') ? undefined : json['snapshotId'],
-    state: DiskStateFromJSON(json['state']),
-    timeCreated: new Date(json['timeCreated']),
-    timeModified: new Date(json['timeModified']),
-  }
-}
-
-export function DiskToJSON(value?: Disk | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    description: value.description,
-    devicePath: value.devicePath,
-    id: value.id,
-    name: value.name,
-    projectId: value.projectId,
-    size: value.size,
-    snapshotId: value.snapshotId,
-    state: DiskStateToJSON(value.state),
-    timeCreated: value.timeCreated.toISOString(),
-    timeModified: value.timeModified.toISOString(),
-  }
-}
diff --git a/libs/api/__generated__/models/DiskAttachment.ts b/libs/api/__generated__/models/DiskAttachment.ts
deleted file mode 100644
index 44095fe849..0000000000
--- a/libs/api/__generated__/models/DiskAttachment.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import {
-  DiskState,
-  DiskStateFromJSON,
-  DiskStateFromJSONTyped,
-  DiskStateToJSON,
-} from './'
-
-/**
- * Describes a Disk's attachment to an Instance
- * @export
- * @interface DiskAttachment
- */
-export interface DiskAttachment {
-  /**
-   *
-   * @type {string}
-   * @memberof DiskAttachment
-   */
-  diskId: string
-  /**
-   * Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'.
-   * @type {string}
-   * @memberof DiskAttachment
-   */
-  diskName: string
-  /**
-   *
-   * @type {DiskState}
-   * @memberof DiskAttachment
-   */
-  diskState: DiskState
-  /**
-   *
-   * @type {string}
-   * @memberof DiskAttachment
-   */
-  instanceId: string
-}
-
-export function DiskAttachmentFromJSON(json: any): DiskAttachment {
-  return DiskAttachmentFromJSONTyped(json, false)
-}
-
-export function DiskAttachmentFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): DiskAttachment {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    diskId: json['diskId'],
-    diskName: json['diskName'],
-    diskState: DiskStateFromJSON(json['diskState']),
-    instanceId: json['instanceId'],
-  }
-}
-
-export function DiskAttachmentToJSON(value?: DiskAttachment | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    diskId: value.diskId,
-    diskName: value.diskName,
-    diskState: DiskStateToJSON(value.diskState),
-    instanceId: value.instanceId,
-  }
-}
diff --git a/libs/api/__generated__/models/DiskCreateParams.ts b/libs/api/__generated__/models/DiskCreateParams.ts
deleted file mode 100644
index 8697debec8..0000000000
--- a/libs/api/__generated__/models/DiskCreateParams.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Create-time parameters for an [`Disk`]
- * @export
- * @interface DiskCreateParams
- */
-export interface DiskCreateParams {
-  /**
-   *
-   * @type {string}
-   * @memberof DiskCreateParams
-   */
-  description: string
-  /**
-   * Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'.
-   * @type {string}
-   * @memberof DiskCreateParams
-   */
-  name: string
-  /**
-   * size of the Disk
-   * @type {number}
-   * @memberof DiskCreateParams
-   */
-  size: number
-  /**
-   * id for snapshot from which the Disk should be created, if any
-   * @type {string}
-   * @memberof DiskCreateParams
-   */
-  snapshotId?: string | null
-}
-
-export function DiskCreateParamsFromJSON(json: any): DiskCreateParams {
-  return DiskCreateParamsFromJSONTyped(json, false)
-}
-
-export function DiskCreateParamsFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): DiskCreateParams {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    description: json['description'],
-    name: json['name'],
-    size: json['size'],
-    snapshotId: !exists(json, 'snapshotId') ? undefined : json['snapshotId'],
-  }
-}
-
-export function DiskCreateParamsToJSON(value?: DiskCreateParams | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    description: value.description,
-    name: value.name,
-    size: value.size,
-    snapshotId: value.snapshotId,
-  }
-}
diff --git a/libs/api/__generated__/models/DiskResultsPage.ts b/libs/api/__generated__/models/DiskResultsPage.ts
deleted file mode 100644
index 1d37129f24..0000000000
--- a/libs/api/__generated__/models/DiskResultsPage.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import { Disk, DiskFromJSON, DiskFromJSONTyped, DiskToJSON } from './'
-
-/**
- * A single page of results
- * @export
- * @interface DiskResultsPage
- */
-export interface DiskResultsPage {
-  /**
-   * list of items on this page of results
-   * @type {Array<Disk>}
-   * @memberof DiskResultsPage
-   */
-  items: Array<Disk>
-  /**
-   * token used to fetch the next page of results (if any)
-   * @type {string}
-   * @memberof DiskResultsPage
-   */
-  nextPage?: string | null
-}
-
-export function DiskResultsPageFromJSON(json: any): DiskResultsPage {
-  return DiskResultsPageFromJSONTyped(json, false)
-}
-
-export function DiskResultsPageFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): DiskResultsPage {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    items: (json['items'] as Array<any>).map(DiskFromJSON),
-    nextPage: !exists(json, 'next_page') ? undefined : json['next_page'],
-  }
-}
-
-export function DiskResultsPageToJSON(value?: DiskResultsPage | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    items: (value.items as Array<any>).map(DiskToJSON),
-    next_page: value.nextPage,
-  }
-}
diff --git a/libs/api/__generated__/models/DiskState.ts b/libs/api/__generated__/models/DiskState.ts
deleted file mode 100644
index 67f90ac4fc..0000000000
--- a/libs/api/__generated__/models/DiskState.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import {
-  DiskStateOneOf,
-  DiskStateOneOf1,
-  DiskStateOneOf2,
-  DiskStateOneOf3,
-  DiskStateOneOf4,
-  DiskStateOneOf5,
-  DiskStateOneOf6,
-  DiskStateOneOfFromJSONTyped,
-  DiskStateOneOfToJSON,
-  DiskStateOneOf1FromJSONTyped,
-  DiskStateOneOf1ToJSON,
-  DiskStateOneOf2FromJSONTyped,
-  DiskStateOneOf2ToJSON,
-  DiskStateOneOf3FromJSONTyped,
-  DiskStateOneOf3ToJSON,
-  DiskStateOneOf4FromJSONTyped,
-  DiskStateOneOf4ToJSON,
-  DiskStateOneOf5FromJSONTyped,
-  DiskStateOneOf5ToJSON,
-  DiskStateOneOf6FromJSONTyped,
-  DiskStateOneOf6ToJSON,
-} from './'
-
-/**
- * @type DiskState
- * State of a Disk (primarily: attached or not)
- * @export
- */
-export type DiskState =
-  | DiskStateOneOf
-  | DiskStateOneOf1
-  | DiskStateOneOf2
-  | DiskStateOneOf3
-  | DiskStateOneOf4
-  | DiskStateOneOf5
-  | DiskStateOneOf6
-
-export function DiskStateFromJSON(json: any): DiskState {
-  return DiskStateFromJSONTyped(json, false)
-}
-
-export function DiskStateFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): DiskState {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    ...DiskStateOneOfFromJSONTyped(json, true),
-    ...DiskStateOneOf1FromJSONTyped(json, true),
-    ...DiskStateOneOf2FromJSONTyped(json, true),
-    ...DiskStateOneOf3FromJSONTyped(json, true),
-    ...DiskStateOneOf4FromJSONTyped(json, true),
-    ...DiskStateOneOf5FromJSONTyped(json, true),
-    ...DiskStateOneOf6FromJSONTyped(json, true),
-  }
-}
-
-export function DiskStateToJSON(value?: DiskState | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    ...DiskStateOneOfToJSON(value as any),
-    ...DiskStateOneOf1ToJSON(value as any),
-    ...DiskStateOneOf2ToJSON(value as any),
-    ...DiskStateOneOf3ToJSON(value as any),
-    ...DiskStateOneOf4ToJSON(value as any),
-    ...DiskStateOneOf5ToJSON(value as any),
-    ...DiskStateOneOf6ToJSON(value as any),
-  }
-}
diff --git a/libs/api/__generated__/models/DiskStateOneOf.ts b/libs/api/__generated__/models/DiskStateOneOf.ts
deleted file mode 100644
index 2d550bb470..0000000000
--- a/libs/api/__generated__/models/DiskStateOneOf.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Disk is being initialized
- * @export
- * @interface DiskStateOneOf
- */
-export interface DiskStateOneOf {
-  /**
-   *
-   * @type {string}
-   * @memberof DiskStateOneOf
-   */
-  state: 'creating'
-}
-
-export function DiskStateOneOfFromJSON(json: any): DiskStateOneOf {
-  return DiskStateOneOfFromJSONTyped(json, false)
-}
-
-export function DiskStateOneOfFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): DiskStateOneOf {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    state: json['state'],
-  }
-}
-
-export function DiskStateOneOfToJSON(value?: DiskStateOneOf | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    state: value.state,
-  }
-}
diff --git a/libs/api/__generated__/models/DiskStateOneOf1.ts b/libs/api/__generated__/models/DiskStateOneOf1.ts
deleted file mode 100644
index d44c7085eb..0000000000
--- a/libs/api/__generated__/models/DiskStateOneOf1.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Disk is ready but detached from any Instance
- * @export
- * @interface DiskStateOneOf1
- */
-export interface DiskStateOneOf1 {
-  /**
-   *
-   * @type {string}
-   * @memberof DiskStateOneOf1
-   */
-  state: 'detached'
-}
-
-export function DiskStateOneOf1FromJSON(json: any): DiskStateOneOf1 {
-  return DiskStateOneOf1FromJSONTyped(json, false)
-}
-
-export function DiskStateOneOf1FromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): DiskStateOneOf1 {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    state: json['state'],
-  }
-}
-
-export function DiskStateOneOf1ToJSON(value?: DiskStateOneOf1 | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    state: value.state,
-  }
-}
diff --git a/libs/api/__generated__/models/DiskStateOneOf2.ts b/libs/api/__generated__/models/DiskStateOneOf2.ts
deleted file mode 100644
index b5e2e5b861..0000000000
--- a/libs/api/__generated__/models/DiskStateOneOf2.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Disk is being attached to the given Instance
- * @export
- * @interface DiskStateOneOf2
- */
-export interface DiskStateOneOf2 {
-  /**
-   *
-   * @type {string}
-   * @memberof DiskStateOneOf2
-   */
-  instance: string
-  /**
-   *
-   * @type {string}
-   * @memberof DiskStateOneOf2
-   */
-  state: 'attaching'
-}
-
-export function DiskStateOneOf2FromJSON(json: any): DiskStateOneOf2 {
-  return DiskStateOneOf2FromJSONTyped(json, false)
-}
-
-export function DiskStateOneOf2FromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): DiskStateOneOf2 {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    instance: json['instance'],
-    state: json['state'],
-  }
-}
-
-export function DiskStateOneOf2ToJSON(value?: DiskStateOneOf2 | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    instance: value.instance,
-    state: value.state,
-  }
-}
diff --git a/libs/api/__generated__/models/DiskStateOneOf3.ts b/libs/api/__generated__/models/DiskStateOneOf3.ts
deleted file mode 100644
index c2b25b8d8b..0000000000
--- a/libs/api/__generated__/models/DiskStateOneOf3.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Disk is attached to the given Instance
- * @export
- * @interface DiskStateOneOf3
- */
-export interface DiskStateOneOf3 {
-  /**
-   *
-   * @type {string}
-   * @memberof DiskStateOneOf3
-   */
-  instance: string
-  /**
-   *
-   * @type {string}
-   * @memberof DiskStateOneOf3
-   */
-  state: 'attached'
-}
-
-export function DiskStateOneOf3FromJSON(json: any): DiskStateOneOf3 {
-  return DiskStateOneOf3FromJSONTyped(json, false)
-}
-
-export function DiskStateOneOf3FromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): DiskStateOneOf3 {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    instance: json['instance'],
-    state: json['state'],
-  }
-}
-
-export function DiskStateOneOf3ToJSON(value?: DiskStateOneOf3 | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    instance: value.instance,
-    state: value.state,
-  }
-}
diff --git a/libs/api/__generated__/models/DiskStateOneOf4.ts b/libs/api/__generated__/models/DiskStateOneOf4.ts
deleted file mode 100644
index 8c41070870..0000000000
--- a/libs/api/__generated__/models/DiskStateOneOf4.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Disk is being detached from the given Instance
- * @export
- * @interface DiskStateOneOf4
- */
-export interface DiskStateOneOf4 {
-  /**
-   *
-   * @type {string}
-   * @memberof DiskStateOneOf4
-   */
-  instance: string
-  /**
-   *
-   * @type {string}
-   * @memberof DiskStateOneOf4
-   */
-  state: 'detaching'
-}
-
-export function DiskStateOneOf4FromJSON(json: any): DiskStateOneOf4 {
-  return DiskStateOneOf4FromJSONTyped(json, false)
-}
-
-export function DiskStateOneOf4FromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): DiskStateOneOf4 {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    instance: json['instance'],
-    state: json['state'],
-  }
-}
-
-export function DiskStateOneOf4ToJSON(value?: DiskStateOneOf4 | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    instance: value.instance,
-    state: value.state,
-  }
-}
diff --git a/libs/api/__generated__/models/DiskStateOneOf5.ts b/libs/api/__generated__/models/DiskStateOneOf5.ts
deleted file mode 100644
index c68b2ec76f..0000000000
--- a/libs/api/__generated__/models/DiskStateOneOf5.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Disk has been destroyed
- * @export
- * @interface DiskStateOneOf5
- */
-export interface DiskStateOneOf5 {
-  /**
-   *
-   * @type {string}
-   * @memberof DiskStateOneOf5
-   */
-  state: 'destroyed'
-}
-
-export function DiskStateOneOf5FromJSON(json: any): DiskStateOneOf5 {
-  return DiskStateOneOf5FromJSONTyped(json, false)
-}
-
-export function DiskStateOneOf5FromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): DiskStateOneOf5 {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    state: json['state'],
-  }
-}
-
-export function DiskStateOneOf5ToJSON(value?: DiskStateOneOf5 | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    state: value.state,
-  }
-}
diff --git a/libs/api/__generated__/models/DiskStateOneOf6.ts b/libs/api/__generated__/models/DiskStateOneOf6.ts
deleted file mode 100644
index 33bef3491f..0000000000
--- a/libs/api/__generated__/models/DiskStateOneOf6.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Disk is unavailable
- * @export
- * @interface DiskStateOneOf6
- */
-export interface DiskStateOneOf6 {
-  /**
-   *
-   * @type {string}
-   * @memberof DiskStateOneOf6
-   */
-  state: 'faulted'
-}
-
-export function DiskStateOneOf6FromJSON(json: any): DiskStateOneOf6 {
-  return DiskStateOneOf6FromJSONTyped(json, false)
-}
-
-export function DiskStateOneOf6FromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): DiskStateOneOf6 {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    state: json['state'],
-  }
-}
-
-export function DiskStateOneOf6ToJSON(value?: DiskStateOneOf6 | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    state: value.state,
-  }
-}
diff --git a/libs/api/__generated__/models/IdSortMode.ts b/libs/api/__generated__/models/IdSortMode.ts
deleted file mode 100644
index f6cf349edf..0000000000
--- a/libs/api/__generated__/models/IdSortMode.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-/**
- * Supported set of sort modes for scanning by id only.
- *
- * Currently, we only support scanning in ascending order.
- * @export
- * @enum {string}
- */
-export enum IdSortMode {
-  IdAscending = 'id-ascending',
-}
-
-export function IdSortModeFromJSON(json: any): IdSortMode {
-  return IdSortModeFromJSONTyped(json, false)
-}
-
-export function IdSortModeFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): IdSortMode {
-  return json as IdSortMode
-}
-
-export function IdSortModeToJSON(value?: IdSortMode | null): any {
-  return value as any
-}
diff --git a/libs/api/__generated__/models/IdentityMetadata.ts b/libs/api/__generated__/models/IdentityMetadata.ts
deleted file mode 100644
index ab264e748b..0000000000
--- a/libs/api/__generated__/models/IdentityMetadata.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Identity-related metadata that's included in nearly all public API objects
- * @export
- * @interface IdentityMetadata
- */
-export interface IdentityMetadata {
-  /**
-   * human-readable free-form text about a resource
-   * @type {string}
-   * @memberof IdentityMetadata
-   */
-  description: string
-  /**
-   * unique, immutable, system-controlled identifier for each resource
-   * @type {string}
-   * @memberof IdentityMetadata
-   */
-  id: string
-  /**
-   * unique, mutable, user-controlled identifier for each resource
-   * @type {string}
-   * @memberof IdentityMetadata
-   */
-  name: string
-  /**
-   * timestamp when this resource was created
-   * @type {Date}
-   * @memberof IdentityMetadata
-   */
-  timeCreated: Date
-  /**
-   * timestamp when this resource was last modified
-   * @type {Date}
-   * @memberof IdentityMetadata
-   */
-  timeModified: Date
-}
-
-export function IdentityMetadataFromJSON(json: any): IdentityMetadata {
-  return IdentityMetadataFromJSONTyped(json, false)
-}
-
-export function IdentityMetadataFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): IdentityMetadata {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    description: json['description'],
-    id: json['id'],
-    name: json['name'],
-    timeCreated: new Date(json['timeCreated']),
-    timeModified: new Date(json['timeModified']),
-  }
-}
-
-export function IdentityMetadataToJSON(value?: IdentityMetadata | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    description: value.description,
-    id: value.id,
-    name: value.name,
-    timeCreated: value.timeCreated.toISOString(),
-    timeModified: value.timeModified.toISOString(),
-  }
-}
diff --git a/libs/api/__generated__/models/Instance.ts b/libs/api/__generated__/models/Instance.ts
deleted file mode 100644
index ad99d9a3a7..0000000000
--- a/libs/api/__generated__/models/Instance.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import {
-  InstanceState,
-  InstanceStateFromJSON,
-  InstanceStateFromJSONTyped,
-  InstanceStateToJSON,
-} from './'
-
-/**
- * Client view of an [`Instance`]
- * @export
- * @interface Instance
- */
-export interface Instance {
-  /**
-   * human-readable free-form text about a resource
-   * @type {string}
-   * @memberof Instance
-   */
-  description: string
-  /**
-   * RFC1035-compliant hostname for the Instance.
-   * @type {string}
-   * @memberof Instance
-   */
-  hostname: string
-  /**
-   * unique, immutable, system-controlled identifier for each resource
-   * @type {string}
-   * @memberof Instance
-   */
-  id: string
-  /**
-   * memory allocated for this Instance
-   * @type {number}
-   * @memberof Instance
-   */
-  memory: number
-  /**
-   * unique, mutable, user-controlled identifier for each resource
-   * @type {string}
-   * @memberof Instance
-   */
-  name: string
-  /**
-   * number of CPUs allocated for this Instance
-   * @type {number}
-   * @memberof Instance
-   */
-  ncpus: number
-  /**
-   * id for the project containing this Instance
-   * @type {string}
-   * @memberof Instance
-   */
-  projectId: string
-  /**
-   *
-   * @type {InstanceState}
-   * @memberof Instance
-   */
-  runState: InstanceState
-  /**
-   * timestamp when this resource was created
-   * @type {Date}
-   * @memberof Instance
-   */
-  timeCreated: Date
-  /**
-   * timestamp when this resource was last modified
-   * @type {Date}
-   * @memberof Instance
-   */
-  timeModified: Date
-  /**
-   *
-   * @type {Date}
-   * @memberof Instance
-   */
-  timeRunStateUpdated: Date
-}
-
-export function InstanceFromJSON(json: any): Instance {
-  return InstanceFromJSONTyped(json, false)
-}
-
-export function InstanceFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): Instance {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    description: json['description'],
-    hostname: json['hostname'],
-    id: json['id'],
-    memory: json['memory'],
-    name: json['name'],
-    ncpus: json['ncpus'],
-    projectId: json['projectId'],
-    runState: InstanceStateFromJSON(json['runState']),
-    timeCreated: new Date(json['timeCreated']),
-    timeModified: new Date(json['timeModified']),
-    timeRunStateUpdated: new Date(json['timeRunStateUpdated']),
-  }
-}
-
-export function InstanceToJSON(value?: Instance | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    description: value.description,
-    hostname: value.hostname,
-    id: value.id,
-    memory: value.memory,
-    name: value.name,
-    ncpus: value.ncpus,
-    projectId: value.projectId,
-    runState: InstanceStateToJSON(value.runState),
-    timeCreated: value.timeCreated.toISOString(),
-    timeModified: value.timeModified.toISOString(),
-    timeRunStateUpdated: value.timeRunStateUpdated.toISOString(),
-  }
-}
diff --git a/libs/api/__generated__/models/InstanceCreateParams.ts b/libs/api/__generated__/models/InstanceCreateParams.ts
deleted file mode 100644
index 0fe572290f..0000000000
--- a/libs/api/__generated__/models/InstanceCreateParams.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Create-time parameters for an [`Instance`]
- * @export
- * @interface InstanceCreateParams
- */
-export interface InstanceCreateParams {
-  /**
-   *
-   * @type {string}
-   * @memberof InstanceCreateParams
-   */
-  description: string
-  /**
-   *
-   * @type {string}
-   * @memberof InstanceCreateParams
-   */
-  hostname: string
-  /**
-   * A count of bytes, typically used either for memory or storage capacity
-   *
-   * The maximum supported byte count is [`i64::MAX`].  This makes it somewhat inconvenient to define constructors: a u32 constructor can be infallible, but an i64 constructor can fail (if the value is negative) and a u64 constructor can fail (if the value is larger than i64::MAX).  We provide all of these for consumers' convenience.
-   * @type {number}
-   * @memberof InstanceCreateParams
-   */
-  memory: number
-  /**
-   * Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'.
-   * @type {string}
-   * @memberof InstanceCreateParams
-   */
-  name: string
-  /**
-   * The number of CPUs in an Instance
-   * @type {number}
-   * @memberof InstanceCreateParams
-   */
-  ncpus: number
-}
-
-export function InstanceCreateParamsFromJSON(json: any): InstanceCreateParams {
-  return InstanceCreateParamsFromJSONTyped(json, false)
-}
-
-export function InstanceCreateParamsFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): InstanceCreateParams {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    description: json['description'],
-    hostname: json['hostname'],
-    memory: json['memory'],
-    name: json['name'],
-    ncpus: json['ncpus'],
-  }
-}
-
-export function InstanceCreateParamsToJSON(
-  value?: InstanceCreateParams | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    description: value.description,
-    hostname: value.hostname,
-    memory: value.memory,
-    name: value.name,
-    ncpus: value.ncpus,
-  }
-}
diff --git a/libs/api/__generated__/models/InstanceResultsPage.ts b/libs/api/__generated__/models/InstanceResultsPage.ts
deleted file mode 100644
index a04537148e..0000000000
--- a/libs/api/__generated__/models/InstanceResultsPage.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import {
-  Instance,
-  InstanceFromJSON,
-  InstanceFromJSONTyped,
-  InstanceToJSON,
-} from './'
-
-/**
- * A single page of results
- * @export
- * @interface InstanceResultsPage
- */
-export interface InstanceResultsPage {
-  /**
-   * list of items on this page of results
-   * @type {Array<Instance>}
-   * @memberof InstanceResultsPage
-   */
-  items: Array<Instance>
-  /**
-   * token used to fetch the next page of results (if any)
-   * @type {string}
-   * @memberof InstanceResultsPage
-   */
-  nextPage?: string | null
-}
-
-export function InstanceResultsPageFromJSON(json: any): InstanceResultsPage {
-  return InstanceResultsPageFromJSONTyped(json, false)
-}
-
-export function InstanceResultsPageFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): InstanceResultsPage {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    items: (json['items'] as Array<any>).map(InstanceFromJSON),
-    nextPage: !exists(json, 'next_page') ? undefined : json['next_page'],
-  }
-}
-
-export function InstanceResultsPageToJSON(
-  value?: InstanceResultsPage | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    items: (value.items as Array<any>).map(InstanceToJSON),
-    next_page: value.nextPage,
-  }
-}
diff --git a/libs/api/__generated__/models/InstanceState.ts b/libs/api/__generated__/models/InstanceState.ts
deleted file mode 100644
index 54951df89c..0000000000
--- a/libs/api/__generated__/models/InstanceState.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-/**
- * Running state of an Instance (primarily: booted or stopped)
- *
- * This typically reflects whether it's starting, running, stopping, or stopped, but also includes states related to the Instance's lifecycle
- * @export
- * @enum {string}
- */
-export enum InstanceState {
-  Creating = 'creating',
-  Starting = 'starting',
-  Running = 'running',
-  Stopping = 'stopping',
-  Stopped = 'stopped',
-  Rebooting = 'rebooting',
-  Repairing = 'repairing',
-  Failed = 'failed',
-  Destroyed = 'destroyed',
-}
-
-export function InstanceStateFromJSON(json: any): InstanceState {
-  return InstanceStateFromJSONTyped(json, false)
-}
-
-export function InstanceStateFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): InstanceState {
-  return json as InstanceState
-}
-
-export function InstanceStateToJSON(value?: InstanceState | null): any {
-  return value as any
-}
diff --git a/libs/api/__generated__/models/LoginParams.ts b/libs/api/__generated__/models/LoginParams.ts
deleted file mode 100644
index 6684e29f55..0000000000
--- a/libs/api/__generated__/models/LoginParams.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- *
- * @export
- * @interface LoginParams
- */
-export interface LoginParams {
-  /**
-   *
-   * @type {string}
-   * @memberof LoginParams
-   */
-  username: string
-}
-
-export function LoginParamsFromJSON(json: any): LoginParams {
-  return LoginParamsFromJSONTyped(json, false)
-}
-
-export function LoginParamsFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): LoginParams {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    username: json['username'],
-  }
-}
-
-export function LoginParamsToJSON(value?: LoginParams | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    username: value.username,
-  }
-}
diff --git a/libs/api/__generated__/models/NameOrIdSortMode.ts b/libs/api/__generated__/models/NameOrIdSortMode.ts
deleted file mode 100644
index 8c73820a7d..0000000000
--- a/libs/api/__generated__/models/NameOrIdSortMode.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-/**
- * Supported set of sort modes for scanning by name or id
- * @export
- * @enum {string}
- */
-export enum NameOrIdSortMode {
-  NameAscending = 'name-ascending',
-  NameDescending = 'name-descending',
-  IdAscending = 'id-ascending',
-}
-
-export function NameOrIdSortModeFromJSON(json: any): NameOrIdSortMode {
-  return NameOrIdSortModeFromJSONTyped(json, false)
-}
-
-export function NameOrIdSortModeFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): NameOrIdSortMode {
-  return json as NameOrIdSortMode
-}
-
-export function NameOrIdSortModeToJSON(value?: NameOrIdSortMode | null): any {
-  return value as any
-}
diff --git a/libs/api/__generated__/models/NameSortMode.ts b/libs/api/__generated__/models/NameSortMode.ts
deleted file mode 100644
index cd4f7bb691..0000000000
--- a/libs/api/__generated__/models/NameSortMode.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-/**
- * Supported set of sort modes for scanning by name only
- *
- * Currently, we only support scanning in ascending order.
- * @export
- * @enum {string}
- */
-export enum NameSortMode {
-  NameAscending = 'name-ascending',
-}
-
-export function NameSortModeFromJSON(json: any): NameSortMode {
-  return NameSortModeFromJSONTyped(json, false)
-}
-
-export function NameSortModeFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): NameSortMode {
-  return json as NameSortMode
-}
-
-export function NameSortModeToJSON(value?: NameSortMode | null): any {
-  return value as any
-}
diff --git a/libs/api/__generated__/models/Organization.ts b/libs/api/__generated__/models/Organization.ts
deleted file mode 100644
index eaae6e31e2..0000000000
--- a/libs/api/__generated__/models/Organization.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Client view of an [`Organization`]
- * @export
- * @interface Organization
- */
-export interface Organization {
-  /**
-   * human-readable free-form text about a resource
-   * @type {string}
-   * @memberof Organization
-   */
-  description: string
-  /**
-   * unique, immutable, system-controlled identifier for each resource
-   * @type {string}
-   * @memberof Organization
-   */
-  id: string
-  /**
-   * unique, mutable, user-controlled identifier for each resource
-   * @type {string}
-   * @memberof Organization
-   */
-  name: string
-  /**
-   * timestamp when this resource was created
-   * @type {Date}
-   * @memberof Organization
-   */
-  timeCreated: Date
-  /**
-   * timestamp when this resource was last modified
-   * @type {Date}
-   * @memberof Organization
-   */
-  timeModified: Date
-}
-
-export function OrganizationFromJSON(json: any): Organization {
-  return OrganizationFromJSONTyped(json, false)
-}
-
-export function OrganizationFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): Organization {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    description: json['description'],
-    id: json['id'],
-    name: json['name'],
-    timeCreated: new Date(json['timeCreated']),
-    timeModified: new Date(json['timeModified']),
-  }
-}
-
-export function OrganizationToJSON(value?: Organization | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    description: value.description,
-    id: value.id,
-    name: value.name,
-    timeCreated: value.timeCreated.toISOString(),
-    timeModified: value.timeModified.toISOString(),
-  }
-}
diff --git a/libs/api/__generated__/models/OrganizationCreate.ts b/libs/api/__generated__/models/OrganizationCreate.ts
deleted file mode 100644
index 9efb630dbd..0000000000
--- a/libs/api/__generated__/models/OrganizationCreate.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Create-time parameters for an [`Organization`]
- * @export
- * @interface OrganizationCreate
- */
-export interface OrganizationCreate {
-  /**
-   *
-   * @type {string}
-   * @memberof OrganizationCreate
-   */
-  description: string
-  /**
-   * Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'.
-   * @type {string}
-   * @memberof OrganizationCreate
-   */
-  name: string
-}
-
-export function OrganizationCreateFromJSON(json: any): OrganizationCreate {
-  return OrganizationCreateFromJSONTyped(json, false)
-}
-
-export function OrganizationCreateFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): OrganizationCreate {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    description: json['description'],
-    name: json['name'],
-  }
-}
-
-export function OrganizationCreateToJSON(
-  value?: OrganizationCreate | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    description: value.description,
-    name: value.name,
-  }
-}
diff --git a/libs/api/__generated__/models/OrganizationResultsPage.ts b/libs/api/__generated__/models/OrganizationResultsPage.ts
deleted file mode 100644
index d9250c41df..0000000000
--- a/libs/api/__generated__/models/OrganizationResultsPage.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import {
-  Organization,
-  OrganizationFromJSON,
-  OrganizationFromJSONTyped,
-  OrganizationToJSON,
-} from './'
-
-/**
- * A single page of results
- * @export
- * @interface OrganizationResultsPage
- */
-export interface OrganizationResultsPage {
-  /**
-   * list of items on this page of results
-   * @type {Array<Organization>}
-   * @memberof OrganizationResultsPage
-   */
-  items: Array<Organization>
-  /**
-   * token used to fetch the next page of results (if any)
-   * @type {string}
-   * @memberof OrganizationResultsPage
-   */
-  nextPage?: string | null
-}
-
-export function OrganizationResultsPageFromJSON(
-  json: any
-): OrganizationResultsPage {
-  return OrganizationResultsPageFromJSONTyped(json, false)
-}
-
-export function OrganizationResultsPageFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): OrganizationResultsPage {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    items: (json['items'] as Array<any>).map(OrganizationFromJSON),
-    nextPage: !exists(json, 'next_page') ? undefined : json['next_page'],
-  }
-}
-
-export function OrganizationResultsPageToJSON(
-  value?: OrganizationResultsPage | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    items: (value.items as Array<any>).map(OrganizationToJSON),
-    next_page: value.nextPage,
-  }
-}
diff --git a/libs/api/__generated__/models/OrganizationUpdate.ts b/libs/api/__generated__/models/OrganizationUpdate.ts
deleted file mode 100644
index 98fb37c328..0000000000
--- a/libs/api/__generated__/models/OrganizationUpdate.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Updateable properties of an [`Organization`]
- * @export
- * @interface OrganizationUpdate
- */
-export interface OrganizationUpdate {
-  /**
-   *
-   * @type {string}
-   * @memberof OrganizationUpdate
-   */
-  description?: string | null
-  /**
-   *
-   * @type {string}
-   * @memberof OrganizationUpdate
-   */
-  name?: string | null
-}
-
-export function OrganizationUpdateFromJSON(json: any): OrganizationUpdate {
-  return OrganizationUpdateFromJSONTyped(json, false)
-}
-
-export function OrganizationUpdateFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): OrganizationUpdate {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    description: !exists(json, 'description') ? undefined : json['description'],
-    name: !exists(json, 'name') ? undefined : json['name'],
-  }
-}
-
-export function OrganizationUpdateToJSON(
-  value?: OrganizationUpdate | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    description: value.description,
-    name: value.name,
-  }
-}
diff --git a/libs/api/__generated__/models/Project.ts b/libs/api/__generated__/models/Project.ts
deleted file mode 100644
index a4138c95cc..0000000000
--- a/libs/api/__generated__/models/Project.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Client view of an [`Project`]
- * @export
- * @interface Project
- */
-export interface Project {
-  /**
-   * human-readable free-form text about a resource
-   * @type {string}
-   * @memberof Project
-   */
-  description: string
-  /**
-   * unique, immutable, system-controlled identifier for each resource
-   * @type {string}
-   * @memberof Project
-   */
-  id: string
-  /**
-   * unique, mutable, user-controlled identifier for each resource
-   * @type {string}
-   * @memberof Project
-   */
-  name: string
-  /**
-   *
-   * @type {string}
-   * @memberof Project
-   */
-  organizationId: string
-  /**
-   * timestamp when this resource was created
-   * @type {Date}
-   * @memberof Project
-   */
-  timeCreated: Date
-  /**
-   * timestamp when this resource was last modified
-   * @type {Date}
-   * @memberof Project
-   */
-  timeModified: Date
-}
-
-export function ProjectFromJSON(json: any): Project {
-  return ProjectFromJSONTyped(json, false)
-}
-
-export function ProjectFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): Project {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    description: json['description'],
-    id: json['id'],
-    name: json['name'],
-    organizationId: json['organizationId'],
-    timeCreated: new Date(json['timeCreated']),
-    timeModified: new Date(json['timeModified']),
-  }
-}
-
-export function ProjectToJSON(value?: Project | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    description: value.description,
-    id: value.id,
-    name: value.name,
-    organizationId: value.organizationId,
-    timeCreated: value.timeCreated.toISOString(),
-    timeModified: value.timeModified.toISOString(),
-  }
-}
diff --git a/libs/api/__generated__/models/ProjectCreate.ts b/libs/api/__generated__/models/ProjectCreate.ts
deleted file mode 100644
index 74cc568afd..0000000000
--- a/libs/api/__generated__/models/ProjectCreate.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Create-time parameters for an [`Project`]
- * @export
- * @interface ProjectCreate
- */
-export interface ProjectCreate {
-  /**
-   *
-   * @type {string}
-   * @memberof ProjectCreate
-   */
-  description: string
-  /**
-   * Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'.
-   * @type {string}
-   * @memberof ProjectCreate
-   */
-  name: string
-}
-
-export function ProjectCreateFromJSON(json: any): ProjectCreate {
-  return ProjectCreateFromJSONTyped(json, false)
-}
-
-export function ProjectCreateFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): ProjectCreate {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    description: json['description'],
-    name: json['name'],
-  }
-}
-
-export function ProjectCreateToJSON(value?: ProjectCreate | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    description: value.description,
-    name: value.name,
-  }
-}
diff --git a/libs/api/__generated__/models/ProjectResultsPage.ts b/libs/api/__generated__/models/ProjectResultsPage.ts
deleted file mode 100644
index 30c084eb52..0000000000
--- a/libs/api/__generated__/models/ProjectResultsPage.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import {
-  Project,
-  ProjectFromJSON,
-  ProjectFromJSONTyped,
-  ProjectToJSON,
-} from './'
-
-/**
- * A single page of results
- * @export
- * @interface ProjectResultsPage
- */
-export interface ProjectResultsPage {
-  /**
-   * list of items on this page of results
-   * @type {Array<Project>}
-   * @memberof ProjectResultsPage
-   */
-  items: Array<Project>
-  /**
-   * token used to fetch the next page of results (if any)
-   * @type {string}
-   * @memberof ProjectResultsPage
-   */
-  nextPage?: string | null
-}
-
-export function ProjectResultsPageFromJSON(json: any): ProjectResultsPage {
-  return ProjectResultsPageFromJSONTyped(json, false)
-}
-
-export function ProjectResultsPageFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): ProjectResultsPage {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    items: (json['items'] as Array<any>).map(ProjectFromJSON),
-    nextPage: !exists(json, 'next_page') ? undefined : json['next_page'],
-  }
-}
-
-export function ProjectResultsPageToJSON(
-  value?: ProjectResultsPage | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    items: (value.items as Array<any>).map(ProjectToJSON),
-    next_page: value.nextPage,
-  }
-}
diff --git a/libs/api/__generated__/models/ProjectUpdate.ts b/libs/api/__generated__/models/ProjectUpdate.ts
deleted file mode 100644
index 36be9b053d..0000000000
--- a/libs/api/__generated__/models/ProjectUpdate.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Updateable properties of an [`Project`]
- * @export
- * @interface ProjectUpdate
- */
-export interface ProjectUpdate {
-  /**
-   *
-   * @type {string}
-   * @memberof ProjectUpdate
-   */
-  description?: string | null
-  /**
-   *
-   * @type {string}
-   * @memberof ProjectUpdate
-   */
-  name?: string | null
-}
-
-export function ProjectUpdateFromJSON(json: any): ProjectUpdate {
-  return ProjectUpdateFromJSONTyped(json, false)
-}
-
-export function ProjectUpdateFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): ProjectUpdate {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    description: !exists(json, 'description') ? undefined : json['description'],
-    name: !exists(json, 'name') ? undefined : json['name'],
-  }
-}
-
-export function ProjectUpdateToJSON(value?: ProjectUpdate | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    description: value.description,
-    name: value.name,
-  }
-}
diff --git a/libs/api/__generated__/models/Rack.ts b/libs/api/__generated__/models/Rack.ts
deleted file mode 100644
index 96623633ef..0000000000
--- a/libs/api/__generated__/models/Rack.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import {
-  IdentityMetadata,
-  IdentityMetadataFromJSON,
-  IdentityMetadataFromJSONTyped,
-  IdentityMetadataToJSON,
-} from './'
-
-/**
- * Client view of an [`Rack`]
- * @export
- * @interface Rack
- */
-export interface Rack {
-  /**
-   *
-   * @type {IdentityMetadata}
-   * @memberof Rack
-   */
-  identity: IdentityMetadata
-}
-
-export function RackFromJSON(json: any): Rack {
-  return RackFromJSONTyped(json, false)
-}
-
-export function RackFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): Rack {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    identity: IdentityMetadataFromJSON(json['identity']),
-  }
-}
-
-export function RackToJSON(value?: Rack | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    identity: IdentityMetadataToJSON(value.identity),
-  }
-}
diff --git a/libs/api/__generated__/models/RackResultsPage.ts b/libs/api/__generated__/models/RackResultsPage.ts
deleted file mode 100644
index c86b8134e1..0000000000
--- a/libs/api/__generated__/models/RackResultsPage.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import { Rack, RackFromJSON, RackFromJSONTyped, RackToJSON } from './'
-
-/**
- * A single page of results
- * @export
- * @interface RackResultsPage
- */
-export interface RackResultsPage {
-  /**
-   * list of items on this page of results
-   * @type {Array<Rack>}
-   * @memberof RackResultsPage
-   */
-  items: Array<Rack>
-  /**
-   * token used to fetch the next page of results (if any)
-   * @type {string}
-   * @memberof RackResultsPage
-   */
-  nextPage?: string | null
-}
-
-export function RackResultsPageFromJSON(json: any): RackResultsPage {
-  return RackResultsPageFromJSONTyped(json, false)
-}
-
-export function RackResultsPageFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): RackResultsPage {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    items: (json['items'] as Array<any>).map(RackFromJSON),
-    nextPage: !exists(json, 'next_page') ? undefined : json['next_page'],
-  }
-}
-
-export function RackResultsPageToJSON(value?: RackResultsPage | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    items: (value.items as Array<any>).map(RackToJSON),
-    next_page: value.nextPage,
-  }
-}
diff --git a/libs/api/__generated__/models/RouteDestination.ts b/libs/api/__generated__/models/RouteDestination.ts
deleted file mode 100644
index d1f309384b..0000000000
--- a/libs/api/__generated__/models/RouteDestination.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import {
-  RouteDestinationOneOf,
-  RouteDestinationOneOf1,
-  RouteDestinationOneOf2,
-  RouteDestinationOneOfFromJSONTyped,
-  RouteDestinationOneOfToJSON,
-  RouteDestinationOneOf1FromJSONTyped,
-  RouteDestinationOneOf1ToJSON,
-  RouteDestinationOneOf2FromJSONTyped,
-  RouteDestinationOneOf2ToJSON,
-} from './'
-
-/**
- * @type RouteDestination
- * A subset of [`NetworkTarget`], `RouteDestination` specifies the kind of network traffic that will be matched to be forwarded to the [`RouteTarget`].
- * @export
- */
-export type RouteDestination =
-  | RouteDestinationOneOf
-  | RouteDestinationOneOf1
-  | RouteDestinationOneOf2
-
-export function RouteDestinationFromJSON(json: any): RouteDestination {
-  return RouteDestinationFromJSONTyped(json, false)
-}
-
-export function RouteDestinationFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): RouteDestination {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    ...RouteDestinationOneOfFromJSONTyped(json, true),
-    ...RouteDestinationOneOf1FromJSONTyped(json, true),
-    ...RouteDestinationOneOf2FromJSONTyped(json, true),
-  }
-}
-
-export function RouteDestinationToJSON(value?: RouteDestination | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    ...RouteDestinationOneOfToJSON(value as any),
-    ...RouteDestinationOneOf1ToJSON(value as any),
-    ...RouteDestinationOneOf2ToJSON(value as any),
-  }
-}
diff --git a/libs/api/__generated__/models/RouteDestinationOneOf.ts b/libs/api/__generated__/models/RouteDestinationOneOf.ts
deleted file mode 100644
index a665ad2c14..0000000000
--- a/libs/api/__generated__/models/RouteDestinationOneOf.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- *
- * @export
- * @interface RouteDestinationOneOf
- */
-export interface RouteDestinationOneOf {
-  /**
-   *
-   * @type {string}
-   * @memberof RouteDestinationOneOf
-   */
-  type: 'ip'
-  /**
-   *
-   * @type {string}
-   * @memberof RouteDestinationOneOf
-   */
-  value: string
-}
-
-export function RouteDestinationOneOfFromJSON(
-  json: any
-): RouteDestinationOneOf {
-  return RouteDestinationOneOfFromJSONTyped(json, false)
-}
-
-export function RouteDestinationOneOfFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): RouteDestinationOneOf {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    type: json['type'],
-    value: json['value'],
-  }
-}
-
-export function RouteDestinationOneOfToJSON(
-  value?: RouteDestinationOneOf | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    type: value.type,
-    value: value.value,
-  }
-}
diff --git a/libs/api/__generated__/models/RouteDestinationOneOf1.ts b/libs/api/__generated__/models/RouteDestinationOneOf1.ts
deleted file mode 100644
index 8a0cb77e60..0000000000
--- a/libs/api/__generated__/models/RouteDestinationOneOf1.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- *
- * @export
- * @interface RouteDestinationOneOf1
- */
-export interface RouteDestinationOneOf1 {
-  /**
-   *
-   * @type {string}
-   * @memberof RouteDestinationOneOf1
-   */
-  type: 'vpc'
-  /**
-   * Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'.
-   * @type {string}
-   * @memberof RouteDestinationOneOf1
-   */
-  value: string
-}
-
-export function RouteDestinationOneOf1FromJSON(
-  json: any
-): RouteDestinationOneOf1 {
-  return RouteDestinationOneOf1FromJSONTyped(json, false)
-}
-
-export function RouteDestinationOneOf1FromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): RouteDestinationOneOf1 {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    type: json['type'],
-    value: json['value'],
-  }
-}
-
-export function RouteDestinationOneOf1ToJSON(
-  value?: RouteDestinationOneOf1 | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    type: value.type,
-    value: value.value,
-  }
-}
diff --git a/libs/api/__generated__/models/RouteDestinationOneOf2.ts b/libs/api/__generated__/models/RouteDestinationOneOf2.ts
deleted file mode 100644
index a8c935dec8..0000000000
--- a/libs/api/__generated__/models/RouteDestinationOneOf2.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- *
- * @export
- * @interface RouteDestinationOneOf2
- */
-export interface RouteDestinationOneOf2 {
-  /**
-   *
-   * @type {string}
-   * @memberof RouteDestinationOneOf2
-   */
-  type: 'subnet'
-  /**
-   * Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'.
-   * @type {string}
-   * @memberof RouteDestinationOneOf2
-   */
-  value: string
-}
-
-export function RouteDestinationOneOf2FromJSON(
-  json: any
-): RouteDestinationOneOf2 {
-  return RouteDestinationOneOf2FromJSONTyped(json, false)
-}
-
-export function RouteDestinationOneOf2FromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): RouteDestinationOneOf2 {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    type: json['type'],
-    value: json['value'],
-  }
-}
-
-export function RouteDestinationOneOf2ToJSON(
-  value?: RouteDestinationOneOf2 | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    type: value.type,
-    value: value.value,
-  }
-}
diff --git a/libs/api/__generated__/models/RouteTarget.ts b/libs/api/__generated__/models/RouteTarget.ts
deleted file mode 100644
index f587f0e7cc..0000000000
--- a/libs/api/__generated__/models/RouteTarget.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import {
-  RouteDestinationOneOf,
-  RouteDestinationOneOf1,
-  RouteDestinationOneOf2,
-  RouteTargetOneOf,
-  RouteTargetOneOf1,
-  RouteDestinationOneOfFromJSONTyped,
-  RouteDestinationOneOfToJSON,
-  RouteDestinationOneOf1FromJSONTyped,
-  RouteDestinationOneOf1ToJSON,
-  RouteDestinationOneOf2FromJSONTyped,
-  RouteDestinationOneOf2ToJSON,
-  RouteTargetOneOfFromJSONTyped,
-  RouteTargetOneOfToJSON,
-  RouteTargetOneOf1FromJSONTyped,
-  RouteTargetOneOf1ToJSON,
-} from './'
-
-/**
- * @type RouteTarget
- * A subset of [`NetworkTarget`], `RouteTarget` specifies all possible targets that a route can forward to.
- * @export
- */
-export type RouteTarget =
-  | RouteDestinationOneOf
-  | RouteDestinationOneOf1
-  | RouteDestinationOneOf2
-  | RouteTargetOneOf
-  | RouteTargetOneOf1
-
-export function RouteTargetFromJSON(json: any): RouteTarget {
-  return RouteTargetFromJSONTyped(json, false)
-}
-
-export function RouteTargetFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): RouteTarget {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    ...RouteDestinationOneOfFromJSONTyped(json, true),
-    ...RouteDestinationOneOf1FromJSONTyped(json, true),
-    ...RouteDestinationOneOf2FromJSONTyped(json, true),
-    ...RouteTargetOneOfFromJSONTyped(json, true),
-    ...RouteTargetOneOf1FromJSONTyped(json, true),
-  }
-}
-
-export function RouteTargetToJSON(value?: RouteTarget | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    ...RouteDestinationOneOfToJSON(value as any),
-    ...RouteDestinationOneOf1ToJSON(value as any),
-    ...RouteDestinationOneOf2ToJSON(value as any),
-    ...RouteTargetOneOfToJSON(value as any),
-    ...RouteTargetOneOf1ToJSON(value as any),
-  }
-}
diff --git a/libs/api/__generated__/models/RouteTargetOneOf.ts b/libs/api/__generated__/models/RouteTargetOneOf.ts
deleted file mode 100644
index d21f70b219..0000000000
--- a/libs/api/__generated__/models/RouteTargetOneOf.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- *
- * @export
- * @interface RouteTargetOneOf
- */
-export interface RouteTargetOneOf {
-  /**
-   *
-   * @type {string}
-   * @memberof RouteTargetOneOf
-   */
-  type: 'instance'
-  /**
-   * Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'.
-   * @type {string}
-   * @memberof RouteTargetOneOf
-   */
-  value: string
-}
-
-export function RouteTargetOneOfFromJSON(json: any): RouteTargetOneOf {
-  return RouteTargetOneOfFromJSONTyped(json, false)
-}
-
-export function RouteTargetOneOfFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): RouteTargetOneOf {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    type: json['type'],
-    value: json['value'],
-  }
-}
-
-export function RouteTargetOneOfToJSON(value?: RouteTargetOneOf | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    type: value.type,
-    value: value.value,
-  }
-}
diff --git a/libs/api/__generated__/models/RouteTargetOneOf1.ts b/libs/api/__generated__/models/RouteTargetOneOf1.ts
deleted file mode 100644
index cb03482a03..0000000000
--- a/libs/api/__generated__/models/RouteTargetOneOf1.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- *
- * @export
- * @interface RouteTargetOneOf1
- */
-export interface RouteTargetOneOf1 {
-  /**
-   *
-   * @type {string}
-   * @memberof RouteTargetOneOf1
-   */
-  type: 'internetGateway'
-  /**
-   * Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'.
-   * @type {string}
-   * @memberof RouteTargetOneOf1
-   */
-  value: string
-}
-
-export function RouteTargetOneOf1FromJSON(json: any): RouteTargetOneOf1 {
-  return RouteTargetOneOf1FromJSONTyped(json, false)
-}
-
-export function RouteTargetOneOf1FromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): RouteTargetOneOf1 {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    type: json['type'],
-    value: json['value'],
-  }
-}
-
-export function RouteTargetOneOf1ToJSON(value?: RouteTargetOneOf1 | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    type: value.type,
-    value: value.value,
-  }
-}
diff --git a/libs/api/__generated__/models/RouterRoute.ts b/libs/api/__generated__/models/RouterRoute.ts
deleted file mode 100644
index 4d18175126..0000000000
--- a/libs/api/__generated__/models/RouterRoute.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import {
-  IdentityMetadata,
-  IdentityMetadataFromJSON,
-  IdentityMetadataFromJSONTyped,
-  IdentityMetadataToJSON,
-  RouteDestination,
-  RouteDestinationFromJSON,
-  RouteDestinationFromJSONTyped,
-  RouteDestinationToJSON,
-  RouteTarget,
-  RouteTargetFromJSON,
-  RouteTargetFromJSONTyped,
-  RouteTargetToJSON,
-  RouterRouteKind,
-  RouterRouteKindFromJSON,
-  RouterRouteKindFromJSONTyped,
-  RouterRouteKindToJSON,
-} from './'
-
-/**
- * A route defines a rule that governs where traffic should be sent based on its destination.
- * @export
- * @interface RouterRoute
- */
-export interface RouterRoute {
-  /**
-   *
-   * @type {RouteDestination}
-   * @memberof RouterRoute
-   */
-  destination: RouteDestination
-  /**
-   * common identifying metadata
-   * @type {IdentityMetadata}
-   * @memberof RouterRoute
-   */
-  identity: IdentityMetadata
-  /**
-   * Describes the kind of router. Set at creation. `read-only`
-   * @type {RouterRouteKind}
-   * @memberof RouterRoute
-   */
-  kind: RouterRouteKind
-  /**
-   * The VPC Router to which the route belongs.
-   * @type {string}
-   * @memberof RouterRoute
-   */
-  routerId: string
-  /**
-   *
-   * @type {RouteTarget}
-   * @memberof RouterRoute
-   */
-  target: RouteTarget
-}
-
-export function RouterRouteFromJSON(json: any): RouterRoute {
-  return RouterRouteFromJSONTyped(json, false)
-}
-
-export function RouterRouteFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): RouterRoute {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    destination: RouteDestinationFromJSON(json['destination']),
-    identity: IdentityMetadataFromJSON(json['identity']),
-    kind: RouterRouteKindFromJSON(json['kind']),
-    routerId: json['router_id'],
-    target: RouteTargetFromJSON(json['target']),
-  }
-}
-
-export function RouterRouteToJSON(value?: RouterRoute | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    destination: RouteDestinationToJSON(value.destination),
-    identity: IdentityMetadataToJSON(value.identity),
-    kind: RouterRouteKindToJSON(value.kind),
-    router_id: value.routerId,
-    target: RouteTargetToJSON(value.target),
-  }
-}
diff --git a/libs/api/__generated__/models/RouterRouteCreateParams.ts b/libs/api/__generated__/models/RouterRouteCreateParams.ts
deleted file mode 100644
index 650c04929a..0000000000
--- a/libs/api/__generated__/models/RouterRouteCreateParams.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import {
-  RouteDestination,
-  RouteDestinationFromJSON,
-  RouteDestinationFromJSONTyped,
-  RouteDestinationToJSON,
-  RouteTarget,
-  RouteTargetFromJSON,
-  RouteTargetFromJSONTyped,
-  RouteTargetToJSON,
-} from './'
-
-/**
- * Create-time parameters for a [`RouterRoute`]
- * @export
- * @interface RouterRouteCreateParams
- */
-export interface RouterRouteCreateParams {
-  /**
-   *
-   * @type {string}
-   * @memberof RouterRouteCreateParams
-   */
-  description: string
-  /**
-   *
-   * @type {RouteDestination}
-   * @memberof RouterRouteCreateParams
-   */
-  destination: RouteDestination
-  /**
-   * Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'.
-   * @type {string}
-   * @memberof RouterRouteCreateParams
-   */
-  name: string
-  /**
-   *
-   * @type {RouteTarget}
-   * @memberof RouterRouteCreateParams
-   */
-  target: RouteTarget
-}
-
-export function RouterRouteCreateParamsFromJSON(
-  json: any
-): RouterRouteCreateParams {
-  return RouterRouteCreateParamsFromJSONTyped(json, false)
-}
-
-export function RouterRouteCreateParamsFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): RouterRouteCreateParams {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    description: json['description'],
-    destination: RouteDestinationFromJSON(json['destination']),
-    name: json['name'],
-    target: RouteTargetFromJSON(json['target']),
-  }
-}
-
-export function RouterRouteCreateParamsToJSON(
-  value?: RouterRouteCreateParams | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    description: value.description,
-    destination: RouteDestinationToJSON(value.destination),
-    name: value.name,
-    target: RouteTargetToJSON(value.target),
-  }
-}
diff --git a/libs/api/__generated__/models/RouterRouteKind.ts b/libs/api/__generated__/models/RouterRouteKind.ts
deleted file mode 100644
index a98d259a5c..0000000000
--- a/libs/api/__generated__/models/RouterRouteKind.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-/**
- * The classification of a [`RouterRoute`] as defined by the system. The kind determines certain attributes such as if the route is modifiable and describes how or where the route was created.
- *
- * See [RFD-21](https://rfd.shared.oxide.computer/rfd/0021#concept-router) for more context
- * @export
- * @enum {string}
- */
-export enum RouterRouteKind {
-  Default = 'Default',
-  VpcSubnet = 'VpcSubnet',
-  VpcPeering = 'VpcPeering',
-  Custom = 'Custom',
-}
-
-export function RouterRouteKindFromJSON(json: any): RouterRouteKind {
-  return RouterRouteKindFromJSONTyped(json, false)
-}
-
-export function RouterRouteKindFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): RouterRouteKind {
-  return json as RouterRouteKind
-}
-
-export function RouterRouteKindToJSON(value?: RouterRouteKind | null): any {
-  return value as any
-}
diff --git a/libs/api/__generated__/models/RouterRouteResultsPage.ts b/libs/api/__generated__/models/RouterRouteResultsPage.ts
deleted file mode 100644
index 1e19f328de..0000000000
--- a/libs/api/__generated__/models/RouterRouteResultsPage.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import {
-  RouterRoute,
-  RouterRouteFromJSON,
-  RouterRouteFromJSONTyped,
-  RouterRouteToJSON,
-} from './'
-
-/**
- * A single page of results
- * @export
- * @interface RouterRouteResultsPage
- */
-export interface RouterRouteResultsPage {
-  /**
-   * list of items on this page of results
-   * @type {Array<RouterRoute>}
-   * @memberof RouterRouteResultsPage
-   */
-  items: Array<RouterRoute>
-  /**
-   * token used to fetch the next page of results (if any)
-   * @type {string}
-   * @memberof RouterRouteResultsPage
-   */
-  nextPage?: string | null
-}
-
-export function RouterRouteResultsPageFromJSON(
-  json: any
-): RouterRouteResultsPage {
-  return RouterRouteResultsPageFromJSONTyped(json, false)
-}
-
-export function RouterRouteResultsPageFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): RouterRouteResultsPage {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    items: (json['items'] as Array<any>).map(RouterRouteFromJSON),
-    nextPage: !exists(json, 'next_page') ? undefined : json['next_page'],
-  }
-}
-
-export function RouterRouteResultsPageToJSON(
-  value?: RouterRouteResultsPage | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    items: (value.items as Array<any>).map(RouterRouteToJSON),
-    next_page: value.nextPage,
-  }
-}
diff --git a/libs/api/__generated__/models/RouterRouteUpdateParams.ts b/libs/api/__generated__/models/RouterRouteUpdateParams.ts
deleted file mode 100644
index 995dd88805..0000000000
--- a/libs/api/__generated__/models/RouterRouteUpdateParams.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import {
-  RouteDestination,
-  RouteDestinationFromJSON,
-  RouteDestinationFromJSONTyped,
-  RouteDestinationToJSON,
-  RouteTarget,
-  RouteTargetFromJSON,
-  RouteTargetFromJSONTyped,
-  RouteTargetToJSON,
-} from './'
-
-/**
- * Updateable properties of a [`RouterRoute`]
- * @export
- * @interface RouterRouteUpdateParams
- */
-export interface RouterRouteUpdateParams {
-  /**
-   *
-   * @type {string}
-   * @memberof RouterRouteUpdateParams
-   */
-  description?: string | null
-  /**
-   *
-   * @type {RouteDestination}
-   * @memberof RouterRouteUpdateParams
-   */
-  destination: RouteDestination
-  /**
-   *
-   * @type {string}
-   * @memberof RouterRouteUpdateParams
-   */
-  name?: string | null
-  /**
-   *
-   * @type {RouteTarget}
-   * @memberof RouterRouteUpdateParams
-   */
-  target: RouteTarget
-}
-
-export function RouterRouteUpdateParamsFromJSON(
-  json: any
-): RouterRouteUpdateParams {
-  return RouterRouteUpdateParamsFromJSONTyped(json, false)
-}
-
-export function RouterRouteUpdateParamsFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): RouterRouteUpdateParams {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    description: !exists(json, 'description') ? undefined : json['description'],
-    destination: RouteDestinationFromJSON(json['destination']),
-    name: !exists(json, 'name') ? undefined : json['name'],
-    target: RouteTargetFromJSON(json['target']),
-  }
-}
-
-export function RouterRouteUpdateParamsToJSON(
-  value?: RouterRouteUpdateParams | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    description: value.description,
-    destination: RouteDestinationToJSON(value.destination),
-    name: value.name,
-    target: RouteTargetToJSON(value.target),
-  }
-}
diff --git a/libs/api/__generated__/models/Saga.ts b/libs/api/__generated__/models/Saga.ts
deleted file mode 100644
index d4041fd3c7..0000000000
--- a/libs/api/__generated__/models/Saga.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import {
-  SagaState,
-  SagaStateFromJSON,
-  SagaStateFromJSONTyped,
-  SagaStateToJSON,
-} from './'
-
-/**
- *
- * @export
- * @interface Saga
- */
-export interface Saga {
-  /**
-   *
-   * @type {string}
-   * @memberof Saga
-   */
-  id: string
-  /**
-   *
-   * @type {SagaState}
-   * @memberof Saga
-   */
-  state: SagaState
-}
-
-export function SagaFromJSON(json: any): Saga {
-  return SagaFromJSONTyped(json, false)
-}
-
-export function SagaFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): Saga {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    id: json['id'],
-    state: SagaStateFromJSON(json['state']),
-  }
-}
-
-export function SagaToJSON(value?: Saga | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    id: value.id,
-    state: SagaStateToJSON(value.state),
-  }
-}
diff --git a/libs/api/__generated__/models/SagaErrorInfo.ts b/libs/api/__generated__/models/SagaErrorInfo.ts
deleted file mode 100644
index 615755417e..0000000000
--- a/libs/api/__generated__/models/SagaErrorInfo.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import {
-  SagaErrorInfoOneOf,
-  SagaErrorInfoOneOf1,
-  SagaErrorInfoOneOf2,
-  SagaErrorInfoOneOf3,
-  SagaErrorInfoOneOf4,
-  SagaErrorInfoOneOfFromJSONTyped,
-  SagaErrorInfoOneOfToJSON,
-  SagaErrorInfoOneOf1FromJSONTyped,
-  SagaErrorInfoOneOf1ToJSON,
-  SagaErrorInfoOneOf2FromJSONTyped,
-  SagaErrorInfoOneOf2ToJSON,
-  SagaErrorInfoOneOf3FromJSONTyped,
-  SagaErrorInfoOneOf3ToJSON,
-  SagaErrorInfoOneOf4FromJSONTyped,
-  SagaErrorInfoOneOf4ToJSON,
-} from './'
-
-/**
- * @type SagaErrorInfo
- *
- * @export
- */
-export type SagaErrorInfo =
-  | SagaErrorInfoOneOf
-  | SagaErrorInfoOneOf1
-  | SagaErrorInfoOneOf2
-  | SagaErrorInfoOneOf3
-  | SagaErrorInfoOneOf4
-
-export function SagaErrorInfoFromJSON(json: any): SagaErrorInfo {
-  return SagaErrorInfoFromJSONTyped(json, false)
-}
-
-export function SagaErrorInfoFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): SagaErrorInfo {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    ...SagaErrorInfoOneOfFromJSONTyped(json, true),
-    ...SagaErrorInfoOneOf1FromJSONTyped(json, true),
-    ...SagaErrorInfoOneOf2FromJSONTyped(json, true),
-    ...SagaErrorInfoOneOf3FromJSONTyped(json, true),
-    ...SagaErrorInfoOneOf4FromJSONTyped(json, true),
-  }
-}
-
-export function SagaErrorInfoToJSON(value?: SagaErrorInfo | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    ...SagaErrorInfoOneOfToJSON(value as any),
-    ...SagaErrorInfoOneOf1ToJSON(value as any),
-    ...SagaErrorInfoOneOf2ToJSON(value as any),
-    ...SagaErrorInfoOneOf3ToJSON(value as any),
-    ...SagaErrorInfoOneOf4ToJSON(value as any),
-  }
-}
diff --git a/libs/api/__generated__/models/SagaErrorInfoOneOf.ts b/libs/api/__generated__/models/SagaErrorInfoOneOf.ts
deleted file mode 100644
index 75c533850f..0000000000
--- a/libs/api/__generated__/models/SagaErrorInfoOneOf.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- *
- * @export
- * @interface SagaErrorInfoOneOf
- */
-export interface SagaErrorInfoOneOf {
-  /**
-   *
-   * @type {string}
-   * @memberof SagaErrorInfoOneOf
-   */
-  error: 'actionFailed'
-  /**
-   *
-   * @type {any}
-   * @memberof SagaErrorInfoOneOf
-   */
-  sourceError: any | null
-}
-
-export function SagaErrorInfoOneOfFromJSON(json: any): SagaErrorInfoOneOf {
-  return SagaErrorInfoOneOfFromJSONTyped(json, false)
-}
-
-export function SagaErrorInfoOneOfFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): SagaErrorInfoOneOf {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    error: json['error'],
-    sourceError: json['source_error'],
-  }
-}
-
-export function SagaErrorInfoOneOfToJSON(
-  value?: SagaErrorInfoOneOf | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    error: value.error,
-    source_error: value.sourceError,
-  }
-}
diff --git a/libs/api/__generated__/models/SagaErrorInfoOneOf1.ts b/libs/api/__generated__/models/SagaErrorInfoOneOf1.ts
deleted file mode 100644
index 4d3baa7c4b..0000000000
--- a/libs/api/__generated__/models/SagaErrorInfoOneOf1.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- *
- * @export
- * @interface SagaErrorInfoOneOf1
- */
-export interface SagaErrorInfoOneOf1 {
-  /**
-   *
-   * @type {string}
-   * @memberof SagaErrorInfoOneOf1
-   */
-  error: 'deserializeFailed'
-  /**
-   *
-   * @type {string}
-   * @memberof SagaErrorInfoOneOf1
-   */
-  message: string
-}
-
-export function SagaErrorInfoOneOf1FromJSON(json: any): SagaErrorInfoOneOf1 {
-  return SagaErrorInfoOneOf1FromJSONTyped(json, false)
-}
-
-export function SagaErrorInfoOneOf1FromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): SagaErrorInfoOneOf1 {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    error: json['error'],
-    message: json['message'],
-  }
-}
-
-export function SagaErrorInfoOneOf1ToJSON(
-  value?: SagaErrorInfoOneOf1 | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    error: value.error,
-    message: value.message,
-  }
-}
diff --git a/libs/api/__generated__/models/SagaErrorInfoOneOf2.ts b/libs/api/__generated__/models/SagaErrorInfoOneOf2.ts
deleted file mode 100644
index 1d39eff675..0000000000
--- a/libs/api/__generated__/models/SagaErrorInfoOneOf2.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- *
- * @export
- * @interface SagaErrorInfoOneOf2
- */
-export interface SagaErrorInfoOneOf2 {
-  /**
-   *
-   * @type {string}
-   * @memberof SagaErrorInfoOneOf2
-   */
-  error: 'injectedError'
-}
-
-export function SagaErrorInfoOneOf2FromJSON(json: any): SagaErrorInfoOneOf2 {
-  return SagaErrorInfoOneOf2FromJSONTyped(json, false)
-}
-
-export function SagaErrorInfoOneOf2FromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): SagaErrorInfoOneOf2 {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    error: json['error'],
-  }
-}
-
-export function SagaErrorInfoOneOf2ToJSON(
-  value?: SagaErrorInfoOneOf2 | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    error: value.error,
-  }
-}
diff --git a/libs/api/__generated__/models/SagaErrorInfoOneOf3.ts b/libs/api/__generated__/models/SagaErrorInfoOneOf3.ts
deleted file mode 100644
index db880dfa8a..0000000000
--- a/libs/api/__generated__/models/SagaErrorInfoOneOf3.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- *
- * @export
- * @interface SagaErrorInfoOneOf3
- */
-export interface SagaErrorInfoOneOf3 {
-  /**
-   *
-   * @type {string}
-   * @memberof SagaErrorInfoOneOf3
-   */
-  error: 'serializeFailed'
-  /**
-   *
-   * @type {string}
-   * @memberof SagaErrorInfoOneOf3
-   */
-  message: string
-}
-
-export function SagaErrorInfoOneOf3FromJSON(json: any): SagaErrorInfoOneOf3 {
-  return SagaErrorInfoOneOf3FromJSONTyped(json, false)
-}
-
-export function SagaErrorInfoOneOf3FromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): SagaErrorInfoOneOf3 {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    error: json['error'],
-    message: json['message'],
-  }
-}
-
-export function SagaErrorInfoOneOf3ToJSON(
-  value?: SagaErrorInfoOneOf3 | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    error: value.error,
-    message: value.message,
-  }
-}
diff --git a/libs/api/__generated__/models/SagaErrorInfoOneOf4.ts b/libs/api/__generated__/models/SagaErrorInfoOneOf4.ts
deleted file mode 100644
index 34ef39f97d..0000000000
--- a/libs/api/__generated__/models/SagaErrorInfoOneOf4.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- *
- * @export
- * @interface SagaErrorInfoOneOf4
- */
-export interface SagaErrorInfoOneOf4 {
-  /**
-   *
-   * @type {string}
-   * @memberof SagaErrorInfoOneOf4
-   */
-  error: 'subsagaCreateFailed'
-  /**
-   *
-   * @type {string}
-   * @memberof SagaErrorInfoOneOf4
-   */
-  message: string
-}
-
-export function SagaErrorInfoOneOf4FromJSON(json: any): SagaErrorInfoOneOf4 {
-  return SagaErrorInfoOneOf4FromJSONTyped(json, false)
-}
-
-export function SagaErrorInfoOneOf4FromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): SagaErrorInfoOneOf4 {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    error: json['error'],
-    message: json['message'],
-  }
-}
-
-export function SagaErrorInfoOneOf4ToJSON(
-  value?: SagaErrorInfoOneOf4 | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    error: value.error,
-    message: value.message,
-  }
-}
diff --git a/libs/api/__generated__/models/SagaResultsPage.ts b/libs/api/__generated__/models/SagaResultsPage.ts
deleted file mode 100644
index 97b4297d71..0000000000
--- a/libs/api/__generated__/models/SagaResultsPage.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import { Saga, SagaFromJSON, SagaFromJSONTyped, SagaToJSON } from './'
-
-/**
- * A single page of results
- * @export
- * @interface SagaResultsPage
- */
-export interface SagaResultsPage {
-  /**
-   * list of items on this page of results
-   * @type {Array<Saga>}
-   * @memberof SagaResultsPage
-   */
-  items: Array<Saga>
-  /**
-   * token used to fetch the next page of results (if any)
-   * @type {string}
-   * @memberof SagaResultsPage
-   */
-  nextPage?: string | null
-}
-
-export function SagaResultsPageFromJSON(json: any): SagaResultsPage {
-  return SagaResultsPageFromJSONTyped(json, false)
-}
-
-export function SagaResultsPageFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): SagaResultsPage {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    items: (json['items'] as Array<any>).map(SagaFromJSON),
-    nextPage: !exists(json, 'next_page') ? undefined : json['next_page'],
-  }
-}
-
-export function SagaResultsPageToJSON(value?: SagaResultsPage | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    items: (value.items as Array<any>).map(SagaToJSON),
-    next_page: value.nextPage,
-  }
-}
diff --git a/libs/api/__generated__/models/SagaState.ts b/libs/api/__generated__/models/SagaState.ts
deleted file mode 100644
index db11bdf9d6..0000000000
--- a/libs/api/__generated__/models/SagaState.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import {
-  SagaStateOneOf,
-  SagaStateOneOf1,
-  SagaStateOneOf2,
-  SagaStateOneOfFromJSONTyped,
-  SagaStateOneOfToJSON,
-  SagaStateOneOf1FromJSONTyped,
-  SagaStateOneOf1ToJSON,
-  SagaStateOneOf2FromJSONTyped,
-  SagaStateOneOf2ToJSON,
-} from './'
-
-/**
- * @type SagaState
- *
- * @export
- */
-export type SagaState = SagaStateOneOf | SagaStateOneOf1 | SagaStateOneOf2
-
-export function SagaStateFromJSON(json: any): SagaState {
-  return SagaStateFromJSONTyped(json, false)
-}
-
-export function SagaStateFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): SagaState {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    ...SagaStateOneOfFromJSONTyped(json, true),
-    ...SagaStateOneOf1FromJSONTyped(json, true),
-    ...SagaStateOneOf2FromJSONTyped(json, true),
-  }
-}
-
-export function SagaStateToJSON(value?: SagaState | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    ...SagaStateOneOfToJSON(value as any),
-    ...SagaStateOneOf1ToJSON(value as any),
-    ...SagaStateOneOf2ToJSON(value as any),
-  }
-}
diff --git a/libs/api/__generated__/models/SagaStateOneOf.ts b/libs/api/__generated__/models/SagaStateOneOf.ts
deleted file mode 100644
index 10f472d6c3..0000000000
--- a/libs/api/__generated__/models/SagaStateOneOf.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- *
- * @export
- * @interface SagaStateOneOf
- */
-export interface SagaStateOneOf {
-  /**
-   *
-   * @type {string}
-   * @memberof SagaStateOneOf
-   */
-  state: 'running'
-}
-
-export function SagaStateOneOfFromJSON(json: any): SagaStateOneOf {
-  return SagaStateOneOfFromJSONTyped(json, false)
-}
-
-export function SagaStateOneOfFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): SagaStateOneOf {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    state: json['state'],
-  }
-}
-
-export function SagaStateOneOfToJSON(value?: SagaStateOneOf | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    state: value.state,
-  }
-}
diff --git a/libs/api/__generated__/models/SagaStateOneOf1.ts b/libs/api/__generated__/models/SagaStateOneOf1.ts
deleted file mode 100644
index 5671c26d5f..0000000000
--- a/libs/api/__generated__/models/SagaStateOneOf1.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- *
- * @export
- * @interface SagaStateOneOf1
- */
-export interface SagaStateOneOf1 {
-  /**
-   *
-   * @type {string}
-   * @memberof SagaStateOneOf1
-   */
-  state: 'succeeded'
-}
-
-export function SagaStateOneOf1FromJSON(json: any): SagaStateOneOf1 {
-  return SagaStateOneOf1FromJSONTyped(json, false)
-}
-
-export function SagaStateOneOf1FromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): SagaStateOneOf1 {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    state: json['state'],
-  }
-}
-
-export function SagaStateOneOf1ToJSON(value?: SagaStateOneOf1 | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    state: value.state,
-  }
-}
diff --git a/libs/api/__generated__/models/SagaStateOneOf2.ts b/libs/api/__generated__/models/SagaStateOneOf2.ts
deleted file mode 100644
index b877a586f7..0000000000
--- a/libs/api/__generated__/models/SagaStateOneOf2.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import {
-  SagaErrorInfo,
-  SagaErrorInfoFromJSON,
-  SagaErrorInfoFromJSONTyped,
-  SagaErrorInfoToJSON,
-} from './'
-
-/**
- *
- * @export
- * @interface SagaStateOneOf2
- */
-export interface SagaStateOneOf2 {
-  /**
-   *
-   * @type {SagaErrorInfo}
-   * @memberof SagaStateOneOf2
-   */
-  errorInfo: SagaErrorInfo
-  /**
-   *
-   * @type {string}
-   * @memberof SagaStateOneOf2
-   */
-  errorNodeName: string
-  /**
-   *
-   * @type {string}
-   * @memberof SagaStateOneOf2
-   */
-  state: 'failed'
-}
-
-export function SagaStateOneOf2FromJSON(json: any): SagaStateOneOf2 {
-  return SagaStateOneOf2FromJSONTyped(json, false)
-}
-
-export function SagaStateOneOf2FromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): SagaStateOneOf2 {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    errorInfo: SagaErrorInfoFromJSON(json['error_info']),
-    errorNodeName: json['error_node_name'],
-    state: json['state'],
-  }
-}
-
-export function SagaStateOneOf2ToJSON(value?: SagaStateOneOf2 | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    error_info: SagaErrorInfoToJSON(value.errorInfo),
-    error_node_name: value.errorNodeName,
-    state: value.state,
-  }
-}
diff --git a/libs/api/__generated__/models/Sled.ts b/libs/api/__generated__/models/Sled.ts
deleted file mode 100644
index 70898c4ebf..0000000000
--- a/libs/api/__generated__/models/Sled.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Client view of an [`Sled`]
- * @export
- * @interface Sled
- */
-export interface Sled {
-  /**
-   * human-readable free-form text about a resource
-   * @type {string}
-   * @memberof Sled
-   */
-  description: string
-  /**
-   * unique, immutable, system-controlled identifier for each resource
-   * @type {string}
-   * @memberof Sled
-   */
-  id: string
-  /**
-   * unique, mutable, user-controlled identifier for each resource
-   * @type {string}
-   * @memberof Sled
-   */
-  name: string
-  /**
-   *
-   * @type {string}
-   * @memberof Sled
-   */
-  serviceAddress: string
-  /**
-   * timestamp when this resource was created
-   * @type {Date}
-   * @memberof Sled
-   */
-  timeCreated: Date
-  /**
-   * timestamp when this resource was last modified
-   * @type {Date}
-   * @memberof Sled
-   */
-  timeModified: Date
-}
-
-export function SledFromJSON(json: any): Sled {
-  return SledFromJSONTyped(json, false)
-}
-
-export function SledFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): Sled {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    description: json['description'],
-    id: json['id'],
-    name: json['name'],
-    serviceAddress: json['serviceAddress'],
-    timeCreated: new Date(json['timeCreated']),
-    timeModified: new Date(json['timeModified']),
-  }
-}
-
-export function SledToJSON(value?: Sled | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    description: value.description,
-    id: value.id,
-    name: value.name,
-    serviceAddress: value.serviceAddress,
-    timeCreated: value.timeCreated.toISOString(),
-    timeModified: value.timeModified.toISOString(),
-  }
-}
diff --git a/libs/api/__generated__/models/SledResultsPage.ts b/libs/api/__generated__/models/SledResultsPage.ts
deleted file mode 100644
index e434bbba11..0000000000
--- a/libs/api/__generated__/models/SledResultsPage.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import { Sled, SledFromJSON, SledFromJSONTyped, SledToJSON } from './'
-
-/**
- * A single page of results
- * @export
- * @interface SledResultsPage
- */
-export interface SledResultsPage {
-  /**
-   * list of items on this page of results
-   * @type {Array<Sled>}
-   * @memberof SledResultsPage
-   */
-  items: Array<Sled>
-  /**
-   * token used to fetch the next page of results (if any)
-   * @type {string}
-   * @memberof SledResultsPage
-   */
-  nextPage?: string | null
-}
-
-export function SledResultsPageFromJSON(json: any): SledResultsPage {
-  return SledResultsPageFromJSONTyped(json, false)
-}
-
-export function SledResultsPageFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): SledResultsPage {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    items: (json['items'] as Array<any>).map(SledFromJSON),
-    nextPage: !exists(json, 'next_page') ? undefined : json['next_page'],
-  }
-}
-
-export function SledResultsPageToJSON(value?: SledResultsPage | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    items: (value.items as Array<any>).map(SledToJSON),
-    next_page: value.nextPage,
-  }
-}
diff --git a/libs/api/__generated__/models/Vpc.ts b/libs/api/__generated__/models/Vpc.ts
deleted file mode 100644
index da2ed66685..0000000000
--- a/libs/api/__generated__/models/Vpc.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Identity-related metadata that's included in nearly all public API objects
- * @export
- * @interface Vpc
- */
-export interface Vpc {
-  /**
-   * human-readable free-form text about a resource
-   * @type {string}
-   * @memberof Vpc
-   */
-  description: string
-  /**
-   * The name used for the VPC in DNS.
-   * @type {string}
-   * @memberof Vpc
-   */
-  dnsName: string
-  /**
-   * unique, immutable, system-controlled identifier for each resource
-   * @type {string}
-   * @memberof Vpc
-   */
-  id: string
-  /**
-   * unique, mutable, user-controlled identifier for each resource
-   * @type {string}
-   * @memberof Vpc
-   */
-  name: string
-  /**
-   * id for the project containing this VPC
-   * @type {string}
-   * @memberof Vpc
-   */
-  projectId: string
-  /**
-   * id for the system router where subnet default routes are registered
-   * @type {string}
-   * @memberof Vpc
-   */
-  systemRouterId: string
-  /**
-   * timestamp when this resource was created
-   * @type {Date}
-   * @memberof Vpc
-   */
-  timeCreated: Date
-  /**
-   * timestamp when this resource was last modified
-   * @type {Date}
-   * @memberof Vpc
-   */
-  timeModified: Date
-}
-
-export function VpcFromJSON(json: any): Vpc {
-  return VpcFromJSONTyped(json, false)
-}
-
-export function VpcFromJSONTyped(json: any, ignoreDiscriminator: boolean): Vpc {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    description: json['description'],
-    dnsName: json['dnsName'],
-    id: json['id'],
-    name: json['name'],
-    projectId: json['projectId'],
-    systemRouterId: json['systemRouterId'],
-    timeCreated: new Date(json['timeCreated']),
-    timeModified: new Date(json['timeModified']),
-  }
-}
-
-export function VpcToJSON(value?: Vpc | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    description: value.description,
-    dnsName: value.dnsName,
-    id: value.id,
-    name: value.name,
-    projectId: value.projectId,
-    systemRouterId: value.systemRouterId,
-    timeCreated: value.timeCreated.toISOString(),
-    timeModified: value.timeModified.toISOString(),
-  }
-}
diff --git a/libs/api/__generated__/models/VpcCreateParams.ts b/libs/api/__generated__/models/VpcCreateParams.ts
deleted file mode 100644
index 52abc8d33c..0000000000
--- a/libs/api/__generated__/models/VpcCreateParams.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Create-time parameters for a [`Vpc`]
- * @export
- * @interface VpcCreateParams
- */
-export interface VpcCreateParams {
-  /**
-   *
-   * @type {string}
-   * @memberof VpcCreateParams
-   */
-  description: string
-  /**
-   * Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'.
-   * @type {string}
-   * @memberof VpcCreateParams
-   */
-  dnsName: string
-  /**
-   * Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'.
-   * @type {string}
-   * @memberof VpcCreateParams
-   */
-  name: string
-}
-
-export function VpcCreateParamsFromJSON(json: any): VpcCreateParams {
-  return VpcCreateParamsFromJSONTyped(json, false)
-}
-
-export function VpcCreateParamsFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): VpcCreateParams {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    description: json['description'],
-    dnsName: json['dnsName'],
-    name: json['name'],
-  }
-}
-
-export function VpcCreateParamsToJSON(value?: VpcCreateParams | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    description: value.description,
-    dnsName: value.dnsName,
-    name: value.name,
-  }
-}
diff --git a/libs/api/__generated__/models/VpcFirewallRule.ts b/libs/api/__generated__/models/VpcFirewallRule.ts
deleted file mode 100644
index 992ca3cfac..0000000000
--- a/libs/api/__generated__/models/VpcFirewallRule.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import {
-  IdentityMetadata,
-  IdentityMetadataFromJSON,
-  IdentityMetadataFromJSONTyped,
-  IdentityMetadataToJSON,
-  VpcFirewallRuleAction,
-  VpcFirewallRuleActionFromJSON,
-  VpcFirewallRuleActionFromJSONTyped,
-  VpcFirewallRuleActionToJSON,
-  VpcFirewallRuleDirection,
-  VpcFirewallRuleDirectionFromJSON,
-  VpcFirewallRuleDirectionFromJSONTyped,
-  VpcFirewallRuleDirectionToJSON,
-  VpcFirewallRuleFilter,
-  VpcFirewallRuleFilterFromJSON,
-  VpcFirewallRuleFilterFromJSONTyped,
-  VpcFirewallRuleFilterToJSON,
-  VpcFirewallRuleStatus,
-  VpcFirewallRuleStatusFromJSON,
-  VpcFirewallRuleStatusFromJSONTyped,
-  VpcFirewallRuleStatusToJSON,
-  VpcFirewallRuleTarget,
-  VpcFirewallRuleTargetFromJSON,
-  VpcFirewallRuleTargetFromJSONTyped,
-  VpcFirewallRuleTargetToJSON,
-} from './'
-
-/**
- * A single rule in a VPC firewall
- * @export
- * @interface VpcFirewallRule
- */
-export interface VpcFirewallRule {
-  /**
-   * whether traffic matching the rule should be allowed or dropped
-   * @type {VpcFirewallRuleAction}
-   * @memberof VpcFirewallRule
-   */
-  action: VpcFirewallRuleAction
-  /**
-   * whether this rule is for incoming or outgoing traffic
-   * @type {VpcFirewallRuleDirection}
-   * @memberof VpcFirewallRule
-   */
-  direction: VpcFirewallRuleDirection
-  /**
-   * reductions on the scope of the rule
-   * @type {VpcFirewallRuleFilter}
-   * @memberof VpcFirewallRule
-   */
-  filters: VpcFirewallRuleFilter
-  /**
-   * common identifying metadata
-   * @type {IdentityMetadata}
-   * @memberof VpcFirewallRule
-   */
-  identity: IdentityMetadata
-  /**
-   * the relative priority of this rule
-   * @type {number}
-   * @memberof VpcFirewallRule
-   */
-  priority: number
-  /**
-   * whether this rule is in effect
-   * @type {VpcFirewallRuleStatus}
-   * @memberof VpcFirewallRule
-   */
-  status: VpcFirewallRuleStatus
-  /**
-   * list of sets of instances that the rule applies to
-   * @type {Array<VpcFirewallRuleTarget>}
-   * @memberof VpcFirewallRule
-   */
-  targets: Array<VpcFirewallRuleTarget>
-}
-
-export function VpcFirewallRuleFromJSON(json: any): VpcFirewallRule {
-  return VpcFirewallRuleFromJSONTyped(json, false)
-}
-
-export function VpcFirewallRuleFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): VpcFirewallRule {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    action: VpcFirewallRuleActionFromJSON(json['action']),
-    direction: VpcFirewallRuleDirectionFromJSON(json['direction']),
-    filters: VpcFirewallRuleFilterFromJSON(json['filters']),
-    identity: IdentityMetadataFromJSON(json['identity']),
-    priority: json['priority'],
-    status: VpcFirewallRuleStatusFromJSON(json['status']),
-    targets: (json['targets'] as Array<any>).map(VpcFirewallRuleTargetFromJSON),
-  }
-}
-
-export function VpcFirewallRuleToJSON(value?: VpcFirewallRule | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    action: VpcFirewallRuleActionToJSON(value.action),
-    direction: VpcFirewallRuleDirectionToJSON(value.direction),
-    filters: VpcFirewallRuleFilterToJSON(value.filters),
-    identity: IdentityMetadataToJSON(value.identity),
-    priority: value.priority,
-    status: VpcFirewallRuleStatusToJSON(value.status),
-    targets: (value.targets as Array<any>).map(VpcFirewallRuleTargetToJSON),
-  }
-}
diff --git a/libs/api/__generated__/models/VpcFirewallRuleAction.ts b/libs/api/__generated__/models/VpcFirewallRuleAction.ts
deleted file mode 100644
index d53244676e..0000000000
--- a/libs/api/__generated__/models/VpcFirewallRuleAction.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-/**
- *
- * @export
- * @enum {string}
- */
-export enum VpcFirewallRuleAction {
-  Allow = 'allow',
-  Deny = 'deny',
-}
-
-export function VpcFirewallRuleActionFromJSON(
-  json: any
-): VpcFirewallRuleAction {
-  return VpcFirewallRuleActionFromJSONTyped(json, false)
-}
-
-export function VpcFirewallRuleActionFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): VpcFirewallRuleAction {
-  return json as VpcFirewallRuleAction
-}
-
-export function VpcFirewallRuleActionToJSON(
-  value?: VpcFirewallRuleAction | null
-): any {
-  return value as any
-}
diff --git a/libs/api/__generated__/models/VpcFirewallRuleDirection.ts b/libs/api/__generated__/models/VpcFirewallRuleDirection.ts
deleted file mode 100644
index 1a61b2d6c1..0000000000
--- a/libs/api/__generated__/models/VpcFirewallRuleDirection.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-/**
- *
- * @export
- * @enum {string}
- */
-export enum VpcFirewallRuleDirection {
-  Inbound = 'inbound',
-  Outbound = 'outbound',
-}
-
-export function VpcFirewallRuleDirectionFromJSON(
-  json: any
-): VpcFirewallRuleDirection {
-  return VpcFirewallRuleDirectionFromJSONTyped(json, false)
-}
-
-export function VpcFirewallRuleDirectionFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): VpcFirewallRuleDirection {
-  return json as VpcFirewallRuleDirection
-}
-
-export function VpcFirewallRuleDirectionToJSON(
-  value?: VpcFirewallRuleDirection | null
-): any {
-  return value as any
-}
diff --git a/libs/api/__generated__/models/VpcFirewallRuleFilter.ts b/libs/api/__generated__/models/VpcFirewallRuleFilter.ts
deleted file mode 100644
index 2361f511ff..0000000000
--- a/libs/api/__generated__/models/VpcFirewallRuleFilter.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import {
-  VpcFirewallRuleHostFilter,
-  VpcFirewallRuleHostFilterFromJSON,
-  VpcFirewallRuleHostFilterFromJSONTyped,
-  VpcFirewallRuleHostFilterToJSON,
-  VpcFirewallRuleProtocol,
-  VpcFirewallRuleProtocolFromJSON,
-  VpcFirewallRuleProtocolFromJSONTyped,
-  VpcFirewallRuleProtocolToJSON,
-} from './'
-
-/**
- * Filter for a firewall rule. A given packet must match every field that is present for the rule to apply to it. A packet matches a field if any entry in that field matches the packet.
- * @export
- * @interface VpcFirewallRuleFilter
- */
-export interface VpcFirewallRuleFilter {
-  /**
-   * If present, the sources (if incoming) or destinations (if outgoing) this rule applies to.
-   * @type {Array<VpcFirewallRuleHostFilter>}
-   * @memberof VpcFirewallRuleFilter
-   */
-  hosts?: Array<VpcFirewallRuleHostFilter> | null
-  /**
-   * If present, the destination ports this rule applies to.
-   * @type {Array<string>}
-   * @memberof VpcFirewallRuleFilter
-   */
-  ports?: Array<string> | null
-  /**
-   * If present, the networking protocols this rule applies to.
-   * @type {Array<VpcFirewallRuleProtocol>}
-   * @memberof VpcFirewallRuleFilter
-   */
-  protocols?: Array<VpcFirewallRuleProtocol> | null
-}
-
-export function VpcFirewallRuleFilterFromJSON(
-  json: any
-): VpcFirewallRuleFilter {
-  return VpcFirewallRuleFilterFromJSONTyped(json, false)
-}
-
-export function VpcFirewallRuleFilterFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): VpcFirewallRuleFilter {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    hosts: !exists(json, 'hosts')
-      ? undefined
-      : json['hosts'] === null
-      ? null
-      : (json['hosts'] as Array<any>).map(VpcFirewallRuleHostFilterFromJSON),
-    ports: !exists(json, 'ports') ? undefined : json['ports'],
-    protocols: !exists(json, 'protocols')
-      ? undefined
-      : json['protocols'] === null
-      ? null
-      : (json['protocols'] as Array<any>).map(VpcFirewallRuleProtocolFromJSON),
-  }
-}
-
-export function VpcFirewallRuleFilterToJSON(
-  value?: VpcFirewallRuleFilter | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    hosts:
-      value.hosts === undefined
-        ? undefined
-        : value.hosts === null
-        ? null
-        : (value.hosts as Array<any>).map(VpcFirewallRuleHostFilterToJSON),
-    ports: value.ports,
-    protocols:
-      value.protocols === undefined
-        ? undefined
-        : value.protocols === null
-        ? null
-        : (value.protocols as Array<any>).map(VpcFirewallRuleProtocolToJSON),
-  }
-}
diff --git a/libs/api/__generated__/models/VpcFirewallRuleHostFilter.ts b/libs/api/__generated__/models/VpcFirewallRuleHostFilter.ts
deleted file mode 100644
index ddaa7f00b4..0000000000
--- a/libs/api/__generated__/models/VpcFirewallRuleHostFilter.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import {
-  RouteDestinationOneOf,
-  RouteDestinationOneOf1,
-  RouteDestinationOneOf2,
-  RouteTargetOneOf,
-  RouteTargetOneOf1,
-  RouteDestinationOneOfFromJSONTyped,
-  RouteDestinationOneOfToJSON,
-  RouteDestinationOneOf1FromJSONTyped,
-  RouteDestinationOneOf1ToJSON,
-  RouteDestinationOneOf2FromJSONTyped,
-  RouteDestinationOneOf2ToJSON,
-  RouteTargetOneOfFromJSONTyped,
-  RouteTargetOneOfToJSON,
-  RouteTargetOneOf1FromJSONTyped,
-  RouteTargetOneOf1ToJSON,
-} from './'
-
-/**
- * @type VpcFirewallRuleHostFilter
- * A subset of [`NetworkTarget`], `VpcFirewallRuleHostFilter` specifies all possible targets that a route can forward to.
- * @export
- */
-export type VpcFirewallRuleHostFilter =
-  | RouteDestinationOneOf
-  | RouteDestinationOneOf1
-  | RouteDestinationOneOf2
-  | RouteTargetOneOf
-  | RouteTargetOneOf1
-
-export function VpcFirewallRuleHostFilterFromJSON(
-  json: any
-): VpcFirewallRuleHostFilter {
-  return VpcFirewallRuleHostFilterFromJSONTyped(json, false)
-}
-
-export function VpcFirewallRuleHostFilterFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): VpcFirewallRuleHostFilter {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    ...RouteDestinationOneOfFromJSONTyped(json, true),
-    ...RouteDestinationOneOf1FromJSONTyped(json, true),
-    ...RouteDestinationOneOf2FromJSONTyped(json, true),
-    ...RouteTargetOneOfFromJSONTyped(json, true),
-    ...RouteTargetOneOf1FromJSONTyped(json, true),
-  }
-}
-
-export function VpcFirewallRuleHostFilterToJSON(
-  value?: VpcFirewallRuleHostFilter | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    ...RouteDestinationOneOfToJSON(value as any),
-    ...RouteDestinationOneOf1ToJSON(value as any),
-    ...RouteDestinationOneOf2ToJSON(value as any),
-    ...RouteTargetOneOfToJSON(value as any),
-    ...RouteTargetOneOf1ToJSON(value as any),
-  }
-}
diff --git a/libs/api/__generated__/models/VpcFirewallRuleProtocol.ts b/libs/api/__generated__/models/VpcFirewallRuleProtocol.ts
deleted file mode 100644
index 02770e8e0b..0000000000
--- a/libs/api/__generated__/models/VpcFirewallRuleProtocol.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-/**
- * The protocols that may be specified in a firewall rule's filter
- * @export
- * @enum {string}
- */
-export enum VpcFirewallRuleProtocol {
-  Tcp = 'TCP',
-  Udp = 'UDP',
-  Icmp = 'ICMP',
-}
-
-export function VpcFirewallRuleProtocolFromJSON(
-  json: any
-): VpcFirewallRuleProtocol {
-  return VpcFirewallRuleProtocolFromJSONTyped(json, false)
-}
-
-export function VpcFirewallRuleProtocolFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): VpcFirewallRuleProtocol {
-  return json as VpcFirewallRuleProtocol
-}
-
-export function VpcFirewallRuleProtocolToJSON(
-  value?: VpcFirewallRuleProtocol | null
-): any {
-  return value as any
-}
diff --git a/libs/api/__generated__/models/VpcFirewallRuleResultsPage.ts b/libs/api/__generated__/models/VpcFirewallRuleResultsPage.ts
deleted file mode 100644
index 013dc2ef3d..0000000000
--- a/libs/api/__generated__/models/VpcFirewallRuleResultsPage.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import {
-  VpcFirewallRule,
-  VpcFirewallRuleFromJSON,
-  VpcFirewallRuleFromJSONTyped,
-  VpcFirewallRuleToJSON,
-} from './'
-
-/**
- * A single page of results
- * @export
- * @interface VpcFirewallRuleResultsPage
- */
-export interface VpcFirewallRuleResultsPage {
-  /**
-   * list of items on this page of results
-   * @type {Array<VpcFirewallRule>}
-   * @memberof VpcFirewallRuleResultsPage
-   */
-  items: Array<VpcFirewallRule>
-  /**
-   * token used to fetch the next page of results (if any)
-   * @type {string}
-   * @memberof VpcFirewallRuleResultsPage
-   */
-  nextPage?: string | null
-}
-
-export function VpcFirewallRuleResultsPageFromJSON(
-  json: any
-): VpcFirewallRuleResultsPage {
-  return VpcFirewallRuleResultsPageFromJSONTyped(json, false)
-}
-
-export function VpcFirewallRuleResultsPageFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): VpcFirewallRuleResultsPage {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    items: (json['items'] as Array<any>).map(VpcFirewallRuleFromJSON),
-    nextPage: !exists(json, 'next_page') ? undefined : json['next_page'],
-  }
-}
-
-export function VpcFirewallRuleResultsPageToJSON(
-  value?: VpcFirewallRuleResultsPage | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    items: (value.items as Array<any>).map(VpcFirewallRuleToJSON),
-    next_page: value.nextPage,
-  }
-}
diff --git a/libs/api/__generated__/models/VpcFirewallRuleStatus.ts b/libs/api/__generated__/models/VpcFirewallRuleStatus.ts
deleted file mode 100644
index c646a1bb92..0000000000
--- a/libs/api/__generated__/models/VpcFirewallRuleStatus.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-/**
- *
- * @export
- * @enum {string}
- */
-export enum VpcFirewallRuleStatus {
-  Disabled = 'disabled',
-  Enabled = 'enabled',
-}
-
-export function VpcFirewallRuleStatusFromJSON(
-  json: any
-): VpcFirewallRuleStatus {
-  return VpcFirewallRuleStatusFromJSONTyped(json, false)
-}
-
-export function VpcFirewallRuleStatusFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): VpcFirewallRuleStatus {
-  return json as VpcFirewallRuleStatus
-}
-
-export function VpcFirewallRuleStatusToJSON(
-  value?: VpcFirewallRuleStatus | null
-): any {
-  return value as any
-}
diff --git a/libs/api/__generated__/models/VpcFirewallRuleTarget.ts b/libs/api/__generated__/models/VpcFirewallRuleTarget.ts
deleted file mode 100644
index b588066f8b..0000000000
--- a/libs/api/__generated__/models/VpcFirewallRuleTarget.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import {
-  RouteDestinationOneOf1,
-  RouteDestinationOneOf2,
-  RouteTargetOneOf,
-  RouteDestinationOneOf1FromJSONTyped,
-  RouteDestinationOneOf1ToJSON,
-  RouteDestinationOneOf2FromJSONTyped,
-  RouteDestinationOneOf2ToJSON,
-  RouteTargetOneOfFromJSONTyped,
-  RouteTargetOneOfToJSON,
-} from './'
-
-/**
- * @type VpcFirewallRuleTarget
- * A subset of [`NetworkTarget`], `VpcFirewallRuleTarget` specifies all possible targets that a firewall rule can be attached to.
- * @export
- */
-export type VpcFirewallRuleTarget =
-  | RouteDestinationOneOf1
-  | RouteDestinationOneOf2
-  | RouteTargetOneOf
-
-export function VpcFirewallRuleTargetFromJSON(
-  json: any
-): VpcFirewallRuleTarget {
-  return VpcFirewallRuleTargetFromJSONTyped(json, false)
-}
-
-export function VpcFirewallRuleTargetFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): VpcFirewallRuleTarget {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    ...RouteDestinationOneOf1FromJSONTyped(json, true),
-    ...RouteDestinationOneOf2FromJSONTyped(json, true),
-    ...RouteTargetOneOfFromJSONTyped(json, true),
-  }
-}
-
-export function VpcFirewallRuleTargetToJSON(
-  value?: VpcFirewallRuleTarget | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    ...RouteDestinationOneOf1ToJSON(value as any),
-    ...RouteDestinationOneOf2ToJSON(value as any),
-    ...RouteTargetOneOfToJSON(value as any),
-  }
-}
diff --git a/libs/api/__generated__/models/VpcFirewallRuleUpdate.ts b/libs/api/__generated__/models/VpcFirewallRuleUpdate.ts
deleted file mode 100644
index c209b17c81..0000000000
--- a/libs/api/__generated__/models/VpcFirewallRuleUpdate.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import {
-  VpcFirewallRuleAction,
-  VpcFirewallRuleActionFromJSON,
-  VpcFirewallRuleActionFromJSONTyped,
-  VpcFirewallRuleActionToJSON,
-  VpcFirewallRuleDirection,
-  VpcFirewallRuleDirectionFromJSON,
-  VpcFirewallRuleDirectionFromJSONTyped,
-  VpcFirewallRuleDirectionToJSON,
-  VpcFirewallRuleFilter,
-  VpcFirewallRuleFilterFromJSON,
-  VpcFirewallRuleFilterFromJSONTyped,
-  VpcFirewallRuleFilterToJSON,
-  VpcFirewallRuleStatus,
-  VpcFirewallRuleStatusFromJSON,
-  VpcFirewallRuleStatusFromJSONTyped,
-  VpcFirewallRuleStatusToJSON,
-  VpcFirewallRuleTarget,
-  VpcFirewallRuleTargetFromJSON,
-  VpcFirewallRuleTargetFromJSONTyped,
-  VpcFirewallRuleTargetToJSON,
-} from './'
-
-/**
- * A single rule in a VPC firewall
- * @export
- * @interface VpcFirewallRuleUpdate
- */
-export interface VpcFirewallRuleUpdate {
-  /**
-   * whether traffic matching the rule should be allowed or dropped
-   * @type {VpcFirewallRuleAction}
-   * @memberof VpcFirewallRuleUpdate
-   */
-  action: VpcFirewallRuleAction
-  /**
-   * human-readable free-form text about a resource
-   * @type {string}
-   * @memberof VpcFirewallRuleUpdate
-   */
-  description: string
-  /**
-   * whether this rule is for incoming or outgoing traffic
-   * @type {VpcFirewallRuleDirection}
-   * @memberof VpcFirewallRuleUpdate
-   */
-  direction: VpcFirewallRuleDirection
-  /**
-   * reductions on the scope of the rule
-   * @type {VpcFirewallRuleFilter}
-   * @memberof VpcFirewallRuleUpdate
-   */
-  filters: VpcFirewallRuleFilter
-  /**
-   * the relative priority of this rule
-   * @type {number}
-   * @memberof VpcFirewallRuleUpdate
-   */
-  priority: number
-  /**
-   * whether this rule is in effect
-   * @type {VpcFirewallRuleStatus}
-   * @memberof VpcFirewallRuleUpdate
-   */
-  status: VpcFirewallRuleStatus
-  /**
-   * list of sets of instances that the rule applies to
-   * @type {Array<VpcFirewallRuleTarget>}
-   * @memberof VpcFirewallRuleUpdate
-   */
-  targets: Array<VpcFirewallRuleTarget>
-}
-
-export function VpcFirewallRuleUpdateFromJSON(
-  json: any
-): VpcFirewallRuleUpdate {
-  return VpcFirewallRuleUpdateFromJSONTyped(json, false)
-}
-
-export function VpcFirewallRuleUpdateFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): VpcFirewallRuleUpdate {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    action: VpcFirewallRuleActionFromJSON(json['action']),
-    description: json['description'],
-    direction: VpcFirewallRuleDirectionFromJSON(json['direction']),
-    filters: VpcFirewallRuleFilterFromJSON(json['filters']),
-    priority: json['priority'],
-    status: VpcFirewallRuleStatusFromJSON(json['status']),
-    targets: (json['targets'] as Array<any>).map(VpcFirewallRuleTargetFromJSON),
-  }
-}
-
-export function VpcFirewallRuleUpdateToJSON(
-  value?: VpcFirewallRuleUpdate | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    action: VpcFirewallRuleActionToJSON(value.action),
-    description: value.description,
-    direction: VpcFirewallRuleDirectionToJSON(value.direction),
-    filters: VpcFirewallRuleFilterToJSON(value.filters),
-    priority: value.priority,
-    status: VpcFirewallRuleStatusToJSON(value.status),
-    targets: (value.targets as Array<any>).map(VpcFirewallRuleTargetToJSON),
-  }
-}
diff --git a/libs/api/__generated__/models/VpcResultsPage.ts b/libs/api/__generated__/models/VpcResultsPage.ts
deleted file mode 100644
index 76a4c6e391..0000000000
--- a/libs/api/__generated__/models/VpcResultsPage.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import { Vpc, VpcFromJSON, VpcFromJSONTyped, VpcToJSON } from './'
-
-/**
- * A single page of results
- * @export
- * @interface VpcResultsPage
- */
-export interface VpcResultsPage {
-  /**
-   * list of items on this page of results
-   * @type {Array<Vpc>}
-   * @memberof VpcResultsPage
-   */
-  items: Array<Vpc>
-  /**
-   * token used to fetch the next page of results (if any)
-   * @type {string}
-   * @memberof VpcResultsPage
-   */
-  nextPage?: string | null
-}
-
-export function VpcResultsPageFromJSON(json: any): VpcResultsPage {
-  return VpcResultsPageFromJSONTyped(json, false)
-}
-
-export function VpcResultsPageFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): VpcResultsPage {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    items: (json['items'] as Array<any>).map(VpcFromJSON),
-    nextPage: !exists(json, 'next_page') ? undefined : json['next_page'],
-  }
-}
-
-export function VpcResultsPageToJSON(value?: VpcResultsPage | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    items: (value.items as Array<any>).map(VpcToJSON),
-    next_page: value.nextPage,
-  }
-}
diff --git a/libs/api/__generated__/models/VpcRouter.ts b/libs/api/__generated__/models/VpcRouter.ts
deleted file mode 100644
index 6dc474e662..0000000000
--- a/libs/api/__generated__/models/VpcRouter.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import {
-  IdentityMetadata,
-  IdentityMetadataFromJSON,
-  IdentityMetadataFromJSONTyped,
-  IdentityMetadataToJSON,
-  VpcRouterKind,
-  VpcRouterKindFromJSON,
-  VpcRouterKindFromJSONTyped,
-  VpcRouterKindToJSON,
-} from './'
-
-/**
- * A VPC router defines a series of rules that indicate where traffic should be sent depending on its destination.
- * @export
- * @interface VpcRouter
- */
-export interface VpcRouter {
-  /**
-   * common identifying metadata
-   * @type {IdentityMetadata}
-   * @memberof VpcRouter
-   */
-  identity: IdentityMetadata
-  /**
-   *
-   * @type {VpcRouterKind}
-   * @memberof VpcRouter
-   */
-  kind: VpcRouterKind
-  /**
-   * The VPC to which the router belongs.
-   * @type {string}
-   * @memberof VpcRouter
-   */
-  vpcId: string
-}
-
-export function VpcRouterFromJSON(json: any): VpcRouter {
-  return VpcRouterFromJSONTyped(json, false)
-}
-
-export function VpcRouterFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): VpcRouter {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    identity: IdentityMetadataFromJSON(json['identity']),
-    kind: VpcRouterKindFromJSON(json['kind']),
-    vpcId: json['vpc_id'],
-  }
-}
-
-export function VpcRouterToJSON(value?: VpcRouter | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    identity: IdentityMetadataToJSON(value.identity),
-    kind: VpcRouterKindToJSON(value.kind),
-    vpc_id: value.vpcId,
-  }
-}
diff --git a/libs/api/__generated__/models/VpcRouterCreateParams.ts b/libs/api/__generated__/models/VpcRouterCreateParams.ts
deleted file mode 100644
index e9228b3ca8..0000000000
--- a/libs/api/__generated__/models/VpcRouterCreateParams.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Create-time parameters for a [`VpcRouter`]
- * @export
- * @interface VpcRouterCreateParams
- */
-export interface VpcRouterCreateParams {
-  /**
-   *
-   * @type {string}
-   * @memberof VpcRouterCreateParams
-   */
-  description: string
-  /**
-   * Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'.
-   * @type {string}
-   * @memberof VpcRouterCreateParams
-   */
-  name: string
-}
-
-export function VpcRouterCreateParamsFromJSON(
-  json: any
-): VpcRouterCreateParams {
-  return VpcRouterCreateParamsFromJSONTyped(json, false)
-}
-
-export function VpcRouterCreateParamsFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): VpcRouterCreateParams {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    description: json['description'],
-    name: json['name'],
-  }
-}
-
-export function VpcRouterCreateParamsToJSON(
-  value?: VpcRouterCreateParams | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    description: value.description,
-    name: value.name,
-  }
-}
diff --git a/libs/api/__generated__/models/VpcRouterKind.ts b/libs/api/__generated__/models/VpcRouterKind.ts
deleted file mode 100644
index 7140a3ab6a..0000000000
--- a/libs/api/__generated__/models/VpcRouterKind.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-/**
- *
- * @export
- * @enum {string}
- */
-export enum VpcRouterKind {
-  System = 'system',
-  Custom = 'custom',
-}
-
-export function VpcRouterKindFromJSON(json: any): VpcRouterKind {
-  return VpcRouterKindFromJSONTyped(json, false)
-}
-
-export function VpcRouterKindFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): VpcRouterKind {
-  return json as VpcRouterKind
-}
-
-export function VpcRouterKindToJSON(value?: VpcRouterKind | null): any {
-  return value as any
-}
diff --git a/libs/api/__generated__/models/VpcRouterResultsPage.ts b/libs/api/__generated__/models/VpcRouterResultsPage.ts
deleted file mode 100644
index 723ead0097..0000000000
--- a/libs/api/__generated__/models/VpcRouterResultsPage.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import {
-  VpcRouter,
-  VpcRouterFromJSON,
-  VpcRouterFromJSONTyped,
-  VpcRouterToJSON,
-} from './'
-
-/**
- * A single page of results
- * @export
- * @interface VpcRouterResultsPage
- */
-export interface VpcRouterResultsPage {
-  /**
-   * list of items on this page of results
-   * @type {Array<VpcRouter>}
-   * @memberof VpcRouterResultsPage
-   */
-  items: Array<VpcRouter>
-  /**
-   * token used to fetch the next page of results (if any)
-   * @type {string}
-   * @memberof VpcRouterResultsPage
-   */
-  nextPage?: string | null
-}
-
-export function VpcRouterResultsPageFromJSON(json: any): VpcRouterResultsPage {
-  return VpcRouterResultsPageFromJSONTyped(json, false)
-}
-
-export function VpcRouterResultsPageFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): VpcRouterResultsPage {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    items: (json['items'] as Array<any>).map(VpcRouterFromJSON),
-    nextPage: !exists(json, 'next_page') ? undefined : json['next_page'],
-  }
-}
-
-export function VpcRouterResultsPageToJSON(
-  value?: VpcRouterResultsPage | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    items: (value.items as Array<any>).map(VpcRouterToJSON),
-    next_page: value.nextPage,
-  }
-}
diff --git a/libs/api/__generated__/models/VpcRouterUpdateParams.ts b/libs/api/__generated__/models/VpcRouterUpdateParams.ts
deleted file mode 100644
index 249d138a29..0000000000
--- a/libs/api/__generated__/models/VpcRouterUpdateParams.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Updateable properties of a [`VpcRouter`]
- * @export
- * @interface VpcRouterUpdateParams
- */
-export interface VpcRouterUpdateParams {
-  /**
-   *
-   * @type {string}
-   * @memberof VpcRouterUpdateParams
-   */
-  description?: string | null
-  /**
-   *
-   * @type {string}
-   * @memberof VpcRouterUpdateParams
-   */
-  name?: string | null
-}
-
-export function VpcRouterUpdateParamsFromJSON(
-  json: any
-): VpcRouterUpdateParams {
-  return VpcRouterUpdateParamsFromJSONTyped(json, false)
-}
-
-export function VpcRouterUpdateParamsFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): VpcRouterUpdateParams {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    description: !exists(json, 'description') ? undefined : json['description'],
-    name: !exists(json, 'name') ? undefined : json['name'],
-  }
-}
-
-export function VpcRouterUpdateParamsToJSON(
-  value?: VpcRouterUpdateParams | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    description: value.description,
-    name: value.name,
-  }
-}
diff --git a/libs/api/__generated__/models/VpcSubnet.ts b/libs/api/__generated__/models/VpcSubnet.ts
deleted file mode 100644
index 1b554819aa..0000000000
--- a/libs/api/__generated__/models/VpcSubnet.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import {
-  IdentityMetadata,
-  IdentityMetadataFromJSON,
-  IdentityMetadataFromJSONTyped,
-  IdentityMetadataToJSON,
-} from './'
-
-/**
- * A VPC subnet represents a logical grouping for instances that allows network traffic between them, within a IPv4 subnetwork or optionall an IPv6 subnetwork.
- * @export
- * @interface VpcSubnet
- */
-export interface VpcSubnet {
-  /**
-   * common identifying metadata
-   * @type {IdentityMetadata}
-   * @memberof VpcSubnet
-   */
-  identity: IdentityMetadata
-  /**
-   * The IPv4 subnet CIDR block.
-   * @type {string}
-   * @memberof VpcSubnet
-   */
-  ipv4Block?: string | null
-  /**
-   * The IPv6 subnet CIDR block.
-   * @type {string}
-   * @memberof VpcSubnet
-   */
-  ipv6Block?: string | null
-  /**
-   * The VPC to which the subnet belongs.
-   * @type {string}
-   * @memberof VpcSubnet
-   */
-  vpcId: string
-}
-
-export function VpcSubnetFromJSON(json: any): VpcSubnet {
-  return VpcSubnetFromJSONTyped(json, false)
-}
-
-export function VpcSubnetFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): VpcSubnet {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    identity: IdentityMetadataFromJSON(json['identity']),
-    ipv4Block: !exists(json, 'ipv4_block') ? undefined : json['ipv4_block'],
-    ipv6Block: !exists(json, 'ipv6_block') ? undefined : json['ipv6_block'],
-    vpcId: json['vpc_id'],
-  }
-}
-
-export function VpcSubnetToJSON(value?: VpcSubnet | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    identity: IdentityMetadataToJSON(value.identity),
-    ipv4_block: value.ipv4Block,
-    ipv6_block: value.ipv6Block,
-    vpc_id: value.vpcId,
-  }
-}
diff --git a/libs/api/__generated__/models/VpcSubnetCreateParams.ts b/libs/api/__generated__/models/VpcSubnetCreateParams.ts
deleted file mode 100644
index e525ca4d22..0000000000
--- a/libs/api/__generated__/models/VpcSubnetCreateParams.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Create-time parameters for a [`VpcSubnet`]
- * @export
- * @interface VpcSubnetCreateParams
- */
-export interface VpcSubnetCreateParams {
-  /**
-   *
-   * @type {string}
-   * @memberof VpcSubnetCreateParams
-   */
-  description: string
-  /**
-   *
-   * @type {string}
-   * @memberof VpcSubnetCreateParams
-   */
-  ipv4Block?: string | null
-  /**
-   *
-   * @type {string}
-   * @memberof VpcSubnetCreateParams
-   */
-  ipv6Block?: string | null
-  /**
-   * Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'.
-   * @type {string}
-   * @memberof VpcSubnetCreateParams
-   */
-  name: string
-}
-
-export function VpcSubnetCreateParamsFromJSON(
-  json: any
-): VpcSubnetCreateParams {
-  return VpcSubnetCreateParamsFromJSONTyped(json, false)
-}
-
-export function VpcSubnetCreateParamsFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): VpcSubnetCreateParams {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    description: json['description'],
-    ipv4Block: !exists(json, 'ipv4Block') ? undefined : json['ipv4Block'],
-    ipv6Block: !exists(json, 'ipv6Block') ? undefined : json['ipv6Block'],
-    name: json['name'],
-  }
-}
-
-export function VpcSubnetCreateParamsToJSON(
-  value?: VpcSubnetCreateParams | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    description: value.description,
-    ipv4Block: value.ipv4Block,
-    ipv6Block: value.ipv6Block,
-    name: value.name,
-  }
-}
diff --git a/libs/api/__generated__/models/VpcSubnetResultsPage.ts b/libs/api/__generated__/models/VpcSubnetResultsPage.ts
deleted file mode 100644
index 12440faddb..0000000000
--- a/libs/api/__generated__/models/VpcSubnetResultsPage.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-import {
-  VpcSubnet,
-  VpcSubnetFromJSON,
-  VpcSubnetFromJSONTyped,
-  VpcSubnetToJSON,
-} from './'
-
-/**
- * A single page of results
- * @export
- * @interface VpcSubnetResultsPage
- */
-export interface VpcSubnetResultsPage {
-  /**
-   * list of items on this page of results
-   * @type {Array<VpcSubnet>}
-   * @memberof VpcSubnetResultsPage
-   */
-  items: Array<VpcSubnet>
-  /**
-   * token used to fetch the next page of results (if any)
-   * @type {string}
-   * @memberof VpcSubnetResultsPage
-   */
-  nextPage?: string | null
-}
-
-export function VpcSubnetResultsPageFromJSON(json: any): VpcSubnetResultsPage {
-  return VpcSubnetResultsPageFromJSONTyped(json, false)
-}
-
-export function VpcSubnetResultsPageFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): VpcSubnetResultsPage {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    items: (json['items'] as Array<any>).map(VpcSubnetFromJSON),
-    nextPage: !exists(json, 'next_page') ? undefined : json['next_page'],
-  }
-}
-
-export function VpcSubnetResultsPageToJSON(
-  value?: VpcSubnetResultsPage | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    items: (value.items as Array<any>).map(VpcSubnetToJSON),
-    next_page: value.nextPage,
-  }
-}
diff --git a/libs/api/__generated__/models/VpcSubnetUpdateParams.ts b/libs/api/__generated__/models/VpcSubnetUpdateParams.ts
deleted file mode 100644
index d8534f427d..0000000000
--- a/libs/api/__generated__/models/VpcSubnetUpdateParams.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Updateable properties of a [`VpcSubnet`]
- * @export
- * @interface VpcSubnetUpdateParams
- */
-export interface VpcSubnetUpdateParams {
-  /**
-   *
-   * @type {string}
-   * @memberof VpcSubnetUpdateParams
-   */
-  description?: string | null
-  /**
-   *
-   * @type {string}
-   * @memberof VpcSubnetUpdateParams
-   */
-  ipv4Block?: string | null
-  /**
-   *
-   * @type {string}
-   * @memberof VpcSubnetUpdateParams
-   */
-  ipv6Block?: string | null
-  /**
-   *
-   * @type {string}
-   * @memberof VpcSubnetUpdateParams
-   */
-  name?: string | null
-}
-
-export function VpcSubnetUpdateParamsFromJSON(
-  json: any
-): VpcSubnetUpdateParams {
-  return VpcSubnetUpdateParamsFromJSONTyped(json, false)
-}
-
-export function VpcSubnetUpdateParamsFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): VpcSubnetUpdateParams {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    description: !exists(json, 'description') ? undefined : json['description'],
-    ipv4Block: !exists(json, 'ipv4Block') ? undefined : json['ipv4Block'],
-    ipv6Block: !exists(json, 'ipv6Block') ? undefined : json['ipv6Block'],
-    name: !exists(json, 'name') ? undefined : json['name'],
-  }
-}
-
-export function VpcSubnetUpdateParamsToJSON(
-  value?: VpcSubnetUpdateParams | null
-): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    description: value.description,
-    ipv4Block: value.ipv4Block,
-    ipv6Block: value.ipv6Block,
-    name: value.name,
-  }
-}
diff --git a/libs/api/__generated__/models/VpcUpdateParams.ts b/libs/api/__generated__/models/VpcUpdateParams.ts
deleted file mode 100644
index d915fe829f..0000000000
--- a/libs/api/__generated__/models/VpcUpdateParams.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime'
-/**
- * Updateable properties of a [`Vpc`]
- * @export
- * @interface VpcUpdateParams
- */
-export interface VpcUpdateParams {
-  /**
-   *
-   * @type {string}
-   * @memberof VpcUpdateParams
-   */
-  description?: string | null
-  /**
-   *
-   * @type {string}
-   * @memberof VpcUpdateParams
-   */
-  dnsName?: string | null
-  /**
-   *
-   * @type {string}
-   * @memberof VpcUpdateParams
-   */
-  name?: string | null
-}
-
-export function VpcUpdateParamsFromJSON(json: any): VpcUpdateParams {
-  return VpcUpdateParamsFromJSONTyped(json, false)
-}
-
-export function VpcUpdateParamsFromJSONTyped(
-  json: any,
-  ignoreDiscriminator: boolean
-): VpcUpdateParams {
-  if (json === undefined || json === null) {
-    return json
-  }
-  return {
-    description: !exists(json, 'description') ? undefined : json['description'],
-    dnsName: !exists(json, 'dnsName') ? undefined : json['dnsName'],
-    name: !exists(json, 'name') ? undefined : json['name'],
-  }
-}
-
-export function VpcUpdateParamsToJSON(value?: VpcUpdateParams | null): any {
-  if (value === undefined) {
-    return undefined
-  }
-  if (value === null) {
-    return null
-  }
-  return {
-    description: value.description,
-    dnsName: value.dnsName,
-    name: value.name,
-  }
-}
diff --git a/libs/api/__generated__/models/index.ts b/libs/api/__generated__/models/index.ts
deleted file mode 100644
index 0ed3d46013..0000000000
--- a/libs/api/__generated__/models/index.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-export * from './Disk'
-export * from './DiskAttachment'
-export * from './DiskCreateParams'
-export * from './DiskResultsPage'
-export * from './DiskState'
-export * from './DiskStateOneOf'
-export * from './DiskStateOneOf1'
-export * from './DiskStateOneOf2'
-export * from './DiskStateOneOf3'
-export * from './DiskStateOneOf4'
-export * from './DiskStateOneOf5'
-export * from './DiskStateOneOf6'
-export * from './IdSortMode'
-export * from './IdentityMetadata'
-export * from './Instance'
-export * from './InstanceCreateParams'
-export * from './InstanceResultsPage'
-export * from './InstanceState'
-export * from './LoginParams'
-export * from './NameOrIdSortMode'
-export * from './NameSortMode'
-export * from './Organization'
-export * from './OrganizationCreate'
-export * from './OrganizationResultsPage'
-export * from './OrganizationUpdate'
-export * from './Project'
-export * from './ProjectCreate'
-export * from './ProjectResultsPage'
-export * from './ProjectUpdate'
-export * from './Rack'
-export * from './RackResultsPage'
-export * from './RouteDestination'
-export * from './RouteDestinationOneOf'
-export * from './RouteDestinationOneOf1'
-export * from './RouteDestinationOneOf2'
-export * from './RouteTarget'
-export * from './RouteTargetOneOf'
-export * from './RouteTargetOneOf1'
-export * from './RouterRoute'
-export * from './RouterRouteCreateParams'
-export * from './RouterRouteKind'
-export * from './RouterRouteResultsPage'
-export * from './RouterRouteUpdateParams'
-export * from './Saga'
-export * from './SagaErrorInfo'
-export * from './SagaErrorInfoOneOf'
-export * from './SagaErrorInfoOneOf1'
-export * from './SagaErrorInfoOneOf2'
-export * from './SagaErrorInfoOneOf3'
-export * from './SagaErrorInfoOneOf4'
-export * from './SagaResultsPage'
-export * from './SagaState'
-export * from './SagaStateOneOf'
-export * from './SagaStateOneOf1'
-export * from './SagaStateOneOf2'
-export * from './Sled'
-export * from './SledResultsPage'
-export * from './Vpc'
-export * from './VpcCreateParams'
-export * from './VpcFirewallRule'
-export * from './VpcFirewallRuleAction'
-export * from './VpcFirewallRuleDirection'
-export * from './VpcFirewallRuleFilter'
-export * from './VpcFirewallRuleHostFilter'
-export * from './VpcFirewallRuleProtocol'
-export * from './VpcFirewallRuleResultsPage'
-export * from './VpcFirewallRuleStatus'
-export * from './VpcFirewallRuleTarget'
-export * from './VpcFirewallRuleUpdate'
-export * from './VpcResultsPage'
-export * from './VpcRouter'
-export * from './VpcRouterCreateParams'
-export * from './VpcRouterKind'
-export * from './VpcRouterResultsPage'
-export * from './VpcRouterUpdateParams'
-export * from './VpcSubnet'
-export * from './VpcSubnetCreateParams'
-export * from './VpcSubnetResultsPage'
-export * from './VpcSubnetUpdateParams'
-export * from './VpcUpdateParams'
diff --git a/libs/api/__generated__/runtime.ts b/libs/api/__generated__/runtime.ts
deleted file mode 100644
index aa32a22060..0000000000
--- a/libs/api/__generated__/runtime.ts
+++ /dev/null
@@ -1,379 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-/**
- * Oxide Region API
- * API for interacting with the Oxide control plane
- *
- * The version of the OpenAPI document: 0.0.1
- * Contact: api@oxide.computer
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-export const BASE_PATH = 'http://localhost'.replace(/\/+$/, '')
-
-const isBlob = (value: any) =>
-  typeof Blob !== 'undefined' && value instanceof Blob
-
-/**
- * This is the base class for all generated API classes.
- */
-export class BaseAPI {
-  private middleware: Middleware[]
-
-  constructor(protected configuration = new Configuration()) {
-    this.middleware = configuration.middleware
-  }
-
-  withMiddleware<T extends BaseAPI>(this: T, ...middlewares: Middleware[]) {
-    const next = this.clone<T>()
-    next.middleware = next.middleware.concat(...middlewares)
-    return next
-  }
-
-  withPreMiddleware<T extends BaseAPI>(
-    this: T,
-    ...preMiddlewares: Array<Middleware['pre']>
-  ) {
-    const middlewares = preMiddlewares.map((pre) => ({ pre }))
-    return this.withMiddleware<T>(...middlewares)
-  }
-
-  withPostMiddleware<T extends BaseAPI>(
-    this: T,
-    ...postMiddlewares: Array<Middleware['post']>
-  ) {
-    const middlewares = postMiddlewares.map((post) => ({ post }))
-    return this.withMiddleware<T>(...middlewares)
-  }
-
-  protected async request(
-    context: RequestOpts,
-    initOverrides?: RequestInit
-  ): Promise<Response> {
-    const { url, init } = this.createFetchParams(context, initOverrides)
-    const response = await this.fetchApi(url, init)
-    if (response.status >= 200 && response.status < 300) {
-      return response
-    }
-    throw response
-  }
-
-  private createFetchParams(context: RequestOpts, initOverrides?: RequestInit) {
-    let url = this.configuration.basePath + context.path
-    if (
-      context.query !== undefined &&
-      Object.keys(context.query).length !== 0
-    ) {
-      // only add the querystring to the URL if there are query parameters.
-      // this is done to avoid urls ending with a "?" character which buggy webservers
-      // do not handle correctly sometimes.
-      url += '?' + this.configuration.queryParamsStringify(context.query)
-    }
-    const body =
-      (typeof FormData !== 'undefined' && context.body instanceof FormData) ||
-      context.body instanceof URLSearchParams ||
-      isBlob(context.body)
-        ? context.body
-        : JSON.stringify(context.body)
-
-    const headers = Object.assign(
-      {},
-      this.configuration.headers,
-      context.headers
-    )
-    const init = {
-      method: context.method,
-      headers: headers,
-      body,
-      credentials: this.configuration.credentials,
-      ...initOverrides,
-    }
-    return { url, init }
-  }
-
-  private fetchApi = async (url: string, init: RequestInit) => {
-    let fetchParams = { url, init }
-    for (const middleware of this.middleware) {
-      if (middleware.pre) {
-        fetchParams =
-          (await middleware.pre({
-            fetch: this.fetchApi,
-            ...fetchParams,
-          })) || fetchParams
-      }
-    }
-    let response = await (this.configuration.fetchApi || fetch)(
-      fetchParams.url,
-      fetchParams.init
-    )
-    for (const middleware of this.middleware) {
-      if (middleware.post) {
-        response =
-          (await middleware.post({
-            fetch: this.fetchApi,
-            url: fetchParams.url,
-            init: fetchParams.init,
-            response: response.clone(),
-          })) || response
-      }
-    }
-    return response
-  }
-
-  /**
-   * Create a shallow clone of `this` by constructing a new instance
-   * and then shallow cloning data members.
-   */
-  private clone<T extends BaseAPI>(this: T): T {
-    const constructor = this.constructor as any
-    const next = new constructor(this.configuration)
-    next.middleware = this.middleware.slice()
-    return next
-  }
-}
-
-export class RequiredError extends Error {
-  name: 'RequiredError' = 'RequiredError'
-  constructor(public field: string, msg?: string) {
-    super(msg)
-  }
-}
-
-export const COLLECTION_FORMATS = {
-  csv: ',',
-  ssv: ' ',
-  tsv: '\t',
-  pipes: '|',
-}
-
-export type FetchAPI = WindowOrWorkerGlobalScope['fetch']
-
-export interface ConfigurationParameters {
-  basePath?: string // override base path
-  fetchApi?: FetchAPI // override for fetch implementation
-  middleware?: Middleware[] // middleware to apply before/after fetch requests
-  queryParamsStringify?: (params: HTTPQuery) => string // stringify function for query strings
-  username?: string // parameter for basic security
-  password?: string // parameter for basic security
-  apiKey?: string | ((name: string) => string) // parameter for apiKey security
-  accessToken?:
-    | string
-    | Promise<string>
-    | ((name?: string, scopes?: string[]) => string | Promise<string>) // parameter for oauth2 security
-  headers?: HTTPHeaders //header params we want to use on every request
-  credentials?: RequestCredentials //value for the credentials param we want to use on each request
-}
-
-export class Configuration {
-  constructor(private configuration: ConfigurationParameters = {}) {}
-
-  get basePath(): string {
-    return this.configuration.basePath != null
-      ? this.configuration.basePath
-      : BASE_PATH
-  }
-
-  get fetchApi(): FetchAPI {
-    return this.configuration.fetchApi || fetch
-  }
-
-  get middleware(): Middleware[] {
-    return this.configuration.middleware || []
-  }
-
-  get queryParamsStringify(): (params: HTTPQuery) => string {
-    return this.configuration.queryParamsStringify || querystring
-  }
-
-  get username(): string | undefined {
-    return this.configuration.username
-  }
-
-  get password(): string | undefined {
-    return this.configuration.password
-  }
-
-  get apiKey(): ((name: string) => string) | undefined {
-    const apiKey = this.configuration.apiKey
-    if (apiKey) {
-      return typeof apiKey === 'function' ? apiKey : () => apiKey
-    }
-    return undefined
-  }
-
-  get accessToken():
-    | ((name?: string, scopes?: string[]) => string | Promise<string>)
-    | undefined {
-    const accessToken = this.configuration.accessToken
-    if (accessToken) {
-      return typeof accessToken === 'function'
-        ? accessToken
-        : async () => accessToken
-    }
-    return undefined
-  }
-
-  get headers(): HTTPHeaders | undefined {
-    return this.configuration.headers
-  }
-
-  get credentials(): RequestCredentials | undefined {
-    return this.configuration.credentials
-  }
-}
-
-export type Json = any
-export type HTTPMethod =
-  | 'GET'
-  | 'POST'
-  | 'PUT'
-  | 'PATCH'
-  | 'DELETE'
-  | 'OPTIONS'
-  | 'HEAD'
-export type HTTPHeaders = { [key: string]: string }
-export type HTTPQuery = {
-  [key: string]:
-    | string
-    | number
-    | null
-    | boolean
-    | Array<string | number | null | boolean>
-    | HTTPQuery
-}
-export type HTTPBody = Json | FormData | URLSearchParams
-export type ModelPropertyNaming =
-  | 'camelCase'
-  | 'snake_case'
-  | 'PascalCase'
-  | 'original'
-
-export interface FetchParams {
-  url: string
-  init: RequestInit
-}
-
-export interface RequestOpts {
-  path: string
-  method: HTTPMethod
-  headers: HTTPHeaders
-  query?: HTTPQuery
-  body?: HTTPBody
-}
-
-export function exists(json: any, key: string) {
-  const value = json[key]
-  return value !== null && value !== undefined
-}
-
-export function querystring(params: HTTPQuery, prefix: string = ''): string {
-  return Object.keys(params)
-    .map((key) => {
-      const fullKey = prefix + (prefix.length ? `[${key}]` : key)
-      const value = params[key]
-      if (value instanceof Array) {
-        const multiValue = value
-          .map((singleValue) => encodeURIComponent(String(singleValue)))
-          .join(`&${encodeURIComponent(fullKey)}=`)
-        return `${encodeURIComponent(fullKey)}=${multiValue}`
-      }
-      if (value instanceof Date) {
-        return `${encodeURIComponent(fullKey)}=${encodeURIComponent(
-          value.toISOString()
-        )}`
-      }
-      if (value instanceof Object) {
-        return querystring(value as HTTPQuery, fullKey)
-      }
-      return `${encodeURIComponent(fullKey)}=${encodeURIComponent(
-        String(value)
-      )}`
-    })
-    .filter((part) => part.length > 0)
-    .join('&')
-}
-
-export function mapValues(data: any, fn: (item: any) => any) {
-  return Object.keys(data).reduce(
-    (acc, key) => ({ ...acc, [key]: fn(data[key]) }),
-    {}
-  )
-}
-
-export function canConsumeForm(consumes: Consume[]): boolean {
-  for (const consume of consumes) {
-    if ('multipart/form-data' === consume.contentType) {
-      return true
-    }
-  }
-  return false
-}
-
-export interface Consume {
-  contentType: string
-}
-
-export interface RequestContext {
-  fetch: FetchAPI
-  url: string
-  init: RequestInit
-}
-
-export interface ResponseContext {
-  fetch: FetchAPI
-  url: string
-  init: RequestInit
-  response: Response
-}
-
-export interface Middleware {
-  pre?(context: RequestContext): Promise<FetchParams | void>
-  post?(context: ResponseContext): Promise<Response | void>
-}
-
-export interface ApiResponse<T> {
-  raw: Response
-  value(): Promise<T>
-}
-
-export interface ResponseTransformer<T> {
-  (json: any): T
-}
-
-export class JSONApiResponse<T> {
-  constructor(
-    public raw: Response,
-    private transformer: ResponseTransformer<T> = (jsonValue: any) => jsonValue
-  ) {}
-
-  async value(): Promise<T> {
-    return this.transformer(await this.raw.json())
-  }
-}
-
-export class VoidApiResponse {
-  constructor(public raw: Response) {}
-
-  async value(): Promise<void> {
-    return undefined
-  }
-}
-
-export class BlobApiResponse {
-  constructor(public raw: Response) {}
-
-  async value(): Promise<Blob> {
-    return await this.raw.blob()
-  }
-}
-
-export class TextApiResponse {
-  constructor(public raw: Response) {}
-
-  async value(): Promise<string> {
-    return await this.raw.text()
-  }
-}

From a5a78167ada56baf5bdcc0adf617fa59ccd776ea Mon Sep 17 00:00:00 2001
From: David Crespo <crespo.dm@gmail.com>
Date: Wed, 1 Dec 2021 14:13:38 -0600
Subject: [PATCH 09/21] make mutate() argument look more like before

---
 app/components/InstancePageHeader.tsx | 24 +++++++++---------------
 app/components/InstancesTable.tsx     |  8 +++-----
 app/pages/ProjectCreatePage.tsx       |  2 +-
 app/pages/instances/create/index.tsx  |  6 ++----
 libs/api/hooks.ts                     |  5 +++--
 5 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/app/components/InstancePageHeader.tsx b/app/components/InstancePageHeader.tsx
index bd87f49352..bd41fa5454 100644
--- a/app/components/InstancePageHeader.tsx
+++ b/app/components/InstancePageHeader.tsx
@@ -76,11 +76,9 @@ export const InstancePageHeader = () => {
   const handleStop = () => {
     if (instanceCan.stop(instance)) {
       stopInstance.mutate({
-        params: {
-          organizationName: orgName,
-          projectName,
-          instanceName: instance.name,
-        },
+        organizationName: orgName,
+        projectName,
+        instanceName: instance.name,
       })
     } else {
       addToast({
@@ -96,11 +94,9 @@ export const InstancePageHeader = () => {
   const handleDelete = () => {
     if (instanceCan.delete(instance)) {
       deleteInstance.mutate({
-        params: {
-          organizationName: orgName,
-          projectName,
-          instanceName: instance.name,
-        },
+        organizationName: orgName,
+        projectName,
+        instanceName: instance.name,
       })
     } else {
       addToast({
@@ -115,11 +111,9 @@ export const InstancePageHeader = () => {
   const handleReboot = () => {
     if (instanceCan.reboot(instance)) {
       rebootInstance.mutate({
-        params: {
-          organizationName: orgName,
-          projectName,
-          instanceName: instance.name,
-        },
+        organizationName: orgName,
+        projectName,
+        instanceName: instance.name,
       })
     } else {
       addToast({
diff --git a/app/components/InstancesTable.tsx b/app/components/InstancesTable.tsx
index 1facd55ed7..1f9e543918 100644
--- a/app/components/InstancesTable.tsx
+++ b/app/components/InstancesTable.tsx
@@ -119,11 +119,9 @@ const menuCol = {
     })
 
     const instanceLookup = {
-      params: {
-        organizationName: orgName,
-        projectName,
-        instanceName,
-      },
+      organizationName: orgName,
+      projectName,
+      instanceName,
     }
 
     return (
diff --git a/app/pages/ProjectCreatePage.tsx b/app/pages/ProjectCreatePage.tsx
index 89d0061add..b2815f37b6 100644
--- a/app/pages/ProjectCreatePage.tsx
+++ b/app/pages/ProjectCreatePage.tsx
@@ -56,7 +56,7 @@ export function ProjectCreateForm({ orgName }: { orgName: string }) {
       initialValues={{ name: '', description: '' }}
       onSubmit={({ name, description }) => {
         createProject.mutate({
-          params: { organizationName: orgName },
+          organizationName: orgName,
           body: { name, description },
         })
       }}
diff --git a/app/pages/instances/create/index.tsx b/app/pages/instances/create/index.tsx
index fb8d1e015d..547d0ee69b 100644
--- a/app/pages/instances/create/index.tsx
+++ b/app/pages/instances/create/index.tsx
@@ -93,10 +93,8 @@ export function InstanceCreateForm({
           ) || { memory: 0, ncpus: 0 }
 
           createInstance.mutate({
-            params: {
-              organizationName: orgName,
-              projectName,
-            },
+            organizationName: orgName,
+            projectName,
             body: {
               name: values['instance-name'],
               hostname: values.hostname,
diff --git a/libs/api/hooks.ts b/libs/api/hooks.ts
index 8fcc950140..265c0d6175 100644
--- a/libs/api/hooks.ts
+++ b/libs/api/hooks.ts
@@ -61,11 +61,12 @@ export const getUseApiMutation =
     options?: UseMutationOptions<
       Result<A[M]>,
       ErrorResponse,
-      { params: Params<A[M]>; body?: Body<A[M]> }
+      Params<A[M]> & { body?: Body<A[M]> }
     >
   ) =>
     useMutation(
-      (arg) => api[method](arg.params, arg.body).then((resp) => resp.data),
+      ({ body, ...params }) =>
+        api[method](params, body).then((resp) => resp.data),
       options
     )
 

From 111d3aa63907bca5d0b0a4a5207e428b52aac954 Mon Sep 17 00:00:00 2001
From: David Crespo <david.crespo@oxidecomputer.com>
Date: Mon, 6 Dec 2021 14:21:29 -0600
Subject: [PATCH 10/21] fix type errors on everything but login

---
 .../networking/VpcPage/tabs/VpcSubnetsTab.tsx  |  2 +-
 libs/api/hooks.ts                              | 18 ++++++++++--------
 libs/api/index.ts                              |  9 +++++----
 libs/table/QueryTable.tsx                      | 16 ++++++----------
 libs/table/cells/DateCell.tsx                  |  6 +++---
 libs/table/cells/InstanceStatusCell.tsx        |  2 +-
 6 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/app/pages/project/networking/VpcPage/tabs/VpcSubnetsTab.tsx b/app/pages/project/networking/VpcPage/tabs/VpcSubnetsTab.tsx
index 96442b759d..f5e173efc4 100644
--- a/app/pages/project/networking/VpcPage/tabs/VpcSubnetsTab.tsx
+++ b/app/pages/project/networking/VpcPage/tabs/VpcSubnetsTab.tsx
@@ -20,7 +20,7 @@ export const VpcSubnetsTab = () => {
       <Column
         id="ip-block"
         header="IP Block"
-        accessor={(vpc) => [vpc.ipv4Block, vpc.ipv6Block]}
+        accessor={(vpc) => [vpc.ipv4_block, vpc.ipv6_block]}
         cell={TwoLineCell}
       />
       <Column id="created" accessor="identity.timeCreated" cell={DateCell} />
diff --git a/libs/api/hooks.ts b/libs/api/hooks.ts
index 265c0d6175..06cf5f53b3 100644
--- a/libs/api/hooks.ts
+++ b/libs/api/hooks.ts
@@ -8,9 +8,15 @@ import { useMutation, useQuery, useQueryClient } from 'react-query'
 import type { HttpResponse } from './__generated__/Api'
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
-type Params<F> = F extends (p: infer P, r: any) => any ? P : never
-type Body<F> = F extends (p: any, r: infer R) => any ? R : never
-type Result<F> = F extends (p: any, r: any) => Promise<HttpResponse<infer R>>
+export type Params<F> = F extends (p: infer P, r: infer R) => any
+  ? P & {
+      body?: R
+    }
+  : never
+export type Result<F> = F extends (
+  p: any,
+  r: any
+) => Promise<HttpResponse<infer R>>
   ? R
   : never
 
@@ -58,11 +64,7 @@ export const getUseApiMutation =
   <A extends ApiClient>(api: A) =>
   <M extends keyof A>(
     method: M,
-    options?: UseMutationOptions<
-      Result<A[M]>,
-      ErrorResponse,
-      Params<A[M]> & { body?: Body<A[M]> }
-    >
+    options?: UseMutationOptions<Result<A[M]>, ErrorResponse, Params<A[M]>>
   ) =>
     useMutation(
       ({ body, ...params }) =>
diff --git a/libs/api/index.ts b/libs/api/index.ts
index b87edcaf04..54d69bdd28 100644
--- a/libs/api/index.ts
+++ b/libs/api/index.ts
@@ -7,18 +7,19 @@ import { Api } from './__generated__/Api'
 
 export * from './instance-can'
 export * from './__generated__/Api'
-export type { ErrorResponse } from './hooks'
+export type { ErrorResponse, Params, Result } from './hooks'
 
 const basePath = process.env.API_URL ?? '/api'
 
 const api = new Api({ baseUrl: basePath })
 
-// The fact that the route functions are groups under keys corresponding to the
+// The fact that the route functions are grouped under keys corresponding to the
 // first segment of the path is weird and sort of annoying. It might be the kind
 // of the thing I'd want to use a custom template to override. On the other hand
 // it's not so bad since all we care about in the console for now is the
 // organzations ones.
+export type ApiClient = typeof api.organizations
+
 export const useApiQuery = getUseApiQuery(api.organizations)
 export const useApiMutation = getUseApiMutation(api.organizations)
-export const useApiQueryClient =
-  getUseApiQueryClient<typeof api.organizations>()
+export const useApiQueryClient = getUseApiQueryClient<ApiClient>()
diff --git a/libs/table/QueryTable.tsx b/libs/table/QueryTable.tsx
index 8879216ea1..b9babbae0f 100644
--- a/libs/table/QueryTable.tsx
+++ b/libs/table/QueryTable.tsx
@@ -1,9 +1,8 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 import { Table } from './Table'
-import type { ApiError } from '@oxide/api'
+import type { ErrorResponse, ApiClient, Params, Result } from '@oxide/api'
 import { useApiQuery } from '@oxide/api'
-import type { DefaultApi } from 'libs/api/__generated__'
 import type { UseQueryOptions } from 'react-query'
 import type { ComponentType, ReactElement } from 'react'
 import { useMemo } from 'react'
@@ -16,10 +15,7 @@ import { DefaultHeader } from './headers'
 import type { Path } from '@oxide/util'
 import { unsafe_get } from '@oxide/util'
 
-type Params<F> = F extends (p: infer P) => any ? P : never
-export type Result<F> = F extends (p: any) => Promise<infer R> ? R : never
-
-interface UseQueryTableResult<A extends DefaultApi, M extends keyof A> {
+interface UseQueryTableResult<A extends ApiClient, M extends keyof A> {
   Table: ComponentType<QueryTableProps>
   Column: ComponentType<QueryTableColumnProps<A, M, Result<A[M]>>>
 }
@@ -29,10 +25,10 @@ interface UseQueryTableResult<A extends DefaultApi, M extends keyof A> {
  * table level options and a `Column` component which governs the individual column
  * configuration
  */
-export const useQueryTable = <A extends DefaultApi, M extends keyof A>(
+export const useQueryTable = <A extends ApiClient, M extends keyof A>(
   query: M,
   params: Params<A[M]>,
-  options?: UseQueryOptions<Result<A[M]>, ApiError>
+  options?: UseQueryOptions<Result<A[M]>, ErrorResponse>
 ): UseQueryTableResult<A, M> => {
   // TODO: We should probably find a better way to do this. In essence
   // we need the params and options to be stable and comparable to prevent unnecessary recreation
@@ -136,7 +132,7 @@ const makeQueryTable = (query: any, params: any, options: any) =>
 type items = 'items'
 
 export interface QueryTableColumnProps<
-  A extends DefaultApi,
+  A extends ApiClient,
   M extends keyof A,
   T extends Result<A[M]>,
   R extends unknown = any
@@ -148,7 +144,7 @@ export interface QueryTableColumnProps<
   cell?: ComponentType<R>
 }
 const QueryTableColumn = <
-  A extends DefaultApi,
+  A extends ApiClient,
   M extends keyof A,
   T extends Result<A[M]>,
   R extends unknown = any
diff --git a/libs/table/cells/DateCell.tsx b/libs/table/cells/DateCell.tsx
index ca42ceb4e7..e171a7d728 100644
--- a/libs/table/cells/DateCell.tsx
+++ b/libs/table/cells/DateCell.tsx
@@ -2,9 +2,9 @@ import { format } from 'date-fns'
 import React from 'react'
 import type { Cell } from './Cell'
 
-export const DateCell = ({ value }: Cell<Date>) => (
+export const DateCell = ({ value }: Cell<string>) => (
   <div className="space-y-0.5">
-    <div>{format(value, 'MMM d, yyyy')}</div>
-    <div className="text-gray-200">{format(value, 'p')}</div>
+    <div>{format(new Date(value), 'MMM d, yyyy')}</div>
+    <div className="text-gray-200">{format(new Date(value), 'p')}</div>
   </div>
 )
diff --git a/libs/table/cells/InstanceStatusCell.tsx b/libs/table/cells/InstanceStatusCell.tsx
index 232ef7bbcf..22a60f11bb 100644
--- a/libs/table/cells/InstanceStatusCell.tsx
+++ b/libs/table/cells/InstanceStatusCell.tsx
@@ -14,7 +14,7 @@ export const InstanceStatusCell = ({
         <Badge variant="dim" key="run-state">
           {value.runState}
         </Badge>,
-        formatDistanceToNow(value.timeRunStateUpdated),
+        formatDistanceToNow(new Date(value.timeRunStateUpdated)),
       ]}
     ></TwoLineCell>
   )

From e2e6b66cffe23e6a46ac238ea3b574f0e0fd856e Mon Sep 17 00:00:00 2001
From: David Crespo <david.crespo@oxidecomputer.com>
Date: Mon, 6 Dec 2021 14:31:55 -0600
Subject: [PATCH 11/21] bump API version, why not

---
 .github/workflows/packer.yaml          |  2 +-
 libs/api/__generated__/Api.ts          | 38 +++++++++++++-------------
 libs/api/__generated__/OMICRON_VERSION |  2 +-
 packer/oxapi_demo                      | 27 ++++++++++++------
 4 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/packer.yaml b/.github/workflows/packer.yaml
index e9cef9ab2e..2e36f110e2 100644
--- a/.github/workflows/packer.yaml
+++ b/.github/workflows/packer.yaml
@@ -46,7 +46,7 @@ jobs:
           CLOUDFLARE_TOKEN: ${{secrets.CLOUDFLARE_TOKEN}}
           SSL_CERT: ${{secrets.SSL_CERT}}
           SSL_KEY: ${{secrets.SSL_KEY}}
-          API_VERSION: de84bb85d6ca264b1adddac9822e173aeb2b433a
+          API_VERSION: 038dbd04fbc292b5f7880c0d0c723ef182145cb2
 
       # get the image information from gcloud
       - name: Get image information
diff --git a/libs/api/__generated__/Api.ts b/libs/api/__generated__/Api.ts
index adc380beea..7c7e4b4cc1 100644
--- a/libs/api/__generated__/Api.ts
+++ b/libs/api/__generated__/Api.ts
@@ -82,9 +82,9 @@ export interface DiskAttachment {
 }
 
 /**
- * Create-time parameters for an [`Disk`]
+ * Create-time parameters for a [`Disk`]
  */
-export interface DiskCreateParams {
+export interface DiskCreate {
   description: string
 
   /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
@@ -216,7 +216,7 @@ export type InstanceCpuCount = number
 /**
  * Create-time parameters for an [`Instance`]
  */
-export interface InstanceCreateParams {
+export interface InstanceCreate {
   description: string
   hostname: string
 
@@ -349,7 +349,7 @@ export interface OrganizationUpdate {
 }
 
 /**
- * Client view of an [`Project`]
+ * Client view of a [`Project`]
  */
 export interface Project {
   /** human-readable free-form text about a resource */
@@ -593,7 +593,7 @@ export interface SledResultsPage {
 }
 
 /**
- * Identity-related metadata that's included in nearly all public API objects
+ * Client view of a [`Vpc`]
  */
 export interface Vpc {
   /** human-readable free-form text about a resource */
@@ -639,7 +639,7 @@ export interface Vpc {
 /**
  * Create-time parameters for a [`Vpc`]
  */
-export interface VpcCreateParams {
+export interface VpcCreate {
   description: string
 
   /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
@@ -815,7 +815,7 @@ export interface VpcRouter {
 /**
  * Create-time parameters for a [`VpcRouter`]
  */
-export interface VpcRouterCreateParams {
+export interface VpcRouterCreate {
   description: string
 
   /** Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. */
@@ -841,7 +841,7 @@ export interface VpcRouterResultsPage {
 /**
  * Updateable properties of a [`VpcRouter`]
  */
-export interface VpcRouterUpdateParams {
+export interface VpcRouterUpdate {
   description?: string | null
   name?: Name | null
 }
@@ -869,7 +869,7 @@ export interface VpcSubnet {
 /**
  * Create-time parameters for a [`VpcSubnet`]
  */
-export interface VpcSubnetCreateParams {
+export interface VpcSubnetCreate {
   description: string
   ipv4Block?: Ipv4Net | null
   ipv6Block?: Ipv6Net | null
@@ -892,7 +892,7 @@ export interface VpcSubnetResultsPage {
 /**
  * Updateable properties of a [`VpcSubnet`]
  */
-export interface VpcSubnetUpdateParams {
+export interface VpcSubnetUpdate {
   description?: string | null
   ipv4Block?: Ipv4Net | null
   ipv6Block?: Ipv6Net | null
@@ -902,7 +902,7 @@ export interface VpcSubnetUpdateParams {
 /**
  * Updateable properties of a [`Vpc`]
  */
-export interface VpcUpdateParams {
+export interface VpcUpdate {
   description?: string | null
   dnsName?: Name | null
   name?: Name | null
@@ -2222,7 +2222,7 @@ export class Api<
      */
     projectDisksPost: (
       { organizationName, projectName }: ProjectDisksPostParams,
-      data: DiskCreateParams,
+      data: DiskCreate,
       params: RequestParams = {}
     ) =>
       this.request<Disk, any>({
@@ -2293,7 +2293,7 @@ export class Api<
      */
     projectInstancesPost: (
       { organizationName, projectName }: ProjectInstancesPostParams,
-      data: InstanceCreateParams,
+      data: InstanceCreate,
       params: RequestParams = {}
     ) =>
       this.request<Instance, any>({
@@ -2517,7 +2517,7 @@ export class Api<
      */
     projectVpcsPost: (
       { organizationName, projectName }: ProjectVpcsPostParams,
-      data: VpcCreateParams,
+      data: VpcCreate,
       params: RequestParams = {}
     ) =>
       this.request<Vpc, any>({
@@ -2554,7 +2554,7 @@ export class Api<
      */
     projectVpcsPutVpc: (
       { organizationName, projectName, vpcName }: ProjectVpcsPutVpcParams,
-      data: VpcUpdateParams,
+      data: VpcUpdate,
       params: RequestParams = {}
     ) =>
       this.request<void, any>({
@@ -2650,7 +2650,7 @@ export class Api<
      */
     vpcRoutersPost: (
       { organizationName, projectName, vpcName }: VpcRoutersPostParams,
-      data: VpcRouterCreateParams,
+      data: VpcRouterCreate,
       params: RequestParams = {}
     ) =>
       this.request<VpcRouter, any>({
@@ -2697,7 +2697,7 @@ export class Api<
         routerName,
         vpcName,
       }: VpcRoutersPutRouterParams,
-      data: VpcRouterUpdateParams,
+      data: VpcRouterUpdate,
       params: RequestParams = {}
     ) =>
       this.request<void, any>({
@@ -2874,7 +2874,7 @@ export class Api<
      */
     vpcSubnetsPost: (
       { organizationName, projectName, vpcName }: VpcSubnetsPostParams,
-      data: VpcSubnetCreateParams,
+      data: VpcSubnetCreate,
       params: RequestParams = {}
     ) =>
       this.request<VpcSubnet, any>({
@@ -2921,7 +2921,7 @@ export class Api<
         subnetName,
         vpcName,
       }: VpcSubnetsPutSubnetParams,
-      data: VpcSubnetUpdateParams,
+      data: VpcSubnetUpdate,
       params: RequestParams = {}
     ) =>
       this.request<void, any>({
diff --git a/libs/api/__generated__/OMICRON_VERSION b/libs/api/__generated__/OMICRON_VERSION
index 0963018969..a14619a714 100644
--- a/libs/api/__generated__/OMICRON_VERSION
+++ b/libs/api/__generated__/OMICRON_VERSION
@@ -1,2 +1,2 @@
 # generated file. do not update manually. see docs/update-pinned-api.md
-de84bb85d6ca264b1adddac9822e173aeb2b433a
+038dbd04fbc292b5f7880c0d0c723ef182145cb2
diff --git a/packer/oxapi_demo b/packer/oxapi_demo
index 4afbb0f66f..b54f613476 100755
--- a/packer/oxapi_demo
+++ b/packer/oxapi_demo
@@ -15,7 +15,7 @@ GENERAL OPTIONS
 
     -A        do not attempt to authenticate
               (default behavior: use "spoof" authentication for endpoints
-	      that require it)
+               that require it)
 
 ORGANIZATIONS
 
@@ -84,7 +84,18 @@ function main
 	local cmd
 
 	type curl > /dev/null 2>&1 || fail "curl not found in PATH."
-	type json > /dev/null 2>&1 || fail "json not found in PATH. Install it with npm i -g json."
+
+	if ! type json > /dev/null 2>&1;
+	then
+		if ! type jq > /dev/null 2>&1;
+		then
+			fail "json or jq not found in PATH. Install with 'npm i -g json' or 'apt install jq'"
+		else
+			JSONTOOL="jq ."
+		fi
+	else
+		JSONTOOL="json -ga"
+	fi
 
 	if [[ "$1" == "-A" ]]; then
 		NO_AUTHENTICATE=true
@@ -123,7 +134,7 @@ function do_curl
 
 	path="$1"
 	shift
-	(set -o xtrace; curl -sSi "$OXAPI_URL$path" "$@" | json -ga)
+	(set -o xtrace; curl -sSq "$OXAPI_URL$path" "$@" | ${JSONTOOL})
 }
 
 function do_curl_authn
@@ -132,7 +143,7 @@ function do_curl_authn
 		do_curl "$@"
 	else
 		do_curl "$@" \
-		    -H "oxide-authn-spoof: 001de000-05e4-0000-0000-000000004007"
+			-H "oxide-authn-spoof: 001de000-05e4-0000-0000-000000004007"
 	fi
 }
 
@@ -156,7 +167,7 @@ function mkjson
 		str="$str \"$key\": $value"
 	done
 	str="$str }"
-	echo "$str" | json
+	echo "$str" | ${JSONTOOL}
 }
 
 #
@@ -236,7 +247,7 @@ function cmd_instance_create_demo
 	# memory is 1024 * 1024 * 256
 	[[ $# != 3 ]] && usage "expected ORGANIZATION_NAME PROJECT_NAME INSTANCE_NAME"
 	mkjson name="$3" description="an instance called $3" ncpus=1 \
-	    memory=268435456 bootDiskSize=1 hostname="$3" |
+		memory=268435456 bootDiskSize=1 hostname="$3" |
 		do_curl "/organizations/$1/projects/$2/instances" -X POST -T -
 }
 
@@ -298,7 +309,7 @@ function cmd_disk_create_demo
 {
 	[[ $# != 3 ]] && usage "expected ORGANIZATION_NAME PROJECT_NAME DISK_NAME"
 	mkjson name="$3" description="a disk called $3" size=1024 |
-	    do_curl "/organizations/$1/projects/$2/disks" -X POST -T -
+		do_curl "/organizations/$1/projects/$2/disks" -X POST -T -
 }
 
 function cmd_disk_get
@@ -317,7 +328,7 @@ function cmd_vpc_create_demo
 {
 	[[ $# != 4 ]] && usage "expected ORGANIZATION_NAME PROJECT_NAME VPC_NAME DNS_NAME"
 	mkjson name="$3" dnsName="$4" description="a vpc called $3" |
-	    do_curl "/organizations/$1/projects/$2/vpcs" -X POST -T -
+		do_curl "/organizations/$1/projects/$2/vpcs" -X POST -T -
 }
 
 

From b99af6b2b3fa983cb4f334eb941421ac6902125a Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 6 Dec 2021 20:40:35 +0000
Subject: [PATCH 12/21] automatically update packer-id

---
 tools/create_gcp_instance.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/create_gcp_instance.sh b/tools/create_gcp_instance.sh
index bc94ece882..bdba547326 100755
--- a/tools/create_gcp_instance.sh
+++ b/tools/create_gcp_instance.sh
@@ -41,7 +41,7 @@ retry 2 gcloud compute instances create "$INSTANCE_NAME" \
 	--description="Machine automatically generated from branch ${BRANCH_NAME} of the oxidecomputer/console git repo." \
 	--hostname="${INSTANCE_NAME}.internal.oxide.computer" \
 	--zone=$ZONE \
-	--image=packer-1638510063 \
+	--image=packer-1638822763 \
 	--maintenance-policy=TERMINATE \
 	--restart-on-failure \
 	--machine-type=$INSTANCE_TYPE \

From 27615322a831eb93561328e9213597084acf31d0 Mon Sep 17 00:00:00 2001
From: David Crespo <david.crespo@oxidecomputer.com>
Date: Mon, 6 Dec 2021 15:13:57 -0600
Subject: [PATCH 13/21] fix... everything? (except the tests)

---
 app/pages/LoginPage.tsx       | 10 +++-------
 libs/api/__generated__/Api.ts | 14 +++++---------
 libs/api/index.ts             |  6 +++---
 libs/table/QueryTable.tsx     |  1 -
 package.json                  |  2 +-
 yarn.lock                     |  4 ++--
 6 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/app/pages/LoginPage.tsx b/app/pages/LoginPage.tsx
index cb0542dc2c..0acb26a689 100644
--- a/app/pages/LoginPage.tsx
+++ b/app/pages/LoginPage.tsx
@@ -59,9 +59,7 @@ export default function LoginPage() {
           variant="solid"
           className="w-full"
           disabled={loginPost.isLoading}
-          onClick={() =>
-            loginPost.mutate({ loginParams: { username: 'privileged' } })
-          }
+          onClick={() => loginPost.mutate({ body: { username: 'privileged' } })}
         >
           Privileged
         </Button>
@@ -71,7 +69,7 @@ export default function LoginPage() {
           className="w-full"
           disabled={loginPost.isLoading}
           onClick={() =>
-            loginPost.mutate({ loginParams: { username: 'unprivileged' } })
+            loginPost.mutate({ body: { username: 'unprivileged' } })
           }
         >
           Unprivileged
@@ -81,9 +79,7 @@ export default function LoginPage() {
           variant="ghost"
           className="w-full"
           disabled={loginPost.isLoading}
-          onClick={() =>
-            loginPost.mutate({ loginParams: { username: 'other' } })
-          }
+          onClick={() => loginPost.mutate({ body: { username: 'other' } })}
         >
           Bad Request
         </Button>
diff --git a/libs/api/__generated__/Api.ts b/libs/api/__generated__/Api.ts
index 7c7e4b4cc1..0ce5cb6359 100644
--- a/libs/api/__generated__/Api.ts
+++ b/libs/api/__generated__/Api.ts
@@ -1905,7 +1905,7 @@ export class HttpClient<SecurityDataType = unknown> {
 export class Api<
   SecurityDataType extends unknown
 > extends HttpClient<SecurityDataType> {
-  hardware = {
+  methods = {
     /**
      * @description List racks in the system.
      *
@@ -1975,8 +1975,7 @@ export class Api<
         format: 'json',
         ...params,
       }),
-  }
-  login = {
+
     /**
      * No description
      *
@@ -1995,8 +1994,7 @@ export class Api<
         type: ContentType.Json,
         ...params,
       }),
-  }
-  logout = {
+
     /**
      * No description
      *
@@ -2009,8 +2007,7 @@ export class Api<
         method: 'POST',
         ...params,
       }),
-  }
-  organizations = {
+
     /**
      * @description List all organizations.
      *
@@ -2952,8 +2949,7 @@ export class Api<
         method: 'DELETE',
         ...params,
       }),
-  }
-  sagas = {
+
     /**
      * @description List all sagas (for debugging)
      *
diff --git a/libs/api/index.ts b/libs/api/index.ts
index 54d69bdd28..3ca15502b6 100644
--- a/libs/api/index.ts
+++ b/libs/api/index.ts
@@ -18,8 +18,8 @@ const api = new Api({ baseUrl: basePath })
 // of the thing I'd want to use a custom template to override. On the other hand
 // it's not so bad since all we care about in the console for now is the
 // organzations ones.
-export type ApiClient = typeof api.organizations
+export type ApiClient = typeof api.methods
 
-export const useApiQuery = getUseApiQuery(api.organizations)
-export const useApiMutation = getUseApiMutation(api.organizations)
+export const useApiQuery = getUseApiQuery(api.methods)
+export const useApiMutation = getUseApiMutation(api.methods)
 export const useApiQueryClient = getUseApiQueryClient<ApiClient>()
diff --git a/libs/table/QueryTable.tsx b/libs/table/QueryTable.tsx
index b9babbae0f..0a847b348a 100644
--- a/libs/table/QueryTable.tsx
+++ b/libs/table/QueryTable.tsx
@@ -48,7 +48,6 @@ export const useQueryTable = <A extends ApiClient, M extends keyof A>(
     [query, stableParams, stableOpts]
   )
 
-  // @ts-expect-error FIXME: The accessor types are reported as different, but they shouldn't be
   return { Table, Column: QueryTableColumn }
 }
 interface QueryTableProps {
diff --git a/package.json b/package.json
index d10a00e0ac..8ca95f2f93 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "postcss-nesting": "^10.0.2",
     "prettier": "2.5.0",
     "rollup": "^2.52.7",
-    "swagger-typescript-api": "https://github.com/oxidecomputer/swagger-typescript-api#27cf1ddc59a17e19ecc0fdb707db2f854c6d729e",
+    "swagger-typescript-api": "https://github.com/oxidecomputer/swagger-typescript-api#48bdd2381485560f0ea3c2013105e379c2c0e2a0",
     "tailwindcss": "^3.0.0-alpha.2",
     "ts-node": "^9.1.1",
     "tsconfig-paths-webpack-plugin": "^3.5.1",
diff --git a/yarn.lock b/yarn.lock
index c841e34f7f..167b90173f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13521,9 +13521,9 @@ swagger-schema-official@2.0.0-bab6bed:
   resolved "https://registry.yarnpkg.com/swagger-schema-official/-/swagger-schema-official-2.0.0-bab6bed.tgz#70070468d6d2977ca5237b2e519ca7d06a2ea3fd"
   integrity sha1-cAcEaNbSl3ylI3suUZyn0Gouo/0=
 
-"swagger-typescript-api@https://github.com/oxidecomputer/swagger-typescript-api#27cf1ddc59a17e19ecc0fdb707db2f854c6d729e":
+"swagger-typescript-api@https://github.com/oxidecomputer/swagger-typescript-api#48bdd2381485560f0ea3c2013105e379c2c0e2a0":
   version "9.3.1"
-  resolved "https://github.com/oxidecomputer/swagger-typescript-api#27cf1ddc59a17e19ecc0fdb707db2f854c6d729e"
+  resolved "https://github.com/oxidecomputer/swagger-typescript-api#48bdd2381485560f0ea3c2013105e379c2c0e2a0"
   dependencies:
     "@types/swagger-schema-official" "2.0.21"
     axios "^0.21.4"

From 6c4945321cebed6d67ddd8043620dd12882a42cd Mon Sep 17 00:00:00 2001
From: David Crespo <david.crespo@oxidecomputer.com>
Date: Mon, 6 Dec 2021 15:26:56 -0600
Subject: [PATCH 14/21] attempt to install git on the GCP VM

---
 Dockerfile          | 1 +
 packer/provision.sh | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index cb25b40761..5adbfb26c0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,7 @@ WORKDIR /app
 ENV PATH /app/node_modules/.bin:$PATH
 COPY package.json ./
 COPY yarn.lock ./
+RUN apk update && apk add git
 RUN yarn
 COPY . ./
 RUN yarn build
diff --git a/packer/provision.sh b/packer/provision.sh
index 3d70dd15b8..abf452c070 100755
--- a/packer/provision.sh
+++ b/packer/provision.sh
@@ -35,6 +35,9 @@ sudo apt update
 sudo apt install -y --no-install-recommends \
 	yarn
 
+# Install git (temporary, only needed for one package we're pulling from a GH fork)
+sudo apt install -y --no-install-recommends git
+
 # Update systemd to include our service files.
 sudo mv /tmp/iptables-routing.service /etc/systemd/system/iptables-routing.service
 sudo systemctl daemon-reload

From 98638951fc09ba2f0badda210136d7b02374d43b Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 6 Dec 2021 21:49:50 +0000
Subject: [PATCH 15/21] automatically update packer-id

---
 tools/create_gcp_instance.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/create_gcp_instance.sh b/tools/create_gcp_instance.sh
index bdba547326..455ec7cad1 100755
--- a/tools/create_gcp_instance.sh
+++ b/tools/create_gcp_instance.sh
@@ -41,7 +41,7 @@ retry 2 gcloud compute instances create "$INSTANCE_NAME" \
 	--description="Machine automatically generated from branch ${BRANCH_NAME} of the oxidecomputer/console git repo." \
 	--hostname="${INSTANCE_NAME}.internal.oxide.computer" \
 	--zone=$ZONE \
-	--image=packer-1638822763 \
+	--image=packer-1638826910 \
 	--maintenance-policy=TERMINATE \
 	--restart-on-failure \
 	--machine-type=$INSTANCE_TYPE \

From b564bbde624babe11404fbb14458adbb31531312 Mon Sep 17 00:00:00 2001
From: David Crespo <david.crespo@oxidecomputer.com>
Date: Mon, 6 Dec 2021 16:09:19 -0600
Subject: [PATCH 16/21] tests pass

---
 app/pages/ProjectCreatePage.tsx               | 25 +++++++++++++------
 .../__tests__/InstanceCreateForm.spec.tsx     | 21 +++++++++++-----
 .../__tests__/ProjectCreatePage.spec.tsx      | 19 +++++++++-----
 .../instances/create/InstancesCreatePage.tsx  | 17 +++++++------
 app/util/errors.spec.ts                       |  4 +--
 5 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/app/pages/ProjectCreatePage.tsx b/app/pages/ProjectCreatePage.tsx
index 39828ac639..3407d4cb82 100644
--- a/app/pages/ProjectCreatePage.tsx
+++ b/app/pages/ProjectCreatePage.tsx
@@ -13,6 +13,7 @@ import {
   Success16Icon,
   FieldTitle,
 } from '@oxide/ui'
+import type { Project } from '@oxide/api'
 import { useApiMutation, useApiQueryClient } from '@oxide/api'
 import { useParams, useToast } from '../hooks'
 import { getServerError } from '../util/errors'
@@ -24,14 +25,18 @@ const ERROR_CODES = {
 }
 
 // exists primarily so we can test it without worrying about route params
-export function ProjectCreateForm({ orgName }: { orgName: string }) {
-  const navigate = useNavigate()
-
+export function ProjectCreateForm({
+  orgName,
+  onSuccess,
+}: {
+  orgName: string
+  onSuccess: (p: Project) => void
+}) {
   const queryClient = useApiQueryClient()
   const addToast = useToast()
 
   const createProject = useApiMutation('organizationProjectsPost', {
-    onSuccess: (data) => {
+    onSuccess: (project) => {
       // refetch list of projects in sidebar
       queryClient.invalidateQueries('organizationProjectsGet', {
         organizationName: orgName,
@@ -39,8 +44,8 @@ export function ProjectCreateForm({ orgName }: { orgName: string }) {
       // avoid the project fetch when the project page loads since we have the data
       queryClient.setQueryData(
         'organizationProjectsGetProject',
-        { organizationName: orgName, projectName: data.name },
-        data
+        { organizationName: orgName, projectName: project.name },
+        project
       )
       addToast({
         icon: <Success16Icon />,
@@ -48,7 +53,7 @@ export function ProjectCreateForm({ orgName }: { orgName: string }) {
         content: 'Your project has been created.',
         timeout: 5000,
       })
-      navigate(`/orgs/${orgName}/projects/${data.name}`)
+      onSuccess(project)
     },
   })
   return (
@@ -105,6 +110,7 @@ export function ProjectCreateForm({ orgName }: { orgName: string }) {
 }
 
 export default function ProjectCreatePage() {
+  const navigate = useNavigate()
   const { orgName } = useParams('orgName')
   return (
     <>
@@ -113,7 +119,10 @@ export default function ProjectCreatePage() {
           Create a new project
         </PageTitle>
       </PageHeader>
-      <ProjectCreateForm orgName={orgName} />
+      <ProjectCreateForm
+        orgName={orgName}
+        onSuccess={(project) => navigate(`../${project.name}`)}
+      />
     </>
   )
 }
diff --git a/app/pages/__tests__/InstanceCreateForm.spec.tsx b/app/pages/__tests__/InstanceCreateForm.spec.tsx
index d1125100cb..1c396f9391 100644
--- a/app/pages/__tests__/InstanceCreateForm.spec.tsx
+++ b/app/pages/__tests__/InstanceCreateForm.spec.tsx
@@ -20,13 +20,20 @@ const instancesUrl = `${projectUrl}/instances`
 const disksUrl = `${projectUrl}/disks`
 const vpcsUrl = `${projectUrl}/vpcs`
 
+let successSpy: jest.Mock
+
 describe('InstanceCreateForm', () => {
   beforeEach(() => {
     // existing disk modal fetches disks on render even if it's not visible
     fetchMock.get(disksUrl, 200)
     fetchMock.get(vpcsUrl, 200)
+    successSpy = jest.fn()
     renderWithRouter(
-      <InstanceCreateForm orgName={org.name} projectName={project.name} />
+      <InstanceCreateForm
+        orgName={org.name}
+        projectName={project.name}
+        onSuccess={successSpy}
+      />
     )
   })
 
@@ -62,7 +69,10 @@ describe('InstanceCreateForm', () => {
   })
 
   it('shows generic message for unknown server error', async () => {
-    fetchMock.post(instancesUrl, 400)
+    fetchMock.post(instancesUrl, {
+      status: 400,
+      body: { error_code: 'UnknownCode' },
+    })
 
     fireEvent.click(submitButton())
 
@@ -89,16 +99,15 @@ describe('InstanceCreateForm', () => {
     )
   })
 
-  it('navigates to project page on success', async () => {
+  it('calls onSuccess on success', async () => {
     const mock = fetchMock.post(instancesUrl, { status: 201, body: instance })
 
-    const projectPath = `/orgs/${org.name}/projects/${project.name}`
-    expect(window.location.pathname).not.toEqual(projectPath)
+    expect(successSpy).not.toHaveBeenCalled()
 
     fireEvent.click(submitButton())
 
     await waitFor(() => expect(mock.called(instancesUrl)).toBeTruthy())
     await waitFor(() => expect(mock.done()).toBeTruthy())
-    await waitFor(() => expect(window.location.pathname).toEqual(projectPath))
+    await waitFor(() => expect(successSpy).toHaveBeenCalled())
   })
 })
diff --git a/app/pages/__tests__/ProjectCreatePage.spec.tsx b/app/pages/__tests__/ProjectCreatePage.spec.tsx
index 185c570152..ff52140d2a 100644
--- a/app/pages/__tests__/ProjectCreatePage.spec.tsx
+++ b/app/pages/__tests__/ProjectCreatePage.spec.tsx
@@ -22,9 +22,14 @@ function enterName(value: string) {
   fireEvent.change(nameInput, { target: { value } })
 }
 
+let successSpy: jest.Mock
+
 describe('ProjectCreateForm', () => {
   beforeEach(() => {
-    renderWithRouter(<ProjectCreateForm orgName={org.name} />)
+    successSpy = jest.fn()
+    renderWithRouter(
+      <ProjectCreateForm orgName={org.name} onSuccess={successSpy} />
+    )
     enterName('valid-name')
   })
 
@@ -78,7 +83,10 @@ describe('ProjectCreateForm', () => {
   })
 
   it('shows generic message for unknown server error', async () => {
-    fetchMock.post(projectsUrl, { status: 400 })
+    fetchMock.post(projectsUrl, {
+      status: 400,
+      body: { error_code: 'UnknownCode' },
+    })
 
     fireEvent.click(submitButton())
 
@@ -95,19 +103,18 @@ describe('ProjectCreateForm', () => {
     )
   })
 
-  it('navigates to project page on success', async () => {
+  it('calls onSuccess on success', async () => {
     const mock = fetchMock.post(projectsUrl, {
       status: 201,
       body: project,
     })
 
-    const projectPath = `/orgs/${org.name}/projects/${project.name}`
-    expect(window.location.pathname).not.toEqual(projectPath)
+    expect(successSpy).not.toHaveBeenCalled()
 
     fireEvent.click(submitButton())
 
     await waitFor(() => expect(mock.called()).toBeTruthy())
     await waitFor(() => expect(mock.done()).toBeTruthy())
-    await waitFor(() => expect(window.location.pathname).toEqual(projectPath))
+    await waitFor(() => expect(successSpy).toHaveBeenCalled())
   })
 })
diff --git a/app/pages/project/instances/create/InstancesCreatePage.tsx b/app/pages/project/instances/create/InstancesCreatePage.tsx
index 48d75c8dff..8c37509e84 100644
--- a/app/pages/project/instances/create/InstancesCreatePage.tsx
+++ b/app/pages/project/instances/create/InstancesCreatePage.tsx
@@ -44,24 +44,20 @@ const ERROR_CODES = {
 type InstanceCreateFormProps = {
   orgName: string
   projectName: string
+  onSuccess: () => void
 }
 
 export function InstanceCreateForm({
   orgName,
   projectName,
+  onSuccess,
 }: InstanceCreateFormProps) {
-  const navigate = useNavigate()
-
   // modals
   const [showNewDiskModal, setShowNewDiskModal] = useState(false)
   const [showExistingDiskModal, setShowExistingDiskModal] = useState(false)
   const [showNetworkModal, setShowNetworkModal] = useState(false)
 
-  const createInstance = useApiMutation('projectInstancesPost', {
-    onSuccess: () => {
-      navigate(`/orgs/${orgName}/projects/${projectName}`)
-    },
-  })
+  const createInstance = useApiMutation('projectInstancesPost', { onSuccess })
 
   const renderLargeRadioCards = (category: string) => {
     return INSTANCE_SIZES.filter((option) => option.category === category).map(
@@ -336,6 +332,7 @@ export function InstanceCreateForm({
 }
 
 const InstanceCreatePage = () => {
+  const navigate = useNavigate()
   const { orgName, projectName } = useParams('orgName', 'projectName')
 
   return (
@@ -345,7 +342,11 @@ const InstanceCreatePage = () => {
           Create a new instance
         </PageTitle>
       </PageHeader>
-      <InstanceCreateForm orgName={orgName} projectName={projectName} />
+      <InstanceCreateForm
+        orgName={orgName}
+        projectName={projectName}
+        onSuccess={() => navigate('..')} // project page
+      />
     </>
   )
 }
diff --git a/app/util/errors.spec.ts b/app/util/errors.spec.ts
index 59f10a1ddc..027de1ee8a 100644
--- a/app/util/errors.spec.ts
+++ b/app/util/errors.spec.ts
@@ -61,8 +61,8 @@ describe('getServerError', () => {
     expect(getServerError(unauthorized, {})).toEqual('Action not authorized')
   })
 
-  it('falls back to generic message if server message empty', () => {
+  it('returns null if the error object is null', () => {
     // happens if json parsing fails
-    expect(getServerError(null, {})).toEqual('Unknown error from server')
+    expect(getServerError(null, {})).toEqual(null)
   })
 })

From 358bdc921301557c45688b9694388ae3b7ed551b Mon Sep 17 00:00:00 2001
From: David Crespo <david.crespo@oxidecomputer.com>
Date: Mon, 6 Dec 2021 16:42:57 -0600
Subject: [PATCH 17/21] don't be scared, extract the whole onSuccess

---
 app/pages/ProjectCreatePage.tsx | 46 ++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/pages/ProjectCreatePage.tsx b/app/pages/ProjectCreatePage.tsx
index 3407d4cb82..3bd2fb1271 100644
--- a/app/pages/ProjectCreatePage.tsx
+++ b/app/pages/ProjectCreatePage.tsx
@@ -32,29 +32,8 @@ export function ProjectCreateForm({
   orgName: string
   onSuccess: (p: Project) => void
 }) {
-  const queryClient = useApiQueryClient()
-  const addToast = useToast()
-
   const createProject = useApiMutation('organizationProjectsPost', {
-    onSuccess: (project) => {
-      // refetch list of projects in sidebar
-      queryClient.invalidateQueries('organizationProjectsGet', {
-        organizationName: orgName,
-      })
-      // avoid the project fetch when the project page loads since we have the data
-      queryClient.setQueryData(
-        'organizationProjectsGetProject',
-        { organizationName: orgName, projectName: project.name },
-        project
-      )
-      addToast({
-        icon: <Success16Icon />,
-        title: 'Success!',
-        content: 'Your project has been created.',
-        timeout: 5000,
-      })
-      onSuccess(project)
-    },
+    onSuccess,
   })
   return (
     <Formik
@@ -110,7 +89,10 @@ export function ProjectCreateForm({
 }
 
 export default function ProjectCreatePage() {
+  const queryClient = useApiQueryClient()
+  const addToast = useToast()
   const navigate = useNavigate()
+
   const { orgName } = useParams('orgName')
   return (
     <>
@@ -121,7 +103,25 @@ export default function ProjectCreatePage() {
       </PageHeader>
       <ProjectCreateForm
         orgName={orgName}
-        onSuccess={(project) => navigate(`../${project.name}`)}
+        onSuccess={(project) => {
+          // refetch list of projects in sidebar
+          queryClient.invalidateQueries('organizationProjectsGet', {
+            organizationName: orgName,
+          })
+          // avoid the project fetch when the project page loads since we have the data
+          queryClient.setQueryData(
+            'organizationProjectsGetProject',
+            { organizationName: orgName, projectName: project.name },
+            project
+          )
+          addToast({
+            icon: <Success16Icon />,
+            title: 'Success!',
+            content: 'Your project has been created.',
+            timeout: 5000,
+          })
+          navigate(`../${project.name}`)
+        }}
       />
     </>
   )

From 4fe96527f00e49e5c9cbccb178815a4cf7c82e33 Mon Sep 17 00:00:00 2001
From: David Crespo <david.crespo@oxidecomputer.com>
Date: Mon, 6 Dec 2021 18:07:25 -0600
Subject: [PATCH 18/21] use package-patch instead of swagger (including patched
 template)

---
 package.json                               |  6 ++-
 patches/swagger-typescript-api+9.3.1.patch | 45 +++++++++++++++++
 yarn.lock                                  | 56 ++++++++++++++++++++--
 3 files changed, 101 insertions(+), 6 deletions(-)
 create mode 100644 patches/swagger-typescript-api+9.3.1.patch

diff --git a/package.json b/package.json
index 8ca95f2f93..953f13399b 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,8 @@
     "storybook:clean": "rm -rf node_modules/.cache",
     "build:storybook": "build-storybook -c libs/ui/.storybook -o dist/storybook/ui",
     "//": "Required due to jscodeshift shipping with windows line endings starting in v0.12. See https://github.com/facebook/jscodeshift/issues/424.",
-    "jscodeshift": "node node_modules/.bin/jscodeshift"
+    "jscodeshift": "node node_modules/.bin/jscodeshift",
+    "postinstall": "patch-package"
   },
   "private": true,
   "dependencies": {
@@ -102,13 +103,14 @@
     "jest": "^26.6.3",
     "jscodeshift": "^0.13.0",
     "node-fetch": "^2.6.1",
+    "patch-package": "^6.4.7",
     "plop": "^2.7.6",
     "postcss": "^8.2.9",
     "postcss-import": "^14.0.2",
     "postcss-nesting": "^10.0.2",
     "prettier": "2.5.0",
     "rollup": "^2.52.7",
-    "swagger-typescript-api": "https://github.com/oxidecomputer/swagger-typescript-api#48bdd2381485560f0ea3c2013105e379c2c0e2a0",
+    "swagger-typescript-api": "9.3.1",
     "tailwindcss": "^3.0.0-alpha.2",
     "ts-node": "^9.1.1",
     "tsconfig-paths-webpack-plugin": "^3.5.1",
diff --git a/patches/swagger-typescript-api+9.3.1.patch b/patches/swagger-typescript-api+9.3.1.patch
new file mode 100644
index 0000000000..399c5a1a82
--- /dev/null
+++ b/patches/swagger-typescript-api+9.3.1.patch
@@ -0,0 +1,45 @@
+diff --git a/node_modules/swagger-typescript-api/src/routes.js b/node_modules/swagger-typescript-api/src/routes.js
+index 2beb1a0..b3a9f77 100644
+--- a/node_modules/swagger-typescript-api/src/routes.js
++++ b/node_modules/swagger-typescript-api/src/routes.js
+@@ -299,7 +299,7 @@ const createRequestParamsSchema = ({
+   extractRequestParams,
+   routeName,
+ }) => {
+-  if (!queryParams || !queryParams.length) return null;
++  if (!extractRequestParams && (!queryParams || !queryParams.length)) return null;
+ 
+   const pathParams = _.reduce(
+     pathArgsSchemas,
+@@ -683,7 +683,7 @@ const parseRoutes = ({
+ 
+           const routeData = {
+             id: routeId,
+-            namespace: _.replace(moduleName, /^(\d)/, "v$1"),
++            namespace: "methods",
+             routeName,
+             routeParams,
+             requestBodyInfo,
+diff --git a/node_modules/swagger-typescript-api/templates/default/procedure-call.eta b/node_modules/swagger-typescript-api/templates/default/procedure-call.eta
+index 7ff931c..7423fd1 100644
+--- a/node_modules/swagger-typescript-api/templates/default/procedure-call.eta
++++ b/node_modules/swagger-typescript-api/templates/default/procedure-call.eta
+@@ -21,14 +21,15 @@ const requestConfigParam = {
+ 
+ const argToTmpl = ({ name, optional, type, defaultValue }) => `${name}${!defaultValue && optional ? '?' : ''}: ${type}${defaultValue ? ` = ${defaultValue}` : ''}`;
+ 
++const querySpread = query ? `...${queryName} ` : '';
++
+ const rawWrapperArgs = config.extractRequestParams ?
+     _.compact([
+-        requestParams && {
+-          name: pathParams.length ? `{ ${_.join(pathParamsNames, ", ")}, ...${queryName} }` : queryName,
++        Object.keys(requestParams).length > 0 && {
++          name: pathParams.length ? `{ ${_.join(pathParamsNames, ", ")}, ${querySpread}}` : queryName,
+           optional: false,
+           type: getInlineParseContent(requestParams),
+         },
+-        ...(!requestParams ? pathParams : []),
+         payload,
+         requestConfigParam,
+     ]) :
diff --git a/yarn.lock b/yarn.lock
index 167b90173f..b4d515caab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4100,6 +4100,11 @@
   resolved "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
+"@yarnpkg/lockfile@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
+  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
+
 abab@^2.0.3, abab@^2.0.5:
   version "2.0.5"
   resolved "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz"
@@ -5883,7 +5888,7 @@ cross-spawn@7.0.3, cross-spawn@^7.0.0, cross-spawn@^7.0.2:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-cross-spawn@^6.0.0:
+cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"
   integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
@@ -7528,6 +7533,13 @@ find-up@^5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
+find-yarn-workspace-root@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz#f47fb8d239c900eb78179aa81b66673eac88f7bd"
+  integrity sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==
+  dependencies:
+    micromatch "^4.0.2"
+
 findup-sync@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz"
@@ -7712,6 +7724,15 @@ fs-extra@^0.30.0:
     path-is-absolute "^1.0.0"
     rimraf "^2.2.8"
 
+fs-extra@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
+  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-extra@^8.1:
   version "8.1.0"
   resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz"
@@ -9753,6 +9774,13 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
+klaw-sync@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/klaw-sync/-/klaw-sync-6.0.0.tgz#1fd2cfd56ebb6250181114f0a581167099c2b28c"
+  integrity sha512-nIeuVSzdCCs6TDPTqI8w1Yre34sSq7AkZ4B3sfOBbI2CgVSB4Du4aLQijFU2+lhAFCwt9+42Hel6lQNIv6AntQ==
+  dependencies:
+    graceful-fs "^4.1.11"
+
 klaw@^1.0.0:
   version "1.3.1"
   resolved "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz"
@@ -10926,7 +10954,7 @@ onetime@^5.1.0:
   dependencies:
     mimic-fn "^2.1.0"
 
-open@^7.0.2, open@^7.0.3:
+open@^7.0.2, open@^7.0.3, open@^7.4.2:
   version "7.4.2"
   resolved "https://registry.npmjs.org/open/-/open-7.4.2.tgz"
   integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==
@@ -11216,6 +11244,25 @@ pascalcase@^0.1.1:
   resolved "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"
   integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
+patch-package@^6.4.7:
+  version "6.4.7"
+  resolved "https://registry.yarnpkg.com/patch-package/-/patch-package-6.4.7.tgz#2282d53c397909a0d9ef92dae3fdeb558382b148"
+  integrity sha512-S0vh/ZEafZ17hbhgqdnpunKDfzHQibQizx9g8yEf5dcVk3KOflOfdufRXQX8CSEkyOQwuM/bNz1GwKvFj54kaQ==
+  dependencies:
+    "@yarnpkg/lockfile" "^1.1.0"
+    chalk "^2.4.2"
+    cross-spawn "^6.0.5"
+    find-yarn-workspace-root "^2.0.0"
+    fs-extra "^7.0.1"
+    is-ci "^2.0.0"
+    klaw-sync "^6.0.0"
+    minimist "^1.2.0"
+    open "^7.4.2"
+    rimraf "^2.6.3"
+    semver "^5.6.0"
+    slash "^2.0.0"
+    tmp "^0.0.33"
+
 path-browserify@0.0.1:
   version "0.0.1"
   resolved "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz"
@@ -13521,9 +13568,10 @@ swagger-schema-official@2.0.0-bab6bed:
   resolved "https://registry.yarnpkg.com/swagger-schema-official/-/swagger-schema-official-2.0.0-bab6bed.tgz#70070468d6d2977ca5237b2e519ca7d06a2ea3fd"
   integrity sha1-cAcEaNbSl3ylI3suUZyn0Gouo/0=
 
-"swagger-typescript-api@https://github.com/oxidecomputer/swagger-typescript-api#48bdd2381485560f0ea3c2013105e379c2c0e2a0":
+swagger-typescript-api@9.3.1:
   version "9.3.1"
-  resolved "https://github.com/oxidecomputer/swagger-typescript-api#48bdd2381485560f0ea3c2013105e379c2c0e2a0"
+  resolved "https://registry.yarnpkg.com/swagger-typescript-api/-/swagger-typescript-api-9.3.1.tgz#07df3aa8e83a3897356a6e820e88b8348830aa6b"
+  integrity sha512-vtarFELmXmDKrtY2FvU2OjNvN1BqOj3kHWzz7mAresNKRgRubZpjlopECxbBekrLeX3lezAYSNcrFMVRGJAD4A==
   dependencies:
     "@types/swagger-schema-official" "2.0.21"
     axios "^0.21.4"

From 8f4836f39aeb735ac010840cc205b81ec0883c4c Mon Sep 17 00:00:00 2001
From: David Crespo <david.crespo@oxidecomputer.com>
Date: Mon, 6 Dec 2021 18:13:06 -0600
Subject: [PATCH 19/21] don't need git if we're not using a fork

---
 Dockerfile          | 1 -
 packer/provision.sh | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5adbfb26c0..cb25b40761 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,6 @@ WORKDIR /app
 ENV PATH /app/node_modules/.bin:$PATH
 COPY package.json ./
 COPY yarn.lock ./
-RUN apk update && apk add git
 RUN yarn
 COPY . ./
 RUN yarn build
diff --git a/packer/provision.sh b/packer/provision.sh
index abf452c070..3d70dd15b8 100755
--- a/packer/provision.sh
+++ b/packer/provision.sh
@@ -35,9 +35,6 @@ sudo apt update
 sudo apt install -y --no-install-recommends \
 	yarn
 
-# Install git (temporary, only needed for one package we're pulling from a GH fork)
-sudo apt install -y --no-install-recommends git
-
 # Update systemd to include our service files.
 sudo mv /tmp/iptables-routing.service /etc/systemd/system/iptables-routing.service
 sudo systemctl daemon-reload

From fbb5e8236ebd0d6c07c9ccef31d2085e2a4f4d2c Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 7 Dec 2021 00:21:50 +0000
Subject: [PATCH 20/21] automatically update packer-id

---
 tools/create_gcp_instance.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/create_gcp_instance.sh b/tools/create_gcp_instance.sh
index 455ec7cad1..a5f07cb999 100755
--- a/tools/create_gcp_instance.sh
+++ b/tools/create_gcp_instance.sh
@@ -41,7 +41,7 @@ retry 2 gcloud compute instances create "$INSTANCE_NAME" \
 	--description="Machine automatically generated from branch ${BRANCH_NAME} of the oxidecomputer/console git repo." \
 	--hostname="${INSTANCE_NAME}.internal.oxide.computer" \
 	--zone=$ZONE \
-	--image=packer-1638826910 \
+	--image=packer-1638836035 \
 	--maintenance-policy=TERMINATE \
 	--restart-on-failure \
 	--machine-type=$INSTANCE_TYPE \

From a6fb60d1d725218fe8e5c86e0485ee524b8f4aee Mon Sep 17 00:00:00 2001
From: Justin Bennett <oss@just-be.dev>
Date: Mon, 6 Dec 2021 20:10:53 -0500
Subject: [PATCH 21/21] remove codemods, update link in readme

---
 README.md                                   |  2 +-
 codemods/collapse-generated-enums.api.js    | 34 ------------------
 codemods/patch-to-json-type-failures.api.js | 38 ---------------------
 codemods/safe-fetch.api.js                  | 24 -------------
 4 files changed, 1 insertion(+), 97 deletions(-)
 delete mode 100644 codemods/collapse-generated-enums.api.js
 delete mode 100644 codemods/patch-to-json-type-failures.api.js
 delete mode 100644 codemods/safe-fetch.api.js

diff --git a/README.md b/README.md
index d81d4b6487..77e2127da9 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Web client to the [Oxide control plane API](https://github.com/oxidecomputer/omi
 - [React](https://reactjs.org/) (+ [React Router](https://reactrouter.com/), [React Query](https://react-query.tanstack.com), [React Table](https://react-table.tanstack.com))
 - [Jest](https://jestjs.io/) + [React Testing Library](https://testing-library.com/docs/react-testing-library/intro/)
 - [Tailwind](https://tailwindcss.com/)
-- [OpenAPI Generator](https://openapi-generator.tech/) (generates typed API client from Nexus's [OpenAPI spec](app/docs/nexus-openapi.json))
+- [OpenAPI Generator](https://github.com/acacode/swagger-typescript-api) (generates typed API client from Nexus's [OpenAPI spec](app/docs/nexus-openapi.json))
 - [Vite](https://vitejs.dev/)
 - [Storybook](https://storybook.js.org/) (see main branch Storybook [here](https://console-ui-storybook.vercel.app/))
 
diff --git a/codemods/collapse-generated-enums.api.js b/codemods/collapse-generated-enums.api.js
deleted file mode 100644
index c9d6268528..0000000000
--- a/codemods/collapse-generated-enums.api.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * This codemod flattens the disk states referenced from files like
- * `libs/api/__generated__/models/DiskState.ts` to ensure they result
- * in a discriminable union instead of a union of single member enums
- *
- * @param {import('jscodeshift').FileInfo} file
- * @param {import('jscodeshift').API} api
- */
-export default function transformer(file, api) {
-  const j = api.jscodeshift
-  const source = j(file.source)
-  let stateName = ''
-  let enumName = ''
-
-  if (file.path.includes('__generated__') && file.path.includes('OneOf')) {
-    source
-      .find(j.ExportNamedDeclaration, {
-        declaration: { type: 'TSEnumDeclaration' },
-      })
-      .forEach((path) => {
-        enumName = path.value.declaration.id.name
-        stateName = path.value.declaration.members[0].initializer.value
-        if (!enumName || !stateName) {
-          throw new Error(`Transform failed for ${file.path}`)
-        }
-      })
-      .remove()
-
-    return source
-      .find(j.Identifier, { name: enumName })
-      .replaceWith(j.literal(stateName))
-      .toSource()
-  }
-}
diff --git a/codemods/patch-to-json-type-failures.api.js b/codemods/patch-to-json-type-failures.api.js
deleted file mode 100644
index b0f049ba5f..0000000000
--- a/codemods/patch-to-json-type-failures.api.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- *
- * @param {import('jscodeshift').FunctionDeclaration} funcDeclaration
- */
-const ToJSONFunctionFilter = (funcDeclaration) => {
-  return funcDeclaration.id.name.endsWith('ToJSON')
-}
-
-/**
- *
- * @param {import('jscodeshift').ReturnStatement} retStatement
- */
-const ReturnsObjectSpread = (retStatement) => {
-  return (
-    retStatement.argument.type === 'ObjectExpression' &&
-    retStatement.argument.properties.every((p) => p.type === 'SpreadElement')
-  )
-}
-
-/**
- * This codemod patches type failures in the generated functions like
- * `DiskStateToJSON` of `libs/api/__generated__/models/DiskState.ts`
- *
- * @param {import('jscodeshift').FileInfo} file
- * @param {import('jscodeshift').API} api
- */
-export default function transformer(file, api) {
-  const j = api.jscodeshift
-  const source = j(file.source)
-
-  return source
-    .find(j.FunctionDeclaration, ToJSONFunctionFilter)
-    .find(j.ReturnStatement, ReturnsObjectSpread)
-    .find(j.CallExpression)
-    .find(j.Identifier, { name: 'value' })
-    .replaceWith(j.tsAsExpression(j.identifier('value'), j.tsAnyKeyword()))
-    .toSource()
-}
diff --git a/codemods/safe-fetch.api.js b/codemods/safe-fetch.api.js
deleted file mode 100644
index 2e8c43ae19..0000000000
--- a/codemods/safe-fetch.api.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * This codemod patches the open-api's generated `runtime.ts` file
- * to ensure the member property `get fetchApi` returns a valid fetch
- * function.
- *
- * @param {import('jscodeshift').FileInfo} file
- * @param {import('jscodeshift').API} api
- */
-export default function transformer(file, api) {
-  const j = api.jscodeshift
-  const source = j(file.source)
-
-  if (!file.path.endsWith('runtime.ts')) return
-
-  return source
-    .find(j.ClassMethod, { key: { name: 'fetchApi' } })
-    .find(j.ReturnStatement)
-    .replaceWith((r) =>
-      j.returnStatement(
-        j.logicalExpression('||', r.value.argument, j.identifier('fetch'))
-      )
-    )
-    .toSource()
-}