Skip to content

Bump dropshot from 0ae4dd3 to 21e86a2 #1789

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.

Sign up for GitHub

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 2 commits into from
Oct 5, 2022
Merged

Bump dropshot from 0ae4dd3 to 21e86a2 #1789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae95ab8
Bump dropshot from `0ae4dd3` to `21e86a2`
dependabot[bot] Oct 5, 2022
5ca61d1
fix output
ahl Oct 5, 2022
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
12 changes: 6 additions & 6 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

98 changes: 76 additions & 22 deletions common/tests/output/pagination-schema.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,14 @@ schema for pagination parameters: scan parameters, scan by name only
"definitions": {
"NameSortMode": {
"description": "Supported set of sort modes for scanning by name only\n\nCurrently, we only support scanning in ascending order.",
"type": "string",
"enum": [
"name_ascending"
"oneOf": [
{
"description": "sort in increasing order of \"name\"",
"type": "string",
"enum": [
"name_ascending"
]
}
]
}
}
Expand All @@ -43,9 +48,14 @@ schema for pagination parameters: scan parameters, scan by id only
"definitions": {
"IdSortMode": {
"description": "Supported set of sort modes for scanning by id only.\n\nCurrently, we only support scanning in ascending order.",
"type": "string",
"enum": [
"id_ascending"
"oneOf": [
{
"description": "sort in increasing order of \"id\"",
"type": "string",
"enum": [
"id_ascending"
]
}
]
}
}
Expand All @@ -69,11 +79,28 @@ schema for pagination parameters: scan parameters, scan by name or id
"definitions": {
"NameOrIdSortMode": {
"description": "Supported set of sort modes for scanning by name or id",
"type": "string",
"enum": [
"name_ascending",
"name_descending",
"id_ascending"
"oneOf": [
{
"description": "sort in increasing order of \"name\"",
"type": "string",
"enum": [
"name_ascending"
]
},
{
"description": "sort in decreasing order of \"name\"",
"type": "string",
"enum": [
"name_descending"
]
},
{
"description": "sort in increasing order of \"id\"",
"type": "string",
"enum": [
"id_ascending"
]
}
]
}
}
Expand Down Expand Up @@ -115,9 +142,14 @@ schema for pagination parameters: page selector, scan by name only
},
"NameSortMode": {
"description": "Supported set of sort modes for scanning by name only\n\nCurrently, we only support scanning in ascending order.",
"type": "string",
"enum": [
"name_ascending"
"oneOf": [
{
"description": "sort in increasing order of \"name\"",
"type": "string",
"enum": [
"name_ascending"
]
}
]
}
}
Expand Down Expand Up @@ -149,9 +181,14 @@ schema for pagination parameters: page selector, scan by id only
"definitions": {
"IdSortMode": {
"description": "Supported set of sort modes for scanning by id only.\n\nCurrently, we only support scanning in ascending order.",
"type": "string",
"enum": [
"id_ascending"
"oneOf": [
{
"description": "sort in increasing order of \"id\"",
"type": "string",
"enum": [
"id_ascending"
]
}
]
}
}
Expand Down Expand Up @@ -222,11 +259,28 @@ schema for pagination parameters: page selector, scan by name or id
},
"NameOrIdSortMode": {
"description": "Supported set of sort modes for scanning by name or id",
"type": "string",
"enum": [
"name_ascending",
"name_descending",
"id_ascending"
"oneOf": [
{
"description": "sort in increasing order of \"name\"",
"type": "string",
"enum": [
"name_ascending"
]
},
{
"description": "sort in decreasing order of \"name\"",
"type": "string",
"enum": [
"name_descending"
]
},
{
"description": "sort in increasing order of \"id\"",
"type": "string",
"enum": [
"id_ascending"
]
}
]
}
}
Expand Down
102 changes: 86 additions & 16 deletions openapi/nexus-internal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1500,18 +1500,77 @@
},
"InstanceState": {
"description": "Running state of an Instance (primarily: booted or stopped)\n\nThis typically reflects whether it's starting, running, stopping, or stopped, but also includes states related to the Instance's lifecycle",
"type": "string",
"enum": [
"creating",
"starting",
"running",
"stopping",
"stopped",
"rebooting",
"migrating",
"repairing",
"failed",
"destroyed"
"oneOf": [
{
"description": "The instance is being created.",
"type": "string",
"enum": [
"creating"
]
},
{
"description": "The instance is currently starting up.",
"type": "string",
"enum": [
"starting"
]
},
{
"description": "The instance is currently running.",
"type": "string",
"enum": [
"running"
]
},
{
"description": "The instance has been requested to stop and a transition to \"Stopped\" is imminent.",
"type": "string",
"enum": [
"stopping"
]
},
{
"description": "The instance is currently stopped.",
"type": "string",
"enum": [
"stopped"
]
},
{
"description": "The instance is in the process of rebooting - it will remain in the \"rebooting\" state until the VM is starting once more.",
"type": "string",
"enum": [
"rebooting"
]
},
{
"description": "The instance is in the process of migrating - it will remain in the \"migrating\" state until the migration process is complete and the destination propolis is ready to continue execution.",
"type": "string",
"enum": [
"migrating"
]
},
{
"description": "The instance is attempting to recover from a failure.",
"type": "string",
"enum": [
"repairing"
]
},
{
"description": "The instance has encountered a failure.",
"type": "string",
"enum": [
"failed"
]
},
{
"description": "The instance has been deleted.",
"type": "string",
"enum": [
"destroyed"
]
}
]
},
"Measurement": {
Expand Down Expand Up @@ -1808,10 +1867,21 @@
},
"SledRole": {
"description": "Describes the role of the sled within the rack.\n\nNote that this may change if the sled is physically moved within the rack.",
"type": "string",
"enum": [
"gimlet",
"scrimlet"
"oneOf": [
{
"description": "The sled is a general compute sled.",
"type": "string",
"enum": [
"gimlet"
]
},
{
"description": "The sled is attached to the network switch, and has additional responsibilities.",
"type": "string",
"enum": [
"scrimlet"
]
}
]
},
"ZpoolPutRequest": {
Expand Down
Loading