Skip to content

Commit a5702fd

Browse files
alamminsaloalamminsalo
alamminsalo
authored and
alamminsalo
committed
Fixed unwrapping results in s3 uri parsing
1 parent 93cd406 commit a5702fd

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

martin/src/pmtiles/mod.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -309,12 +309,12 @@ impl_pmtiles_source!(PmtS3Source, S3Backend, Url, identity, InvalidUrlMetadata);
309309

310310
impl PmtS3Source {
311311
pub async fn new(cache: PmtCache, id: String, url: Url) -> FileResult<Self> {
312-
let bucket_name = url.host_str().expect("Failed to parse bucket name.");
313-
let credentials = Credentials::default().expect("Failed to parse AWS credentials.");
312+
let bucket_name = url.host_str().ok_or_else(|| FileError::S3SourceError(format!("failed to parse bucket name from {url}")))?;
313+
let credentials = Credentials::default().map_err(|_| FileError::S3SourceError(format!("failed to read AWS credentials for {url}")))?;
314314
let region: String =
315-
env::var("AWS_REGION").expect("Failed to get AWS_REGION environment variable.");
316-
let bucket = Bucket::new(bucket_name, region.parse().unwrap(), credentials)
317-
.expect("Failed to instantiate bucket.");
315+
env::var("AWS_REGION").map_err(|_| FileError::S3SourceError(format!("failed to get AWS_REGION environment variable for {url}")))?;
316+
let bucket = Bucket::new(bucket_name, region.parse().map_err(|_| FileError::S3SourceError(format!("failed to parse region")))? , credentials)
317+
.map_err(|_| FileError::S3SourceError(format!("failed to instantiate bucket for {url}")))?;
318318

319319
let reader =
320320
AsyncPmTilesReader::new_with_cached_bucket_path(cache, bucket, url.path().to_owned())

0 commit comments

Comments
 (0)