robur/builder-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

upload_binary: add binary_name query parameter

Browse source 
This allows for binary upload with a binary name other than <job>.bin,
making bootstrapping easier.
This commit is contained in:
Reynir Björnsson 2021-10-26 13:24:17 +02:00
parent a249eb0572
commit 9dc3fe7abe
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/builder_web.ml
View file

@ -301,6 +301,13 @@ let add_routes datadir =
let upload_binary req = let upload_binary req =
let job = Dream.param "job" req in let job = Dream.param "job" req in
let binary_name =
Dream.query "binary_name" req
|> Option.map Fpath.of_string
|> Option.value ~default:(Ok Fpath.(v job + "bin"))
in
if_error "Bad request" ~status:`Bad_Request (Lwt.return binary_name) >>=
fun binary_name ->
let* body = Dream.body req in let* body = Dream.body req in
Authorization.authorized req job Authorization.authorized req job
|> if_error ~status:`Forbidden "Forbidden" >>= fun () -> |> if_error ~status:`Forbidden "Forbidden" >>= fun () ->
@ -320,7 +327,7 @@ let add_routes datadir =
let exec = let exec =
let now = Ptime_clock.now () in let now = Ptime_clock.now () in
({ Builder.name = job ; script = "" }, uuid, [], now, now, Builder.Exited 0, ({ Builder.name = job ; script = "" }, uuid, [], now, now, Builder.Exited 0,
[ (Fpath.(v "bin" / job + "bin"), body) ]) [ (Fpath.(v "bin" // binary_name), body) ])
in in
(Lwt.return (Dream.local Authorization.user_info_local req |> (Lwt.return (Dream.local Authorization.user_info_local req |>
Option.to_result ~none:(`Msg "no authenticated user")) >>= fun (user_id, _) -> Option.to_result ~none:(`Msg "no authenticated user")) >>= fun (user_id, _) ->