refactor: DRY to_object_store_path

Author: Devdutt Shenoi

src/storage/azure_blob.rs

@@ -17,8 +17,7 @@
  */
 use super::object_storage::parseable_json_path;
 use super::{
-    LogStream, ObjectStorage, ObjectStorageError, ObjectStorageProvider, PARSEABLE_ROOT_DIRECTORY,
-    SCHEMA_FILE_NAME, STREAM_METADATA_FILE_NAME, STREAM_ROOT_DIRECTORY,
+    to_object_store_path, LogStream, ObjectStorage, ObjectStorageError, ObjectStorageProvider, PARSEABLE_ROOT_DIRECTORY, SCHEMA_FILE_NAME, STREAM_METADATA_FILE_NAME, STREAM_ROOT_DIRECTORY
 };
 use async_trait::async_trait;
 use bytes::Bytes;
@@ -185,10 +184,6 @@ impl ObjectStorageProvider for AzureBlobConfig {
     }
 }
 
-pub fn to_object_store_path(path: &RelativePath) -> StorePath {
-    StorePath::from(path.as_str())
-}
-
 // ObjStoreClient is generic client to enable interactions with different cloudprovider's
 // object store such as S3 and Azure Blob
 #[derive(Debug)]

src/storage/mod.rs

@@ -25,6 +25,8 @@ use crate::{
 };
 
 use chrono::Local;
+use object_store::path::Path;
+use relative_path::RelativePath;
 use serde::{Deserialize, Serialize};
 
 use std::fmt::Debug;
@@ -260,3 +262,7 @@ pub enum ObjectStorageError {
     #[error("Error: {0}")]
     MetadataError(#[from] MetadataError),
 }
+
+pub fn to_object_store_path(path: &RelativePath) -> Path {
+    Path::from(path.as_str())
+}

src/storage/s3.rs

@@ -43,8 +43,7 @@ use std::time::{Duration, Instant};
 use super::metrics_layer::MetricLayer;
 use super::object_storage::parseable_json_path;
 use super::{
-    LogStream, ObjectStorageProvider, SCHEMA_FILE_NAME, STREAM_METADATA_FILE_NAME,
-    STREAM_ROOT_DIRECTORY,
+    to_object_store_path, LogStream, ObjectStorageProvider, SCHEMA_FILE_NAME, STREAM_METADATA_FILE_NAME, STREAM_ROOT_DIRECTORY
 };
 use crate::handlers::http::users::USERS_ROOT_DIR;
 use crate::metrics::storage::{s3::REQUEST_RESPONSE_TIME, StorageMetrics};
@@ -321,10 +320,6 @@ impl ObjectStorageProvider for S3Config {
     }
 }
 
-fn to_object_store_path(path: &RelativePath) -> StorePath {
-    StorePath::from(path.as_str())
-}
-
 #[derive(Debug)]
 pub struct S3 {
     client: LimitStore<AmazonS3>,