Handle empty inputs correctly

Author: alexeyr

.github/workflows/benchmark.yml

@@ -67,17 +67,17 @@ env:
   FORTIO_VERSION: "1.73.0"
   K6_VERSION: "1.3.0"
   VEGETA_VERSION: "12.13.0"
-  # Benchmark parameters
+  # Benchmark parameters (defaults in bench.rb unless overridden here for CI)
   ROUTES: ${{ github.event.inputs.routes }}
   RATE: ${{ github.event.inputs.rate || 'max' }}
-  DURATION: ${{ github.event.inputs.duration || '30s' }}
-  REQUEST_TIMEOUT: ${{ github.event.inputs.request_timeout || '60s' }}
-  CONNECTIONS: ${{ github.event.inputs.connections || 10 }}
-  MAX_CONNECTIONS: ${{ github.event.inputs.connections || 10 }}
+  DURATION: ${{ github.event.inputs.duration }}
+  REQUEST_TIMEOUT: ${{ github.event.inputs.request_timeout }}
+  CONNECTIONS: ${{ github.event.inputs.connections }}
+  MAX_CONNECTIONS: ${{ github.event.inputs.connections }}
   WEB_CONCURRENCY: ${{ github.event.inputs.web_concurrency || 4 }}
   RAILS_MAX_THREADS: ${{ github.event.inputs.rails_threads || 3 }}
   RAILS_MIN_THREADS: ${{ github.event.inputs.rails_threads || 3 }}
-  TOOLS: ${{ github.event.inputs.tools || 'fortio,vegeta,k6' }}
+  TOOLS: ${{ github.event.inputs.tools }}
 
 jobs:
   benchmark:

spec/performance/bench.rb

@@ -10,20 +10,20 @@
 # Benchmark parameters
 PRO = ENV.fetch("PRO", "false") == "true"
 APP_DIR = PRO ? "react_on_rails_pro/spec/dummy" : "spec/dummy"
-ROUTES = ENV.fetch("ROUTES", nil)
-BASE_URL = ENV.fetch("BASE_URL", "localhost:3001")
+ROUTES = ENV["ROUTES"].to_s.empty? ? nil : ENV.fetch("ROUTES", nil)
+BASE_URL = ENV["BASE_URL"] || "localhost:3001"
 # requests per second; if "max" will get maximum number of queries instead of a fixed rate
-RATE = ENV.fetch("RATE", "50")
+RATE = ENV["RATE"] || "50"
 # concurrent connections/virtual users
-CONNECTIONS = ENV.fetch("CONNECTIONS", "10").to_i
+CONNECTIONS = (ENV["CONNECTIONS"] || 10).to_i
 # maximum connections/virtual users
-MAX_CONNECTIONS = ENV.fetch("MAX_CONNECTIONS", CONNECTIONS).to_i
+MAX_CONNECTIONS = (ENV["MAX_CONNECTIONS"] || CONNECTIONS).to_i
 # benchmark duration (duration string like "30s", "1m", "90s")
-DURATION = ENV.fetch("DURATION", "30s")
+DURATION = ENV["DURATION"] || "30s"
 # request timeout (duration string as above)
-REQUEST_TIMEOUT = ENV.fetch("REQUEST_TIMEOUT", "60s")
+REQUEST_TIMEOUT = ENV["REQUEST_TIMEOUT"] || "60s"
 # Tools to run (comma-separated)
-TOOLS = ENV.fetch("TOOLS", "fortio,vegeta,k6").split(",")
+TOOLS = (ENV["TOOLS"] || "fortio,vegeta,k6").split(",")
 
 OUTDIR = "bench_results"
 SUMMARY_TXT = "#{OUTDIR}/summary.txt".freeze
@@ -93,11 +93,13 @@ def get_benchmark_routes(app_dir)
 # Get all routes to benchmark
 routes =
   if ROUTES
-    ROUTES.split(",").map(&:strip)
+    ROUTES.split(",").map(&:strip).reject(&:empty?)
   else
     get_benchmark_routes(APP_DIR)
   end
 
+raise "No routes to benchmark" if routes.empty?
+
 validate_rate(RATE)
 validate_positive_integer(CONNECTIONS, "CONNECTIONS")
 validate_positive_integer(MAX_CONNECTIONS, "MAX_CONNECTIONS")