Migrate the app to .NET 8

SneaksAndData · Apr 4, 2024 · ba9926a · ba9926a
1 parent 293942b
commit ba9926a
Show file tree

Hide file tree

Showing 24 changed files with 32 additions and 35 deletions.
diff --git a/src/Arcane.Operator.csproj b/src/Arcane.Operator.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <LangVersion>10</LangVersion>
         <RootNamespace>Arcane.Operator</RootNamespace>
     </PropertyGroup>

diff --git a/...es/V1Beta1/V1Beta1StreamingJobTemplate.cs → ...es/V1Beta1/V1Beta1StreamingJobTemplate.cs b/...es/V1Beta1/V1Beta1StreamingJobTemplate.cs → ...es/V1Beta1/V1Beta1StreamingJobTemplate.cs
@@ -3,7 +3,7 @@
 using k8s;
 using k8s.Models;
 
-namespace Arcane.Operator.JobTemplates.V1Beta1;
+namespace Arcane.Operator.Models.JobTemplates.V1Beta1;
 
 [ExcludeFromCodeCoverage(Justification = "Model")]
 public class V1Beta1StreamingJobTemplate : IKubernetesObject<V1ObjectMeta>

diff --git a/...tes/V1Beta1/V1StreamingJobTemplateSpec.cs → ...tes/V1Beta1/V1StreamingJobTemplateSpec.cs b/...tes/V1Beta1/V1StreamingJobTemplateSpec.cs → ...tes/V1Beta1/V1StreamingJobTemplateSpec.cs
@@ -2,7 +2,7 @@
 using System.Text.Json.Serialization;
 using k8s.Models;
 
-namespace Arcane.Operator.JobTemplates.V1Beta1;
+namespace Arcane.Operator.Models.JobTemplates.V1Beta1;
 
 /// <summary>
 /// Configuration for streaming job template.

diff --git a/...reamDefinitions/Base/IStreamDefinition.cs → ...reamDefinitions/Base/IStreamDefinition.cs b/...reamDefinitions/Base/IStreamDefinition.cs → ...reamDefinitions/Base/IStreamDefinition.cs
@@ -4,7 +4,7 @@
 using k8s.Models;
 using Newtonsoft.Json;
 
-namespace Arcane.Operator.StreamDefinitions.Base;
+namespace Arcane.Operator.Models.StreamDefinitions.Base;
 
 public interface IStreamDefinition : IKubernetesObject<V1ObjectMeta>
 {

diff --git a/src/StreamDefinitions/StreamDefinition.cs → ...els/StreamDefinitions/StreamDefinition.cs b/src/StreamDefinitions/StreamDefinition.cs → ...els/StreamDefinitions/StreamDefinition.cs
@@ -7,10 +7,10 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Arcane.Models.StreamingJobLifecycle;
-using Arcane.Operator.StreamDefinitions.Base;
+using Arcane.Operator.Models.StreamDefinitions.Base;
 using k8s.Models;
 
-namespace Arcane.Operator.StreamDefinitions;
+namespace Arcane.Operator.Models.StreamDefinitions;
 
 [ExcludeFromCodeCoverage(Justification = "Model")]
 public class StreamDefinition : IStreamDefinition

diff --git a/...StreamDefinitions/StreamDefinitionSpec.cs → ...StreamDefinitions/StreamDefinitionSpec.cs b/...StreamDefinitions/StreamDefinitionSpec.cs → ...StreamDefinitions/StreamDefinitionSpec.cs
@@ -3,7 +3,7 @@
 using System.Text.Json.Serialization;
 using k8s.Models;
 
-namespace Arcane.Operator.StreamDefinitions;
+namespace Arcane.Operator.Models.StreamDefinitions;
 
 /// <summary>
 /// Configuration for Sql Server Single Table Stream.

diff --git a/src/Models/StreamOperatorResponse.cs b/src/Models/StreamOperatorResponse.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
-using Arcane.Operator.StreamStatuses.StreamStatus.V1Beta1;
+using Arcane.Operator.Models.StreamStatuses.StreamStatus.V1Beta1;
 
 namespace Arcane.Operator.Models;
 

diff --git a/...mStatus/V1Beta1/V1Beta1StreamCondition.cs → ...mStatus/V1Beta1/V1Beta1StreamCondition.cs b/...mStatus/V1Beta1/V1Beta1StreamCondition.cs → ...mStatus/V1Beta1/V1Beta1StreamCondition.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json.Serialization;
 
-namespace Arcane.Operator.StreamStatuses.StreamStatus.V1Beta1;
+namespace Arcane.Operator.Models.StreamStatuses.StreamStatus.V1Beta1;
 
 /// <summary>
 /// Represents the status of a stream for Kubernetes CRD

diff --git a/...reamStatus/V1Beta1/V1Beta1StreamStatus.cs → ...reamStatus/V1Beta1/V1Beta1StreamStatus.cs b/...reamStatus/V1Beta1/V1Beta1StreamStatus.cs → ...reamStatus/V1Beta1/V1Beta1StreamStatus.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Arcane.Operator.StreamStatuses.StreamStatus.V1Beta1;
+namespace Arcane.Operator.Models.StreamStatuses.StreamStatus.V1Beta1;
 
 public class V1Beta1StreamStatus
 {

diff --git a/src/Program.cs b/src/Program.cs
@@ -40,10 +40,7 @@ public static IHostBuilder CreateHostBuilder(string[] args)
             .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); })
             .ConfigureServices(services =>
             {
-                if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("MAINTAINER")))
-                {
-                    services.AddHostedService<HostedStreamingJobMaintenanceService>();
-                }
+                services.AddHostedService<HostedStreamingJobMaintenanceService>();
             });
     }
 }
diff --git a/src/Services/Base/IStreamDefinitionRepository.cs b/src/Services/Base/IStreamDefinitionRepository.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Akka.Util;
-using Arcane.Operator.StreamDefinitions.Base;
-using Arcane.Operator.StreamStatuses.StreamStatus.V1Beta1;
+using Arcane.Operator.Models.StreamDefinitions.Base;
+using Arcane.Operator.Models.StreamStatuses.StreamStatus.V1Beta1;
 
 namespace Arcane.Operator.Services.Base;
 

diff --git a/src/Services/Base/IStreamingJobOperatorService.cs b/src/Services/Base/IStreamingJobOperatorService.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Akka.Util;
 using Arcane.Operator.Models;
-using Arcane.Operator.StreamDefinitions.Base;
+using Arcane.Operator.Models.StreamDefinitions.Base;
 using k8s.Models;
 
 namespace Arcane.Operator.Services.Base;

diff --git a/src/Services/Base/IStreamingJobTemplateRepository.cs b/src/Services/Base/IStreamingJobTemplateRepository.cs
@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 using Akka.Util;
-using Arcane.Operator.JobTemplates.V1Beta1;
+using Arcane.Operator.Models.JobTemplates.V1Beta1;
 
 namespace Arcane.Operator.Services.Base;
 

diff --git a/src/Services/Maintenance/StreamingJobMaintenanceService.cs b/src/Services/Maintenance/StreamingJobMaintenanceService.cs
@@ -8,8 +8,8 @@
 using Arcane.Operator.Configurations;
 using Arcane.Operator.Extensions;
 using Arcane.Operator.Models;
+using Arcane.Operator.Models.StreamDefinitions.Base;
 using Arcane.Operator.Services.Base;
-using Arcane.Operator.StreamDefinitions.Base;
 using k8s;
 using k8s.Models;
 using Microsoft.Extensions.Logging;

diff --git a/src/Services/Operator/StreamOperatorService.cs b/src/Services/Operator/StreamOperatorService.cs
@@ -11,8 +11,8 @@
 using Arcane.Operator.Configurations;
 using Arcane.Operator.Extensions;
 using Arcane.Operator.Models;
+using Arcane.Operator.Models.StreamDefinitions.Base;
 using Arcane.Operator.Services.Base;
-using Arcane.Operator.StreamDefinitions.Base;
 using k8s;
 using k8s.Models;
 using Microsoft.Extensions.Logging;

diff --git a/src/Services/Repositories/StreamDefinitionRepository.cs b/src/Services/Repositories/StreamDefinitionRepository.cs
@@ -4,10 +4,10 @@
 using Akka.Util;
 using Akka.Util.Extensions;
 using Arcane.Models.StreamingJobLifecycle;
+using Arcane.Operator.Models.StreamDefinitions;
+using Arcane.Operator.Models.StreamDefinitions.Base;
+using Arcane.Operator.Models.StreamStatuses.StreamStatus.V1Beta1;
 using Arcane.Operator.Services.Base;
-using Arcane.Operator.StreamDefinitions;
-using Arcane.Operator.StreamDefinitions.Base;
-using Arcane.Operator.StreamStatuses.StreamStatus.V1Beta1;
 using Microsoft.Extensions.Logging;
 using Snd.Sdk.Kubernetes.Base;
 using Snd.Sdk.Tasks;

diff --git a/src/Services/Repositories/StreamingJobTemplateRepository.cs b/src/Services/Repositories/StreamingJobTemplateRepository.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Akka.Util;
 using Akka.Util.Extensions;
-using Arcane.Operator.JobTemplates.V1Beta1;
+using Arcane.Operator.Models.JobTemplates.V1Beta1;
 using Arcane.Operator.Services.Base;
 using Microsoft.Extensions.Logging;
 using Snd.Sdk.Kubernetes.Base;

diff --git a/src/Services/Streams/StreamingJobOperatorService.cs b/src/Services/Streams/StreamingJobOperatorService.cs
@@ -9,8 +9,8 @@
 using Arcane.Operator.Configurations;
 using Arcane.Operator.Extensions;
 using Arcane.Operator.Models;
+using Arcane.Operator.Models.StreamDefinitions.Base;
 using Arcane.Operator.Services.Base;
-using Arcane.Operator.StreamDefinitions.Base;
 using k8s.Models;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;

diff --git a/test/Arcane.Operator.Tests.csproj b/test/Arcane.Operator.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
 

diff --git a/test/Services/HostedStreamingJobMaintenanceServiceTests.cs b/test/Services/HostedStreamingJobMaintenanceServiceTests.cs
@@ -6,11 +6,11 @@
 using Akka.Streams;
 using Akka.Streams.Dsl;
 using Arcane.Operator.Configurations;
+using Arcane.Operator.Models.StreamDefinitions;
 using Arcane.Operator.Services.Base;
 using Arcane.Operator.Services.Maintenance;
 using Arcane.Operator.Services.Operator;
 using Arcane.Operator.Services.Streams;
-using Arcane.Operator.StreamDefinitions;
 using Arcane.Operator.Tests.Fixtures;
 using k8s;
 using k8s.Models;

diff --git a/test/Services/StreamOperatorServiceTests.cs b/test/Services/StreamOperatorServiceTests.cs
@@ -8,11 +8,11 @@
 using Akka.Util;
 using Akka.Util.Extensions;
 using Arcane.Operator.Configurations;
+using Arcane.Operator.Models.StreamDefinitions;
+using Arcane.Operator.Models.StreamDefinitions.Base;
+using Arcane.Operator.Models.StreamStatuses.StreamStatus.V1Beta1;
 using Arcane.Operator.Services.Base;
 using Arcane.Operator.Services.Operator;
-using Arcane.Operator.StreamDefinitions;
-using Arcane.Operator.StreamDefinitions.Base;
-using Arcane.Operator.StreamStatuses.StreamStatus.V1Beta1;
 using Arcane.Operator.Tests.Fixtures;
 using Arcane.Operator.Tests.Services.TestCases;
 using k8s;

diff --git a/test/Services/StreamingJobMaintenanceServiceTests.cs b/test/Services/StreamingJobMaintenanceServiceTests.cs
@@ -9,10 +9,10 @@
 using Arcane.Operator.Configurations;
 using Arcane.Operator.Extensions;
 using Arcane.Operator.Models;
+using Arcane.Operator.Models.StreamDefinitions.Base;
+using Arcane.Operator.Models.StreamStatuses.StreamStatus.V1Beta1;
 using Arcane.Operator.Services.Maintenance;
 using Arcane.Operator.Services.Streams;
-using Arcane.Operator.StreamDefinitions.Base;
-using Arcane.Operator.StreamStatuses.StreamStatus.V1Beta1;
 using Arcane.Operator.Tests.Fixtures;
 using k8s;
 using k8s.Models;

diff --git a/test/Services/TestCases/FailedStreamDefinition.cs b/test/Services/TestCases/FailedStreamDefinition.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using Arcane.Operator.StreamDefinitions.Base;
+using Arcane.Operator.Models.StreamDefinitions.Base;
 using k8s.Models;
 
 namespace Arcane.Operator.Tests.Services.TestCases;

diff --git a/test/Services/TestCases/StreamDefinitionTestCases.cs b/test/Services/TestCases/StreamDefinitionTestCases.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using Arcane.Models.StreamingJobLifecycle;
-using Arcane.Operator.StreamDefinitions;
-using Arcane.Operator.StreamDefinitions.Base;
+using Arcane.Operator.Models.StreamDefinitions;
+using Arcane.Operator.Models.StreamDefinitions.Base;
 using k8s.Models;
 
 namespace Arcane.Operator.Tests.Services.TestCases;