Merge pull request #387 from superfly/reject-non-members

Remove local flag for membership-state

Author: somtochiama

crates/corro-admin/src/lib.rs

@@ -135,7 +135,7 @@ pub enum LogCommand {
 pub enum ClusterCommand {
     Rejoin,
     Members,
-    MembershipStates { local: bool },
+    MembershipStates,
     SetId(ClusterId),
 }
 
@@ -347,20 +347,8 @@ async fn handle_conn(
                     }
                     send_success(&mut stream).await;
                 }
-                Command::Cluster(ClusterCommand::MembershipStates { local }) => {
+                Command::Cluster(ClusterCommand::MembershipStates) => {
                     info_log(&mut stream, "gathering membership state").await;
-
-                    if local {
-                        let members = agent.members().read().states.clone();
-                        for member in members {
-                            match serde_json::to_value(&member) {
-                                Ok(json) => send(&mut stream, Response::Json(json)).await,
-                                Err(e) => send_error(&mut stream, e).await,
-                            }
-                        }
-                        send_success(&mut stream).await;
-                        continue;
-                    }
                     let (tx, mut rx) = mpsc::channel(1024);
                     if let Err(e) = agent
                         .tx_foca()

crates/corrosion/src/main.rs

@@ -370,10 +370,10 @@ async fn process_cli(cli: Cli) -> eyre::Result<()> {
             ))
             .await?;
         }
-        Command::Cluster(ClusterCommand::MembershipStates { local }) => {
+        Command::Cluster(ClusterCommand::MembershipStates) => {
             let mut conn = AdminConn::connect(cli.admin_path()).await?;
             conn.send_command(corro_admin::Command::Cluster(
-                corro_admin::ClusterCommand::MembershipStates { local: *local },
+                corro_admin::ClusterCommand::MembershipStates,
             ))
             .await?;
         }
@@ -773,10 +773,7 @@ enum ClusterCommand {
     /// Dumps the current members
     Members,
     /// Dumps the current member SWIM states
-    MembershipStates {
-        #[arg(long, default_value = "false")]
-        local: bool,
-    },
+    MembershipStates,
     /// Set a new cluster ID for the node
     SetId { cluster_id: u16 },
 }