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

nix(loadtest): remove --rsa option from genTargets

Browse Source 
The public key is not needed for target generation, only the private
key, so it's enough to pass that.
This commit is contained in:
Wolfgang Walther
2026-06-26 19:33:51 +00:00
parent b32c477b1d
commit 94be1b7250
2 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nix/tools/generate_targets.py
+2 -12
View File
@@ -89,8 +89,8 @@ def main():
dest="private_key_path", dest="private_key_path",
metavar="PRIVATE_KEY_PATH", metavar="PRIVATE_KEY_PATH",
type=Path, type=Path,
help="Path to the RSA private key file",
default=None, default=None,
help="Path to the RSA private key file (required when --rsa is used)",
) )
parser.add_argument( parser.add_argument(
"--worst", "--worst",
@@ -99,20 +99,12 @@ def main():
default=False, default=False,
help="Generate worst case targets for a JWT cache", help="Generate worst case targets for a JWT cache",
) )
parser.add_argument(
"--rsa",
dest="jwk_path",
metavar="JWK_PATH",
type=Path,
default=None,
help="Path to an existing RSA JWK file used for signing tokens",
)
args = parser.parse_args() args = parser.parse_args()
rsa_private_key: Optional[jwt.algorithms.RSAAlgorithm] = None rsa_private_key: Optional[jwt.algorithms.RSAAlgorithm] = None
is_hs = args.jwk_path is None is_hs = args.private_key_path is None
nsamples = 1000 nsamples = 1000
@@ -123,8 +115,6 @@ def main():
ntargets = 50000 ntargets = 50000
if not is_hs: if not is_hs:
if args.private_key_path is None:
parser.error("--rsa requires the --private-key option")
try: try:
private_key_data = args.private_key_path.read_text() private_key_data = args.private_key_path.read_text()
except OSError as e: except OSError as e:
nix/tools/loadtest.nix
+3 -3
View File
@@ -102,7 +102,7 @@ let
${genRsaMaterials} --rsa="$_arg_testdir"/gen_jwk.json --private-key="$_arg_testdir"/gen_private.json ${genRsaMaterials} --rsa="$_arg_testdir"/gen_jwk.json --private-key="$_arg_testdir"/gen_private.json
export PGRST_JWT_SECRET="@$_arg_testdir/gen_jwk.json" export PGRST_JWT_SECRET="@$_arg_testdir/gen_jwk.json"
${genTargets} --rsa="$_arg_testdir"/gen_jwk.json --private-key="$_arg_testdir"/gen_private.json "$_arg_testdir"/gen_targets.http ${genTargets} --private-key="$_arg_testdir"/gen_private.json "$_arg_testdir"/gen_targets.http
# shellcheck disable=SC2145 # shellcheck disable=SC2145
${withTools.withPg} -f "$_arg_testdir"/fixtures.sql \ ${withTools.withPg} -f "$_arg_testdir"/fixtures.sql \
@@ -115,7 +115,7 @@ let
${genRsaMaterials} --rsa="$_arg_testdir"/gen_jwk.json --private-key="$_arg_testdir"/gen_private.json ${genRsaMaterials} --rsa="$_arg_testdir"/gen_jwk.json --private-key="$_arg_testdir"/gen_private.json
export PGRST_JWT_SECRET="@$_arg_testdir/gen_jwk.json" export PGRST_JWT_SECRET="@$_arg_testdir/gen_jwk.json"
${genTargets} --rsa="$_arg_testdir"/gen_jwk.json --private-key="$_arg_testdir"/gen_private.json "$_arg_testdir"/gen_targets.http ${genTargets} --private-key="$_arg_testdir"/gen_private.json "$_arg_testdir"/gen_targets.http
# shellcheck disable=SC2145 # shellcheck disable=SC2145
${withTools.withPg} -f "$_arg_testdir"/fixtures.sql \ ${withTools.withPg} -f "$_arg_testdir"/fixtures.sql \
@@ -128,7 +128,7 @@ let
${genRsaMaterials} --rsa="$_arg_testdir"/gen_jwk.json --private-key="$_arg_testdir"/gen_private.json ${genRsaMaterials} --rsa="$_arg_testdir"/gen_jwk.json --private-key="$_arg_testdir"/gen_private.json
export PGRST_JWT_SECRET="@$_arg_testdir/gen_jwk.json" export PGRST_JWT_SECRET="@$_arg_testdir/gen_jwk.json"
${libfaketime}/bin/faketime '2000-01-01 00:00:00' ${genTargets} --worst --rsa="$_arg_testdir"/gen_jwk.json --private-key="$_arg_testdir"/gen_private.json "$_arg_testdir"/gen_targets.http ${libfaketime}/bin/faketime '2000-01-01 00:00:00' ${genTargets} --worst --private-key="$_arg_testdir"/gen_private.json "$_arg_testdir"/gen_targets.http
# shellcheck disable=SC2145 # shellcheck disable=SC2145
${withTools.withPg} -f "$_arg_testdir"/fixtures.sql \ ${withTools.withPg} -f "$_arg_testdir"/fixtures.sql \