removing KV logic from SecretsRepositoryTests (#10319)

Author: mattchenderson

test/WebJobs.Script.Tests.Integration/Host/SecretsRepositoryTests.cs

@@ -529,15 +529,6 @@ public Fixture()
                 var configuration = TestHelpers.GetTestConfiguration();
                 BlobConnectionString = configuration.GetWebJobsConnectionString(ConnectionStringNames.Storage);
 
-                KeyVaultConnectionString = configuration.GetWebJobsConnectionString(EnvironmentSettingNames.AzureWebJobsSecretStorageKeyVaultConnectionString);
-                KeyVaultName = configuration.GetWebJobsConnectionString(EnvironmentSettingNames.AzureWebJobsSecretStorageKeyVaultName);
-
-                if (KeyVaultConnectionString is not null && KeyVaultName is not null)
-                {
-                    AzureServiceTokenProvider azureServiceTokenProvider = new AzureServiceTokenProvider(KeyVaultConnectionString);
-                    KeyVaultClient = new KeyVaultClient(new KeyVaultClient.AuthenticationCallback(azureServiceTokenProvider.KeyVaultTokenCallback));
-                }
-
                 Environment = new TestEnvironment();
                 AzureStorageProvider = TestHelpers.GetAzureStorageProvider(configuration);
             }
@@ -554,8 +545,6 @@ public Fixture()
 
             public CloudBlobContainer BlobContainer { get; private set; }
 
-            public KeyVaultClient KeyVaultClient { get; private set; }
-
             public string KeyVaultName { get; private set; }
 
             public string KeyVaultConnectionString { get; private set; }
@@ -588,11 +577,6 @@ public async Task TestInitialize(SecretsRepositoryType repositoryType, string se
                 await ClearAllBlobSecrets();
                 ClearAllFileSecrets();
 
-                if (KeyVaultClient != null)
-                {
-                    await ClearAllKeyVaultSecrets();
-                }
-
                 LoggerProvider = new TestLoggerProvider();
                 var loggerFactory = new LoggerFactory();
                 loggerFactory.AddProvider(LoggerProvider);
@@ -626,7 +610,6 @@ public void Dispose()
                     // delete blob files
                     ClearAllBlobSecrets().ContinueWith(t => { });
                     ClearAllFileSecrets();
-                    ClearAllKeyVaultSecrets().ContinueWith(t => { });
                 }
                 catch
                 {
@@ -663,9 +646,6 @@ public async Task WriteSecret(string functionNameOrHost, ScriptSecrets scriptSec
                     case SecretsRepositoryType.BlobStorageSas:
                         await WriteSecretsBlobAndUpdateSentinelFile(functionNameOrHost, ScriptSecretSerializer.SerializeSecrets(scriptSecret));
                         break;
-                    case SecretsRepositoryType.KeyVault:
-                        await WriteSecretsKeyVaultAndUpdateSectinelFile(functionNameOrHost, scriptSecret);
-                        break;
                     default:
                         break;
                 }
@@ -692,15 +672,6 @@ private async Task WriteSecretsBlobAndUpdateSentinelFile(string functionNameOrHo
                 }
             }
 
-            private async Task WriteSecretsKeyVaultAndUpdateSectinelFile(string functionNameOrHost, ScriptSecrets secrets, bool createSentinelFile = true)
-            {
-                Dictionary<string, string> dictionary = KeyVaultSecretsRepository.GetDictionaryFromScriptSecrets(secrets, functionNameOrHost);
-                foreach (string key in dictionary.Keys)
-                {
-                    await KeyVaultClient.SetSecretAsync(GetKeyVaultBaseUrl(), key, dictionary[key]);
-                }
-            }
-
             public async Task<ScriptSecrets> GetSecretText(string functionNameOrHost, ScriptSecretsType type)
             {
                 ScriptSecrets secrets = null;
@@ -714,9 +685,6 @@ public async Task<ScriptSecrets> GetSecretText(string functionNameOrHost, Script
                     case SecretsRepositoryType.BlobStorageSas:
                         secrets = await GetSecretBlobText(functionNameOrHost, type);
                         break;
-                    case SecretsRepositoryType.KeyVault:
-                        secrets = await GetSecretsFromKeyVault(functionNameOrHost, type);
-                        break;
                     default:
                         break;
                 }
@@ -734,33 +702,6 @@ private async Task<ScriptSecrets> GetSecretBlobText(string functionNameOrHost, S
                 return ScriptSecretSerializer.DeserializeSecrets(type, blobText);
             }
 
-            private async Task<ScriptSecrets> GetSecretsFromKeyVault(string functionNameOrHost, ScriptSecretsType type)
-            {
-                var secretResults = await KeyVaultClient.GetSecretsAsync(GetKeyVaultBaseUrl());
-                if (type == ScriptSecretsType.Host)
-                {
-                    SecretBundle masterBundle = await KeyVaultClient.GetSecretAsync(GetKeyVaultBaseUrl(), secretResults.FirstOrDefault(x => x.Identifier.Name.StartsWith("host--master")).Identifier.Name);
-                    SecretBundle functionKeyBundle = await KeyVaultClient.GetSecretAsync(GetKeyVaultBaseUrl(), secretResults.FirstOrDefault(x => x.Identifier.Name.StartsWith("host--functionKey")).Identifier.Name);
-                    SecretBundle systemKeyBundle = await KeyVaultClient.GetSecretAsync(GetKeyVaultBaseUrl(), secretResults.FirstOrDefault(x => x.Identifier.Name.StartsWith("host--systemKey")).Identifier.Name);
-                    HostSecrets hostSecrets = new HostSecrets()
-                    {
-                        FunctionKeys = new List<Key>() { new Key(GetSecretName(functionKeyBundle.SecretIdentifier.Name), functionKeyBundle.Value) },
-                        SystemKeys = new List<Key>() { new Key(GetSecretName(systemKeyBundle.SecretIdentifier.Name), systemKeyBundle.Value) }
-                    };
-                    hostSecrets.MasterKey = new Key("master", masterBundle.Value);
-                    return hostSecrets;
-                }
-                else
-                {
-                    SecretBundle functionKeyBundle = await KeyVaultClient.GetSecretAsync(GetKeyVaultBaseUrl(), secretResults.FirstOrDefault(x => x.Identifier.Name.StartsWith("function--")).Identifier.Name);
-                    FunctionSecrets functionSecrets = new FunctionSecrets()
-                    {
-                        Keys = new List<Key>() { new Key(GetSecretName(functionKeyBundle.SecretIdentifier.Name), functionKeyBundle.Value) }
-                    };
-                    return functionSecrets;
-                }
-            }
-
             public bool MarkerFileExists(string functionNameOrHost)
             {
                 return File.Exists(SecretsFileOrSentinelPath(functionNameOrHost));
@@ -800,18 +741,6 @@ private async Task ClearAllBlobSecrets()
                     await BlobContainer.GetBlockBlobReference(((CloudBlockBlob)blob).Name).DeleteIfExistsAsync();
                 }
             }
-
-            private async Task ClearAllKeyVaultSecrets()
-            {
-                var secretsPages = await KeyVaultSecretsRepository.GetKeyVaultSecretsPagesAsync(KeyVaultClient, GetKeyVaultBaseUrl());
-                foreach (IPage<SecretItem> secretsPage in secretsPages)
-                {
-                    foreach (SecretItem item in secretsPage)
-                    {
-                        await KeyVaultClient.DeleteSecretAsync(GetKeyVaultBaseUrl(), item.Identifier.Name);
-                    }
-                }
-            }
         }
     }
 }