Fix copying files located on the root folder in GCS/S3 buckets (#5)

abdolence · Aug 5, 2024 · fd49e8f · fd49e8f
1 parent c77b92d
commit fd49e8f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "redacter"
-version = "0.3.0"
+version = "0.3.1"
 edition = "2021"
 authors = ["Abdulla Abdurakhmanov <[email protected]>"]
 license = "Apache-2.0"

diff --git a/src/filesystems/aws_s3.rs b/src/filesystems/aws_s3.rs
@@ -230,9 +230,14 @@ impl<'a> FileSystemConnection<'a> for AwsS3FileSystem<'a> {
     fn resolve(&self, file_ref: Option<&FileSystemRef>) -> AbsoluteFilePath {
         AbsoluteFilePath {
             file_path: if self.is_dir {
+                let object_name_prefix = if self.object_name == "/" {
+                    ""
+                } else {
+                    self.object_name.as_str()
+                };
                 format!(
                     "{}{}",
-                    &self.object_name,
+                    object_name_prefix,
                     file_ref
                         .map(|fr| fr.relative_path.value().clone())
                         .unwrap_or_default()

diff --git a/src/filesystems/gcs.rs b/src/filesystems/gcs.rs
@@ -233,9 +233,14 @@ impl<'a> FileSystemConnection<'a> for GoogleCloudStorageFileSystem<'a> {
     fn resolve(&self, file_ref: Option<&FileSystemRef>) -> AbsoluteFilePath {
         AbsoluteFilePath {
             file_path: if self.is_dir {
+                let object_name_prefix = if self.object_name == "/" {
+                    ""
+                } else {
+                    self.object_name.as_str()
+                };
                 format!(
                     "{}{}",
-                    &self.object_name,
+                    object_name_prefix,
                     file_ref
                         .map(|fr| fr.relative_path.value().clone())
                         .unwrap_or_default()