refactor: DRY get_all_dashboards

Author: Devdutt Shenoi

src/storage/azure_blob.rs

@@ -668,42 +668,6 @@ impl ObjectStorage for BlobStore {
             .collect::<Vec<_>>())
     }
 
-    async fn get_all_dashboards(
-        &self,
-    ) -> Result<HashMap<RelativePathBuf, Vec<Bytes>>, ObjectStorageError> {
-        let mut dashboards: HashMap<RelativePathBuf, Vec<Bytes>> = HashMap::new();
-        let users_root_path = object_store::path::Path::from(USERS_ROOT_DIR);
-        let resp = self
-            .client
-            .list_with_delimiter(Some(&users_root_path))
-            .await?;
-
-        let users = resp
-            .common_prefixes
-            .iter()
-            .flat_map(|path| path.parts())
-            .filter(|name| name.as_ref() != USERS_ROOT_DIR)
-            .map(|name| name.as_ref().to_string())
-            .collect::<Vec<_>>();
-        for user in users {
-            let user_dashboard_path =
-                object_store::path::Path::from(format!("{USERS_ROOT_DIR}/{user}/dashboards"));
-            let dashboards_path = RelativePathBuf::from(&user_dashboard_path);
-            let dashboard_bytes = self
-                .get_objects(
-                    Some(&dashboards_path),
-                    Box::new(|file_name| file_name.ends_with(".json")),
-                )
-                .await?;
-
-            dashboards
-                .entry(dashboards_path)
-                .or_default()
-                .extend(dashboard_bytes);
-        }
-        Ok(dashboards)
-    }
-
     ///fetch all correlations uploaded in object store
     /// return the correlation file path and all correlation json bytes for each file path
     async fn get_all_correlations(

src/storage/localfs.rs

@@ -374,36 +374,6 @@ impl ObjectStorage for LocalFS {
         Ok(dirs)
     }
 
-    async fn get_all_dashboards(
-        &self,
-    ) -> Result<HashMap<RelativePathBuf, Vec<Bytes>>, ObjectStorageError> {
-        let mut dashboards: HashMap<RelativePathBuf, Vec<Bytes>> = HashMap::new();
-        let users_root_path = self.root.join(USERS_ROOT_DIR);
-        let directories = ReadDirStream::new(fs::read_dir(&users_root_path).await?);
-        let users: Vec<DirEntry> = directories.try_collect().await?;
-        for user in users {
-            if !user.path().is_dir() {
-                continue;
-            }
-            let dashboards_path = users_root_path.join(user.path()).join("dashboards");
-            let directories = ReadDirStream::new(fs::read_dir(&dashboards_path).await?);
-            let dashboards_files: Vec<DirEntry> = directories.try_collect().await?;
-            for dashboard in dashboards_files {
-                let dashboard_absolute_path = dashboard.path();
-                let file = fs::read(dashboard_absolute_path.clone()).await?;
-                let dashboard_relative_path = dashboard_absolute_path
-                    .strip_prefix(self.root.as_path())
-                    .unwrap();
-
-                dashboards
-                    .entry(RelativePathBuf::from_path(dashboard_relative_path).unwrap())
-                    .or_default()
-                    .push(file.into());
-            }
-        }
-        Ok(dashboards)
-    }
-
     ///fetch all correlations stored in disk
     /// return the correlation file path and all correlation json bytes for each file path
     async fn get_all_correlations(

src/storage/object_storage.rs

@@ -126,7 +126,29 @@ pub trait ObjectStorage: Debug + Send + Sync + 'static {
 
     async fn get_all_dashboards(
         &self,
-    ) -> Result<HashMap<RelativePathBuf, Vec<Bytes>>, ObjectStorageError>;
+    ) -> Result<HashMap<RelativePathBuf, Vec<Bytes>>, ObjectStorageError> {
+        let mut dashboards: HashMap<RelativePathBuf, Vec<Bytes>> = HashMap::new();
+        
+        let users_dir = RelativePathBuf::from_iter([USERS_ROOT_DIR]);
+        for user in self.list_dirs_relative(&users_dir).await? {
+            let user_dashboard_path =
+                object_store::path::Path::from(format!("{USERS_ROOT_DIR}/{user}/dashboards"));
+            let dashboards_path = RelativePathBuf::from(&user_dashboard_path);
+            let dashboard_bytes = self
+                .get_objects(
+                    Some(&dashboards_path),
+                    Box::new(|file_name| file_name.ends_with(".json")),
+                )
+                .await?;
+
+            dashboards
+                .entry(dashboards_path)
+                .or_default()
+                .extend(dashboard_bytes);
+        }
+        Ok(dashboards)
+    }
+
     async fn get_all_correlations(
         &self,
     ) -> Result<HashMap<RelativePathBuf, Vec<Bytes>>, ObjectStorageError>;

src/storage/s3.rs

@@ -801,42 +801,6 @@ impl ObjectStorage for S3 {
             .collect::<Vec<_>>())
     }
 
-    async fn get_all_dashboards(
-        &self,
-    ) -> Result<HashMap<RelativePathBuf, Vec<Bytes>>, ObjectStorageError> {
-        let mut dashboards: HashMap<RelativePathBuf, Vec<Bytes>> = HashMap::new();
-        let users_root_path = object_store::path::Path::from(USERS_ROOT_DIR);
-        let resp = self
-            .client
-            .list_with_delimiter(Some(&users_root_path))
-            .await?;
-
-        let users = resp
-            .common_prefixes
-            .iter()
-            .flat_map(|path| path.parts())
-            .filter(|name| name.as_ref() != USERS_ROOT_DIR)
-            .map(|name| name.as_ref().to_string())
-            .collect::<Vec<_>>();
-        for user in users {
-            let user_dashboard_path =
-                object_store::path::Path::from(format!("{USERS_ROOT_DIR}/{user}/dashboards"));
-            let dashboards_path = RelativePathBuf::from(&user_dashboard_path);
-            let dashboard_bytes = self
-                .get_objects(
-                    Some(&dashboards_path),
-                    Box::new(|file_name| file_name.ends_with(".json")),
-                )
-                .await?;
-
-            dashboards
-                .entry(dashboards_path)
-                .or_default()
-                .extend(dashboard_bytes);
-        }
-        Ok(dashboards)
-    }
-
     ///fetch all correlations stored in object store
     /// return the correlation file path and all correlation json bytes for each file path
     async fn get_all_correlations(