Using alternate setting for blob key storage location

Author: krolson

src/WebJobs.Script.WebHost/Security/BlobStorageSecretsRepository.cs

@@ -29,7 +29,7 @@ public sealed class BlobStorageSecretsRepository : ISecretsRepository, IDisposab
         private readonly string _accountConnectionString;
         private bool _disposed = false;
 
-        public BlobStorageSecretsRepository(string secretSentinelDirectoryPath, string accountConnectionString, string siteHostName)
+        public BlobStorageSecretsRepository(string secretSentinelDirectoryPath, string accountConnectionString, string siteSlotName)
         {
             if (secretSentinelDirectoryPath == null)
             {
@@ -39,6 +39,10 @@ public BlobStorageSecretsRepository(string secretSentinelDirectoryPath, string a
             {
                 throw new ArgumentNullException(nameof(accountConnectionString));
             }
+            if (siteSlotName == null)
+            {
+                throw new ArgumentNullException(nameof(siteSlotName));
+            }
 
             _secretsSentinelFilePath = secretSentinelDirectoryPath;
             _hostSecretsSentinelFilePath = Path.Combine(_secretsSentinelFilePath, ScriptConstants.HostMetadataFileName);
@@ -48,7 +52,7 @@ public BlobStorageSecretsRepository(string secretSentinelDirectoryPath, string a
             _sentinelFileWatcher = new AutoRecoveringFileSystemWatcher(_secretsSentinelFilePath, "*.json");
             _sentinelFileWatcher.Changed += OnChanged;
 
-            _secretsBlobPath = siteHostName.ToLowerInvariant();
+            _secretsBlobPath = siteSlotName.ToLowerInvariant();
             _hostSecretsBlobPath = string.Format("{0}/{1}", _secretsBlobPath, ScriptConstants.HostMetadataFileName);
 
             _accountConnectionString = accountConnectionString;

src/WebJobs.Script.WebHost/Security/DefaultSecretsRepositoryFactory.cs

@@ -19,8 +19,8 @@ public ISecretsRepository Create(ScriptSettingsManager settingsManager, WebHostS
             string storageString = AmbientConnectionStringProvider.Instance.GetConnectionString(ConnectionStringNames.Storage);
             if (secretStorageType != null && secretStorageType.Equals("Blob", StringComparison.OrdinalIgnoreCase) && storageString != null)
             {
-                string siteHostId = settingsManager.AzureWebsiteDefaultSubdomain ?? config.HostConfig.HostId;
-                return new BlobStorageSecretsRepository(Path.Combine(webHostSettings.SecretsPath, "Sentinels"), storageString, siteHostId);
+                string siteSlotName = settingsManager.AzureWebsiteUniqueSlotName ?? config.HostConfig.HostId;
+                return new BlobStorageSecretsRepository(Path.Combine(webHostSettings.SecretsPath, "Sentinels"), storageString, siteSlotName);
             }
             else
             {