jimmy/postgrest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nix: use json file for generated jwk on loadtest

Browse Source 
Having the JWK as .http file was confusing.

Also split genTargets into two to avoid confusion.
This commit is contained in:
steve-chavez
2025-06-20 11:27:44 -05:00
parent c7e5db34e4
commit 67bd3526c2
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1 -1
View File
@@ -25,4 +25,4 @@ loadtest
.history .history
.docs-build .docs-build
gen_targets.http gen_targets.http
gen_jwk.http gen_jwk.json
nix/tools/loadtest.nix
+13 -6
View File
@@ -69,7 +69,7 @@ let
case "$_arg_kind" in case "$_arg_kind" in
jwt-hs) jwt-hs)
${genTargets ./generate_targets.py} "$_arg_testdir"/gen_targets.http ${genTargetsHS} "$_arg_testdir"/gen_targets.http
if [ "$_arg_jwtcache" = "off" ]; then if [ "$_arg_jwtcache" = "off" ]; then
export PGRST_JWT_CACHE_MAX_LIFETIME="0" export PGRST_JWT_CACHE_MAX_LIFETIME="0"
@@ -84,9 +84,9 @@ let
jwt-rsa) jwt-rsa)
${genTargets ./generate_targets_rsa.py} "$_arg_testdir"/gen_targets.http "$_arg_testdir"/gen_jwk.http ${genTargetsRSA} "$_arg_testdir"/gen_targets.http "$_arg_testdir"/gen_jwk.json
export PGRST_JWT_SECRET="@$_arg_testdir/gen_jwk.http" export PGRST_JWT_SECRET="@$_arg_testdir/gen_jwk.json"
if [ "$_arg_jwtcache" = "off" ]; then if [ "$_arg_jwtcache" = "off" ]; then
export PGRST_JWT_CACHE_MAX_LIFETIME="0" export PGRST_JWT_CACHE_MAX_LIFETIME="0"
@@ -245,12 +245,19 @@ let
| ${mergeMonitorResults} | ${mergeMonitorResults}
''; '';
genTargets = genTargetsScript: genTargetsHS =
writers.writePython3 "postgrest-gen-loadtest-targets" writers.writePython3 "postgrest-gen-loadtest-targets-hs"
{ {
libraries = [ python3Packages.pyjwt python3Packages.jwcrypto ]; libraries = [ python3Packages.pyjwt python3Packages.jwcrypto ];
} }
(builtins.readFile genTargetsScript); (builtins.readFile ./generate_targets.py);
genTargetsRSA =
writers.writePython3 "postgrest-gen-loadtest-targets-rsa"
{
libraries = [ python3Packages.pyjwt python3Packages.jwcrypto ];
}
(builtins.readFile ./generate_targets_rsa.py);
mergeMonitorResults = mergeMonitorResults =
writers.writePython3 "postgrest-merge-monitor-results" writers.writePython3 "postgrest-merge-monitor-results"