Deuxfleurs/garage
34
65
Fork 83
Code Issues 95 Pull requests 16 Releases 32 Wiki Activity

helper: refactoring

Browse source
This commit is contained in:
Alex 2025-03-18 11:40:10 +01:00
parent ce3ea454c1
commit 3c94773ab1
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/model/helper/locked.rs
View file

@ -225,14 +225,12 @@ impl<'a> LockedHelper<'a> {
key_id: &String, key_id: &String,
alias_name: &String, alias_name: &String,
) -> Result<(), Error> { ) -> Result<(), Error> {
let key_helper = KeyHelper(self.0);
if !is_valid_bucket_name(alias_name) { if !is_valid_bucket_name(alias_name) {
return Err(Error::InvalidBucketName(alias_name.to_string())); return Err(Error::InvalidBucketName(alias_name.to_string()));
} }
let mut bucket = self.bucket().get_existing_bucket(bucket_id).await?; 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(); let key_param = key.state.as_option_mut().unwrap();
@ -281,10 +279,8 @@ impl<'a> LockedHelper<'a> {
key_id: &String, key_id: &String,
alias_name: &String, alias_name: &String,
) -> Result<(), Error> { ) -> Result<(), Error> {
let key_helper = KeyHelper(self.0);
let bucket = self.bucket().get_existing_bucket(bucket_id).await?; 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 key_p = key.state.as_option().unwrap();
let bucket_p = bucket.state.as_option().unwrap(); let bucket_p = bucket.state.as_option().unwrap();
@ -331,10 +327,8 @@ impl<'a> LockedHelper<'a> {
key_id: &String, key_id: &String,
alias_name: &String, alias_name: &String,
) -> Result<(), Error> { ) -> Result<(), Error> {
let key_helper = KeyHelper(self.0);
let bucket = self.bucket().get_existing_bucket(bucket_id).await?; 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) self.internal_purge_local_bucket_alias(bucket, key, alias_name)
.await?; .await?;
@ -387,10 +381,8 @@ impl<'a> LockedHelper<'a> {
key_id: &String, key_id: &String,
mut perm: BucketKeyPerm, mut perm: BucketKeyPerm,
) -> Result<(), Error> { ) -> Result<(), Error> {
let key_helper = KeyHelper(self.0);
let mut bucket = self.bucket().get_internal_bucket(bucket_id).await?; 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(bstate) = bucket.state.as_option() {
if let Some(kp) = bstate.authorized_keys.get(key_id) { if let Some(kp) = bstate.authorized_keys.get(key_id) {