diff options
author | sterni <sternenseemann@systemli.org> | 2021-04-04T23·58+0200 |
---|---|---|
committer | sterni <sternenseemann@systemli.org> | 2021-04-05T10·54+0000 |
commit | 386afdc794eefd5bcbc47a3fd7b898a07f69f978 (patch) | |
tree | 7fdb834139cf48794b68ef481220ecf479bd1d7b /web/bubblegum/default.nix | |
parent | 1c0f89f4cadba4957e95fc80b25b1b8b6dd1a3b3 (diff) |
feat(web/bubblegum): allow passing status as an int r/2439
The whole pass the name of the status as a string thing was mostly born out of an overeager use of yants. It is still very neat especially for common cases like "OK", so we'll keep it, but also allow passing the integer variant of the status as well which probably feels more natural for a lot of people, especially over getting the casing right for "I'm a teapot". Change-Id: I3f012a291447ef385efdd28132292a8b331998c0 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2850 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'web/bubblegum/default.nix')
-rw-r--r-- | web/bubblegum/default.nix | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/web/bubblegum/default.nix b/web/bubblegum/default.nix index 393ac75d4803..aecc701886b5 100644 --- a/web/bubblegum/default.nix +++ b/web/bubblegum/default.nix @@ -89,12 +89,12 @@ let See the [README](./README.md) for an example. - Type: string -> attrs string -> string -> string + Type: either int string -> attrs string -> string -> string */ respond = - # response status as the textual representation in the - # HTTP protocol. See `statusCodes` for a list of valid - # options. + # response status as an integer (status code) or its + # textual representation in the HTTP protocol. + # See `statusCodes` for a list of valid options. statusArg: # headers as an attribute set of strings headers: @@ -102,7 +102,14 @@ let bodyArg: let status = - if builtins.isString statusArg then { + if builtins.isInt statusArg + then { + code = statusArg; + line = lib.findFirst + (line: statusCodes."${line}" == statusArg) + null + (builtins.attrNames statusCodes); + } else if builtins.isString statusArg then { code = statusCodes."${statusArg}" or null; line = statusArg; } else { |