Skip to content

Added support for key vault storage #182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 23, 2021
Merged

Added support for key vault storage #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/UmbracoFileSystemProviders.Azure.Installer/InstallerController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,8 +447,8 @@ private static bool ExecuteImageProcessorSecurityConfigTransform()

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]
bool useEmulator = ConfigurationHelper.GetAppSetting(Azure.Constants.Configuration.UseStorageEmulatorKey) != null
&& ConfigurationHelper.GetAppSetting(Azure.Constants.Configuration.UseStorageEmulatorKey)
.Equals("true", StringComparison.InvariantCultureIgnoreCase);
try
{
Expand Down
12 changes: 6 additions & 6 deletions src/UmbracoFileSystemProviders.Azure/AzureBlobFileSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,34 +113,34 @@ public AzureBlobFileSystem(string containerName, string rootUrl, string connecti
/// <param name="alias">The alias of the provider</param>
public AzureBlobFileSystem(string alias)
{
string connectionString = ConfigurationManager.AppSettings[$"{ConnectionStringKey}:{alias}"];
string connectionString = ConfigurationHelper.GetAppSetting(ConnectionStringKey,alias);
if (!string.IsNullOrWhiteSpace(connectionString))
{
string rootUrl = ConfigurationManager.AppSettings[$"{RootUrlKey}:{alias}"];
string rootUrl = ConfigurationHelper.GetAppSetting(RootUrlKey,alias);
if (string.IsNullOrWhiteSpace(rootUrl))
{
throw new InvalidOperationException("Azure Storage Root URL is not defined in application settings. The " + RootUrlKey + " property was not defined or is empty.");
}

string containerName = ConfigurationManager.AppSettings[$"{ContainerNameKey}:{alias}"];
string containerName = ConfigurationHelper.GetAppSetting(ContainerNameKey,alias);
if (string.IsNullOrWhiteSpace(containerName))
{
containerName = "media";
}

string maxDays = ConfigurationManager.AppSettings[$"{MaxDaysKey}:{alias}"];
string maxDays = ConfigurationHelper.GetAppSetting(MaxDaysKey,alias);
if (string.IsNullOrWhiteSpace(maxDays))
{
maxDays = "365";
}

string useDefaultRoute = ConfigurationManager.AppSettings[$"{UseDefaultRootKey}:{alias}"];
string useDefaultRoute = ConfigurationHelper.GetAppSetting(UseDefaultRootKey,alias);
if (string.IsNullOrWhiteSpace(useDefaultRoute))
{
useDefaultRoute = "true";
}

string accessType = ConfigurationManager.AppSettings[$"{UsePrivateContainerKey}:{alias}"];
string accessType = ConfigurationHelper.GetAppSetting(UsePrivateContainerKey,alias);
if (string.IsNullOrWhiteSpace(accessType))
{
accessType = "true";
Expand Down
8 changes: 4 additions & 4 deletions src/UmbracoFileSystemProviders.Azure/AzureFileSystem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@ internal AzureFileSystem(string containerName, string rootUrl, string connection
throw new ArgumentNullException(nameof(containerName));
}

this.DisableVirtualPathProvider = ConfigurationManager.AppSettings[DisableVirtualPathProviderKey] != null
&& ConfigurationManager.AppSettings[DisableVirtualPathProviderKey]
this.DisableVirtualPathProvider = ConfigurationHelper.GetAppSetting(DisableVirtualPathProviderKey) != null
&& ConfigurationHelper.GetAppSetting(DisableVirtualPathProviderKey)
.Equals("true", StringComparison.InvariantCultureIgnoreCase);

bool useEmulator = ConfigurationManager.AppSettings[UseStorageEmulatorKey] != null
&& ConfigurationManager.AppSettings[UseStorageEmulatorKey]
bool useEmulator = ConfigurationHelper.GetAppSetting(UseStorageEmulatorKey) != null
&& ConfigurationHelper.GetAppSetting(UseStorageEmulatorKey)
.Equals("true", StringComparison.InvariantCultureIgnoreCase);

CloudStorageAccount cloudStorageAccount;
Expand Down
20 changes: 19 additions & 1 deletion src/UmbracoFileSystemProviders.Azure/Helpers/ConfigurationHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,27 @@

public class ConfigurationHelper
{
public static string GetAppSetting(string key)
{
var settings = ConfigurationManager.AppSettings[key];

if (!string.IsNullOrEmpty(settings))
{
return settings;
}

return ConfigurationManager.AppSettings[key.Replace(".", "-")];
}
public static string GetAppSetting(string key, string providerAlias)
{
return ConfigurationManager.AppSettings[$"{key}:{providerAlias}"];
var settings = ConfigurationManager.AppSettings[$"{key}:{providerAlias}"];

if (!string.IsNullOrEmpty(settings))
{
return settings;
}

return ConfigurationManager.AppSettings[$"{key.Replace(".", "-")}-{providerAlias}"];
}
}
}