GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests Projects Releases 323 Packages Wiki Activity Actions

feat(s3): Finally improve directory upload with proper path handling

Browse source 
- Added bucket parameter to upload_directory_recursive for explicit bucket specification
- Improved key construction logic to handle path prefixes more robustly
- Removed redundant trace logs and added more informative upload messages
- Fixed potential issue with bucket name extraction from prefix
- Ensured consistent path separator handling in S3 keys

The changes make the S3 upload functionality more reliable and maintainable by:
1. Explicitly passing bucket names instead of extracting from prefixes
2. Properly handling path separators in S3 keys
3. Providing clearer logging for upload operations
This commit is contained in:
Rodrigo Rodriguez (Pragmatismo) 2025-10-30 12:52:21 -03:00
parent 5a6e36e6c2
commit 792186cf76
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/bootstrap/mod.rs
View file

@ -459,7 +459,7 @@ aws_sdk_s3::Client::from_conf(s3_config)
}
}
self.upload_directory_recursive(client, &path, &bucket)
self.upload_directory_recursive(client, &path, &bucket, "/")
.await?;
info!("Uploaded template {} to Drive bucket {}", bot_name, bucket);
}
@ -523,6 +523,7 @@ aws_sdk_s3::Client::from_conf(s3_config)
&'a self,
client: &'a Client,
local_path: &'a Path,
bucket: &'a str,
prefix: &'a str,
) -> std::pin::Pin<Box<dyn std::future::Future<Output = Result<()>> + 'a>> {
Box::pin(async move {
@ -536,25 +537,26 @@ aws_sdk_s3::Client::from_conf(s3_config)
let entry = entry?;
let path = entry.path();
let file_name = path.file_name().unwrap().to_string_lossy().to_string();
let key = if prefix.is_empty() {
file_name.clone()
} else {
format!("{}/{}", prefix.trim_end_matches('/'), file_name)
};
// Construct key path, ensuring no duplicate slashes
let mut key = prefix.trim_matches('/').to_string();
if !key.is_empty() {
key.push('/');
}
key.push_str(&file_name);
if path.is_file() {
info!("Uploading file: {} with key: {}", path.display(), key);
info!("Uploading file: {} to bucket {} with key: {}",
path.display(), bucket, key);
let content = std::fs::read(&path)?;
trace!("Writing file {} with key {}", path.display(), key);
client.put_object()
.bucket(prefix.split('/').next().unwrap_or("default.gbai"))
.bucket(bucket)
.key(&key)
.body(content.into())
.send()
.await?;
trace!("Successfully wrote file {}", path.display());
} else if path.is_dir() {
self.upload_directory_recursive(client, &path, &key).await?;
self.upload_directory_recursive(client, &path, bucket, &key).await?;
}
}
Ok(())