Add in formatting pre-check. (#431)

Author: brendandburns

.github/workflows/dotnet.yaml

@@ -34,6 +34,12 @@ jobs:
         if: matrix.os != 'windows-latest'
         run: |
           rsync --archive --ignore-existing ${DOTNET_ROOT/3.1.201/2.1.805}/ ${DOTNET_ROOT/3.1.201/2.1.202}/ $DOTNET_ROOT
+      - name: Setup Format
+        run: dotnet tool install -g dotnet-format
+      - name: Check Format
+        # don't check formatting on Windows b/c of CRLF issues.
+        if: matrix.os != 'windows-latest'
+        run: dotnet format --check --dry-run --exclude ./src/KubernetesClient/generated/
       - name: Build
         run: dotnet build --configuration Release
       - name: Test

examples/attach/Attach.cs

@@ -21,7 +21,8 @@ private static async Task Main(string[] args)
             await AttachToPod(client, pod);
         }
 
-        private async static Task AttachToPod(IKubernetes client, V1Pod pod) {
+        private async static Task AttachToPod(IKubernetes client, V1Pod pod)
+        {
             var webSocket = await client.WebSocketNamespacedPodAttachAsync(pod.Metadata.Name, "default", pod.Spec.Containers[0].Name);
 
             var demux = new StreamDemuxer(webSocket);

examples/exec/Exec.cs

@@ -18,7 +18,8 @@ private static async Task Main(string[] args)
             await ExecInPod(client, pod);
         }
 
-        private async static Task ExecInPod(IKubernetes client, V1Pod pod) {
+        private async static Task ExecInPod(IKubernetes client, V1Pod pod)
+        {
             var webSocket = await client.WebSocketNamespacedPodExecAsync(pod.Metadata.Name, "default", "ls", pod.Spec.Containers[0].Name);
 
             var demux = new StreamDemuxer(webSocket);

examples/logs/Logs.cs

@@ -14,7 +14,8 @@ private static async Task Main(string[] args)
             Console.WriteLine("Starting Request!");
 
             var list = client.ListNamespacedPod("default");
-            if (list.Items.Count == 0) {
+            if (list.Items.Count == 0)
+            {
                 Console.WriteLine("No pods!");
                 return;
             }

examples/namespace/Namespace.cs

@@ -8,42 +8,56 @@ namespace @namespace
 {
     class NamespaceExample
     {
-        static void ListNamespaces(IKubernetes client) {
+        static void ListNamespaces(IKubernetes client)
+        {
             var list = client.ListNamespace();
-            foreach (var item in list.Items) {
+            foreach (var item in list.Items)
+            {
                 Console.WriteLine(item.Metadata.Name);
             }
-            if (list.Items.Count == 0) {
+            if (list.Items.Count == 0)
+            {
                 Console.WriteLine("Empty!");
             }
         }
 
-        static async Task DeleteAsync(IKubernetes client, string name, int delayMillis) {
-            while (true) {
+        static async Task DeleteAsync(IKubernetes client, string name, int delayMillis)
+        {
+            while (true)
+            {
                 await Task.Delay(delayMillis);
                 try
                 {
                     await client.ReadNamespaceAsync(name);
-                } catch (AggregateException ex) {
-                    foreach (var innerEx in ex.InnerExceptions) {
-                        if (innerEx is Microsoft.Rest.HttpOperationException) {
+                }
+                catch (AggregateException ex)
+                {
+                    foreach (var innerEx in ex.InnerExceptions)
+                    {
+                        if (innerEx is Microsoft.Rest.HttpOperationException)
+                        {
                             var code = ((Microsoft.Rest.HttpOperationException)innerEx).Response.StatusCode;
-                            if (code == HttpStatusCode.NotFound) {
+                            if (code == HttpStatusCode.NotFound)
+                            {
                                 return;
                             }
                             throw ex;
                         }
                     }
-                } catch (Microsoft.Rest.HttpOperationException ex) {
-                    if (ex.Response.StatusCode == HttpStatusCode.NotFound) {
+                }
+                catch (Microsoft.Rest.HttpOperationException ex)
+                {
+                    if (ex.Response.StatusCode == HttpStatusCode.NotFound)
+                    {
                         return;
                     }
                     throw ex;
                 }
             }
         }
 
-        static void Delete(IKubernetes client, string name, int delayMillis) {
+        static void Delete(IKubernetes client, string name, int delayMillis)
+        {
             DeleteAsync(client, name, delayMillis).Wait();
         }
 

gen/KubernetesWatchGenerator/Program.cs

@@ -51,25 +51,25 @@ static async Task Main(string[] args)
             _schemaDefinitionsInMultipleGroups = _schemaToNameMap.Values.Select(x =>
             {
                 var parts = x.Split(".");
-                return new {FullName = x, Name = parts[parts.Length - 1], Version = parts[parts.Length - 2], Group = parts[parts.Length - 3]};
+                return new { FullName = x, Name = parts[parts.Length - 1], Version = parts[parts.Length - 2], Group = parts[parts.Length - 3] };
             })
-                .GroupBy(x => new {x.Name, x.Version})
+                .GroupBy(x => new { x.Name, x.Version })
                 .Where(x => x.Count() > 1)
                 .SelectMany(x => x)
                 .Select(x => x.FullName)
                 .ToHashSet();
 
             _classNameToPluralMap = swagger.Operations
                 .Where(x => x.Operation.OperationId.StartsWith("list"))
-                .Select(x => { return new {PluralName = x.Path.Split("/").Last(), ClassName = GetClassNameForSchemaDefinition(x.Operation.Responses["200"].ActualResponseSchema)}; })
+                .Select(x => { return new { PluralName = x.Path.Split("/").Last(), ClassName = GetClassNameForSchemaDefinition(x.Operation.Responses["200"].ActualResponseSchema) }; })
                 .Distinct()
                 .ToDictionary(x => x.ClassName, x => x.PluralName);
 
             // dictionary only contains "list" plural maps. assign the same plural names to entities those lists support
             _classNameToPluralMap = _classNameToPluralMap
                 .Where(x => x.Key.EndsWith("List"))
                 .Select(x =>
-                    new {ClassName = x.Key.Remove(x.Key.Length - 4), PluralName = x.Value})
+                    new { ClassName = x.Key.Remove(x.Key.Length - 4), PluralName = x.Value })
                 .ToDictionary(x => x.ClassName, x => x.PluralName)
                 .Union(_classNameToPluralMap)
                 .ToDictionary(x => x.Key, x => x.Value);
@@ -119,7 +119,7 @@ static async Task Main(string[] args)
 
             var modelsDir = Path.Combine(outputDirectory, "Models");
             _classesWithValidation = Directory.EnumerateFiles(modelsDir)
-                .Select(x => new {Class = Path.GetFileNameWithoutExtension(x), Content = File.ReadAllText(x)})
+                .Select(x => new { Class = Path.GetFileNameWithoutExtension(x), Content = File.ReadAllText(x) })
                 .Where(x => x.Content.Contains("public virtual void Validate()"))
                 .Select(x => x.Class)
                 .ToHashSet();
@@ -244,7 +244,7 @@ static string GetInterfaceName(JsonSchema4 definition)
                 interfaces.Add($"ISpec<{GetClassNameForSchemaDefinition(specProperty.Reference)}>");
             }
 
-            if(_classesWithValidation.Contains(className))
+            if (_classesWithValidation.Contains(className))
                 interfaces.Add("IValidate");
             var result = string.Join(", ", interfaces);
             return result;
@@ -272,7 +272,7 @@ static void GetPlural(RenderContext context, IList<object> arguments, IDictionar
             if (arguments != null && arguments.Count > 0 && arguments[0] != null && arguments[0] is JsonSchema4)
             {
                 var plural = GetPlural(arguments[0] as JsonSchema4);
-                if(plural != null)
+                if (plural != null)
                     context.Write($"\"{plural}\"");
                 else
                     context.Write("null");

src/KubernetesClient/CertUtils.cs

@@ -21,7 +21,7 @@ public static class CertUtils
         /// <returns>List of x509 instances.</returns>
         public static X509Certificate2Collection LoadPemFileCert(string file)
         {
-            var certs =  new X509CertificateParser().ReadCertificates(File.OpenRead(file));
+            var certs = new X509CertificateParser().ReadCertificates(File.OpenRead(file));
             var certCollection = new X509Certificate2Collection();
 
             // Convert BouncyCastle X509Certificates to the .NET cryptography implementation and add
@@ -76,7 +76,8 @@ public static X509Certificate2 GeneratePfx(KubernetesClientConfiguration config)
             var cert = new X509CertificateParser().ReadCertificate(new MemoryStream(certData));
             // key usage is a bit string, zero-th bit is 'digitalSignature'
             // See https://www.alvestrand.no/objectid/2.5.29.15.html for more details.
-            if (cert != null && cert.GetKeyUsage() != null && !cert.GetKeyUsage()[0]) {
+            if (cert != null && cert.GetKeyUsage() != null && !cert.GetKeyUsage()[0])
+            {
                 throw new Exception(
                     "Client certificates must be marked for digital signing. " +
                     "See https://github.com/kubernetes-client/csharp/issues/319");
@@ -93,10 +94,10 @@ public static X509Certificate2 GeneratePfx(KubernetesClientConfiguration config)
                 }
             }
 
-            var keyParams = (AsymmetricKeyParameter) obj;
+            var keyParams = (AsymmetricKeyParameter)obj;
 
             var store = new Pkcs12StoreBuilder().Build();
-            store.SetKeyEntry("K8SKEY", new AsymmetricKeyEntry(keyParams), new[] {new X509CertificateEntry(cert)});
+            store.SetKeyEntry("K8SKEY", new AsymmetricKeyEntry(keyParams), new[] { new X509CertificateEntry(cert) });
 
             using (var pkcs = new MemoryStream())
             {

src/KubernetesClient/IItems.cs

@@ -14,4 +14,4 @@ public interface IItems<T>
         /// </summary>
         IList<T> Items { get; set; }
     }
-}
+}

src/KubernetesClient/IMetadata.cs

@@ -15,4 +15,4 @@ public interface IMetadata<T>
         /// </summary>
         T Metadata { get; set; }
     }
-}
+}

src/KubernetesClient/ISpec.cs

@@ -14,4 +14,4 @@ public interface ISpec<T>
         /// </summary>
         T Spec { get; set; }
     }
-}
+}