Delete list_nodes1

Author: ansd

deps/rabbitmq_peer_discovery_k8s/src/rabbit_peer_discovery_k8s.erl

@@ -38,11 +38,16 @@ init() ->
 -spec list_nodes() -> {ok, {Nodes :: list(), NodeType :: rabbit_types:node_type()}} | {error, Reason :: string()}.
 
 list_nodes() ->
-  case list_nodes1() of
-    {ok, Nodes} ->
+  case make_request() of
+    {ok, Response} ->
+      Addresses = extract_node_list(Response),
+      Nodes = lists:map(fun node_name/1, Addresses),
       {ok, {Nodes, disc}};
-    {error, _} = Error ->
-      Error
+    {error, Reason} ->
+      Details = io_lib:format("Failed to fetch a list of nodes from Kubernetes API: ~s", [Reason]),
+      rabbit_log:error(Details),
+      send_event("Warning", "Failed", Details),
+      {error, Reason}
   end.
 
 -spec supports_registration() -> boolean().
@@ -66,9 +71,9 @@ unregister() ->
 -spec lock(Node :: node()) -> {ok, {ResourceId :: string(), LockRequesterId :: node()}} | {error, Reason :: string()}.
 
 lock(Node) ->
-  %% call list_nodes1/0 externally such that meck can mock the function
-  case ?MODULE:list_nodes1() of
-    {ok, Nodes} ->
+  %% call list_nodes/0 externally such that meck can mock the function
+  case ?MODULE:list_nodes() of
+    {ok, {Nodes, disc}} ->
       case lists:member(Node, Nodes) of
         true ->
           rabbit_log:info("Will try to lock connecting to nodes ~p", [Nodes]),
@@ -93,8 +98,8 @@ lock(Node) ->
 -spec unlock({ResourceId :: string(), LockRequesterId :: node()}) -> ok | {error, Reason :: string()}.
 
 unlock(LockId) ->
-  case ?MODULE:list_nodes1() of
-    {ok, Nodes} ->
+  case ?MODULE:list_nodes() of
+    {ok, {Nodes, disc}} ->
       global:del_lock(LockId, Nodes),
       ok;
     {error, _} = Error ->
@@ -238,15 +243,3 @@ send_event(Type, Reason, Message) ->
        [{ssl, [{cacertfile, get_config_key(k8s_cert_path, M)}]}],
         Body
       ).
-
-list_nodes1() ->
-  case make_request() of
-    {ok, Response} ->
-      Addresses = extract_node_list(Response),
-      {ok, lists:map(fun node_name/1, Addresses)};
-    {error, Reason} ->
-      Details = io_lib:format("Failed to fetch a list of nodes from Kubernetes API: ~s", [Reason]),
-      rabbit_log:error(Details),
-      send_event("Warning", "Failed", Details),
-      {error, Reason}
-  end.

deps/rabbitmq_peer_discovery_k8s/test/rabbitmq_peer_discovery_k8s_SUITE.erl

@@ -145,7 +145,7 @@ event_v1_test(_Config) ->
 
 lock_single_node(_Config) ->
   LocalNode = node(),
-  meck:expect(rabbit_peer_discovery_k8s, list_nodes1, 0, {ok, [LocalNode]}),
+  meck:expect(rabbit_peer_discovery_k8s, list_nodes, 0, {ok, {[LocalNode], disc}}),
 
   {ok, LockId} = rabbit_peer_discovery_k8s:lock(LocalNode),
   ?assertEqual(ok, rabbit_peer_discovery_k8s:unlock(LockId)).
@@ -154,7 +154,7 @@ lock_multiple_nodes(_Config) ->
   application:set_env(rabbit, cluster_formation, [{internal_lock_retries, 2}]),
   LocalNode = node(),
   OtherNode = other@host,
-  meck:expect(rabbit_peer_discovery_k8s, list_nodes1, 0, {ok, [OtherNode, LocalNode]}),
+  meck:expect(rabbit_peer_discovery_k8s, list_nodes, 0, {ok, {[OtherNode, LocalNode], disc}}),
 
   {ok, {LockResourceId, OtherNode}} = rabbit_peer_discovery_k8s:lock(OtherNode),
   ?assertEqual({error, "Acquiring lock taking too long, bailing out after 2 retries"}, rabbit_peer_discovery_k8s:lock(LocalNode)),
@@ -163,10 +163,10 @@ lock_multiple_nodes(_Config) ->
   ?assertEqual(ok, rabbitmq_peer_discovery_k8s:unlock({LockResourceId, LocalNode})).
 
 lock_local_node_not_discovered(_Config) ->
-  meck:expect(rabbit_peer_discovery_k8s, list_nodes1, 0, {ok, [n1@host, n2@host]} ),
+  meck:expect(rabbit_peer_discovery_k8s, list_nodes, 0, {ok, {[n1@host, n2@host], disc}} ),
   Expectation = {error, "Local node me@host is not part of discovered nodes [n1@host,n2@host]"},
   ?assertEqual(Expectation, rabbit_peer_discovery_k8s:lock(me@host)).
 
 lock_list_nodes_fails(_Config) ->
-  meck:expect(rabbit_peer_discovery_k8s, list_nodes1, 0, {error, "K8s API unavailable"}),
+  meck:expect(rabbit_peer_discovery_k8s, list_nodes, 0, {error, "K8s API unavailable"}),
   ?assertEqual({error, "K8s API unavailable"}, rabbit_peer_discovery_k8s:lock(me@host)).