[PATCH] http: Support fetching builds by derivation.

[PATCH] http: Support fetching builds by derivation.

[Christopher Baines via Development of GNU Guix and the GNU System distribution.]

There's a one to one mapping of build id to derivation, so allow querying by
derivation file name as well. I'm looking at this as I'm interested in getting
build information in to the Guix Data Service.

* src/cuirass/http.scm (url-handler): Add new clause to match statement, to
return build information by derivation file name.
---
 src/cuirass/http.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/cuirass/http.scm b/src/cuirass/http.scm
index 2da3637..3f37716 100644
--- a/src/cuirass/http.scm
+++ b/src/cuirass/http.scm
@@ -248,6 +248,13 @@ Hydra format."
        (if hydra-build
            (respond-json (object->json-string hydra-build))
            (respond-build-not-found build-id))))
+    (("build" "gnu" "store" derivation-file-name)
+     (let* ((full-derivation-file-name
+             (string-append "/gnu/store/" derivation-file-name))
+            (hydra-build (handle-build-request full-derivation-file-name)))
+       (if hydra-build
+           (respond-json (object->json-string hydra-build))
+           (respond-build-not-found full-derivation-file-name))))
     (("build" build-id "details")
      (let ((build (db-get-build (string->number build-id))))
        (if build
-- 
2.23.0

Re: [PATCH] http: Support fetching builds by derivation.

[Ludovic Courtès]

Hello!

Christopher Baines via "Development of GNU Guix and the GNU System
distribution." <guix-devel@gnu.org> skribis:

> There's a one to one mapping of build id to derivation, so allow querying by
> derivation file name as well. I'm looking at this as I'm interested in getting
> build information in to the Guix Data Service.
>
> * src/cuirass/http.scm (url-handler): Add new clause to match statement, to
> return build information by derivation file name.

[...]

> +    (("build" "gnu" "store" derivation-file-name)

Perhaps we can avoid /gnu/store in the URL, and…

> +     (let* ((full-derivation-file-name
> +             (string-append "/gnu/store/" derivation-file-name))

… use (%store-prefix) instead of "/gnu/store" here

Otherwise LGTM, thanks!

Ludo’.

[PATCH] http: Support fetching builds by derivation.

[Christopher Baines via Development of GNU Guix and the GNU System distribution.]

There's a one to one mapping of build id to derivation, so allow querying by
derivation file name as well. I'm looking at this as I'm interested in getting
build information in to the Guix Data Service.

* src/cuirass/http.scm (url-handler): Support fetching builds by numeric id or
the derivation file name.
---
 src/cuirass/http.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/cuirass/http.scm b/src/cuirass/http.scm
index 2da3637..b6a4358 100644
--- a/src/cuirass/http.scm
+++ b/src/cuirass/http.scm
@@ -42,6 +42,7 @@
   #:use-module (sxml simple)
   #:use-module (cuirass templates)
   #:use-module (guix utils)
+  #:use-module ((guix store) #:select (%store-prefix))
   #:use-module (guix build union)
   #:export (run-cuirass-server))
 
@@ -243,11 +244,14 @@ Hydra format."
     (((or "jobsets" "specifications") . rest)
      (respond-json (object->json-string
                     (list->vector (db-get-specifications)))))
-    (("build" build-id)
-     (let ((hydra-build (handle-build-request (string->number build-id))))
+    (("build" id)
+     (let ((hydra-build (handle-build-request
+                         (if (string-suffix? ".drv" id)
+                             (string-append (%store-prefix) "/" id)
+                             (string->number id)))))
        (if hydra-build
            (respond-json (object->json-string hydra-build))
-           (respond-build-not-found build-id))))
+           (respond-build-not-found id))))
     (("build" build-id "details")
      (let ((build (db-get-build (string->number build-id))))
        (if build
-- 
2.23.0

Re: [PATCH] http: Support fetching builds by derivation.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 908 bytes --]


Ludovic Courtès <ludo@gnu.org> writes:

> Hello!
>
> Christopher Baines via "Development of GNU Guix and the GNU System
> distribution." <guix-devel@gnu.org> skribis:
>
>> There's a one to one mapping of build id to derivation, so allow querying by
>> derivation file name as well. I'm looking at this as I'm interested in getting
>> build information in to the Guix Data Service.
>>
>> * src/cuirass/http.scm (url-handler): Add new clause to match statement, to
>> return build information by derivation file name.
>
> [...]
>
>> +    (("build" "gnu" "store" derivation-file-name)
>
> Perhaps we can avoid /gnu/store in the URL, and…
>
>> +     (let* ((full-derivation-file-name
>> +             (string-append "/gnu/store/" derivation-file-name))
>
> … use (%store-prefix) instead of "/gnu/store" here

Sure, I've sent another patch with these changes.

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]

Re: [PATCH] http: Support fetching builds by derivation.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 1046 bytes --]


Christopher Baines <mail@cbaines.net> writes:

> Ludovic Courtès <ludo@gnu.org> writes:
>
>> Hello!
>>
>> Christopher Baines via "Development of GNU Guix and the GNU System
>> distribution." <guix-devel@gnu.org> skribis:
>>
>>> There's a one to one mapping of build id to derivation, so allow querying by
>>> derivation file name as well. I'm looking at this as I'm interested in getting
>>> build information in to the Guix Data Service.
>>>
>>> * src/cuirass/http.scm (url-handler): Add new clause to match statement, to
>>> return build information by derivation file name.
>>
>> [...]
>>
>>> +    (("build" "gnu" "store" derivation-file-name)
>>
>> Perhaps we can avoid /gnu/store in the URL, and…
>>
>>> +     (let* ((full-derivation-file-name
>>> +             (string-append "/gnu/store/" derivation-file-name))
>>
>> … use (%store-prefix) instead of "/gnu/store" here
>
> Sure, I've sent another patch with these changes.

I've gone ahead and pushed this as
9acb0aa55b5787edef885bb812e2ee66d4401e80.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 962 bytes --]