Added factory class

Author: andyfelton-equatedigital

src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCache.cs

@@ -11,6 +11,8 @@
 using Amazon.S3;
 using Amazon.S3.Model;
 using Microsoft.Extensions.Options;
+using SixLabors.ImageSharp.Web.Factories;
+using SixLabors.ImageSharp.Web.Providers.AWS;
 using SixLabors.ImageSharp.Web.Resolvers;
 using SixLabors.ImageSharp.Web.Resolvers.AWS;
 
@@ -26,6 +28,7 @@ public class AWSS3StorageCache : IImageCache
             TaskCreationOptions.None,
             TaskContinuationOptions.None,
             TaskScheduler.Default);
+        private static readonly AWSS3Factory AWSS3Factory = new ();
 
         private readonly IAmazonS3 amazonS3Client;
         private readonly string bucket;
@@ -34,12 +37,12 @@ public class AWSS3StorageCache : IImageCache
         /// Initializes a new instance of the <see cref="AWSS3StorageCache"/> class.
         /// </summary>
         /// <param name="cacheOptions">The cache options.</param>
-        public AWSS3StorageCache(IOptions<AWSS3StorageCacheOptions> cacheOptions)
+        public AWSS3StorageCache(IOptions<AWSS3BucketClientOptions> cacheOptions)
         {
             Guard.NotNull(cacheOptions, nameof(cacheOptions));
-            AWSS3StorageCacheOptions options = cacheOptions.Value;
+            AWSS3BucketClientOptions options = cacheOptions.Value;
             this.bucket = options.BucketName;
-            this.amazonS3Client = CreateClient(options);
+            this.amazonS3Client = AWSS3Factory.CreateClient(options);
         }
 
         /// <inheritdoc/>
@@ -95,10 +98,10 @@ public Task SetAsync(string key, Stream stream, ImageCacheMetadata metadata)
         /// created bucket. If the container already exists, <see langword="null"/>.
         /// </returns>
         public static PutBucketResponse CreateIfNotExists(
-            AWSS3StorageCacheOptions options,
+            AWSS3BucketClientOptions options,
             S3CannedACL acl)
         {
-            AmazonS3Client client = CreateClient(options);
+            AmazonS3Client client = AWSS3Factory.CreateClient(options);
 
             bool foundBucket = false;
             ListBucketsResponse listBucketsResponse = RunSync(() => client.ListBucketsAsync());
@@ -126,33 +129,6 @@ public static PutBucketResponse CreateIfNotExists(
             return null;
         }
 
-        private static AmazonS3Client CreateClient(AWSS3StorageCacheOptions options)
-        {
-            if (!string.IsNullOrWhiteSpace(options.Endpoint))
-            {
-                // AccessKey can be empty.
-                // AccessSecret can be empty.
-                AmazonS3Config config = new() { ServiceURL = options.Endpoint, ForcePathStyle = true };
-                return new AmazonS3Client(options.AccessKey, options.AccessSecret, config);
-            }
-            else if (!string.IsNullOrWhiteSpace(options.AccessKey))
-            {
-                // AccessSecret can be empty.
-                Guard.NotNullOrWhiteSpace(options.Region, nameof(options.Region));
-                var region = RegionEndpoint.GetBySystemName(options.Region);
-                return new AmazonS3Client(options.AccessKey, options.AccessSecret, region);
-            }
-            else if (!string.IsNullOrWhiteSpace(options.Region))
-            {
-                var region = RegionEndpoint.GetBySystemName(options.Region);
-                return new AmazonS3Client(region);
-            }
-            else
-            {
-                throw new ArgumentException("Invalid configuration.", nameof(options));
-            }
-        }
-
         /// <summary>
         /// Executes an async <see cref="Task{TResult}"/> method which has
         /// a <paramref name="task"/> return type synchronously.

src/ImageSharp.Web.Providers.AWS/Caching/AWSS3StorageCacheOptions.cs

@@ -0,0 +1,61 @@
+// Copyright (c) Six Labors.
+// Licensed under the Apache License, Version 2.0.
+
+using System;
+using System.Globalization;
+using System.Threading;
+using System.Threading.Tasks;
+using Amazon;
+using Amazon.S3;
+using Amazon.S3.Model;
+using SixLabors.ImageSharp.Web.Caching.AWS;
+using SixLabors.ImageSharp.Web.Providers.AWS;
+
+namespace SixLabors.ImageSharp.Web.Factories
+{
+    internal class AWSS3Factory
+    {
+        /// <summary>
+        /// Creates a new bucket under the specified account if a bucket
+        /// with the same name does not already exist.
+        /// </summary>
+        /// <param name="options">The AWS S3 Storage cache options.</param>
+        /// <param name="acl">
+        /// Specifies whether data in the bucket may be accessed publicly and the level of access.
+        /// <see cref="S3CannedACL.PublicRead"/> specifies full public read access for bucket
+        /// and object data. <see cref="S3CannedACL.Private"/> specifies that the bucket
+        /// data is private to the account owner.
+        /// </param>
+        /// <returns>
+        /// If the bucket does not already exist, a <see cref="PutBucketResponse"/> describing the newly
+        /// created bucket. If the container already exists, <see langword="null"/>.
+        /// </returns>
+
+        public static AmazonS3Client CreateClient(AWSS3BucketClientOptions options)
+        {
+            if (!string.IsNullOrWhiteSpace(options.Endpoint))
+            {
+                // AccessKey can be empty.
+                // AccessSecret can be empty.
+                AmazonS3Config config = new() { ServiceURL = options.Endpoint, ForcePathStyle = true };
+                return new AmazonS3Client(options.AccessKey, options.AccessSecret, config);
+            }
+            else if (!string.IsNullOrWhiteSpace(options.AccessKey))
+            {
+                // AccessSecret can be empty.
+                Guard.NotNullOrWhiteSpace(options.Region, nameof(options.Region));
+                var region = RegionEndpoint.GetBySystemName(options.Region);
+                return new AmazonS3Client(options.AccessKey, options.AccessSecret, region);
+            }
+            else if (!string.IsNullOrWhiteSpace(options.Region))
+            {
+                var region = RegionEndpoint.GetBySystemName(options.Region);
+                return new AmazonS3Client(region);
+            }
+            else
+            {
+                throw new ArgumentException("Invalid configuration.", nameof(options));
+            }
+        }
+    }
+}

src/ImageSharp.Web.Providers.AWS/Factories/AWSS3Factory.cs

@@ -10,6 +10,7 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.Extensions.Options;
+using SixLabors.ImageSharp.Web.Factories;
 using SixLabors.ImageSharp.Web.Resolvers;
 using SixLabors.ImageSharp.Web.Resolvers.AWS;
 
@@ -20,6 +21,8 @@ namespace SixLabors.ImageSharp.Web.Providers.AWS
     /// </summary>
     public class AWSS3StorageImageProvider : IImageProvider
     {
+        private static readonly AWSS3Factory AWSS3Factory = new();
+
         /// <summary>
         /// Character array to remove from paths.
         /// </summary>
@@ -54,33 +57,7 @@ public AWSS3StorageImageProvider(IOptions<AWSS3StorageImageProviderOptions> stor
 
             foreach (AWSS3BucketClientOptions bucket in this.storageOptions.S3Buckets)
             {
-                AmazonS3Client s3Client;
-                if (!string.IsNullOrEmpty(bucket.Endpoint) &&
-                    bucket.AccessKey != null &&
-                    bucket.AccessSecret != null)
-                {
-                    var config = new AmazonS3Config
-                    {
-                        ServiceURL = bucket.Endpoint,
-                        ForcePathStyle = true
-                    };
-
-                    s3Client = new AmazonS3Client(bucket.AccessKey, bucket.AccessSecret, config);
-                }
-                else if (!string.IsNullOrEmpty(bucket.AccessKey) &&
-                         !string.IsNullOrEmpty(bucket.AccessSecret) &&
-                         !string.IsNullOrEmpty(bucket.Region))
-                {
-                    var region = RegionEndpoint.GetBySystemName(bucket.Region);
-                    s3Client = new AmazonS3Client(bucket.AccessKey, bucket.AccessSecret, region);
-                }
-                else
-                {
-                    var region = RegionEndpoint.GetBySystemName(bucket.Region);
-                    s3Client = new AmazonS3Client(region);
-                }
-
-                this.buckets.Add(bucket.BucketName, s3Client);
+                this.buckets.Add(bucket.BucketName, AWSS3Factory.CreateClient(bucket));
             }
         }
 

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

@@ -88,7 +88,7 @@ protected override void ConfigureServices(IServiceCollection services) =>
                 .AddProvider(AWSS3StorageImageProviderFactory.Create)
                 .AddProvider<PhysicalFileSystemProvider>()
                 .AddProcessor<CacheBusterWebProcessor>()
-                .Configure<AWSS3StorageCacheOptions>(options =>
+                .Configure<AWSS3BucketClientOptions>(options =>
                 {
                     options.Endpoint = TestConstants.AWSEndpoint;
                     options.BucketName = TestConstants.AWSCacheBucketName;