Merge branch 'tvhong-amazon-tvhong/fix_type_specs'

(cherry picked from commit 6a9790189cd26e03221a67e3396407794bd4259a)

6 files changed, 7 insertions, 10 deletions

diff --git a/deps/rabbit_common/src/rabbit_peer_discovery_backend.erl b/deps/rabbit_common/src/rabbit_peer_discovery_backend.erl
index 0ab2f09a36..14132ae528 100644
--- a/deps/rabbit_common/src/rabbit_peer_discovery_backend.erl
+++ b/deps/rabbit_common/src/rabbit_peer_discovery_backend.erl
@@ -54,6 +54,6 @@
 
 -callback lock(Node :: atom())   -> {ok, Data :: term()} | not_supported | {error, Reason :: string()}.
 
--callback unlock(Data :: term()) -> ok | {error, Reason :: string()}.
+-callback unlock(Data :: term()) -> ok.
 
 -optional_callbacks([init/0]).
diff --git a/deps/rabbitmq_peer_discovery_aws/src/rabbit_peer_discovery_aws.erl b/deps/rabbitmq_peer_discovery_aws/src/rabbit_peer_discovery_aws.erl
index 3df6890b54..a668f5843d 100644
--- a/deps/rabbitmq_peer_discovery_aws/src/rabbit_peer_discovery_aws.erl
+++ b/deps/rabbitmq_peer_discovery_aws/src/rabbit_peer_discovery_aws.erl
@@ -143,9 +143,7 @@ lock(Node) ->
       Error
   end.
 
--spec unlock({{ResourceId :: string(), LockRequesterId :: node()}, Nodes :: [node()]}) ->
-    ok | {error, Reason :: string()}.
-
+-spec unlock({{ResourceId :: string(), LockRequestedId :: atom()}, Nodes :: [atom()]}) -> 'ok'.
 unlock({LockId, Nodes}) ->
   global:del_lock(LockId, Nodes),
   ok.
@@ -153,6 +151,7 @@ unlock({LockId, Nodes}) ->
 %%
 %% Implementation
 %%
+
 -spec get_config_key(Key :: atom(), Map :: #{atom() => peer_discovery_config_value()})
                     -> peer_discovery_config_value().
 
diff --git a/deps/rabbitmq_peer_discovery_aws/src/rabbitmq_peer_discovery_aws.erl b/deps/rabbitmq_peer_discovery_aws/src/rabbitmq_peer_discovery_aws.erl
index 05bae26c20..840d7e7687 100644
--- a/deps/rabbitmq_peer_discovery_aws/src/rabbitmq_peer_discovery_aws.erl
+++ b/deps/rabbitmq_peer_discovery_aws/src/rabbitmq_peer_discovery_aws.erl
@@ -49,6 +49,6 @@ post_registration() ->
 lock(Node) ->
     ?DELEGATE:lock(Node).
 
--spec unlock({ResourceId :: string(), LockRequesterId :: node()}) -> ok | {error, Reason :: string()}.
+-spec unlock({{ResourceId :: string(), LockRequestedId :: atom()}, Nodes :: [atom()]}) -> 'ok'.
 unlock(Data) ->
     ?DELEGATE:unlock(Data).
diff --git a/deps/rabbitmq_peer_discovery_common/include/rabbit_peer_discovery.hrl b/deps/rabbitmq_peer_discovery_common/include/rabbit_peer_discovery.hrl
index cb9dadbbe0..271ee08d82 100644
--- a/deps/rabbitmq_peer_discovery_common/include/rabbit_peer_discovery.hrl
+++ b/deps/rabbitmq_peer_discovery_common/include/rabbit_peer_discovery.hrl
@@ -16,7 +16,7 @@
 % by `httpc`
 -define(DEFAULT_HTTP_TIMEOUT, 2250).
 
--type peer_discovery_config_value() :: atom() | integer() | string() | undefined.
+-type peer_discovery_config_value() :: atom() | integer() | string() | list() | map() | any() | undefined.
 
 -record(peer_discovery_config_entry_meta,
         {env_variable  :: string(),
diff --git a/deps/rabbitmq_peer_discovery_k8s/src/rabbit_peer_discovery_k8s.erl b/deps/rabbitmq_peer_discovery_k8s/src/rabbit_peer_discovery_k8s.erl
index 117be80bc1..ce02cce6cd 100644
--- a/deps/rabbitmq_peer_discovery_k8s/src/rabbit_peer_discovery_k8s.erl
+++ b/deps/rabbitmq_peer_discovery_k8s/src/rabbit_peer_discovery_k8s.erl
@@ -96,9 +96,7 @@ lock(Node) ->
       Error
   end.
 
--spec unlock({{ResourceId :: string(), LockRequesterId :: node()}, Nodes :: [node()]}) ->
-    ok | {error, Reason :: string()}.
-
+-spec unlock({{ResourceId :: string(), LockRequestedId :: atom()}, Nodes :: [atom()]}) -> 'ok'.
 unlock({LockId, Nodes}) ->
     global:del_lock(LockId, Nodes),
     ok.
diff --git a/deps/rabbitmq_peer_discovery_k8s/src/rabbitmq_peer_discovery_k8s.erl b/deps/rabbitmq_peer_discovery_k8s/src/rabbitmq_peer_discovery_k8s.erl
index e4a718088b..9e2a6e3406 100644
--- a/deps/rabbitmq_peer_discovery_k8s/src/rabbitmq_peer_discovery_k8s.erl
+++ b/deps/rabbitmq_peer_discovery_k8s/src/rabbitmq_peer_discovery_k8s.erl
@@ -48,7 +48,7 @@ post_registration() ->
 lock(Node) ->
     ?DELEGATE:lock(Node).
 
--spec unlock({ResourceId :: string(), LockRequesterId :: node()}) -> ok | {error, Reason :: string()}.
+-spec unlock({{ResourceId :: string(), LockRequestedId :: atom()}, Nodes :: [atom()]}) -> 'ok'.
 unlock(Data) ->
     ?DELEGATE:unlock(Data).