Started using function heads

2 files changed, 7 insertions, 7 deletions

diff --git a/deps/rabbitmq_aws/src/rabbitmq_aws.erl b/deps/rabbitmq_aws/src/rabbitmq_aws.erl
index acf2a8f82b..8daa5447df 100644
--- a/deps/rabbitmq_aws/src/rabbitmq_aws.erl
+++ b/deps/rabbitmq_aws/src/rabbitmq_aws.erl
@@ -549,16 +549,16 @@ api_get_request(Service, Path) ->
   -spec api_get_request_with_retries(string(), path(), integer(), integer()) -> result().
   %% @doc Invoke an API call to an AWS service with retries.
   %% @end
+api_get_request_with_retries(_, _, 0, _) ->
+  rabbit_log:warning("Request to AWS service has failed after ~b retries.", [?MAX_RETRIES]),
+  {error, "AWS service is unavailable."};
 api_get_request_with_retries(Service, Path, Retries, WaitTimeBetweenRetries) ->
   ensure_credentials_valid(),
   case get(Service, Path) of
     {ok, {_Headers, Payload}} -> rabbit_log:debug("AWS request: ~s~nResponse: ~p", [Path, Payload]),
                                  {ok, Payload};
     {error, {credentials, _}} -> {error, credentials};
-    {error, Message, _}       -> case Retries > 0 of
-                                   true ->  rabbit_log:warning("Error occurred ~s~nWill retry AWS request, remaining retries: ~b", [Message, Retries]),
-                                            timer:sleep(WaitTimeBetweenRetries),
-                                            api_get_request_with_retries(Service, Path, Retries - 1, WaitTimeBetweenRetries);
-                                   false -> {error, Message}
-                                 end
+    {error, Message, _}       -> rabbit_log:warning("Error occurred ~s~nWill retry AWS request, remaining retries: ~b", [Message, Retries]),
+                                 timer:sleep(WaitTimeBetweenRetries),
+                                 api_get_request_with_retries(Service, Path, Retries - 1, WaitTimeBetweenRetries)
   end.
diff --git a/deps/rabbitmq_aws/test/src/rabbitmq_aws_tests.erl b/deps/rabbitmq_aws/test/src/rabbitmq_aws_tests.erl
index 1882447942..0d23df4324 100644
--- a/deps/rabbitmq_aws/test/src/rabbitmq_aws_tests.erl
+++ b/deps/rabbitmq_aws/test/src/rabbitmq_aws_tests.erl
@@ -491,7 +491,7 @@ api_get_request_test_() ->
           rabbitmq_aws:set_credentials(State),
           Result = rabbitmq_aws:api_get_request_with_retries("AWS", "API", 3, 1),
           ok = gen_server:stop(Pid),
-          ?assertEqual({error, "invalid input"}, Result),
+          ?assertEqual({error, "AWS service is unavailable"}, Result),
           meck:validate(httpc)
         end
       },