Skip to content

Commit 67bd352

Browse files
committed
nix: use json file for generated jwk on loadtest
Having the JWK as .http file was confusing. Also split genTargets into two to avoid confusion.
1 parent c7e5db3 commit 67bd352

File tree

2 files changed

+14
-7
lines changed

2 files changed

+14
-7
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ loadtest
2525
.history
2626
.docs-build
2727
gen_targets.http
28-
gen_jwk.http
28+
gen_jwk.json

nix/tools/loadtest.nix

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ let
6969
case "$_arg_kind" in
7070
jwt-hs)
7171
72-
${genTargets ./generate_targets.py} "$_arg_testdir"/gen_targets.http
72+
${genTargetsHS} "$_arg_testdir"/gen_targets.http
7373
7474
if [ "$_arg_jwtcache" = "off" ]; then
7575
export PGRST_JWT_CACHE_MAX_LIFETIME="0"
@@ -84,9 +84,9 @@ let
8484
8585
jwt-rsa)
8686
87-
${genTargets ./generate_targets_rsa.py} "$_arg_testdir"/gen_targets.http "$_arg_testdir"/gen_jwk.http
87+
${genTargetsRSA} "$_arg_testdir"/gen_targets.http "$_arg_testdir"/gen_jwk.json
8888
89-
export PGRST_JWT_SECRET="@$_arg_testdir/gen_jwk.http"
89+
export PGRST_JWT_SECRET="@$_arg_testdir/gen_jwk.json"
9090
9191
if [ "$_arg_jwtcache" = "off" ]; then
9292
export PGRST_JWT_CACHE_MAX_LIFETIME="0"
@@ -245,12 +245,19 @@ let
245245
| ${mergeMonitorResults}
246246
'';
247247

248-
genTargets = genTargetsScript:
249-
writers.writePython3 "postgrest-gen-loadtest-targets"
248+
genTargetsHS =
249+
writers.writePython3 "postgrest-gen-loadtest-targets-hs"
250250
{
251251
libraries = [ python3Packages.pyjwt python3Packages.jwcrypto ];
252252
}
253-
(builtins.readFile genTargetsScript);
253+
(builtins.readFile ./generate_targets.py);
254+
255+
genTargetsRSA =
256+
writers.writePython3 "postgrest-gen-loadtest-targets-rsa"
257+
{
258+
libraries = [ python3Packages.pyjwt python3Packages.jwcrypto ];
259+
}
260+
(builtins.readFile ./generate_targets_rsa.py);
254261

255262
mergeMonitorResults =
256263
writers.writePython3 "postgrest-merge-monitor-results"

0 commit comments

Comments
 (0)