From ba7aaa8ab13468c75eff8f082a4be32b02bbc6de Mon Sep 17 00:00:00 2001 From: steve-chavez Date: Sat, 14 Jun 2025 12:06:15 -0500 Subject: [PATCH] nix: dedup vegeta command in nix loadtest --- nix/tools/loadtest.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/nix/tools/loadtest.nix b/nix/tools/loadtest.nix index 02fee267e..e46301796 100644 --- a/nix/tools/loadtest.nix +++ b/nix/tools/loadtest.nix @@ -77,8 +77,8 @@ let # shellcheck disable=SC2145 ${withTools.withPg} -f "$_arg_testdir"/fixtures.sql \ ${withTools.withPgrst} \ - sh -c "cd \"$_arg_testdir\" && ${runner} -lazy -targets gen_targets.http -output \"$abs_output\" \"''${_arg_leftovers[@]}\"" - ${vegeta}/bin/vegeta report -type=text "$_arg_output" + sh -c "cd \"$_arg_testdir\" && \ + ${runner} -lazy -targets gen_targets.http -output \"$abs_output\" \"''${_arg_leftovers[@]}\"" ;; jwt-rsa-1k) @@ -94,8 +94,8 @@ let # shellcheck disable=SC2145 ${withTools.withPg} -f "$_arg_testdir"/fixtures.sql \ ${withTools.withPgrst} \ - sh -c "cd \"$_arg_testdir\" && ${runner} -lazy -targets gen_targets.http -output \"$abs_output\" \"''${_arg_leftovers[@]}\"" - ${vegeta}/bin/vegeta report -type=text "$_arg_output" + sh -c "cd \"$_arg_testdir\" && \ + ${runner} -lazy -targets gen_targets.http -output \"$abs_output\" \"''${_arg_leftovers[@]}\"" ;; *) @@ -105,11 +105,12 @@ let ${withTools.withSlowPg} \ ${withTools.withPgrst} \ ${withTools.withSlowPgrst} \ - sh -c "cd \"$_arg_testdir\" && ${runner} -targets targets.http -output \"$abs_output\" \"''${_arg_leftovers[@]}\"" - ${vegeta}/bin/vegeta report -type=text "$_arg_output" + sh -c "cd \"$_arg_testdir\" && \ + ${runner} -targets targets.http -output \"$abs_output\" \"''${_arg_leftovers[@]}\"" ;; - esac + + ${vegeta}/bin/vegeta report -type=text "$_arg_output" ''; loadtestAgainst =