address review feedback

5 files changed, 21 insertions, 23 deletions

diff --git a/deps/rabbit/priv/schema/rabbit.schema b/deps/rabbit/priv/schema/rabbit.schema
index 5f3763b84c..d7e5bb3c69 100644
--- a/deps/rabbit/priv/schema/rabbit.schema
+++ b/deps/rabbit/priv/schema/rabbit.schema
@@ -1916,21 +1916,6 @@ end}.
     end
 }.
 
-
-% ===============================
-% AWS section
-% ===============================
-
-%% @doc Whether or not to prefer EC2 IMDSv2 when querying instance metadata service.
-%% The setting defaults to true. When true, instance metadata will first be attempted using EC2 IMDSv2
-%% and will fall back to EC2 IMDSv1 upon failure.
-%% When false, EC2 IMDSv1 will be used first and no attempt will be made to EC2 IMDSv2.
-%% See https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html.
-
-{mapping, "aws.prefer_imdsv2", "rabbit.aws_prefer_imdsv2",
-    [{datatype, {enum, [true, false]}}]}.
-
-
 % ===============================
 % Validators
 % ===============================
diff --git a/deps/rabbitmq_aws/priv/schema/rabbitmq_aws.schema b/deps/rabbitmq_aws/priv/schema/rabbitmq_aws.schema
new file mode 100644
index 0000000000..160bd08f54
--- /dev/null
+++ b/deps/rabbitmq_aws/priv/schema/rabbitmq_aws.schema
@@ -0,0 +1,13 @@
+
+% ===============================
+% AWS section
+% ===============================
+
+%% @doc Whether or not to prefer EC2 IMDSv2 when querying instance metadata service.
+%% The setting defaults to true. When true, instance metadata will first be attempted using EC2 IMDSv2
+%% and will fall back to EC2 IMDSv1 upon failure.
+%% When false, EC2 IMDSv1 will be used first and no attempt will be made to EC2 IMDSv2.
+%% See https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/configuring-instance-metadata-service.html.
+
+{mapping, "aws.prefer_imdsv2", "rabbit.aws_prefer_imdsv2",
+    [{datatype, {enum, [true, false]}}]}.
diff --git a/deps/rabbitmq_aws/src/rabbitmq_aws.erl b/deps/rabbitmq_aws/src/rabbitmq_aws.erl
index 58ee137937..06202b35e7 100644
--- a/deps/rabbitmq_aws/src/rabbitmq_aws.erl
+++ b/deps/rabbitmq_aws/src/rabbitmq_aws.erl
@@ -164,7 +164,7 @@ set_imdsv2_token(Imdsv2Token) ->
 %% @doc return the current Imdsv2Token used to perform instance metadata service requests.
 %% @end
 get_imdsv2_token() ->
-  {ok, Imdsv2Token}=gen_server:call(rabbitmq_aws, get_imdsv2_token),
+  {ok, Imdsv2Token} = gen_server:call(rabbitmq_aws, get_imdsv2_token),
   Imdsv2Token.
 
 
@@ -513,10 +513,10 @@ expired_imdsv2_token({_, _, Expiration}) ->
 
 -spec ensure_imdsv2_token_valid() -> imdsv2token().
 ensure_imdsv2_token_valid() ->
-  Imdsv2Token=get_imdsv2_token(),
+  Imdsv2Token = get_imdsv2_token(),
   case expired_imdsv2_token(Imdsv2Token) of
-    true -> Value=rabbitmq_aws_config:load_imdsv2_token(),
-            Expiration=calendar:datetime_to_gregorian_seconds(local_time()) + ?METADATA_TOKEN_TTL_SECONDS,
+    true -> Value = rabbitmq_aws_config:load_imdsv2_token(),
+            Expiration = calendar:datetime_to_gregorian_seconds(local_time()) + ?METADATA_TOKEN_TTL_SECONDS,
             set_imdsv2_token(#imdsv2token{token = Value,
                                           expiration = Expiration}),
             Value;
@@ -530,7 +530,7 @@ ensure_imdsv2_token_valid() ->
 %% @end
 ensure_credentials_valid() ->
   rabbit_log:debug("Making sure AWS credentials are available and still valid."),
-  {ok, State}=gen_server:call(rabbitmq_aws, get_state),
+  {ok, State} = gen_server:call(rabbitmq_aws, get_state),
   case has_credentials(State) of
     true -> case expired_credentials(State#state.expiration) of
               true -> refresh_credentials(State);
diff --git a/deps/rabbitmq_aws/src/rabbitmq_aws_config.erl b/deps/rabbitmq_aws/src/rabbitmq_aws_config.erl
index a5e5690559..68e9f90ac7 100644
--- a/deps/rabbitmq_aws/src/rabbitmq_aws_config.erl
+++ b/deps/rabbitmq_aws/src/rabbitmq_aws_config.erl
@@ -745,7 +745,7 @@ region_from_availability_zone(Value) ->
 %% @doc Attempt to obtain EC2 IMDSv2 token.
 %% @end
 load_imdsv2_token() ->
-  TokenUrl=imdsv2_token_url(),
+  TokenUrl = imdsv2_token_url(),
   rabbit_log:info("Attempting to obtain EC2 IMDSv2 token from ~p ...", [TokenUrl]),
   case httpc:request(put, {TokenUrl, [{?METADATA_TOKEN_TTL_HEADER, integer_to_list(?METADATA_TOKEN_TTL_SECONDS)}]},
     [{timeout, ?DEFAULT_HTTP_TIMEOUT}], []) of
diff --git a/deps/rabbitmq_aws/test/src/rabbitmq_aws_tests.erl b/deps/rabbitmq_aws/test/src/rabbitmq_aws_tests.erl
index 99b85ba39a..5490da8221 100644
--- a/deps/rabbitmq_aws/test/src/rabbitmq_aws_tests.erl
+++ b/deps/rabbitmq_aws/test/src/rabbitmq_aws_tests.erl
@@ -218,7 +218,7 @@ gen_server_call_test_() ->
           ?assertEqual({reply, ok, State},
                        rabbitmq_aws:handle_call({set_credentials,
                                               State#state.access_key,
-                                              State#state.secret_access_key}, eunit, #state{region="us-west-3"}))
+                                              State#state.secret_access_key}, eunit, #state{region = "us-west-3"}))
         end
       },
       {
@@ -395,7 +395,7 @@ perform_request_test_() ->
           Options = [],
           Host = undefined,
           meck:expect(rabbitmq_aws_config, credentials, fun() -> {error, unit_test} end),
-          Expectation = {{error, {credentials, "Credentials expired!"}}, State#state{error="Credentials expired!"}},
+          Expectation = {{error, {credentials, "Credentials expired!"}}, State#state{error = "Credentials expired!"}},
           Result = rabbitmq_aws:perform_request(State, Service, Method, Headers, Path, Body, Options, Host),
           ?assertEqual(Expectation, Result),
           meck:validate(rabbitmq_aws_config)