Reduce verbosity of some log statements

Author: MarcialRosales

deps/oauth2_client/src/oauth2_client.erl

@@ -11,7 +11,8 @@
         get_openid_configuration/2, get_openid_configuration/3,
         merge_openid_configuration/2,
         merge_oauth_provider/2,
-        extract_ssl_options_as_list/1
+        extract_ssl_options_as_list/1,
+        format_ssl_options/1, format_oauth_provider/1, format_oauth_provider_id/1
         ]).
 
 -include("oauth2_client.hrl").
@@ -557,8 +558,7 @@ format_ssl_options(TlsOptions) ->
         [] -> 0;
         Certs -> length(Certs)
     end,
-    lists:flatten(io_lib:format("{verify: ~p, fail_if_no_peer_cert: ~p, crl_check: ~p, " ++
-        "depth: ~p, cacertfile: ~p, cacerts(count): ~p }", [
+    lists:flatten(io_lib:format("{verify: ~p, fail_if_no_peer_cert: ~p, crl_check: ~p, depth: ~p, cacertfile: ~p, cacerts(count): ~p }", [
         proplists:get_value(verify, TlsOptions),
         proplists:get_value(fail_if_no_peer_cert, TlsOptions),
         proplists:get_value(crl_check, TlsOptions),

deps/rabbitmq_auth_backend_oauth2/src/rabbit_oauth2_config.erl

@@ -155,7 +155,8 @@ do_replace_signing_keys(SigningKeys, root) ->
         proplists:get_value(signing_keys, KeyConfig1, #{}),
         SigningKeys)} | KeyConfig1],
     application:set_env(?APP, key_config, KeyConfig2),
-    rabbit_log:debug("Replacing signing keys  ~p", [ KeyConfig2]),
+    rabbit_log:debug("Replacing signing keys for key_config with ~p keys",
+        [maps:size(SigningKeys)]),
     SigningKeys;
 
 do_replace_signing_keys(SigningKeys, OauthProviderId) ->
@@ -168,7 +169,8 @@ do_replace_signing_keys(SigningKeys, OauthProviderId) ->
 
     OauthProviders = maps:put(OauthProviderId, OauthProvider, OauthProviders0),
     application:set_env(?APP, oauth_providers, OauthProviders),
-    rabbit_log:debug("Replacing signing keys for ~p -> ~p", [OauthProviderId, OauthProvider]),
+    rabbit_log:debug("Replacing signing keys for ~p -> ~p with ~p keys",
+        [OauthProviderId, OauthProvider, maps:size(SigningKeys)]),
     SigningKeys.
 
 

deps/rabbitmq_auth_backend_oauth2/src/uaa_jwt.erl

@@ -33,14 +33,14 @@ add_signing_key(KeyId, Type, Value) ->
 update_jwks_signing_keys(#oauth_provider{id = Id, jwks_uri = JwksUrl,
         ssl_options = SslOptions}) ->
     rabbit_log:debug("Downloading signing keys from ~tp (TLS options: ~p)",
-        [JwksUrl, SslOptions]),
+        [JwksUrl, oauth2_client:format_ssl_options(SslOptions)]),
     case uaa_jwks:get(JwksUrl, SslOptions) of
         {ok, {_, _, JwksBody}} ->
             KeyList = maps:get(<<"keys">>,
                 jose:decode(erlang:iolist_to_binary(JwksBody)), []),
             Keys = maps:from_list(lists:map(fun(Key) ->
                 {maps:get(<<"kid">>, Key, undefined), {json, Key}} end, KeyList)),
-            rabbit_log:debug("Downloaded signing keys ~tp", [Keys]),
+            rabbit_log:debug("Downloaded ~p signing keys", [maps:size(Keys)]),
             case rabbit_oauth2_config:replace_signing_keys(Keys, Id) of
               {error, _} = Err -> Err;
               _ -> ok
@@ -63,7 +63,7 @@ decode_and_verify(Token) ->
 
 decode_and_verify(Token, ResourceServerId, OAuthProviderId) ->
     rabbit_log:debug("Resolved resource_server_id: ~p -> oauth_provider_id: ~p",
-        [ResourceServerId, OAuthProviderId]),
+        [ResourceServerId, oauth2_client:format_oauth_provider_id(OAuthProviderId)]),
     case uaa_jwt_jwt:get_key_id(rabbit_oauth2_config:get_default_key(OAuthProviderId), Token) of
         {ok, KeyId} ->
             case get_jwk(KeyId, OAuthProviderId) of

selenium/test/oauth/env.local.keycloak

@@ -1,3 +1,3 @@
 export KEYCLOAK_URL=https://localhost:8443/realms/test
 export OAUTH_PROVIDER_URL=https://localhost:8443/realms/test
-export OAUTH_PROVIDER_CA_CERT=test/oauth/keycloak/ca_certificate.pem
+export OAUTH_PROVIDER_CA_CERT=selenium/test/oauth/keycloak/ca_certificate.pem