azure key vault extension updated to use latest sharede lib

Author: NickRimmer

src/Extensions/RestApia.Extensions.Auth.Basic/BasicAuthService.cs

@@ -29,13 +29,13 @@ public class BasicAuthService: IAuthValuesProvider
     public Task<ReloadValuesResults> ReloadValuesAsync(IReadOnlyCollection<ValueModel> inputValues, ValuesReloadMode mode) =>
         Task.FromResult(ReloadValues(inputValues));
 
-    private static ReloadValuesResults ReloadValues(IReadOnlyCollection<ValueModel> userValues)
+    private static ReloadValuesResults ReloadValues(IReadOnlyCollection<ValueModel> inputValues)
     {
         // all templated values must be replaced
-        var hasUnresolvedValues = userValues.All(x => x.Value.Parts.All(y => !y.IsTemplatedVariable));
+        var hasUnresolvedValues = inputValues.All(x => x.Value.Parts.All(y => !y.IsTemplatedVariable));
         if (!hasUnresolvedValues) return ReloadValuesResults.Failed;
 
-        if (!VariablesConverter.TryDeserialize<BasicAuthSettings>(userValues, out var settings))
+        if (!VariablesConverter.TryDeserialize<BasicAuthSettings>(inputValues, out var settings))
             return ReloadValuesResults.Failed;
 
         // validate values

src/Extensions/RestApia.Extensions.ValuesProvider.AzureKeyVault/KeyVaultValuesProvider.cs

@@ -14,63 +14,59 @@
 namespace RestApia.Extensions.ValuesProvider.AzureKeyVault;
 
 [SuppressMessage("Performance", "CA1822:Mark members as static")]
-public class KeyVaultValuesProvider: IUserValuesProvider
+public class KeyVaultValuesProvider : IUserValuesProvider
 {
     private const string ValuesLoadedDateKey = "ValuesLoadedDate";
 
-    private readonly ILogger _logger;
-    private readonly IExtensionDialogs _dialogs;
-
-    public KeyVaultValuesProvider(ILogger logger, IExtensionDialogs dialogs)
-    {
-        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-        _dialogs = dialogs ?? throw new ArgumentNullException(nameof(dialogs));
-    }
-
-    public ValuesProviderSettings GetProviderSettings() => new ()
+    private static readonly ValuesProviderSettings Settings = new ()
     {
         Title = "Azure KeyVault Secrets",
         DefaultName = "Azure Secrets",
         CanBeReloaded = true,
         HelpPageUrl = "https://github.com/RestApia/RestApia.Shared/tree/main/src/Extensions/RestApia.Extensions.ValuesProvider.AzureKeyVault",
         ReservedValues =
         [
-            new () { Name = "KeyVaultUrl", Description = "KeyVault URL", IsRequired = true },
+            new () { Name = nameof(KeyVaultSettings.KeyVaultUrl), Description = "KeyVault URL", IsRequired = true, Placeholder = "https://my-keyvault.vault.azure.net" },
         ],
     };
 
-    // public async Task<IReadOnlyCollection<ExtensionValueModel>> GetInjectionAsync(Guid settingsId, IReadOnlyCollection<ExtensionValueModel> userValues, bool forceReload)
-    // {
-    //     var stored = _storage.GetValues(settingsId);
-    //
-    //     // let's see if values are already loaded
-    //     if (stored.Any(x => x.Name.Equals(ValuesLoadedDateKey, StringComparison.Ordinal) && x.Type == ValueTypeEnum.Other))
-    //         return stored;
-    //
-    //     stored = await GetRemoteValuesAsync(userValues);
-    //     _storage.SetValues(stored, settingsId);
-    //
-    //     return stored;
-    // }
+    private readonly ILogger _logger;
+    private readonly IExtensionDialogs _dialogs;
 
-    public async Task<ReloadValuesResults> ReloadValuesAsync(IReadOnlyCollection<ValueModel> inputValues, ValuesReloadMode mode)
+    public KeyVaultValuesProvider(ILogger logger, IExtensionDialogs dialogs)
     {
-        var validInputs = inputValues.All(x => x.Value.Parts.All(y => !y.IsTemplatedVariable));
-        if (!validInputs) return ReloadValuesResults.Failed;
-
-        return new ReloadValuesResults
-            { Values = await GetRemoteValuesAsync(inputValues), Status = ValueReloadResultType.Success };
+        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+        _dialogs = dialogs ?? throw new ArgumentNullException(nameof(dialogs));
     }
 
-    private async Task<IReadOnlyCollection<ValueModel>> GetRemoteValuesAsync(IReadOnlyCollection<ValueModel> userValues)
+    public ValuesProviderSettings GetProviderSettings() => Settings;
+
+    public async Task<ReloadValuesResults> ReloadValuesAsync(IReadOnlyCollection<ValueModel> inputValues, ValuesReloadMode mode)
     {
-        if (VariablesConverter.TryDeserialize(userValues, out KeyVaultSettings settings) is FalseResult error)
+        // all templated values must be replaced
+        var hasUnresolvedValues = inputValues.All(x => x.Value.Parts.All(y => !y.IsTemplatedVariable));
+        if (!hasUnresolvedValues) return ReloadValuesResults.Failed;
+
+        // validate settings
+        if (!Settings.ValidateReserved(inputValues, out var errors))
         {
-            _dialogs.ShowError(error.Message ?? "Cannot read KeyVault settings.");
-            return [];
+            var resultError = errors.Count == 1
+                ? errors.ElementAt(0)
+                : errors.Select(x => $"- {x}").JoinString("\r\n");
+            return ReloadValuesResults.FailedWithMessage(resultError);
         }
 
-        if (settings.KeyVaultUrl.IsEmpty() || !Uri.TryCreate(settings.KeyVaultUrl, UriKind.Absolute, out var keyVaultUrl))
+        // try to deserialize settings
+        if (!VariablesConverter.TryDeserialize<KeyVaultSettings>(inputValues, out var settings))
+            return ReloadValuesResults.Failed;
+
+        return new ReloadValuesResults
+            { Values = await GetRemoteValuesAsync(settings), Status = ValueReloadResultType.Success };
+    }
+
+    private async Task<IReadOnlyCollection<ValueModel>> GetRemoteValuesAsync(KeyVaultSettings settings)
+    {
+        if (!Uri.TryCreate(settings.KeyVaultUrl, UriKind.Absolute, out var keyVaultUrl))
         {
             _dialogs.ShowError("Cannot read KeyVault secret values. KeyVault URL is not valid.");
             return [];

src/Extensions/RestApia.Extensions.ValuesProvider.AzureKeyVault/RestApia.Extensions.ValuesProvider.AzureKeyVault.csproj

@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
+    <Title>Azure KeyVault Values Provider</Title>
+    <Description>Extensions provides Azure KeyVault secrets as variables</Description>
+    <RepositoryUrl>https://github.com/RestApia/RestApia.Shared/tree/main/src/Extensions/RestApia.Extensions.ValuesProvider.AzureKeyVault</RepositoryUrl>
+    <PackageTags>RestApia, Extension, Values Provider</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>