Rename AWS S# to plain S3 to provide for S3-compatibles

Signed-off-by: itowlson <[email protected]>

Author: itowlson

Cargo.lock

@@ -1,5 +1,5 @@
 [package]
-name = "spin-blobstore-aws-s3"
+name = "spin-blobstore-s3"
 version.workspace = true
 authors.workspace = true
 edition.workspace = true

crates/blobstore-aws-s3/Cargo.toml renamed to crates/blobstore-s3/Cargo.toml

@@ -4,20 +4,23 @@ use serde::Deserialize;
 use spin_factor_blobstore::runtime_config::spin::MakeBlobStore;
 use store::BlobStoreS3;
 
-/// A key-value store that uses Azure Cosmos as the backend.
+/// A blob store that uses a S3-compatible service as the backend.
+/// This currently supports only AWS S3
 #[derive(Default)]
 pub struct S3BlobStore {
     _priv: (),
 }
 
 impl S3BlobStore {
-    /// Creates a new `AzureBlobStore`.
+    /// Creates a new `S3BlobStore`.
     pub fn new() -> Self {
         Self::default()
     }
 }
 
-/// Runtime configuration for the Azure Cosmos key-value store.
+// TODO: allow URL configuration for compatible non-AWS services
+
+/// Runtime configuration for the S3 blob store.
 #[derive(Deserialize)]
 pub struct S3BlobStoreRuntimeConfig {
     /// The access key for the AWS S3 account role.
@@ -31,7 +34,7 @@ pub struct S3BlobStoreRuntimeConfig {
 }
 
 impl MakeBlobStore for S3BlobStore {
-    const RUNTIME_CONFIG_TYPE: &'static str = "aws_s3";
+    const RUNTIME_CONFIG_TYPE: &'static str = "s3";
 
     type RuntimeConfig = S3BlobStoreRuntimeConfig;
 

crates/blobstore-aws-s3/src/lib.rs renamed to crates/blobstore-s3/src/lib.rs

@@ -10,7 +10,7 @@ rust-version.workspace = true
 
 [dependencies]
 anyhow = { workspace = true }
-spin-blobstore-aws-s3 = { path = "../blobstore-aws-s3" }
+spin-blobstore-s3 = { path = "../blobstore-s3" }
 spin-blobstore-azure = { path = "../blobstore-azure" }
 spin-blobstore-memory = { path = "../blobstore-memory" }
 spin-common = { path = "../common" }

crates/blobstore-aws-s3/src/store.rs renamed to crates/blobstore-s3/src/store.rs

@@ -470,7 +470,7 @@ pub fn blobstore_config_resolver(
         .register_store_type(spin_blobstore_azure::AzureBlobStore::new())
         .unwrap();
     cr
-        .register_store_type(spin_blobstore_aws_s3::S3BlobStore::new())
+        .register_store_type(spin_blobstore_s3::S3BlobStore::new())
         .unwrap();
 
     cr