reboot the project

freddycoder · freddycoder · commit a99a4f5b39db · 2024-01-27T10:25:53.000-05:00
diff --git a/AzureDevOpsTeamMembersVelocity/Areas/Identity/EmailSender.cs b/AzureDevOpsTeamMembersVelocity/Areas/Identity/EmailSender.cs
@@ -0,0 +1,21 @@
+﻿using Microsoft.AspNetCore.Identity.UI.Services;
+using System.Threading.Tasks;
+
+namespace AzureDevOpsTeamMembersVelocity.Areas.Identity;
+
+public interface IEmailSender
+{
+    Task SendEmailAsync(string email, string v1, string v2);
+}
+
+public class EmailSender : IEmailSender
+{
+    public EmailSender()
+    {
+    }
+
+    public Task SendEmailAsync(string email, string v1, string v2)
+    {
+        return Task.CompletedTask;
+    }
+}
diff --git a/AzureDevOpsTeamMembersVelocity/AzureDevOpsTeamMembersVelocity.csproj b/AzureDevOpsTeamMembersVelocity/AzureDevOpsTeamMembersVelocity.csproj
@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <DocumentationFile>Documentation.xml</DocumentationFile>
+    <UserSecretsId>3d6eaaa4-04d3-4fc0-9854-e2c5c83b96c0</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>
@@ -35,6 +36,7 @@
     <PackageReference Include="MudBlazor" Version="5.2.0" />
     <PackageReference Include="NReco.Logging.File" Version="1.1.2" />
     <PackageReference Include="RateLimiter" Version="2.2.0" />
+    <PackageReference Include="System.IO.Abstractions" Version="20.0.15" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/AzureDevOpsTeamMembersVelocity/Extensions/UseForwardedHeadersExtension.cs b/AzureDevOpsTeamMembersVelocity/Extensions/UseForwardedHeadersExtension.cs
@@ -31,7 +31,7 @@ public static IServiceCollection AddTeamVelocityForwardedHeaders(this IServiceCo
                     {
                         var ipInfo = network.Split("/");
 
-                        options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse(ipInfo[0]), int.Parse(ipInfo[1])));
+                        options.KnownNetworks.Add(new Microsoft.AspNetCore.HttpOverrides.IPNetwork(IPAddress.Parse(ipInfo[0]), int.Parse(ipInfo[1])));
                     }
                 });
             }
diff --git a/AzureDevOpsTeamMembersVelocity/Hubs/K8sHub.cs b/AzureDevOpsTeamMembersVelocity/Hubs/K8sHub.cs
@@ -37,7 +37,7 @@ public K8SHub(IKubernetes client, ILogger<K8SHub> logger)
         /// <returns></returns>
         public async IAsyncEnumerable<Pair<WatchEventType?, V1Namespace>> Namespaces([EnumeratorCancellation] CancellationToken cancellationToken)
         {
-            var watcher = _kubernetesClient.ListNamespaceWithHttpMessagesAsync(allowWatchBookmarks: false, watch: true, cancellationToken: cancellationToken);
+            var watcher = _kubernetesClient.CoreV1.ListNamespaceWithHttpMessagesAsync(allowWatchBookmarks: false, watch: true, cancellationToken: cancellationToken);
 
             await foreach (var (type, item) in watcher.WatchAsync<V1Namespace, V1NamespaceList>())
             {
@@ -54,7 +54,7 @@ public K8SHub(IKubernetes client, ILogger<K8SHub> logger)
         /// <returns></returns>
         public async IAsyncEnumerable<Pair<WatchEventType?, V1Deployment>> Deployments([EnumeratorCancellation] CancellationToken cancellationToken)
         {
-            var watcher = _kubernetesClient.ListDeploymentForAllNamespacesWithHttpMessagesAsync(allowWatchBookmarks: false, watch: true, cancellationToken: cancellationToken);
+            var watcher = _kubernetesClient.AppsV1.ListDeploymentForAllNamespacesWithHttpMessagesAsync(allowWatchBookmarks: false, watch: true, cancellationToken: cancellationToken);
 
             await foreach (var (type, item) in watcher.WatchAsync<V1Deployment, V1DeploymentList>())
             {
@@ -71,7 +71,7 @@ public K8SHub(IKubernetes client, ILogger<K8SHub> logger)
         /// <returns></returns>
         public async IAsyncEnumerable<Pair<WatchEventType?, V1Pod>> Pods([EnumeratorCancellation] CancellationToken cancellationToken)
         {
-            var watcher = _kubernetesClient.ListPodForAllNamespacesWithHttpMessagesAsync(allowWatchBookmarks: false, watch: true, cancellationToken: cancellationToken);
+            var watcher = _kubernetesClient.CoreV1.ListPodForAllNamespacesWithHttpMessagesAsync(allowWatchBookmarks: false, watch: true, cancellationToken: cancellationToken);
 
             await foreach (var (type, item) in watcher.WatchAsync<V1Pod, V1PodList>())
             {
diff --git a/AzureDevOpsTeamMembersVelocity/Hubs/LogStreamHub.cs b/AzureDevOpsTeamMembersVelocity/Hubs/LogStreamHub.cs
@@ -61,7 +61,7 @@ public async IAsyncEnumerable<string> GetPodLog(string ns, string pod, [Enumerat
         {
             cancellationToken.ThrowIfCancellationRequested();
 
-            var stream = await _kubernetesClient.ReadNamespacedPodLogAsync(pod, ns, follow: true, sinceSeconds: 2000, cancellationToken: cancellationToken);
+            var stream = await _kubernetesClient.CoreV1.ReadNamespacedPodLogAsync(pod, ns, follow: true, sinceSeconds: 2000, cancellationToken: cancellationToken);
 
             var buffer = new byte[8192];
 
diff --git a/AzureDevOpsTeamMembersVelocity/Pages/Index.razor b/AzureDevOpsTeamMembersVelocity/Pages/Index.razor
@@ -97,7 +97,7 @@ Welcome to the team members velocity app.
                 @foreach (var iteration in Sprints)
                 {
                     <li class="list-group-item list-group-item-action">
-                        <a href="/SprintAnalysis?sprints=@iteration.Url">@iteration.Name</a>
+                        <a href="/SprintAnalysis?sprints=@iteration.Url">@iteration.Name - @iteration?.Attributes?.StartDate</a>
                     </li>
                 }
             </ul>
diff --git a/AzureDevOpsTeamMembersVelocity/Pages/KubernetesDashboard.razor.cs b/AzureDevOpsTeamMembersVelocity/Pages/KubernetesDashboard.razor.cs
@@ -516,7 +516,7 @@ private async Task DeleteNamespace(V1Namespace ns)
         {
             try
             {
-                await Client.DeleteNamespaceAsync(ns.Metadata.Name, new V1DeleteOptions());
+                await Client.CoreV1.DeleteNamespaceAsync(ns.Metadata.Name, new V1DeleteOptions());
             }
             catch (Exception e)
             {
@@ -529,7 +529,7 @@ private async Task DeletePod(V1Pod pod)
         {
             try
             {
-                await Client.DeleteNamespacedPodAsync(pod.Name(), pod.Namespace(), new V1DeleteOptions());
+                await Client.CoreV1.DeleteNamespacedPodAsync(pod.Name(), pod.Namespace(), new V1DeleteOptions());
             }
             catch (Exception e)
             {
diff --git a/AzureDevOpsTeamMembersVelocity/Properties/launchSettings.json b/AzureDevOpsTeamMembersVelocity/Properties/launchSettings.json
@@ -10,7 +10,7 @@
         "FileLoggingEnable": "true",
 
         "COOKIEAUTH_USER": "admin@teamvelocity.com",
-        //"COOKIEAUTH_PASSWORD": "admin",
+        "COOKIEAUTH_PASSWORD": "admin",
 
         //"USE_IDENTITY": "true",
 
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,9 @@
-FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
 COPY ["MockK8s/MockK8s.csproj", "MockK8s/"]
 COPY ["AzureDevOpsTeamMembersVelocity/AzureDevOpsTeamMembersVelocity.csproj", "AzureDevOpsTeamMembersVelocity/"]
diff --git a/IntegrationTest/IntegrationTest.csproj b/IntegrationTest/IntegrationTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/MockK8s/K8sClientFactory.cs b/MockK8s/K8sClientFactory.cs
@@ -1,10 +1,9 @@
 ﻿using k8s;
 using k8s.Models;
 using Microsoft.AspNetCore.Http;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
 using Nito.AsyncEx;
 using System.Linq;
+using System.Text.Json;
 using System.Threading.Tasks;
 using Xunit.Abstractions;
 
@@ -41,10 +40,9 @@ public static IKubernetes CreateClientForIntegrationTest(ITestOutputHelper? test
 
         private static string BuildWatchEventStreamLine(WatchEventType eventType, string response)
         {
-            var corev1PodList = JsonConvert.DeserializeObject<V1PodList>(response);
-            return JsonConvert.SerializeObject(
-                new Watcher<V1Pod>.WatchEvent { Type = eventType, Object = corev1PodList.Items.First() },
-                new StringEnumConverter());
+            var corev1PodList = JsonSerializer.Deserialize<V1PodList>(response);
+            return JsonSerializer.Serialize(
+                new Watcher<V1Pod>.WatchEvent { Type = eventType, Object = corev1PodList.Items.First() });
         }
 
         private static async Task WriteStreamLine(HttpContext httpContext, string reponseLine)
diff --git a/MockK8s/MockK8s.csproj b/MockK8s/MockK8s.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="KubernetesClient" Version="6.0.23" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.11" />
+    <PackageReference Include="KubernetesClient" Version="13.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.1" />
     <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
-    <PackageReference Include="System.Reactive" Version="5.0.0" />
+    <PackageReference Include="System.Reactive" Version="6.0.0" />
     <PackageReference Include="xunit.abstractions" Version="2.0.3" />
   </ItemGroup>
   
diff --git a/UnitTest/UnitTest.csproj b/UnitTest/UnitTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public static IServiceCollection AddTeamVelocityForwardedHeaders(this IServiceCo`
`31`	`31`	`{`
`32`	`32`	`var ipInfo = network.Split("/");`
`33`	`33`
`34`		`- options.KnownNetworks.Add(new IPNetwork(IPAddress.Parse(ipInfo[0]), int.Parse(ipInfo[1])));`
	`34`	`+ options.KnownNetworks.Add(new Microsoft.AspNetCore.HttpOverrides.IPNetwork(IPAddress.Parse(ipInfo[0]), int.Parse(ipInfo[1])));`
`35`	`35`	`}`
`36`	`36`	`});`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public K8SHub(IKubernetes client, ILogger<K8SHub> logger)`
`37`	`37`	`/// <returns></returns>`
`38`	`38`	`public async IAsyncEnumerable<Pair<WatchEventType?, V1Namespace>> Namespaces([EnumeratorCancellation] CancellationToken cancellationToken)`
`39`	`39`	`{`
`40`		`- var watcher = _kubernetesClient.ListNamespaceWithHttpMessagesAsync(allowWatchBookmarks: false, watch: true, cancellationToken: cancellationToken);`
	`40`	`+ var watcher = _kubernetesClient.CoreV1.ListNamespaceWithHttpMessagesAsync(allowWatchBookmarks: false, watch: true, cancellationToken: cancellationToken);`
`41`	`41`
`42`	`42`	`await foreach (var (type, item) in watcher.WatchAsync<V1Namespace, V1NamespaceList>())`
`43`	`43`	`{`
`@@ -54,7 +54,7 @@ public K8SHub(IKubernetes client, ILogger<K8SHub> logger)`
`54`	`54`	`/// <returns></returns>`
`55`	`55`	`public async IAsyncEnumerable<Pair<WatchEventType?, V1Deployment>> Deployments([EnumeratorCancellation] CancellationToken cancellationToken)`
`56`	`56`	`{`
`57`		`- var watcher = _kubernetesClient.ListDeploymentForAllNamespacesWithHttpMessagesAsync(allowWatchBookmarks: false, watch: true, cancellationToken: cancellationToken);`
	`57`	`+ var watcher = _kubernetesClient.AppsV1.ListDeploymentForAllNamespacesWithHttpMessagesAsync(allowWatchBookmarks: false, watch: true, cancellationToken: cancellationToken);`
`58`	`58`
`59`	`59`	`await foreach (var (type, item) in watcher.WatchAsync<V1Deployment, V1DeploymentList>())`
`60`	`60`	`{`
`@@ -71,7 +71,7 @@ public K8SHub(IKubernetes client, ILogger<K8SHub> logger)`
`71`	`71`	`/// <returns></returns>`
`72`	`72`	`public async IAsyncEnumerable<Pair<WatchEventType?, V1Pod>> Pods([EnumeratorCancellation] CancellationToken cancellationToken)`
`73`	`73`	`{`
`74`		`- var watcher = _kubernetesClient.ListPodForAllNamespacesWithHttpMessagesAsync(allowWatchBookmarks: false, watch: true, cancellationToken: cancellationToken);`
	`74`	`+ var watcher = _kubernetesClient.CoreV1.ListPodForAllNamespacesWithHttpMessagesAsync(allowWatchBookmarks: false, watch: true, cancellationToken: cancellationToken);`
`75`	`75`
`76`	`76`	`await foreach (var (type, item) in watcher.WatchAsync<V1Pod, V1PodList>())`
`77`	`77`	`{`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public async IAsyncEnumerable<string> GetPodLog(string ns, string pod, [Enumerat`
`61`	`61`	`{`
`62`	`62`	`cancellationToken.ThrowIfCancellationRequested();`
`63`	`63`
`64`		`- var stream = await _kubernetesClient.ReadNamespacedPodLogAsync(pod, ns, follow: true, sinceSeconds: 2000, cancellationToken: cancellationToken);`
	`64`	`+ var stream = await _kubernetesClient.CoreV1.ReadNamespacedPodLogAsync(pod, ns, follow: true, sinceSeconds: 2000, cancellationToken: cancellationToken);`
`65`	`65`
`66`	`66`	`var buffer = new byte[8192];`
`67`	`67`
Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ Welcome to the team members velocity app.`
`97`	`97`	`@foreach (var iteration in Sprints)`
`98`	`98`	`{`
`99`	`99`	`<li class="list-group-item list-group-item-action">`
`100`		`- <a href="/[email protected]">@iteration.Name</a>`
	`100`	`+ <a href="/[email protected]">@iteration.Name - @iteration?.Attributes?.StartDate</a>`
`101`	`101`	`</li>`
`102`	`102`	`}`
`103`	`103`	`</ul>`
Original file line number	Diff line number	Diff line change
`@@ -516,7 +516,7 @@ private async Task DeleteNamespace(V1Namespace ns)`
`516`	`516`	`{`
`517`	`517`	`try`
`518`	`518`	`{`
`519`		`- await Client.DeleteNamespaceAsync(ns.Metadata.Name, new V1DeleteOptions());`
	`519`	`+ await Client.CoreV1.DeleteNamespaceAsync(ns.Metadata.Name, new V1DeleteOptions());`
`520`	`520`	`}`
`521`	`521`	`catch (Exception e)`
`522`	`522`	`{`
`@@ -529,7 +529,7 @@ private async Task DeletePod(V1Pod pod)`
`529`	`529`	`{`
`530`	`530`	`try`
`531`	`531`	`{`
`532`		`- await Client.DeleteNamespacedPodAsync(pod.Name(), pod.Namespace(), new V1DeleteOptions());`
	`532`	`+ await Client.CoreV1.DeleteNamespacedPodAsync(pod.Name(), pod.Namespace(), new V1DeleteOptions());`
`533`	`533`	`}`
`534`	`534`	`catch (Exception e)`
`535`	`535`	`{`