chore: make template tests async and use editorconfig (#604)

This fixes #542.
buehler · Sep 19, 2023 · 1602b1c · 1602b1c
1 parent 9e9bc0f
commit 1602b1c
Show file tree

Hide file tree

Showing 117 changed files with 651 additions and 283 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/DotnetOperatorSdk.sln b/DotnetOperatorSdk.sln
@@ -23,12 +23,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "config", "config", "{EF94C4
 ProjectSection(SolutionItems) = preProject
 	config\CodeAnalysis.targets = config\CodeAnalysis.targets
 	config\Common.targets = config\Common.targets
-	config\project.ruleset = config\project.ruleset
 	config\stylecop.json = config\stylecop.json
 	.gitignore = .gitignore
 	.releaserc.json = .releaserc.json
 	renovate.json = renovate.json
 	config\CommonTests.targets = config\CommonTests.targets
+	.editorconfig = .editorconfig
 EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KubeOps.Testing", "src\KubeOps.Testing\KubeOps.Testing.csproj", "{4A6D1BEB-CB4C-495A-A20D-D8728F6BBC93}"

diff --git a/config/CodeAnalysis.targets b/config/CodeAnalysis.targets
@@ -7,7 +7,6 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)/project.ruleset</CodeAnalysisRuleSet>
     <TreatWarningsAsErrors Condition="'$(Configuration)' == 'Release'">true</TreatWarningsAsErrors>
   </PropertyGroup>
 

diff --git a/config/project.ruleset b/config/project.ruleset
diff --git a/src/KubeOps.KubernetesClient/Entities/EntityList{TEntity}.cs b/src/KubeOps.KubernetesClient/Entities/EntityList{TEntity}.cs
@@ -1,4 +1,5 @@
 using System.Text.Json.Serialization;
+
 using k8s;
 using k8s.Models;
 

diff --git a/src/KubeOps.KubernetesClient/Entities/Extensions.cs b/src/KubeOps.KubernetesClient/Entities/Extensions.cs
@@ -1,4 +1,5 @@
 using System.Reflection;
+
 using k8s;
 using k8s.Models;
 

diff --git a/src/KubeOps.KubernetesClient/IKubernetesClient.cs b/src/KubeOps.KubernetesClient/IKubernetesClient.cs
@@ -1,5 +1,6 @@
 using k8s;
 using k8s.Models;
+
 using KubeOps.KubernetesClient.LabelSelectors;
 
 namespace KubeOps.KubernetesClient;

diff --git a/src/KubeOps.KubernetesClient/KubernetesClient.cs b/src/KubeOps.KubernetesClient/KubernetesClient.cs
@@ -1,7 +1,9 @@
 using System.Net;
+
 using k8s;
 using k8s.Autorest;
 using k8s.Models;
+
 using KubeOps.KubernetesClient.Entities;
 using KubeOps.KubernetesClient.LabelSelectors;
 

diff --git a/src/KubeOps.Testing/KubernetesOperatorFactory.cs b/src/KubeOps.Testing/KubernetesOperatorFactory.cs
@@ -1,9 +1,11 @@
 using k8s;
 using k8s.Models;
+
 using KubeOps.KubernetesClient;
 using KubeOps.Operator.Controller;
 using KubeOps.Operator.Kubernetes;
 using KubeOps.Operator.Leadership;
+
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.AspNetCore.TestHost;

diff --git a/src/KubeOps.Testing/MockEventQueue.cs b/src/KubeOps.Testing/MockEventQueue.cs
@@ -1,6 +1,8 @@
 using System.Reactive.Subjects;
+
 using k8s;
 using k8s.Models;
+
 using KubeOps.Operator.Controller;
 
 namespace KubeOps.Testing;

diff --git a/src/KubeOps.Testing/MockKubernetesClient.cs b/src/KubeOps.Testing/MockKubernetesClient.cs
@@ -1,6 +1,8 @@
 using System.Diagnostics.CodeAnalysis;
+
 using k8s;
 using k8s.Models;
+
 using KubeOps.KubernetesClient;
 using KubeOps.KubernetesClient.LabelSelectors;
 

diff --git a/src/KubeOps.Testing/MockedLeaderElection.cs b/src/KubeOps.Testing/MockedLeaderElection.cs
@@ -1,4 +1,5 @@
 using System.Reactive.Subjects;
+
 using KubeOps.Operator.Leadership;
 
 namespace KubeOps.Testing;

diff --git a/src/KubeOps/Operator/ApplicationBuilderExtensions.cs b/src/KubeOps/Operator/ApplicationBuilderExtensions.cs
@@ -1,7 +1,10 @@
 using System.Reflection;
+
 using KubeOps.Operator.Builder;
 using KubeOps.Operator.Webhooks;
+
 using Microsoft.AspNetCore.Diagnostics.HealthChecks;
+
 using Prometheus;
 
 namespace KubeOps.Operator;

diff --git a/src/KubeOps/Operator/Builder/AssemblyScanner.cs b/src/KubeOps/Operator/Builder/AssemblyScanner.cs
@@ -1,6 +1,8 @@
 using System.Reflection;
+
 using k8s;
 using k8s.Models;
+
 using KubeOps.Operator.Controller;
 using KubeOps.Operator.Finalizer;
 using KubeOps.Operator.Webhooks;

diff --git a/src/KubeOps/Operator/Builder/ComponentRegistrar.cs b/src/KubeOps/Operator/Builder/ComponentRegistrar.cs
@@ -1,9 +1,12 @@
 using System.Collections.Immutable;
+
 using k8s;
 using k8s.Models;
+
 using KubeOps.Operator.Controller;
 using KubeOps.Operator.Finalizer;
 using KubeOps.Operator.Webhooks;
+
 using static KubeOps.Operator.Builder.IComponentRegistrar;
 
 namespace KubeOps.Operator.Builder;

diff --git a/src/KubeOps/Operator/Builder/IComponentRegistrar.cs b/src/KubeOps/Operator/Builder/IComponentRegistrar.cs
@@ -1,6 +1,8 @@
 using System.Collections.Immutable;
+
 using k8s;
 using k8s.Models;
+
 using KubeOps.Operator.Controller;
 using KubeOps.Operator.Finalizer;
 using KubeOps.Operator.Webhooks;

diff --git a/src/KubeOps/Operator/Builder/IOperatorBuilder.cs b/src/KubeOps/Operator/Builder/IOperatorBuilder.cs
@@ -1,9 +1,12 @@
 using System.Reflection;
+
 using k8s;
 using k8s.Models;
+
 using KubeOps.Operator.Controller;
 using KubeOps.Operator.Finalizer;
 using KubeOps.Operator.Webhooks;
+
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 
 namespace KubeOps.Operator.Builder;

diff --git a/src/KubeOps/Operator/Builder/OperatorBuilder.cs b/src/KubeOps/Operator/Builder/OperatorBuilder.cs
@@ -1,6 +1,8 @@
 using System.Reflection;
+
 using k8s;
 using k8s.Models;
+
 using KubeOps.KubernetesClient;
 using KubeOps.Operator.Caching;
 using KubeOps.Operator.Controller;
@@ -12,8 +14,10 @@
 using KubeOps.Operator.Leadership;
 using KubeOps.Operator.Rbac;
 using KubeOps.Operator.Webhooks;
+
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
+
 using Prometheus;
 
 namespace KubeOps.Operator.Builder;

diff --git a/src/KubeOps/Operator/Caching/ResourceCache{TEntity}.cs b/src/KubeOps/Operator/Caching/ResourceCache{TEntity}.cs
@@ -1,7 +1,10 @@
 using System.Collections.Concurrent;
+
 using k8s;
 using k8s.Models;
+
 using KellermanSoftware.CompareNetObjects;
+
 using KubeOps.Operator.DevOps;
 using KubeOps.Operator.Entities.Extensions;
 

diff --git a/src/KubeOps/Operator/Commands/Generators/CrdGenerator.cs b/src/KubeOps/Operator/Commands/Generators/CrdGenerator.cs
@@ -2,6 +2,7 @@
 using KubeOps.Operator.Entities;
 using KubeOps.Operator.Entities.Kustomize;
 using KubeOps.Operator.Serialization;
+
 using McMaster.Extensions.CommandLineUtils;
 
 namespace KubeOps.Operator.Commands.Generators;

diff --git a/src/KubeOps/Operator/Commands/Generators/DockerGenerator.cs b/src/KubeOps/Operator/Commands/Generators/DockerGenerator.cs
@@ -1,5 +1,7 @@
 using System.Text;
+
 using KubeOps.Operator.Builder;
+
 using McMaster.Extensions.CommandLineUtils;
 
 namespace KubeOps.Operator.Commands.Generators;

diff --git a/src/KubeOps/Operator/Commands/Generators/InstallerGenerator.cs b/src/KubeOps/Operator/Commands/Generators/InstallerGenerator.cs
@@ -1,7 +1,9 @@
 using k8s.Models;
+
 using KubeOps.Operator.Commands.CommandHelpers;
 using KubeOps.Operator.Entities.Kustomize;
 using KubeOps.Operator.Serialization;
+
 using McMaster.Extensions.CommandLineUtils;
 
 namespace KubeOps.Operator.Commands.Generators;

diff --git a/src/KubeOps/Operator/Commands/Generators/OperatorGenerator.cs b/src/KubeOps/Operator/Commands/Generators/OperatorGenerator.cs
@@ -1,8 +1,10 @@
 using k8s.Models;
+
 using KubeOps.Operator.Builder;
 using KubeOps.Operator.Commands.CommandHelpers;
 using KubeOps.Operator.Entities.Kustomize;
 using KubeOps.Operator.Serialization;
+
 using McMaster.Extensions.CommandLineUtils;
 
 namespace KubeOps.Operator.Commands.Generators;

diff --git a/src/KubeOps/Operator/Commands/Generators/OutputBase.cs b/src/KubeOps/Operator/Commands/Generators/OutputBase.cs
@@ -1,4 +1,5 @@
 using KubeOps.Operator.Serialization;
+
 using McMaster.Extensions.CommandLineUtils;
 
 namespace KubeOps.Operator.Commands.Generators;

diff --git a/src/KubeOps/Operator/Commands/Generators/RbacGenerator.cs b/src/KubeOps/Operator/Commands/Generators/RbacGenerator.cs
@@ -1,8 +1,10 @@
 using k8s.Models;
+
 using KubeOps.Operator.Commands.CommandHelpers;
 using KubeOps.Operator.Entities.Kustomize;
 using KubeOps.Operator.Rbac;
 using KubeOps.Operator.Serialization;
+
 using McMaster.Extensions.CommandLineUtils;
 
 namespace KubeOps.Operator.Commands.Generators;

diff --git a/src/KubeOps/Operator/Commands/Management/Install.cs b/src/KubeOps/Operator/Commands/Management/Install.cs
@@ -1,6 +1,8 @@
 using k8s.Autorest;
+
 using KubeOps.KubernetesClient;
 using KubeOps.Operator.Entities;
+
 using McMaster.Extensions.CommandLineUtils;
 
 namespace KubeOps.Operator.Commands.Management;

diff --git a/src/KubeOps/Operator/Commands/Management/Uninstall.cs b/src/KubeOps/Operator/Commands/Management/Uninstall.cs
@@ -1,6 +1,8 @@
 using k8s.Autorest;
+
 using KubeOps.KubernetesClient;
 using KubeOps.Operator.Entities;
+
 using McMaster.Extensions.CommandLineUtils;
 
 namespace KubeOps.Operator.Commands.Management;

diff --git a/src/KubeOps/Operator/Commands/Management/Webhooks/Install.cs b/src/KubeOps/Operator/Commands/Management/Webhooks/Install.cs
@@ -1,9 +1,11 @@
 using k8s.Models;
+
 using KubeOps.KubernetesClient;
 using KubeOps.KubernetesClient.LabelSelectors;
 using KubeOps.Operator.Commands.CommandHelpers;
 using KubeOps.Operator.Entities.Extensions;
 using KubeOps.Operator.Webhooks;
+
 using McMaster.Extensions.CommandLineUtils;
 
 namespace KubeOps.Operator.Commands.Management.Webhooks;

diff --git a/src/KubeOps/Operator/Commands/Management/Webhooks/Register.cs b/src/KubeOps/Operator/Commands/Management/Webhooks/Register.cs
@@ -1,8 +1,11 @@
 using System.Text;
+
 using k8s.Models;
+
 using KubeOps.KubernetesClient;
 using KubeOps.Operator.Builder;
 using KubeOps.Operator.Webhooks;
+
 using McMaster.Extensions.CommandLineUtils;
 
 namespace KubeOps.Operator.Commands.Management.Webhooks;

diff --git a/src/KubeOps/Operator/Commands/RunOperator.cs b/src/KubeOps/Operator/Commands/RunOperator.cs
@@ -1,6 +1,7 @@
 using KubeOps.KubernetesClient;
 using KubeOps.Operator.Commands.Generators;
 using KubeOps.Operator.Commands.Management;
+
 using McMaster.Extensions.CommandLineUtils;
 
 namespace KubeOps.Operator.Commands;

diff --git a/src/KubeOps/Operator/Commands/Utilities/Version.cs b/src/KubeOps/Operator/Commands/Utilities/Version.cs
@@ -1,4 +1,5 @@
 using KubeOps.KubernetesClient;
+
 using McMaster.Extensions.CommandLineUtils;
 
 namespace KubeOps.Operator.Commands.Utilities;

diff --git a/src/KubeOps/Operator/Controller/ControllerInstanceBuilder.cs b/src/KubeOps/Operator/Controller/ControllerInstanceBuilder.cs
@@ -1,5 +1,6 @@
 using k8s;
 using k8s.Models;
+
 using KubeOps.Operator.Builder;
 
 namespace KubeOps.Operator.Controller;

diff --git a/src/KubeOps/Operator/Controller/EventQueue.cs b/src/KubeOps/Operator/Controller/EventQueue.cs
@@ -1,7 +1,9 @@
 using System.Reactive.Linq;
 using System.Reactive.Subjects;
+
 using k8s;
 using k8s.Models;
+
 using KubeOps.KubernetesClient;
 using KubeOps.Operator.Caching;
 using KubeOps.Operator.Kubernetes;

diff --git a/src/KubeOps/Operator/Controller/IControllerInstanceBuilder.cs b/src/KubeOps/Operator/Controller/IControllerInstanceBuilder.cs
@@ -1,5 +1,6 @@
 using k8s;
 using k8s.Models;
+
 using KubeOps.Operator.Builder;
 
 namespace KubeOps.Operator.Controller;

diff --git a/src/KubeOps/Operator/Controller/IResourceController{TEntity}.cs b/src/KubeOps/Operator/Controller/IResourceController{TEntity}.cs
@@ -1,5 +1,6 @@
 using k8s;
 using k8s.Models;
+
 using KubeOps.Operator.Controller.Results;
 using KubeOps.Operator.Kubernetes;
 

diff --git a/src/KubeOps/Operator/Controller/ManagedResourceController{TEntity}.cs b/src/KubeOps/Operator/Controller/ManagedResourceController{TEntity}.cs
@@ -2,13 +2,16 @@
 using System.Reactive;
 using System.Reactive.Concurrency;
 using System.Reactive.Linq;
+
 using k8s;
 using k8s.Autorest;
 using k8s.Models;
+
 using KubeOps.Operator.Controller.Results;
 using KubeOps.Operator.DevOps;
 using KubeOps.Operator.Finalizer;
 using KubeOps.Operator.Kubernetes;
+
 using static KubeOps.Operator.Builder.IComponentRegistrar;
 
 namespace KubeOps.Operator.Controller;

diff --git a/src/KubeOps/Operator/Controller/ResourceEvent.cs b/src/KubeOps/Operator/Controller/ResourceEvent.cs
@@ -1,5 +1,6 @@
 using k8s;
 using k8s.Models;
+
 using KubeOps.Operator.Kubernetes;
 
 namespace KubeOps.Operator.Controller;

diff --git a/src/KubeOps/Operator/DevOps/IResourceWatcherMetrics{TEntity}.cs b/src/KubeOps/Operator/DevOps/IResourceWatcherMetrics{TEntity}.cs
@@ -1,5 +1,6 @@
 using k8s;
 using k8s.Models;
+
 using Prometheus;
 
 namespace KubeOps.Operator.DevOps;

diff --git a/src/KubeOps/Operator/DevOps/ResourceCacheMetrics{TEntity}.cs b/src/KubeOps/Operator/DevOps/ResourceCacheMetrics{TEntity}.cs
@@ -1,6 +1,8 @@
 using k8s;
 using k8s.Models;
+
 using KubeOps.KubernetesClient.Entities;
+
 using Prometheus;
 
 namespace KubeOps.Operator.DevOps;

diff --git a/src/KubeOps/Operator/DevOps/ResourceControllerMetrics{TEntity}.cs b/src/KubeOps/Operator/DevOps/ResourceControllerMetrics{TEntity}.cs
@@ -1,6 +1,8 @@
 using k8s;
 using k8s.Models;
+
 using KubeOps.KubernetesClient.Entities;
+
 using Prometheus;
 
 namespace KubeOps.Operator.DevOps;