From 3c94773ab1ac269eb1ea8d2b42f3647830ad404d Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Tue, 18 Mar 2025 11:40:10 +0100 Subject: [PATCH] helper: refactoring --- src/model/helper/locked.rs | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/model/helper/locked.rs b/src/model/helper/locked.rs index 1faefe26..7e7a67c7 100644 --- a/src/model/helper/locked.rs +++ b/src/model/helper/locked.rs @@ -225,14 +225,12 @@ impl<'a> LockedHelper<'a> { key_id: &String, alias_name: &String, ) -> Result<(), Error> { - let key_helper = KeyHelper(self.0); - if !is_valid_bucket_name(alias_name) { return Err(Error::InvalidBucketName(alias_name.to_string())); } let mut bucket = self.bucket().get_existing_bucket(bucket_id).await?; - let mut key = key_helper.get_existing_key(key_id).await?; + let mut key = self.key().get_existing_key(key_id).await?; let key_param = key.state.as_option_mut().unwrap(); @@ -281,10 +279,8 @@ impl<'a> LockedHelper<'a> { key_id: &String, alias_name: &String, ) -> Result<(), Error> { - let key_helper = KeyHelper(self.0); - let bucket = self.bucket().get_existing_bucket(bucket_id).await?; - let key = key_helper.get_existing_key(key_id).await?; + let key = self.key().get_existing_key(key_id).await?; let key_p = key.state.as_option().unwrap(); let bucket_p = bucket.state.as_option().unwrap(); @@ -331,10 +327,8 @@ impl<'a> LockedHelper<'a> { key_id: &String, alias_name: &String, ) -> Result<(), Error> { - let key_helper = KeyHelper(self.0); - let bucket = self.bucket().get_existing_bucket(bucket_id).await?; - let key = key_helper.get_existing_key(key_id).await?; + let key = self.key().get_existing_key(key_id).await?; self.internal_purge_local_bucket_alias(bucket, key, alias_name) .await?; @@ -387,10 +381,8 @@ impl<'a> LockedHelper<'a> { key_id: &String, mut perm: BucketKeyPerm, ) -> Result<(), Error> { - let key_helper = KeyHelper(self.0); - let mut bucket = self.bucket().get_internal_bucket(bucket_id).await?; - let mut key = key_helper.get_internal_key(key_id).await?; + let mut key = self.key().get_internal_key(key_id).await?; if let Some(bstate) = bucket.state.as_option() { if let Some(kp) = bstate.authorized_keys.get(key_id) {