Reorganize S3 clients

crates/pile-value/src/value/item.rs

@@ -1,6 +1,6 @@
 use mime::Mime;
 use pile_config::Label;
-use pile_io::{ChaChaReaderAsync, S3Reader, SyncReadBridge};
+use pile_io::{SyncReadBridge, chacha::ChaChaReaderv1Async};
 use smartstring::{LazyCompact, SmartString};
 use std::{collections::HashMap, fs::File, path::PathBuf, sync::Arc};
 
@@ -59,39 +59,13 @@ impl Item {
 					}
 				};
 
-				let head = source
-					.client
-					.head_object()
-					.bucket(source.bucket.as_str())
-					.key(full_key.as_str())
-					.send()
-					.await
-					.map_err(std::io::Error::other)?;
-
-				let size = head.content_length().unwrap_or(0) as u64;
+				let reader = source.client.get(&full_key).await?;
 
 				match source.encryption_key {
-					None => ItemReader::S3(S3Reader {
-						client: source.client.clone(),
-						bucket: source.bucket.clone(),
-						key: full_key,
-						cursor: 0,
-						size,
-					}),
-
-					Some(enc_key) => ItemReader::EncryptedS3(
-						ChaChaReaderAsync::new(
-							S3Reader {
-								client: source.client.clone(),
-								bucket: source.bucket.clone(),
-								key: full_key,
-								cursor: 0,
-								size,
-							},
-							enc_key,
-						)
-						.await?,
-					),
+					None => ItemReader::S3(reader),
+					Some(enc_key) => {
+						ItemReader::EncryptedS3(ChaChaReaderv1Async::new(reader, enc_key).await?)
+					}
 				}
 			}
 		})