Skip to content

Bump dropshot from ff33033 to e145e9b #473

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 5 commits into from
Dec 9, 2021
Merged

Bump dropshot from ff33033 to e145e9b #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
038f8ea
Bump dropshot from `ff33033` to `e145e9b`
dependabot[bot] Dec 2, 2021
486abb5
clean up some endpoints that should return HttpResponseUpdatedNoContent
ahl Dec 2, 2021
8f3aa4f
fix tests (the status codes changed)
ahl Dec 2, 2021
3c149d3
fix the other two tests
david-crespo Dec 2, 2021
5e2326f
Merge branch 'main' of github.com:oxidecomputer/omicron into dependab…
ahl Dec 8, 2021
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
4 changes: 2 additions & 2 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.

17 changes: 9 additions & 8 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 @@ -22,6 +22,7 @@ use dropshot::HttpResponseAccepted;
use dropshot::HttpResponseCreated;
use dropshot::HttpResponseDeleted;
use dropshot::HttpResponseOk;
use dropshot::HttpResponseUpdatedNoContent;
use dropshot::Path;
use dropshot::Query;
use dropshot::RequestContext;
Expand Down Expand Up @@ -1143,7 +1144,7 @@ async fn project_vpcs_put_vpc(
rqctx: Arc<RequestContext<Arc<ServerContext>>>,
path_params: Path<VpcPathParam>,
updated_vpc: TypedBody<params::VpcUpdate>,
) -> Result<HttpResponseOk<()>, HttpError> {
) -> Result<HttpResponseUpdatedNoContent, HttpError> {
let apictx = rqctx.context();
let nexus = &apictx.nexus;
let path = path_params.into_inner();
Expand All @@ -1156,7 +1157,7 @@ async fn project_vpcs_put_vpc(
&updated_vpc.into_inner(),
)
.await?;
Ok(HttpResponseOk(()))
Ok(HttpResponseUpdatedNoContent())
};
apictx.external_latencies.instrument_dropshot_handler(&rqctx, handler).await
}
Expand Down Expand Up @@ -1328,7 +1329,7 @@ async fn vpc_subnets_put_subnet(
rqctx: Arc<RequestContext<Arc<ServerContext>>>,
path_params: Path<VpcSubnetPathParam>,
subnet_params: TypedBody<params::VpcSubnetUpdate>,
) -> Result<HttpResponseOk<()>, HttpError> {
) -> Result<HttpResponseUpdatedNoContent, HttpError> {
let apictx = rqctx.context();
let nexus = &apictx.nexus;
let path = path_params.into_inner();
Expand All @@ -1342,7 +1343,7 @@ async fn vpc_subnets_put_subnet(
&subnet_params.into_inner(),
)
.await?;
Ok(HttpResponseOk(()))
Ok(HttpResponseUpdatedNoContent())
};
apictx.external_latencies.instrument_dropshot_handler(&rqctx, handler).await
}
Expand Down Expand Up @@ -1564,7 +1565,7 @@ async fn vpc_routers_put_router(
rqctx: Arc<RequestContext<Arc<ServerContext>>>,
path_params: Path<VpcRouterPathParam>,
router_params: TypedBody<params::VpcRouterUpdate>,
) -> Result<HttpResponseOk<()>, HttpError> {
) -> Result<HttpResponseUpdatedNoContent, HttpError> {
let apictx = rqctx.context();
let nexus = &apictx.nexus;
let path = path_params.into_inner();
Expand All @@ -1578,7 +1579,7 @@ async fn vpc_routers_put_router(
&router_params.into_inner(),
)
.await?;
Ok(HttpResponseOk(()))
Ok(HttpResponseUpdatedNoContent())
};
apictx.external_latencies.instrument_dropshot_handler(&rqctx, handler).await
}
Expand Down Expand Up @@ -1734,7 +1735,7 @@ async fn routers_routes_put_route(
rqctx: Arc<RequestContext<Arc<ServerContext>>>,
path_params: Path<RouterRoutePathParam>,
router_params: TypedBody<RouterRouteUpdateParams>,
) -> Result<HttpResponseOk<()>, HttpError> {
) -> Result<HttpResponseUpdatedNoContent, HttpError> {
let apictx = rqctx.context();
let nexus = &apictx.nexus;
let path = path_params.into_inner();
Expand All @@ -1749,7 +1750,7 @@ async fn routers_routes_put_route(
&router_params.into_inner(),
)
.await?;
Ok(HttpResponseOk(()))
Ok(HttpResponseUpdatedNoContent())
};
apictx.external_latencies.instrument_dropshot_handler(&rqctx, handler).await
}
Expand Down
2 changes: 1 addition & 1 deletion nexus/tests/test_router_routes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ async fn test_router_routes() {
"loopback".parse().unwrap(),
),
}),
StatusCode::OK,
StatusCode::NO_CONTENT,
)
.await
.unwrap();
Expand Down
2 changes: 1 addition & 1 deletion nexus/tests/test_vpc_routers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ async fn test_vpc_routers() {
Method::PUT,
&router_url,
Some(update_params),
StatusCode::OK,
StatusCode::NO_CONTENT,
)
.await
.unwrap();
Expand Down
2 changes: 1 addition & 1 deletion nexus/tests/test_vpc_subnets.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ async fn test_vpc_subnets() {
Method::PUT,
&subnet_url,
Some(update_params),
StatusCode::OK,
StatusCode::NO_CONTENT,
)
.await
.unwrap();
Expand Down
7 changes: 6 additions & 1 deletion nexus/tests/test_vpcs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,12 @@ async fn vpc_put(
params: params::VpcUpdate,
) {
client
.make_request(Method::PUT, &vpc_url, Some(params), StatusCode::OK)
.make_request(
Method::PUT,
&vpc_url,
Some(params),
StatusCode::NO_CONTENT,
)
.await
.unwrap();
}
Expand Down
16 changes: 8 additions & 8 deletions openapi/nexus.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1522,8 +1522,8 @@
"required": true
},
"responses": {
"200": {
"description": "successful operation"
"204": {
"description": "resource updated"
}
}
},
Expand Down Expand Up @@ -1939,8 +1939,8 @@
"required": true
},
"responses": {
"200": {
"description": "successful operation"
"204": {
"description": "resource updated"
}
}
},
Expand Down Expand Up @@ -2268,8 +2268,8 @@
"required": true
},
"responses": {
"200": {
"description": "successful operation"
"204": {
"description": "resource updated"
}
}
},
Expand Down Expand Up @@ -2570,8 +2570,8 @@
"required": true
},
"responses": {
"200": {
"description": "successful operation"
"204": {
"description": "resource updated"
}
}
},
Expand Down