Skip to content

Update pinned omicron version #474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Oct 1, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/packer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
CLOUDFLARE_TOKEN: ${{secrets.CLOUDFLARE_TOKEN}}
SSL_CERT: ${{secrets.SSL_CERT}}
SSL_KEY: ${{secrets.SSL_KEY}}
API_VERSION: ee3fa440088b0298c7df1a84fec1811a8448b424
API_VERSION: 9ecefb6eb2d4c38040ad5afa33dd84f9ce22d0a2

# get the image information from gcloud
- name: Get image information
Expand Down
316 changes: 305 additions & 11 deletions app/docs/nexus-openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -1142,6 +1142,252 @@
}
}
},
"/projects/{project_name}/vpcs/{vpc_name}/subnets": {
"get": {
"description": "List subnets in a VPC.",
"operationId": "vpc_subnets_get",
"parameters": [
{
"in": "query",
"name": "limit",
"schema": {
"description": "Maximum number of items returned by a single call",
"type": "integer",
"format": "uint32",
"minimum": 1
},
"style": "form"
},
{
"in": "query",
"name": "page_token",
"schema": {
"description": "Token returned by previous call to retreive the subsequent page",
"type": "string"
},
"style": "form"
},
{
"in": "query",
"name": "sort_by",
"schema": {
"$ref": "#/components/schemas/NameSortMode"
},
"style": "form"
},
{
"in": "path",
"name": "project_name",
"required": true,
"schema": {
"$ref": "#/components/schemas/Name"
},
"style": "simple"
},
{
"in": "path",
"name": "vpc_name",
"required": true,
"schema": {
"$ref": "#/components/schemas/Name"
},
"style": "simple"
}
],
"responses": {
"200": {
"description": "successful operation",
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/VpcSubnetResultsPage"
}
}
}
}
},
"x-dropshot-pagination": true
},
"post": {
"description": "Create a subnet in a VPC.",
"operationId": "vpc_subnets_post",
"parameters": [
{
"in": "path",
"name": "project_name",
"required": true,
"schema": {
"$ref": "#/components/schemas/Name"
},
"style": "simple"
},
{
"in": "path",
"name": "vpc_name",
"required": true,
"schema": {
"$ref": "#/components/schemas/Name"
},
"style": "simple"
}
],
"requestBody": {
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/VpcSubnetCreateParams"
}
}
},
"required": true
},
"responses": {
"201": {
"description": "successful creation",
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/VpcSubnet"
}
}
}
}
}
}
},
"/projects/{project_name}/vpcs/{vpc_name}/subnets/{subnet_name}": {
"get": {
"description": "Get subnet in a VPC.",
"operationId": "vpc_subnets_get_subnet",
"parameters": [
{
"in": "path",
"name": "project_name",
"required": true,
"schema": {
"$ref": "#/components/schemas/Name"
},
"style": "simple"
},
{
"in": "path",
"name": "subnet_name",
"required": true,
"schema": {
"$ref": "#/components/schemas/Name"
},
"style": "simple"
},
{
"in": "path",
"name": "vpc_name",
"required": true,
"schema": {
"$ref": "#/components/schemas/Name"
},
"style": "simple"
}
],
"responses": {
"200": {
"description": "successful operation",
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/VpcSubnet"
}
}
}
}
}
},
"put": {
"description": "Update a VPC Subnet.",
"operationId": "vpc_subnets_put_subnet",
"parameters": [
{
"in": "path",
"name": "project_name",
"required": true,
"schema": {
"$ref": "#/components/schemas/Name"
},
"style": "simple"
},
{
"in": "path",
"name": "subnet_name",
"required": true,
"schema": {
"$ref": "#/components/schemas/Name"
},
"style": "simple"
},
{
"in": "path",
"name": "vpc_name",
"required": true,
"schema": {
"$ref": "#/components/schemas/Name"
},
"style": "simple"
}
],
"requestBody": {
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/VpcSubnetUpdateParams"
}
}
},
"required": true
},
"responses": {
"200": {
"description": "successful operation"
}
}
},
"delete": {
"description": "Delete a subnet from a VPC.",
"operationId": "vpc_subnets_delete_subnet",
"parameters": [
{
"in": "path",
"name": "project_name",
"required": true,
"schema": {
"$ref": "#/components/schemas/Name"
},
"style": "simple"
},
{
"in": "path",
"name": "subnet_name",
"required": true,
"schema": {
"$ref": "#/components/schemas/Name"
},
"style": "simple"
},
{
"in": "path",
"name": "vpc_name",
"required": true,
"schema": {
"$ref": "#/components/schemas/Name"
},
"style": "simple"
}
],
"responses": {
"204": {
"description": "successful deletion"
}
}
}
},
"/sagas": {
"get": {
"description": "List all sagas (for debugging)",
Expand Down Expand Up @@ -1348,7 +1594,7 @@
},
"DiskState": {
"description": "State of a Disk (primarily: attached or not)",
"anyOf": [
"oneOf": [
{
"description": "Disk is being initialized",
"type": "object",
Expand Down Expand Up @@ -1728,7 +1974,7 @@
"required": ["id", "state"]
},
"SagaErrorInfo": {
"anyOf": [
"oneOf": [
{
"type": "object",
"properties": {
Expand Down Expand Up @@ -1810,7 +2056,7 @@
"required": ["items"]
},
"SagaState": {
"anyOf": [
"oneOf": [
{
"type": "object",
"properties": {
Expand Down Expand Up @@ -1939,12 +2185,6 @@
"description": "timestamp when this resource was last modified",
"type": "string",
"format": "date-time"
},
"vpcSubnets": {
"type": "array",
"items": {
"$ref": "#/components/schemas/VpcSubnet"
}
}
},
"required": [
Expand All @@ -1954,8 +2194,7 @@
"name",
"projectId",
"timeCreated",
"timeModified",
"vpcSubnets"
"timeModified"
]
},
"VpcCreateParams": {
Expand Down Expand Up @@ -2013,6 +2252,61 @@
},
"required": ["identity", "vpc_id"]
},
"VpcSubnetCreateParams": {
"description": "Create-time parameters for a [`VpcSubnet`]",
"type": "object",
"properties": {
"description": {
"type": "string"
},
"ipv4Block": {
"$ref": "#/components/schemas/Ipv4Net"
},
"ipv6Block": {
"$ref": "#/components/schemas/Ipv6Net"
},
"name": {
"$ref": "#/components/schemas/Name"
}
},
"required": ["description", "name"]
},
"VpcSubnetResultsPage": {
"description": "A single page of results",
"type": "object",
"properties": {
"items": {
"description": "list of items on this page of results",
"type": "array",
"items": {
"$ref": "#/components/schemas/VpcSubnet"
}
},
"next_page": {
"description": "token used to fetch the next page of results (if any)",
"type": "string"
}
},
"required": ["items"]
},
"VpcSubnetUpdateParams": {
"description": "Updateable properties of a [`VpcSubnet`]",
"type": "object",
"properties": {
"description": {
"type": "string"
},
"ipv4Block": {
"$ref": "#/components/schemas/Ipv4Net"
},
"ipv6Block": {
"$ref": "#/components/schemas/Ipv6Net"
},
"name": {
"$ref": "#/components/schemas/Name"
}
}
},
"VpcUpdateParams": {
"description": "Updateable properties of a [`Vpc`]",
"type": "object",
Expand Down
4 changes: 1 addition & 3 deletions app/pages/instances/create/existing-disk-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ type Props = {
}

const isUnattached = ({ state }: Disk) => {
// HACK: the DiskState types are all messed up, so here we work around that
// by casting the state to a string, which we know it is
const stateStr = state.state as string
const stateStr = state.state
return (
stateStr !== 'attached' &&
stateStr !== 'attaching' &&
Expand Down
Loading