Skip to content

Use common prefixes for logstream listing #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 27, 2022
Merged

Use common prefixes for logstream listing #69

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1377cbd
Use common prefixes for logstream listing
trueleo Aug 27, 2022
8b0f4fc
Clippy suggestions
trueleo Aug 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions server/src/s3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use async_trait::async_trait;
use aws_sdk_s3::error::{HeadBucketError, HeadBucketErrorKind};
use aws_sdk_s3::model::{Delete, ObjectIdentifier};
use aws_sdk_s3::model::{CommonPrefix, Delete, ObjectIdentifier};
use aws_sdk_s3::types::{ByteStream, SdkError};
use aws_sdk_s3::Error as AwsSdkError;
use aws_sdk_s3::{Client, Credentials, Endpoint, Region};
Expand All @@ -18,7 +18,6 @@ use futures::StreamExt;
use http::Uri;
use object_store::aws::AmazonS3Builder;
use object_store::limit::LimitStore;
use std::collections::HashSet;
use std::fs;
use std::iter::Iterator;
use std::sync::Arc;
Expand Down Expand Up @@ -298,23 +297,22 @@ impl S3 {
.client
.list_objects_v2()
.bucket(&S3_CONFIG.s3_bucket_name)
.delimiter('/')
.send()
.await?;
let body = resp.contents().unwrap_or_default();
// make a set of unique prefixes at the root level
let mut hs = HashSet::<String>::new();
for logstream in body {
let name = logstream.key().unwrap_or_default().to_string();
let tokens = name.split('/').collect::<Vec<&str>>();
hs.insert(tokens[0].to_string());
}
// transform that hashset to a vector before returning
let mut streams = Vec::new();
for v in hs {
streams.push(LogStream { name: v });
}

Ok(streams)
let common_prefixes = resp.common_prefixes().unwrap_or_default();

// return prefixes at the root level
let logstreams: Vec<_> = common_prefixes
.iter()
.filter_map(CommonPrefix::prefix)
.filter_map(|name| name.strip_suffix('/'))
.map(String::from)
.map(|name| LogStream { name })
.collect();

Ok(logstreams)
}

async fn _upload_file(&self, key: &str, path: &str) -> Result<(), AwsSdkError> {
Expand Down