Fixed unwrapping results in s3 uri parsing

Author: alamminsalo

martin/src/pmtiles/mod.rs

@@ -309,12 +309,12 @@ impl_pmtiles_source!(PmtS3Source, S3Backend, Url, identity, InvalidUrlMetadata);
 
 impl PmtS3Source {
     pub async fn new(cache: PmtCache, id: String, url: Url) -> FileResult<Self> {
-        let bucket_name = url.host_str().expect("Failed to parse bucket name.");
-        let credentials = Credentials::default().expect("Failed to parse AWS credentials.");
+        let bucket_name = url.host_str().ok_or_else(|| FileError::S3SourceError(format!("failed to parse bucket name from {url}")))?;
+        let credentials = Credentials::default().map_err(|_| FileError::S3SourceError(format!("failed to read AWS credentials for {url}")))?;
         let region: String =
-            env::var("AWS_REGION").expect("Failed to get AWS_REGION environment variable.");
-        let bucket = Bucket::new(bucket_name, region.parse().unwrap(), credentials)
-            .expect("Failed to instantiate bucket.");
+            env::var("AWS_REGION").map_err(|_| FileError::S3SourceError(format!("failed to get AWS_REGION environment variable for {url}")))?;
+        let bucket = Bucket::new(bucket_name, region.parse().map_err(|_| FileError::S3SourceError(format!("failed to parse region")))? , credentials)
+            .map_err(|_| FileError::S3SourceError(format!("failed to instantiate bucket for {url}")))?;
 
         let reader =
             AsyncPmTilesReader::new_with_cached_bucket_path(cache, bucket, url.path().to_owned())