From ba9926ad12467e62dca8c088d95c4ca2cbc25efa Mon Sep 17 00:00:00 2001 From: Vitalii Savitskii Date: Thu, 4 Apr 2024 10:53:46 +0200 Subject: [PATCH] Migrate the app to .NET 8 --- src/Arcane.Operator.csproj | 2 +- .../JobTemplates/V1Beta1/V1Beta1StreamingJobTemplate.cs | 2 +- .../JobTemplates/V1Beta1/V1StreamingJobTemplateSpec.cs | 2 +- .../StreamDefinitions/Base/IStreamDefinition.cs | 2 +- src/{ => Models}/StreamDefinitions/StreamDefinition.cs | 4 ++-- src/{ => Models}/StreamDefinitions/StreamDefinitionSpec.cs | 2 +- src/Models/StreamOperatorResponse.cs | 2 +- .../StreamStatus/V1Beta1/V1Beta1StreamCondition.cs | 2 +- .../StreamStatus/V1Beta1/V1Beta1StreamStatus.cs | 2 +- src/Program.cs | 5 +---- src/Services/Base/IStreamDefinitionRepository.cs | 4 ++-- src/Services/Base/IStreamingJobOperatorService.cs | 2 +- src/Services/Base/IStreamingJobTemplateRepository.cs | 2 +- src/Services/Maintenance/StreamingJobMaintenanceService.cs | 2 +- src/Services/Operator/StreamOperatorService.cs | 2 +- src/Services/Repositories/StreamDefinitionRepository.cs | 6 +++--- src/Services/Repositories/StreamingJobTemplateRepository.cs | 2 +- src/Services/Streams/StreamingJobOperatorService.cs | 2 +- test/Arcane.Operator.Tests.csproj | 2 +- test/Services/HostedStreamingJobMaintenanceServiceTests.cs | 2 +- test/Services/StreamOperatorServiceTests.cs | 6 +++--- test/Services/StreamingJobMaintenanceServiceTests.cs | 4 ++-- test/Services/TestCases/FailedStreamDefinition.cs | 2 +- test/Services/TestCases/StreamDefinitionTestCases.cs | 4 ++-- 24 files changed, 32 insertions(+), 35 deletions(-) rename src/{ => Models}/JobTemplates/V1Beta1/V1Beta1StreamingJobTemplate.cs (95%) rename src/{ => Models}/JobTemplates/V1Beta1/V1StreamingJobTemplateSpec.cs (91%) rename src/{ => Models}/StreamDefinitions/Base/IStreamDefinition.cs (96%) rename src/{ => Models}/StreamDefinitions/StreamDefinition.cs (97%) rename src/{ => Models}/StreamDefinitions/StreamDefinitionSpec.cs (96%) rename src/{ => Models}/StreamStatuses/StreamStatus/V1Beta1/V1Beta1StreamCondition.cs (91%) rename src/{ => Models}/StreamStatuses/StreamStatus/V1Beta1/V1Beta1StreamStatus.cs (85%) diff --git a/src/Arcane.Operator.csproj b/src/Arcane.Operator.csproj index 4433bff..f0debb4 100644 --- a/src/Arcane.Operator.csproj +++ b/src/Arcane.Operator.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 10 Arcane.Operator diff --git a/src/JobTemplates/V1Beta1/V1Beta1StreamingJobTemplate.cs b/src/Models/JobTemplates/V1Beta1/V1Beta1StreamingJobTemplate.cs similarity index 95% rename from src/JobTemplates/V1Beta1/V1Beta1StreamingJobTemplate.cs rename to src/Models/JobTemplates/V1Beta1/V1Beta1StreamingJobTemplate.cs index b79d9af..06ae1f5 100644 --- a/src/JobTemplates/V1Beta1/V1Beta1StreamingJobTemplate.cs +++ b/src/Models/JobTemplates/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 diff --git a/src/JobTemplates/V1Beta1/V1StreamingJobTemplateSpec.cs b/src/Models/JobTemplates/V1Beta1/V1StreamingJobTemplateSpec.cs similarity index 91% rename from src/JobTemplates/V1Beta1/V1StreamingJobTemplateSpec.cs rename to src/Models/JobTemplates/V1Beta1/V1StreamingJobTemplateSpec.cs index 8fcf5ec..0cc8a8d 100644 --- a/src/JobTemplates/V1Beta1/V1StreamingJobTemplateSpec.cs +++ b/src/Models/JobTemplates/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; /// /// Configuration for streaming job template. diff --git a/src/StreamDefinitions/Base/IStreamDefinition.cs b/src/Models/StreamDefinitions/Base/IStreamDefinition.cs similarity index 96% rename from src/StreamDefinitions/Base/IStreamDefinition.cs rename to src/Models/StreamDefinitions/Base/IStreamDefinition.cs index f43c6e6..ca55c11 100644 --- a/src/StreamDefinitions/Base/IStreamDefinition.cs +++ b/src/Models/StreamDefinitions/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 { diff --git a/src/StreamDefinitions/StreamDefinition.cs b/src/Models/StreamDefinitions/StreamDefinition.cs similarity index 97% rename from src/StreamDefinitions/StreamDefinition.cs rename to src/Models/StreamDefinitions/StreamDefinition.cs index 42f26c3..cc69d24 100644 --- a/src/StreamDefinitions/StreamDefinition.cs +++ b/src/Models/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/src/StreamDefinitions/StreamDefinitionSpec.cs b/src/Models/StreamDefinitions/StreamDefinitionSpec.cs similarity index 96% rename from src/StreamDefinitions/StreamDefinitionSpec.cs rename to src/Models/StreamDefinitions/StreamDefinitionSpec.cs index 9d684dd..2983331 100644 --- a/src/StreamDefinitions/StreamDefinitionSpec.cs +++ b/src/Models/StreamDefinitions/StreamDefinitionSpec.cs @@ -3,7 +3,7 @@ using System.Text.Json.Serialization; using k8s.Models; -namespace Arcane.Operator.StreamDefinitions; +namespace Arcane.Operator.Models.StreamDefinitions; /// /// Configuration for Sql Server Single Table Stream. diff --git a/src/Models/StreamOperatorResponse.cs b/src/Models/StreamOperatorResponse.cs index 63b5d25..b17108f 100644 --- 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/src/StreamStatuses/StreamStatus/V1Beta1/V1Beta1StreamCondition.cs b/src/Models/StreamStatuses/StreamStatus/V1Beta1/V1Beta1StreamCondition.cs similarity index 91% rename from src/StreamStatuses/StreamStatus/V1Beta1/V1Beta1StreamCondition.cs rename to src/Models/StreamStatuses/StreamStatus/V1Beta1/V1Beta1StreamCondition.cs index 23c45c3..70f07f5 100644 --- a/src/StreamStatuses/StreamStatus/V1Beta1/V1Beta1StreamCondition.cs +++ b/src/Models/StreamStatuses/StreamStatus/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; /// /// Represents the status of a stream for Kubernetes CRD diff --git a/src/StreamStatuses/StreamStatus/V1Beta1/V1Beta1StreamStatus.cs b/src/Models/StreamStatuses/StreamStatus/V1Beta1/V1Beta1StreamStatus.cs similarity index 85% rename from src/StreamStatuses/StreamStatus/V1Beta1/V1Beta1StreamStatus.cs rename to src/Models/StreamStatuses/StreamStatus/V1Beta1/V1Beta1StreamStatus.cs index 4750960..00a03b1 100644 --- a/src/StreamStatuses/StreamStatus/V1Beta1/V1Beta1StreamStatus.cs +++ b/src/Models/StreamStatuses/StreamStatus/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 index acd6884..7510419 100644 --- a/src/Program.cs +++ b/src/Program.cs @@ -40,10 +40,7 @@ public static IHostBuilder CreateHostBuilder(string[] args) .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); }) .ConfigureServices(services => { - if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("MAINTAINER"))) - { - services.AddHostedService(); - } + services.AddHostedService(); }); } } diff --git a/src/Services/Base/IStreamDefinitionRepository.cs b/src/Services/Base/IStreamDefinitionRepository.cs index 8fb8c69..50bfa16 100644 --- 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 index a7ea67d..1885a9f 100644 --- 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 index fc9dc00..793600d 100644 --- 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 index 7984cc1..84617d8 100644 --- 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 index de9fdbe..bdfca91 100644 --- 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 index 8d56e18..dff85b5 100644 --- 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 index 42a2c39..d80cc00 100644 --- 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 index 1933391..fda70fb 100644 --- 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 index 2b31628..3299689 100644 --- a/test/Arcane.Operator.Tests.csproj +++ b/test/Arcane.Operator.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 false diff --git a/test/Services/HostedStreamingJobMaintenanceServiceTests.cs b/test/Services/HostedStreamingJobMaintenanceServiceTests.cs index c50e3f3..5cd31bb 100644 --- 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 index 150623a..77b9c1c 100644 --- 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 index ae207fc..447c22a 100644 --- 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 index ef340a1..b992446 100644 --- 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 index 30c6374..d154947 100644 --- 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;