diff options
| author | Teo Klestrup Röijezon <teo.roijezon@appva.com> | 2021-02-18 17:41:54 +0100 |
|---|---|---|
| committer | Teo Klestrup Röijezon <teo.roijezon@appva.com> | 2021-02-18 17:41:54 +0100 |
| commit | 543e8aa3a358ba9fd3f57913a84497b430669bc6 (patch) | |
| tree | 59a8b076b1a14c3bd716324e3a15f5f7283e1bc5 | |
| parent | 68dd52e5778a1389d3266874a7ed8c71436e53bd (diff) | |
| download | rabbitmq-server-git-543e8aa3a358ba9fd3f57913a84497b430669bc6.tar.gz | |
Enable jwks_http to run embedded without requiring a separate OTP application
| -rw-r--r-- | deps/rabbitmq_auth_backend_oauth2/ebin/jwks_http.app | 9 | ||||
| -rw-r--r-- | deps/rabbitmq_auth_backend_oauth2/test/jwks_SUITE.erl | 7 | ||||
| -rw-r--r-- | deps/rabbitmq_auth_backend_oauth2/test/jwks_http_app.erl | 12 |
3 files changed, 8 insertions, 20 deletions
diff --git a/deps/rabbitmq_auth_backend_oauth2/ebin/jwks_http.app b/deps/rabbitmq_auth_backend_oauth2/ebin/jwks_http.app deleted file mode 100644 index cc69d5a4e0..0000000000 --- a/deps/rabbitmq_auth_backend_oauth2/ebin/jwks_http.app +++ /dev/null @@ -1,9 +0,0 @@ -{application, 'jwks_http', [ - {description, "Dummy JWKS server"}, - {vsn, "0.0.0"}, - {modules, ['jwks_http_app','jwks_http_sup','jwks_http_handler']}, - {mod, {jwks_http_app, undefined}}, - {registered, []}, - {applications, [kernel,stdlib,jsx,cowboy]}, - {env, []} - ]}. diff --git a/deps/rabbitmq_auth_backend_oauth2/test/jwks_SUITE.erl b/deps/rabbitmq_auth_backend_oauth2/test/jwks_SUITE.erl index 52c4ad6c48..4823a68e27 100644 --- a/deps/rabbitmq_auth_backend_oauth2/test/jwks_SUITE.erl +++ b/deps/rabbitmq_auth_backend_oauth2/test/jwks_SUITE.erl @@ -143,17 +143,16 @@ start_jwks_server(Config) -> %% Assume we don't have more than 100 ports allocated for tests PortBase = rabbit_ct_broker_helpers:get_node_config(Config, 0, tcp_ports_base), JwksServerPort = PortBase + 100, - ok = application:load(jwks_http), - ok = application:set_env(jwks_http, port, JwksServerPort), ok = application:set_env(jwks_http, keys, [Jwk]), - {ok, _} = application:ensure_all_started(jwks_http), + {ok, _} = application:ensure_all_started(cowboy), + ok = jwks_http_app:start(JwksServerPort), KeyConfig = [{jwks_url, "http://127.0.0.1:" ++ integer_to_list(JwksServerPort) ++ "/jwks"}], ok = rabbit_ct_broker_helpers:rpc(Config, 0, application, set_env, [rabbitmq_auth_backend_oauth2, key_config, KeyConfig]), rabbit_ct_helpers:set_config(Config, {fixture_jwk, Jwk}). stop_jwks_server(Config) -> - ok = application:stop(jwks_http), + ok = jwks_http_app:stop(), Config. generate_valid_token(Config) -> diff --git a/deps/rabbitmq_auth_backend_oauth2/test/jwks_http_app.erl b/deps/rabbitmq_auth_backend_oauth2/test/jwks_http_app.erl index f31f1060ec..16353e34f4 100644 --- a/deps/rabbitmq_auth_backend_oauth2/test/jwks_http_app.erl +++ b/deps/rabbitmq_auth_backend_oauth2/test/jwks_http_app.erl @@ -1,10 +1,8 @@ -module(jwks_http_app). --behavior(application). --export([start/2, stop/1]). +-export([start/1, stop/0]). -start(_Type, _Args) -> - {ok, Port} = application:get_env(jwks_http, port), +start(Port) -> Dispatch = cowboy_router:compile( [ @@ -16,7 +14,7 @@ start(_Type, _Args) -> {ok, _} = cowboy:start_clear(jwks_http_listener, [{port, Port}], #{env => #{dispatch => Dispatch}}), - jwks_http_sup:start_link(). - -stop(_State) -> ok. + +stop() -> + ok = cowboy:stop_listener(jwks_http_listener). |