maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(3p/nix): Implement two more RPC calls

Browse source 
Implement AddTextToStore and BuildPaths both on the client and the
server

Refs: #29
Change-Id: I45294c3e1c1a7489e42099d36425b7acc04e0427
Reviewed-on: https://cl.tvl.fyi/c/depot/+/1560
Reviewed-by: kanepyork <rikingcoding@gmail.com>
Tested-by: BuildkiteCI
This commit is contained in:
Griffin Smith 2020-08-01 20:23:53 -04:00 • committed by glittershark
parent 8a1c7da357
commit 209489e348
4 changed files with 76 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

36
third_party/nix/src/nix-daemon/nix-daemon-proto.cc vendored
View file

@ -172,6 +172,40 @@ class WorkerServiceImpl final : public WorkerService::Service {
return Status::OK;
}
Status AddTextToStore(grpc::ServerContext*,
const nix::proto::AddTextToStoreRequest* request,
nix::proto::StorePath* response) override {
PathSet references;
for (const auto& ref : request->references()) {
references.insert(ref);
}
auto path =
store_->addTextToStore(request->name(), request->content(), references);
response->set_path(path);
return Status::OK;
}
Status BuildPaths(grpc::ServerContext*,
const nix::proto::BuildPathsRequest* request,
google::protobuf::Empty*) override {
PathSet drvs;
for (const auto& drv : request->drvs()) {
drvs.insert(drv);
}
auto mode = BuildModeFrom(request->mode());
if (!mode.has_value()) {
return Status(grpc::StatusCode::INTERNAL, "Invalid build mode");
}
// TODO(grfn): If mode is repair and not trusted, we need to return an error
// here (but we can't yet because we don't know anything about trusted
// users)
store_->buildPaths(drvs, mode.value());
return Status::OK;
}
Status QuerySubstitutablePathInfos(
grpc::ServerContext*, const StorePaths* request,
nix::proto::SubstitutablePathInfos* response) override {
@ -357,7 +391,7 @@ class WorkerServiceImpl final : public WorkerService::Service {
store_->assertStorePath(drv_path);
auto drv = BasicDerivation::from_proto(&request->derivation(), *store_);
auto build_mode = nix::build_mode_from(request->build_mode());
auto build_mode = nix::BuildModeFrom(request->build_mode());
if (!build_mode) {
return Status(grpc::StatusCode::INTERNAL, "Invalid build mode");
}