More parking

Author: itowlson

crates/blobstore-s3/src/lib.rs

@@ -31,7 +31,8 @@ pub struct S3BlobStoreRuntimeConfig {
     token: Option<String>,
     /// The AWS region where the S3 account is located
     region: String,
-    container_name: Option<String>,
+    /// The name of the bucket backing the store. The default is the store label.
+    bucket: Option<String>,
 }
 
 impl MakeBlobStore for S3BlobStore {
@@ -51,7 +52,7 @@ impl MakeBlobStore for S3BlobStore {
             _ => anyhow::bail!("either both of access_key and secret_key must be provided, or neither"),
         };
 
-        let blob_store = BlobStoreS3::new(runtime_config.region, auth, runtime_config.container_name)?;
+        let blob_store = BlobStoreS3::new(runtime_config.region, auth, runtime_config.bucket)?;
         Ok(blob_store)
     }
 }

crates/blobstore-s3/src/store.rs

@@ -16,7 +16,7 @@ pub struct BlobStoreS3 {
         aws_sdk_s3::Client,
         std::pin::Pin<Box<dyn std::future::Future<Output = aws_sdk_s3::Client> + Send>>,
     >,
-    container_name: Option<String>,
+    bucket: Option<String>,
 }
 
 /// AWS S3 runtime config literal options for authentication
@@ -70,7 +70,7 @@ impl BlobStoreS3 {
     pub fn new(
         region: String,
         auth_options: BlobStoreS3AuthOptions,
-        container_name: Option<String>,
+        bucket: Option<String>,
     ) -> Result<Self> {
         let builder = match &auth_options {
             BlobStoreS3AuthOptions::RuntimeConfigValues(config) =>
@@ -97,14 +97,14 @@ impl BlobStoreS3 {
             aws_sdk_s3::Client::new(&sdk_config)
         });
 
-        Ok(Self { builder, client: async_once_cell::Lazy::from_future(client_fut), container_name })
+        Ok(Self { builder, client: async_once_cell::Lazy::from_future(client_fut), bucket })
     }
 }
 
 #[async_trait]
 impl ContainerManager for BlobStoreS3 {
     async fn get(&self, name: &str) -> Result<Arc<dyn Container>, Error> {
-        let name = self.container_name.clone().unwrap_or_else(|| name.to_owned());
+        let name = self.bucket.clone().unwrap_or_else(|| name.to_owned());
 
         let store = self.builder.clone().with_bucket_name(&name).build().map_err(|e| e.to_string())?;