Skip to content
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

Bump dropshot from 8e4af93 to 85799da #640

Merged
merged 2 commits into from
Jan 26, 2022
Merged

Bump dropshot from 8e4af93 to 85799da #640

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
2ae1742
Bump dropshot from `8e4af93` to `85799da`
dependabot[bot] Jan 26, 2022
0b3c706
updates for dropshot
ahl Jan 26, 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
24 changes: 12 additions & 12 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.

12 changes: 8 additions & 4 deletions nexus/src/external_api/http_entrypoints.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,8 @@ async fn organizations_delete_organization(

/**
* 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
Expand Down Expand Up @@ -513,7 +514,8 @@ async fn organization_projects_delete_project(

/**
* 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
Expand Down Expand Up @@ -590,7 +592,8 @@ async fn project_disks_get(

/**
* Create a disk in a project.
*
*/
/*
* TODO-correctness See note about instance create. This should be async.
*/
#[endpoint {
Expand Down Expand Up @@ -734,7 +737,8 @@ async fn project_instances_get(

/**
* 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
Expand Down
16 changes: 8 additions & 8 deletions openapi/nexus-internal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"paths": {
"/disks/{disk_id}": {
"put": {
"description": "Report updated state for a disk.",
"summary": "Report updated state for a disk.",
"operationId": "cpapi_disks_put",
"parameters": [
{
Expand Down Expand Up @@ -45,7 +45,7 @@
},
"/instances/{instance_id}": {
"put": {
"description": "Report updated state for an instance.",
"summary": "Report updated state for an instance.",
"operationId": "cpapi_instances_put",
"parameters": [
{
Expand Down Expand Up @@ -78,7 +78,7 @@
},
"/metrics/collect/{producer_id}": {
"get": {
"description": "Endpoint for oximeter to collect nexus server metrics.",
"summary": "Endpoint for oximeter to collect nexus server metrics.",
"operationId": "cpapi_metrics_collect",
"parameters": [
{
Expand Down Expand Up @@ -112,7 +112,7 @@
},
"/metrics/collectors": {
"post": {
"description": "Accept a notification of a new oximeter collection server.",
"summary": "Accept a notification of a new oximeter collection server.",
"operationId": "cpapi_collectors_post",
"requestBody": {
"content": {
Expand All @@ -133,7 +133,7 @@
},
"/metrics/producers": {
"post": {
"description": "Accept a registration from a new metric producer",
"summary": "Accept a registration from a new metric producer",
"operationId": "cpapi_producers_post",
"requestBody": {
"content": {
Expand All @@ -154,7 +154,7 @@
},
"/sled_agents/{sled_id}": {
"post": {
"description": "Report that the sled agent for the specified sled has come online.",
"summary": "Report that the sled agent for the specified sled has come online.",
"operationId": "cpapi_sled_agents_post",
"parameters": [
{
Expand Down Expand Up @@ -187,7 +187,7 @@
},
"/sled_agents/{sled_id}/zpools/{zpool_id}": {
"put": {
"description": "Report that a pool for a specified sled has come online.",
"summary": "Report that a pool for a specified sled has come online.",
"operationId": "zpool_put",
"parameters": [
{
Expand Down Expand Up @@ -237,7 +237,7 @@
},
"/zpools/{zpool_id}/dataset/{dataset_id}": {
"put": {
"description": "Report that a dataset within a pool has come online.",
"summary": "Report that a dataset within a pool has come online.",
"operationId": "dataset_put",
"parameters": [
{
Expand Down
Loading