Merge branch 'main' into stefannikolei/nullable/aws

Author: stefannikolei

src/ImageSharp.Web.Providers.AWS/Providers/AWSS3StorageImageProvider.cs

@@ -113,12 +113,13 @@ public bool IsValidRequest(HttpContext context)
             return null;
         }
 
-        if (!await KeyExists(s3Client, bucketName, key))
+        KeyExistsResult keyExists = await KeyExists(s3Client, bucketName, key);
+        if (!keyExists.Exists)
         {
             return null;
         }
 
-        return new AWSS3StorageImageResolver(s3Client, bucketName, key);
+        return new AWSS3StorageImageResolver(s3Client, bucketName, key, keyExists.Metadata);
     }
 
     private bool IsMatch(HttpContext context)
@@ -144,39 +145,40 @@ private bool IsMatch(HttpContext context)
     }
 
     // ref https://github.com/aws/aws-sdk-net/blob/master/sdk/src/Services/S3/Custom/_bcl/IO/S3FileInfo.cs#L118
-    private static async Task<bool> KeyExists(IAmazonS3 s3Client, string bucketName, string key)
+    private static async Task<KeyExistsResult> KeyExists(IAmazonS3 s3Client, string bucketName, string key)
     {
         try
         {
-            GetObjectMetadataRequest request = new()
-            {
-                BucketName = bucketName,
-                Key = key
-            };
+            GetObjectMetadataRequest request = new() { BucketName = bucketName, Key = key };
 
             // If the object doesn't exist then a "NotFound" will be thrown
-            await s3Client.GetObjectMetadataAsync(request);
-            return true;
+            GetObjectMetadataResponse metadata = await s3Client.GetObjectMetadataAsync(request);
+            return new KeyExistsResult(metadata);
         }
         catch (AmazonS3Exception e)
         {
             if (string.Equals(e.ErrorCode, "NoSuchBucket", StringComparison.Ordinal))
             {
-                return false;
+                return default;
             }
 
             if (string.Equals(e.ErrorCode, "NotFound", StringComparison.Ordinal))
             {
-                return false;
+                return default;
             }
 
             // If the object exists but the client is not authorized to access it, then a "Forbidden" will be thrown.
             if (string.Equals(e.ErrorCode, "Forbidden", StringComparison.Ordinal))
             {
-                return false;
+                return default;
             }
 
             throw;
         }
     }
+
+    private readonly record struct KeyExistsResult(GetObjectMetadataResponse Metadata)
+    {
+        public bool Exists => this.Metadata is not null;
+    }
 }

src/ImageSharp.Web.Providers.AWS/Resolvers/AWSS3StorageImageResolver.cs

@@ -15,24 +15,27 @@ public class AWSS3StorageImageResolver : IImageResolver
     private readonly IAmazonS3 amazonS3;
     private readonly string bucketName;
     private readonly string imagePath;
+    private readonly GetObjectMetadataResponse metadataResponse;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="AWSS3StorageImageResolver"/> class.
     /// </summary>
     /// <param name="amazonS3">The Amazon S3 Client</param>
     /// <param name="bucketName">The bucket name.</param>
     /// <param name="imagePath">The image path.</param>
-    public AWSS3StorageImageResolver(IAmazonS3 amazonS3, string bucketName, string imagePath)
+    /// <param name="metadataResponse">Optional metadata response.</param>
+    public AWSS3StorageImageResolver(IAmazonS3 amazonS3, string bucketName, string imagePath, GetObjectMetadataResponse metadataResponse = null)
     {
         this.amazonS3 = amazonS3;
         this.bucketName = bucketName;
         this.imagePath = imagePath;
+        this.metadataResponse = metadataResponse;
     }
 
     /// <inheritdoc />
     public async Task<ImageMetadata> GetMetaDataAsync()
     {
-        GetObjectMetadataResponse metadata = await this.amazonS3.GetObjectMetadataAsync(this.bucketName, this.imagePath);
+        GetObjectMetadataResponse metadata = this.metadataResponse ?? await this.amazonS3.GetObjectMetadataAsync(this.bucketName, this.imagePath);
 
         // Try to parse the max age from the source. If it's not zero then we pass it along
         // to set the cache control headers for the response.