Skip to content

Commit

Permalink
Review
Browse files Browse the repository at this point in the history
  • Loading branch information
bpaquet committed Dec 3, 2024
1 parent eec112b commit 9e4c9e4
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
12 changes: 8 additions & 4 deletions load_test/config/runtime.exs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ config :load_test,
sse_url: System.get_env("SSE_URL") || "http://localhost:4000/v1/subscribe",
sse_jwt_issuer: System.get_env("SSE_JWT_ISSUER") || "test_issuer1",
sse_jwt_expiration: String.to_integer(System.get_env("SSE_JWT_EXPIRATION") || "86400"),
sse_jwt_secret: System.get_env("SSE_JWT_SECRET") || "966KljJz--KyzyBnMOrFXfAkq9XMqWwPgdBV3cKTxsc",
sse_jwt_secret:
System.get_env("SSE_JWT_SECRET") || "966KljJz--KyzyBnMOrFXfAkq9XMqWwPgdBV3cKTxsc",
sse_jwt_audience: System.get_env("SSE_JWT_AUDIENCE") || "public_api",
sse_auto_reconnect: String.to_atom(System.get_env("SSE_AUTO_RECONNECT") || "false")

Expand All @@ -25,12 +26,15 @@ config :load_test,
publish_timeout: String.to_integer(System.get_env("PUBLISH_TIMEOUT") || "5000"),
publish_http_pool_size: String.to_integer(System.get_env("PUBLISH_HTTP_POOL_SIZE") || "2000"),
publish_jwt_issuer: System.get_env("PUBLISH_JWT_ISSUER") || "test_issuer1",
publish_jwt_secret: System.get_env("PUBLISH_JWT_SECRET") || "nLjJdNLlpdv3W4Xk7MyVCAZKD-hvza6FQ4yhUUFnjmg",
publish_jwt_secret:
System.get_env("PUBLISH_JWT_SECRET") || "nLjJdNLlpdv3W4Xk7MyVCAZKD-hvza6FQ4yhUUFnjmg",
publish_jwt_audience: System.get_env("PUBLISH_JWT_AUDIENCE") || "internal_api"

config :load_test,
delay_between_messages_min: String.to_integer(System.get_env("DELAY_BETWEEN_MESSAGES_MIN") || "500"),
delay_between_messages_max: String.to_integer(System.get_env("DELAY_BETWEEN_MESSAGES_MAX") || "5000"),
delay_between_messages_min:
String.to_integer(System.get_env("DELAY_BETWEEN_MESSAGES_MIN") || "500"),
delay_between_messages_max:
String.to_integer(System.get_env("DELAY_BETWEEN_MESSAGES_MAX") || "5000"),
number_of_messages_min: String.to_integer(System.get_env("NUMBER_OF_MESSAGES_MIN") || "10"),
number_of_messages_max: String.to_integer(System.get_env("NUMBER_OF_MESSAGES_MAX") || "50")

Expand Down
4 changes: 2 additions & 2 deletions load_test/lib/load_test/main.ex
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ defmodule LoadTest.Main do
:delay_between_messages_min,
:delay_between_messages_max,
:number_of_messages_min,
:number_of_messages_max,
:number_of_messages_max
]
end

Expand Down Expand Up @@ -75,7 +75,7 @@ defmodule LoadTest.Main do
delay_between_messages_min: delay_between_messages_min,
delay_between_messages_max: delay_between_messages_max,
number_of_messages_min: number_of_messages_min,
number_of_messages_max: number_of_messages_max,
number_of_messages_max: number_of_messages_max
}

Logger.warning("SSE base url: #{sse_url}")
Expand Down
12 changes: 4 additions & 8 deletions load_test/lib/load_test/user/sse.ex
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ defmodule SseUser do
]
end

defp last_event_id_header(nil), do: []
defp last_event_id_header(last_event_id), do: [{"Last-Event-ID", last_event_id}]

defp build_headers(context, state, topic) do
iat = :os.system_time(:second)
exp = iat + context.sse_jwt_expiration
Expand All @@ -37,17 +40,10 @@ defmodule SseUser do
signed = JOSE.JWT.sign(context.sse_jwt_secret, jws, jwt)
{%{alg: :jose_jws_alg_hmac}, compact_signed} = JOSE.JWS.compact(signed)

last_event_id =
if state.last_event_id != nil do
[{["Last-Event-ID"], state.last_event_id}]
else
[]
end

[
{["Authorization"], "Bearer #{compact_signed}"},
{["User-Agent"], context.sse_user_agent}
] ++ last_event_id
] ++ last_event_id_header(state.last_event_id)
end

def run(context, user_name, topic, expected_messages) do
Expand Down

0 comments on commit 9e4c9e4

Please sign in to comment.