Remove no longer necessary SharedCachingProxy <T>

Author: regexident

src/lib.rs

@@ -29,7 +29,7 @@ use tracing::{debug, error, info};
 pub use self::config::Config;
 pub use self::error::ApplicationError;
 pub use self::fifo_cache::FifoCache;
-pub use self::proxy_service::{CachingProxy, SharedCachingProxy, range_to_string};
+pub use self::proxy_service::{CachingProxy, range_to_string};
 pub use self::s3_cache::{CacheKey, CachedObject, S3Cache};
 pub use self::statistics::UniqueRequestedObjectsStatisticsTracker;
 
@@ -132,18 +132,17 @@ where
         ))
     });
 
-    // Build caching proxy (wrapped for sharing with metrics writer)
-    let caching_proxy =
-        proxy_service::SharedCachingProxy::new(proxy_service::CachingProxy::from_aws_proxy(
-            proxy,
-            cache,
-            config.cache_max_object_size_bytes,
-            config.cache_dry_run,
-        ));
+    // Build caching proxy
+    let caching_proxy = proxy_service::CachingProxy::from_aws_proxy(
+        proxy,
+        cache,
+        config.cache_max_object_size_bytes,
+        config.cache_dry_run,
+    );
 
     // Build S3 service with auth
     let service = {
-        let mut b = S3ServiceBuilder::new(caching_proxy.clone());
+        let mut b = S3ServiceBuilder::new(caching_proxy);
         b.set_auth(auth::create_auth(&config));
         b.build()
     };

src/proxy_service.rs

@@ -614,170 +614,3 @@ impl<T: S3 + Send + Sync> S3 for CachingProxy<T> {
         self.inner.upload_part_copy(req).await
     }
 }
-
-/// Thread-safe shared wrapper around [`CachingProxy`].
-///
-/// Wraps the proxy in an [`Arc`] to allow sharing between the S3 service handler
-/// and other components like the metrics writer.
-pub struct SharedCachingProxy<T>(Arc<CachingProxy<T>>);
-
-impl<T> SharedCachingProxy<T> {
-    /// Wraps a caching proxy for shared access.
-    pub fn new(proxy: CachingProxy<T>) -> Self {
-        Self(Arc::new(proxy))
-    }
-
-    /// Returns a clone of the inner [`Arc<CachingProxy<T>>`].
-    pub fn clone_arc(&self) -> Arc<CachingProxy<T>> {
-        self.0.clone()
-    }
-}
-
-impl<T> Clone for SharedCachingProxy<T> {
-    fn clone(&self) -> Self {
-        Self(self.0.clone())
-    }
-}
-
-#[async_trait::async_trait]
-impl<T: S3 + Send + Sync> S3 for SharedCachingProxy<T> {
-    async fn get_object(
-        &self,
-        req: S3Request<GetObjectInput>,
-    ) -> S3Result<S3Response<GetObjectOutput>> {
-        self.0.get_object(req).await
-    }
-
-    async fn put_object(
-        &self,
-        req: S3Request<PutObjectInput>,
-    ) -> S3Result<S3Response<PutObjectOutput>> {
-        self.0.put_object(req).await
-    }
-
-    async fn delete_object(
-        &self,
-        req: S3Request<DeleteObjectInput>,
-    ) -> S3Result<S3Response<DeleteObjectOutput>> {
-        self.0.delete_object(req).await
-    }
-
-    async fn delete_objects(
-        &self,
-        req: S3Request<DeleteObjectsInput>,
-    ) -> S3Result<S3Response<DeleteObjectsOutput>> {
-        self.0.delete_objects(req).await
-    }
-
-    async fn copy_object(
-        &self,
-        req: S3Request<CopyObjectInput>,
-    ) -> S3Result<S3Response<CopyObjectOutput>> {
-        self.0.copy_object(req).await
-    }
-
-    async fn head_object(
-        &self,
-        req: S3Request<HeadObjectInput>,
-    ) -> S3Result<S3Response<HeadObjectOutput>> {
-        self.0.head_object(req).await
-    }
-
-    async fn create_multipart_upload(
-        &self,
-        req: S3Request<CreateMultipartUploadInput>,
-    ) -> S3Result<S3Response<CreateMultipartUploadOutput>> {
-        self.0.create_multipart_upload(req).await
-    }
-
-    async fn complete_multipart_upload(
-        &self,
-        req: S3Request<CompleteMultipartUploadInput>,
-    ) -> S3Result<S3Response<CompleteMultipartUploadOutput>> {
-        self.0.complete_multipart_upload(req).await
-    }
-
-    async fn abort_multipart_upload(
-        &self,
-        req: S3Request<AbortMultipartUploadInput>,
-    ) -> S3Result<S3Response<AbortMultipartUploadOutput>> {
-        self.0.abort_multipart_upload(req).await
-    }
-
-    async fn list_objects(
-        &self,
-        req: S3Request<ListObjectsInput>,
-    ) -> S3Result<S3Response<ListObjectsOutput>> {
-        self.0.list_objects(req).await
-    }
-
-    async fn list_objects_v2(
-        &self,
-        req: S3Request<ListObjectsV2Input>,
-    ) -> S3Result<S3Response<ListObjectsV2Output>> {
-        self.0.list_objects_v2(req).await
-    }
-
-    async fn list_parts(
-        &self,
-        req: S3Request<ListPartsInput>,
-    ) -> S3Result<S3Response<ListPartsOutput>> {
-        self.0.list_parts(req).await
-    }
-
-    async fn upload_part(
-        &self,
-        req: S3Request<UploadPartInput>,
-    ) -> S3Result<S3Response<UploadPartOutput>> {
-        self.0.upload_part(req).await
-    }
-
-    async fn upload_part_copy(
-        &self,
-        req: S3Request<UploadPartCopyInput>,
-    ) -> S3Result<S3Response<UploadPartCopyOutput>> {
-        self.0.upload_part_copy(req).await
-    }
-
-    async fn create_bucket(
-        &self,
-        req: S3Request<CreateBucketInput>,
-    ) -> S3Result<S3Response<CreateBucketOutput>> {
-        self.0.create_bucket(req).await
-    }
-
-    async fn list_buckets(
-        &self,
-        req: S3Request<ListBucketsInput>,
-    ) -> S3Result<S3Response<ListBucketsOutput>> {
-        self.0.list_buckets(req).await
-    }
-
-    async fn delete_bucket(
-        &self,
-        req: S3Request<DeleteBucketInput>,
-    ) -> S3Result<S3Response<DeleteBucketOutput>> {
-        self.0.delete_bucket(req).await
-    }
-
-    async fn get_bucket_location(
-        &self,
-        req: S3Request<GetBucketLocationInput>,
-    ) -> S3Result<S3Response<GetBucketLocationOutput>> {
-        self.0.get_bucket_location(req).await
-    }
-
-    async fn head_bucket(
-        &self,
-        req: S3Request<HeadBucketInput>,
-    ) -> S3Result<S3Response<HeadBucketOutput>> {
-        self.0.head_bucket(req).await
-    }
-
-    async fn list_multipart_uploads(
-        &self,
-        req: S3Request<ListMultipartUploadsInput>,
-    ) -> S3Result<S3Response<ListMultipartUploadsOutput>> {
-        self.0.list_multipart_uploads(req).await
-    }
-}