Add BiMultiMap to rule_structs.rs and use it in RuleManager Move

scylla-server/src/controllers/rule_controller.rs

@@ -5,7 +5,6 @@ use axum_extra::{
     headers::{authorization::Basic, Authorization},
     TypedHeader,
 };
-use tokio::sync::RwLock;
 use tracing::debug;
 
 use crate::{
@@ -16,7 +15,7 @@ use crate::{
 #[debug_handler]
 pub async fn add_rule(
     TypedHeader(auth): TypedHeader<Authorization<Basic>>,
-    Extension(rules_manager): Extension<Arc<RwLock<RuleManager>>>,
+    Extension(rules_manager): Extension<Arc<RuleManager>>,
     Json(rule): Json<Rule>,
 ) -> Result<Json<String>, ScyllaError> {
     debug!(
@@ -25,9 +24,8 @@ pub async fn add_rule(
         auth.username().to_string()
     );
     match rules_manager
-        .write()
-        .await
         .add_rule(ClientId(auth.username().to_string()), rule)
+        .await
     {
         Ok(_) => Ok(Json::from("Rule added!".to_owned())),
         Err(err) => Err(ScyllaError::RuleError(err)),
@@ -37,7 +35,7 @@ pub async fn add_rule(
 #[debug_handler]
 pub async fn delete_rule(
     TypedHeader(auth): TypedHeader<Authorization<Basic>>,
-    Extension(rules_manager): Extension<Arc<RwLock<RuleManager>>>,
+    Extension(rules_manager): Extension<Arc<RuleManager>>,
     Path(rule_id): Path<String>,
 ) -> Result<(), ScyllaError> {
     debug!(
@@ -46,9 +44,8 @@ pub async fn delete_rule(
         auth.username().to_string()
     );
     match rules_manager
-        .write()
-        .await
         .delete_rule(ClientId(auth.username().to_string()), RuleId(rule_id))
+        .await
     {
         Ok(_) => Ok(()),
         Err(err) => Err(ScyllaError::RuleError(err)),

scylla-server/src/main.rs

@@ -43,7 +43,7 @@ use scylla_server::{
 use socketioxide::{extract::SocketRef, SocketIo};
 use tokio::{
     signal,
-    sync::{broadcast, mpsc, RwLock},
+    sync::{broadcast, mpsc},
 };
 use tokio_util::{sync::CancellationToken, task::TaskTracker};
 use tower::ServiceBuilder;
@@ -249,7 +249,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let (db_send, db_receive) = mpsc::channel::<Vec<ClientData>>(1000);
 
     // the rules manager
-    let rules_manager = Arc::new(RwLock::new(RuleManager::new()));
+    let rules_manager = Arc::new(RuleManager::new());
 
     // the below two threads need to cancel cleanly to ensure all queued messages are sent.  therefore they are part of the a task tracker group.
     // create a task tracker and cancellation token