merge heal

ecstore/src/bucket/metadata.rs

@@ -9,7 +9,6 @@ use s3s::dto::{
     BucketLifecycleConfiguration, NotificationConfiguration, ObjectLockConfiguration, ReplicationConfiguration,
     ServerSideEncryptionConfiguration, Tagging, VersioningConfiguration,
 };
-use s3s::xml;
 use serde::Serializer;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;

ecstore/src/bucket/metadata_sys.rs

@@ -28,7 +28,7 @@ use super::target::BucketTargets;
 use lazy_static::lazy_static;
 
 lazy_static! {
-    static ref GLOBAL_BucketMetadataSys: Arc<RwLock<BucketMetadataSys>> = Arc::new(RwLock::new(BucketMetadataSys::new()));
+    pub static ref GLOBAL_BucketMetadataSys: Arc<RwLock<BucketMetadataSys>> = Arc::new(RwLock::new(BucketMetadataSys::new()));
 }
 
 pub async fn init_bucket_metadata_sys(api: ECStore, buckets: Vec<String>) {

ecstore/src/bucket/policy/bucket_policy.rs

@@ -2,7 +2,6 @@ use crate::error::{Error, Result};
 // use rmp_serde::Serializer as rmpSerializer;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
-use std::collections::HashSet;
 
 use super::{
     action::{Action, ActionSet, IAMActionConditionKeyMap},

ecstore/src/bucket/utils.rs

@@ -39,10 +39,8 @@ pub fn check_bucket_name_common(bucket_name: &str, strict: bool) -> Result<(), E
         if !VALID_BUCKET_NAME_STRICT.is_match(bucket_name_trimmed) {
             return Err(Error::msg("Bucket name contains invalid characters"));
         }
-    } else {
-        if !VALID_BUCKET_NAME.is_match(bucket_name_trimmed) {
-            return Err(Error::msg("Bucket name contains invalid characters"));
-        }
+    } else if !VALID_BUCKET_NAME.is_match(bucket_name_trimmed) {
+        return Err(Error::msg("Bucket name contains invalid characters"));
     }
     Ok(())
 }

ecstore/src/bucket/versioning/mod.rs

@@ -40,10 +40,8 @@ impl VersioningApi for VersioningConfiguration {
         }
 
         if let Some(status) = self.status.as_ref() {
-            if status.as_str() == BucketVersioningStatus::ENABLED {
-                if prefix.is_empty() {
-                    return false;
-                }
+            if status.as_str() == BucketVersioningStatus::ENABLED && prefix.is_empty() {
+                return false;
 
                 // TODO: ExcludeFolders
             }