add AWS_ENDPOINT_URL env and fix get_object_attributes

crates/aws_s3/src/storage.rs

@@ -9,9 +9,9 @@ use async_trait::async_trait;
 use aws_config::retry::RetryConfig;
 use aws_sdk_s3::{
     operation::{
-        get_object_attributes::{
-            GetObjectAttributesError,
-            GetObjectAttributesOutput,
+        head_object::{
+            HeadObjectOutput,
+            HeadObjectError,
         },
         upload_part::builders::UploadPartFluentBuilder,
     },
@@ -434,26 +434,24 @@ impl<RT: Runtime> Storage for S3Storage<RT> {
             .split_once('/')
             .with_context(|| format!("Invalid fully qualified S3 key {:?}", key))?;
         let result: Result<
-            GetObjectAttributesOutput,
-            aws_sdk_s3::error::SdkError<GetObjectAttributesError>,
+            HeadObjectOutput,
+            aws_sdk_s3::error::SdkError<HeadObjectError>,
         > = self
             .client
-            .get_object_attributes()
+            .head_object()
             .bucket(bucket)
             .key(s3_key)
-            .object_attributes(aws_sdk_s3::types::ObjectAttributes::Checksum)
-            .object_attributes(aws_sdk_s3::types::ObjectAttributes::ObjectSize)
             .send()
             .await;
         match result {
-            Ok(object_attributes) => {
-                let size = object_attributes
-                    .object_size
+            Ok(head_attributes) => {
+                let size = head_attributes
+                    .content_length
                     .context("Object is missing size")? as u64;
                 Ok(Some(ObjectAttributes { size }))
             },
             Err(aws_sdk_s3::error::SdkError::ServiceError(err)) => match err.err() {
-                GetObjectAttributesError::NoSuchKey(_) => Ok(None),
+                HeadObjectError::NotFound(_) => Ok(None),
                 // Other service errors from S3
                 _ => Err(err.into_err().into()),
             },

crates/aws_utils/src/lib.rs

@@ -14,6 +14,9 @@ use aws_types::region::Region;
 
 pub mod s3;
 
+static AWS_ENDPOINT_URL: LazyLock<Option<String>> =
+    LazyLock::new(|| env::var("AWS_ENDPOINT_URL").ok());
+
 static AWS_ACCESS_KEY_ID: LazyLock<Option<String>> =
     LazyLock::new(|| env::var("AWS_ACCESS_KEY_ID").ok());
 
@@ -36,8 +39,12 @@ pub fn must_config_from_env() -> anyhow::Result<ConfigLoader> {
     let Some(_) = AWS_SECRET_ACCESS_KEY.clone() else {
         anyhow::bail!("AWS_SECRET_ACCESS_KEY env variable must be set");
     };
+    let Some(endpoint_url) = AWS_ENDPOINT_URL.clone() else {
+        anyhow::bail!("AWS_ENDPOINT_URL env variable must be set");
+    };
     let credentials = EnvironmentVariableCredentialsProvider::new();
     Ok(aws_config::defaults(BehaviorVersion::v2024_03_28())
+        .endpoint_url(endpoint_url)
         .region(region)
         .credentials_provider(credentials))
 }