Fix for the installer creating private containers for new installs

Author: Jeavon

src/UmbracoFileSystemProviders.Azure.Installer/InstallerController.cs

@@ -84,7 +84,9 @@ public InstallerStatus PostParameters(IEnumerable<Parameter> parameters)
             bool usePrivateContainer = bool.Parse(newParameters.SingleOrDefault(k => k.Key == "UsePrivateContainer").Value);
             string rootUrl = newParameters.SingleOrDefault(k => k.Key == "RootUrl").Value;
 
-            if (!TestAzureCredentials(connection, containerName))
+            BlobContainerPublicAccessType blobContainerPublicAccessType = usePrivateContainer ? BlobContainerPublicAccessType.Off : BlobContainerPublicAccessType.Blob;
+
+            if (!TestAzureCredentials(connection, containerName, blobContainerPublicAccessType))
             {
                 return InstallerStatus.ConnectionError;
             }
@@ -443,7 +445,7 @@ private static bool ExecuteImageProcessorSecurityConfigTransform()
             return true;
         }
 
-        private static bool TestAzureCredentials(string connectionString, string containerName)
+        private static bool TestAzureCredentials(string connectionString, string containerName, BlobContainerPublicAccessType accessType)
         {
             bool useEmulator = ConfigurationManager.AppSettings[Azure.Constants.Configuration.UseStorageEmulatorKey] != null
                                && ConfigurationManager.AppSettings[Azure.Constants.Configuration.UseStorageEmulatorKey]
@@ -453,11 +455,14 @@ private static bool TestAzureCredentials(string connectionString, string contain
                 CloudStorageAccount cloudStorageAccount = useEmulator ? CloudStorageAccount.DevelopmentStorageAccount : CloudStorageAccount.Parse(connectionString);
 
                 CloudBlobClient cloudBlobClient = cloudStorageAccount.CreateCloudBlobClient();
-                CloudBlobContainer blobContainer = cloudBlobClient.GetContainerReference(containerName);
 
                 // This should fully check that the connection works.
-                blobContainer.CreateIfNotExists();
-                return true;
+                var testContainer = AzureFileSystem.CreateContainer(cloudBlobClient, containerName, accessType);
+
+                if (testContainer.Exists())
+                {
+                    return true;
+                }
             }
             catch (Exception e)
             {

src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs

@@ -6,6 +6,8 @@
 // <summary>
 // A singleton class for communicating with Azure Blob Storage.
 // </summary>
+using System.Runtime.CompilerServices;
+[assembly: InternalsVisibleTo("Our.Umbraco.FileSystemProviders.Azure.Installer")]
 namespace Our.Umbraco.FileSystemProviders.Azure
 {
     using System;
@@ -668,7 +670,7 @@ public Stream OpenFile(string path)
         /// <param name="containerName">The name of the container.</param>
         /// <param name="accessType"><see cref="BlobContainerPublicAccessType"/> indicating the access permissions.</param>
         /// <returns>The <see cref="CloudBlobContainer"/></returns>
-        private static CloudBlobContainer CreateContainer(CloudBlobClient cloudBlobClient, string containerName, BlobContainerPublicAccessType accessType)
+        internal static CloudBlobContainer CreateContainer(CloudBlobClient cloudBlobClient, string containerName, BlobContainerPublicAccessType accessType)
         {
             containerName = containerName.ToLowerInvariant();