Update Marain.TenantManagement to v3 (#313)

* Update Marain.TenantManagement to v3 * Increase version * Update build script version
marain-dotnet · Dec 16, 2022 · 9ea8131 · 9ea8131
1 parent 0b41d67
commit 9ea8131
Show file tree

Hide file tree

Showing 26 changed files with 1,825 additions and 3,531 deletions.
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -20,5 +20,5 @@ branches:
     - feature
     - support
     - hotfix
-next-version: "0.3"
+next-version: "0.4"
 
diff --git a/Solutions/Marain.UserNotifications.Abstractions/Marain.UserNotifications.Abstractions.csproj b/Solutions/Marain.UserNotifications.Abstractions/Marain.UserNotifications.Abstractions.csproj
@@ -15,12 +15,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Corvus.Tenancy.Abstractions" Version="3.2.0" />
-    <PackageReference Include="Endjin.RecommendedPractices.GitHub" Version="2.1.2">
+    <PackageReference Include="Corvus.Tenancy.Abstractions" Version="3.5.0" />
+    <PackageReference Include="Endjin.RecommendedPractices.GitHub" Version="2.1.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Corvus.Json.Abstractions" Version="2.0.6" />
+    <PackageReference Include="Corvus.Json.Abstractions" Version="3.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.1.46">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/...ain.UserNotifications.Abstractions/Marain/UserNotifications/UserNotificationExtensions.cs b/...ain.UserNotifications.Abstractions/Marain/UserNotifications/UserNotificationExtensions.cs
@@ -222,11 +222,6 @@ public static UserNotification AddDeliveryChannelConfiguredPerCommunicationType(
                 throw new ArgumentNullException(nameof(notification));
             }
 
-            if (deliveryChannelConfiguredPerCommunicationType is null)
-            {
-                throw new ArgumentNullException(nameof(deliveryChannelConfiguredPerCommunicationType));
-            }
-
             return new UserNotification(
                 notification.Id,
                 notification.NotificationType,

diff --git a/...fications.ApiDeliveryChannel.Host/Marain.UserNotifications.ApiDeliveryChannel.Host.csproj b/...fications.ApiDeliveryChannel.Host/Marain.UserNotifications.ApiDeliveryChannel.Host.csproj
@@ -14,8 +14,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.0" />
-    <PackageReference Include="Endjin.RecommendedPractices.GitHub" Version="2.1.2">
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />
+    <PackageReference Include="Endjin.RecommendedPractices.GitHub" Version="2.1.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/Solutions/Marain.UserNotifications.ApiDeliveryChannel.Host/packages.lock.json b/Solutions/Marain.UserNotifications.ApiDeliveryChannel.Host/packages.lock.json
diff --git a/Solutions/Marain.UserNotifications.Benchmarks/Marain.UserNotifications.Benchmarks.csproj b/Solutions/Marain.UserNotifications.Benchmarks/Marain.UserNotifications.Benchmarks.csproj
@@ -12,7 +12,7 @@
     <RestoreLockedMode Condition="$(ContinuousIntegrationBuild) == 'true'">true</RestoreLockedMode>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.2" />
     <!--
     The reference to Microsoft.CodeAnalysis.CSharp is to prevent warnings from appearing for this project
     in Visual Studio 2022. With version 17.1.0, and with version 6.0.200 of the .NET SDK installed, Visual
@@ -35,7 +35,7 @@
     in the future. We don't really want it in here - it's not like this project uses that library directly. It's just
     necessary with the current versions of everything on 2nd March 2022 if we are to avoid spurious warnings in VS.
     -->
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="[6.0.*,)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="[6.0.*,)" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="[6.0.*,)" />

diff --git a/Solutions/Marain.UserNotifications.Benchmarks/packages.lock.json b/Solutions/Marain.UserNotifications.Benchmarks/packages.lock.json
diff --git a/Solutions/Marain.UserNotifications.Client/Marain.UserNotifications.Client.csproj b/Solutions/Marain.UserNotifications.Client/Marain.UserNotifications.Client.csproj
@@ -14,17 +14,17 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Corvus.Extensions.Newtonsoft.Json" Version="2.0.6" />
-    <PackageReference Include="Corvus.Identity.Azure" Version="3.0.0" />
-    <PackageReference Include="Corvus.Identity.MicrosoftRest" Version="3.0.0" />
+    <PackageReference Include="Corvus.Extensions.Newtonsoft.Json" Version="3.0.0" />
+    <PackageReference Include="Corvus.Identity.Azure" Version="3.2.0" />
+    <PackageReference Include="Corvus.Identity.MicrosoftRest" Version="3.2.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[6.0.*,)" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="[6.0.*,)" />
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.1.46">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="Endjin.RecommendedPractices.GitHub" Version="2.1.2">
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
+    <PackageReference Include="Endjin.RecommendedPractices.GitHub" Version="2.1.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/...rain.UserNotifications.Deployment/ServiceManifests/UserNotificationsServiceManifest.jsonc b/...rain.UserNotifications.Deployment/ServiceManifests/UserNotificationsServiceManifest.jsonc
@@ -10,19 +10,15 @@
   ],
   "requiredConfigurationEntries": [
     {
-      "contentType": "application/vnd.marain.tenancy.servicemanifests.requiredconfigurationentries.azuretablestorage",
-      "key": "userNotificationStore",
-      "containerDefinition": {
-        "tableName": "usernotifications"
-      },
+      "contentType": "application/vnd.marain.tenancy.servicemanifests.requiredconfigurationentries.azuretablestorage.v3",
+      "key": "Marain:UserNotifications:TableConfiguration:UserNotificationsMarain:UserNotifications:TableConfiguration:UserNotifications",
+      "legacyV2Key": "StorageConfiguration__Table__usernotifications",
       "description": "User notifications store."
     },
     {
-      "contentType": "application/vnd.marain.tenancy.servicemanifests.requiredconfigurationentries.azureblobstorage",
-      "key": "templateStore",
-      "containerDefinition": {
-        "containerName": "templates"
-      },
+      "contentType": "application/vnd.marain.tenancy.servicemanifests.requiredconfigurationentries.azureblobstorage.v3",
+      "key": "Marain:UserNotifications:BlobContainerConfiguration:Templates",
+      "legacyV2Key": "StorageConfiguration__templates",
       "description": "Template Store"
     }
   ]

diff --git a/...n.UserNotifications.Hosting.AspNetCore/Marain.UserNotifications.Hosting.AspNetCore.csproj b/...n.UserNotifications.Hosting.AspNetCore/Marain.UserNotifications.Hosting.AspNetCore.csproj
@@ -9,13 +9,13 @@
 
   <ItemGroup>
     <PackageReference Include="Corvus.Monitoring.ApplicationInsights" Version="1.3.2" />
-    <PackageReference Include="Endjin.RecommendedPractices.GitHub" Version="2.1.2">
+    <PackageReference Include="Endjin.RecommendedPractices.GitHub" Version="2.1.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Marain.Tenancy.ClientTenantProvider" Version="2.0.5" />
-    <PackageReference Include="Menes.Hosting.AspNetCore" Version="3.1.3" />
-    <PackageReference Include="Marain.Operations.ControlClient" Version="2.0.2" />
+    <PackageReference Include="Marain.Tenancy.ClientTenantProvider" Version="3.0.0" />
+    <PackageReference Include="Menes.Hosting.AspNetCore" Version="4.0.0" />
+    <PackageReference Include="Marain.Operations.ControlClient" Version="3.0.0" />
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.1.46">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/.../Marain.UserNotifications.Management.Host/Marain.UserNotifications.Management.Host.csproj b/.../Marain.UserNotifications.Management.Host/Marain.UserNotifications.Management.Host.csproj
@@ -20,10 +20,11 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Corvus.DotLiquidAsync" Version="1.7.4" />
+    <PackageReference Include="Corvus.Identity.Azure" Version="3.2.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.0" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="2.6.1" />
-    <PackageReference Include="Endjin.RecommendedPractices.GitHub" Version="2.1.2">
+    <PackageReference Include="Endjin.RecommendedPractices.GitHub" Version="2.1.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/...ations.Management.Host/Marain/UserNotifications/Management/Host/Helpers/KeyVaultHelper.cs b/...ations.Management.Host/Marain/UserNotifications/Management/Host/Helpers/KeyVaultHelper.cs
@@ -4,12 +4,16 @@
 
 namespace Marain.UserNotifications.Management.Host.Helpers
 {
+    using System;
     using System.Threading.Tasks;
-    using Microsoft.Azure.KeyVault;
+
+    using Azure;
+    using Azure.Security.KeyVault.Secrets;
+
     using Microsoft.Extensions.Configuration;
 
     /// <summary>
-    /// Helper methods to work with the <see cref="Microsoft.Azure.KeyVault"/>.
+    /// Helper methods to work with the <see cref="SecretClient"/>.
     /// </summary>
     public static class KeyVaultHelper
     {
@@ -22,11 +26,13 @@ public static class KeyVaultHelper
         public static async Task<string> GetDeliveryChannelSecretAsync(IConfiguration configuration, string deliveryChannelSecretUrl)
         {
             string? azureConnectionString = configuration.GetValue<string>("AzureServicesAuthConnectionString");
-            var azureServiceTokenProvider = new Microsoft.Azure.Services.AppAuthentication.AzureServiceTokenProvider(azureConnectionString);
-            using var keyVaultClient = new KeyVaultClient(new KeyVaultClient.AuthenticationCallback(azureServiceTokenProvider.KeyVaultTokenCallback));
+            var azureCredentials = Corvus.Identity.ClientAuthentication.Azure.LegacyAzureServiceTokenProviderConnectionString.ToTokenCredential(azureConnectionString);
 
-            Microsoft.Azure.KeyVault.Models.SecretBundle accountKey = await keyVaultClient.GetSecretAsync(deliveryChannelSecretUrl).ConfigureAwait(false);
-            return accountKey.Value;
+            Uri secretUri = new(deliveryChannelSecretUrl);
+            Uri vaultUri = new(secretUri, "/");
+            SecretClient keyVaultClient = new(vaultUri, azureCredentials);
+            Response<KeyVaultSecret> accountKey = await keyVaultClient.GetSecretAsync(deliveryChannelSecretUrl).ConfigureAwait(false);
+            return accountKey.Value.Value;
         }
     }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,5 +20,5 @@ branches: @@
         - feature
         - support
         - hotfix
-    next-version: "0.3"
+    next-version: "0.4"