Use same condition for composing

Author: ronaldbarendse

src/Umbraco.Cloud.StorageProviders.AzureBlob.Core/AzureBlobComposer.cs

@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Core.Composing;
@@ -14,30 +15,43 @@ public sealed class AzureBlobComposer : IComposer
     /// <inheritdoc />
     public void Compose(IUmbracoBuilder builder)
     {
-        ArgumentNullException.ThrowIfNull(builder);
+        // Configure Azure Blob Storage
+        if (TryGetOptions(out AzureBlobOptions? azureBlobOptions))
+        {
+            builder.AddAzureBlobMediaFileSystem(options =>
+            {
+                options.ConnectionString = azureBlobOptions.ConnectionString;
+                options.ContainerName = azureBlobOptions.ContainerName;
+            });
+        }
+    }
 
-        var configuration = new ConfigurationBuilder()
+    /// <summary>
+    /// Gets the validated Azure Blob Storage options from the environment variables.
+    /// </summary>
+    /// <param name="options">The options.</param>
+    /// <returns>
+    ///   <c>true</c> if the environment variables contains valid Azure Blob Storage options; otherwise, <c>false</c>.
+    /// </returns>
+    internal static bool TryGetOptions([MaybeNullWhen(false)] out AzureBlobOptions options)
+    {
+        IConfigurationRoot configuration = new ConfigurationBuilder()
             .AddEnvironmentVariables("Umbraco:Cloud:")
             .Build();
 
         // Get options and manually validate (no need to add them to the service collection)
-        var azureBlobOptions = configuration.GetSection("Storage:AzureBlob").Get<AzureBlobOptions>();
-        if (azureBlobOptions == null)
+        options = configuration.GetSection("Storage:AzureBlob").Get<AzureBlobOptions>();
+        if (options == null)
         {
-            return;
+            return false;
         }
 
-        var validateResult = new DataAnnotationValidateOptions<AzureBlobOptions>(null).Validate(null, azureBlobOptions);
+        ValidateOptionsResult validateResult = new DataAnnotationValidateOptions<AzureBlobOptions>(null).Validate(null, options);
         if (validateResult.Failed)
         {
-            return;
+            return false;
         }
 
-        // Configure Azure Blob Storage
-        builder.AddAzureBlobMediaFileSystem(options =>
-        {
-            options.ConnectionString = azureBlobOptions.ConnectionString;
-            options.ContainerName = azureBlobOptions.ContainerName;
-        });
+        return true;
     }
 }

src/Umbraco.Cloud.StorageProviders.AzureBlob.Core/Umbraco.Cloud.StorageProviders.AzureBlob.Core.csproj

@@ -7,4 +7,9 @@
   <ItemGroup>
     <PackageReference Include="Umbraco.StorageProviders.AzureBlob" />
   </ItemGroup>
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
+      <_Parameter1>Umbraco.Cloud.StorageProviders.AzureBlob.ImageSharp</_Parameter1>
+    </AssemblyAttribute>
+  </ItemGroup>
 </Project>

src/Umbraco.Cloud.StorageProviders.AzureBlob.ImageSharp/AzureBlobImageSharpComposer.cs

@@ -1,7 +1,6 @@
 using Umbraco.Cloud.StorageProviders.AzureBlob.Core;
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.StorageProviders.AzureBlob.IO;
 
 namespace Umbraco.Cloud.StorageProviders.AzureBlob.ImageSharp;
 
@@ -15,11 +14,9 @@ public sealed class AzureBlobImageSharpComposer : IComposer
     /// <inheritdoc />
     public void Compose(IUmbracoBuilder builder)
     {
-        ArgumentNullException.ThrowIfNull(builder);
-
-        if (builder.Services.Any(x => x.ServiceType == typeof(IAzureBlobFileSystemProvider)))
+        // Configure ImageSharp support using Azure Blob Storage
+        if (AzureBlobComposer.TryGetOptions(out _))
         {
-            // Configure ImageSharp support using Azure Blob Storage
             builder.AddAzureBlobImageSharpCache();
         }
     }