kubernetes-client · k8s-ci-robot · Oct 23, 2020 · Oct 15, 2020
diff --git a/examples/attach/Attach.cs b/examples/attach/Attach.cs
@@ -18,14 +18,14 @@ private static async Task Main(string[] args)
 
             var list = client.ListNamespacedPod("default");
             var pod = list.Items[0];
-            await AttachToPod(client, pod);
+            await AttachToPod(client, pod).ConfigureAwait(false);
         }
 
         private async static Task AttachToPod(IKubernetes client, V1Pod pod)
         {
             var webSocket =
                 await client.WebSocketNamespacedPodAttachAsync(pod.Metadata.Name, "default",
-                    pod.Spec.Containers[0].Name);
+                    pod.Spec.Containers[0].Name).ConfigureAwait(false);
 
             var demux = new StreamDemuxer(webSocket);
             demux.Start();

diff --git a/examples/exec/Exec.cs b/examples/exec/Exec.cs
@@ -15,14 +15,14 @@ private static async Task Main(string[] args)
 
             var list = client.ListNamespacedPod("default");
             var pod = list.Items[0];
-            await ExecInPod(client, pod);
+            await ExecInPod(client, pod).ConfigureAwait(false);
         }
 
         private async static Task ExecInPod(IKubernetes client, V1Pod pod)
         {
             var webSocket =
                 await client.WebSocketNamespacedPodExecAsync(pod.Metadata.Name, "default", "ls",
-                    pod.Spec.Containers[0].Name);
+                    pod.Spec.Containers[0].Name).ConfigureAwait(false);
 
             var demux = new StreamDemuxer(webSocket);
             demux.Start();

diff --git a/examples/httpClientFactory/PodListHostedService.cs b/examples/httpClientFactory/PodListHostedService.cs
@@ -8,7 +8,7 @@
 namespace httpClientFactory
 {
     // Learn more about IHostedServices at https://docs.microsoft.com/en-us/aspnet/core/fundamentals/host/hosted-services?view=aspnetcore-2.2&tabs=visual-studio
-    internal class PodListHostedService : IHostedService
+    public class PodListHostedService : IHostedService
     {
         private readonly IKubernetes _kubernetesClient;
         private readonly ILogger<PodListHostedService> _logger;
@@ -23,7 +23,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
         {
             _logger.LogInformation("Starting Request!");
 
-            var list = await _kubernetesClient.ListNamespacedPodAsync("default", cancellationToken: cancellationToken);
+            var list = await _kubernetesClient.ListNamespacedPodAsync("default", cancellationToken: cancellationToken).ConfigureAwait(false);
             foreach (var item in list.Items)
             {
                 _logger.LogInformation(item.Metadata.Name);

diff --git a/examples/logs/Logs.cs b/examples/logs/Logs.cs
@@ -23,7 +23,7 @@ private static async Task Main(string[] args)
             var pod = list.Items[0];
 
             var response = await client.ReadNamespacedPodLogWithHttpMessagesAsync(pod.Metadata.Name,
-                pod.Metadata.NamespaceProperty, follow: true);
+                pod.Metadata.NamespaceProperty, follow: true).ConfigureAwait(false);
             var stream = response.Body;
             stream.CopyTo(Console.OpenStandardOutput());
         }

diff --git a/examples/metrics/Metrics.cs → examples/metrics/Program.cs b/examples/metrics/Metrics.cs → examples/metrics/Program.cs
@@ -5,9 +5,9 @@
 
 namespace metrics
 {
-    class Program
+    internal class Program
     {
-        static async Task NodesMetrics(IKubernetes client)
+        private static async Task NodesMetrics(IKubernetes client)
         {
             var nodesMetrics = await client.GetKubernetesNodesMetricsAsync().ConfigureAwait(false);
 
@@ -22,7 +22,7 @@ static async Task NodesMetrics(IKubernetes client)
             }
         }
 
-        static async Task PodsMetrics(IKubernetes client)
+        private static async Task PodsMetrics(IKubernetes client)
         {
             var podsMetrics = await client.GetKubernetesPodsMetricsAsync().ConfigureAwait(false);
 
@@ -42,11 +42,12 @@ static async Task PodsMetrics(IKubernetes client)
                         Console.WriteLine($"{metric.Key}: {metric.Value}");
                     }
                 }
+
                 Console.Write(Environment.NewLine);
             }
         }
 
-        static async Task Main(string[] args)
+        private static async Task Main(string[] args)
         {
             var config = KubernetesClientConfiguration.BuildConfigFromConfigFile();
             var client = new Kubernetes(config);

diff --git a/examples/namespace/Namespace.cs → examples/namespace/NamespaceExample.cs b/examples/namespace/Namespace.cs → examples/namespace/NamespaceExample.cs
@@ -6,9 +6,9 @@
 
 namespace @namespace
 {
-    class NamespaceExample
+    internal class NamespaceExample
     {
-        static void ListNamespaces(IKubernetes client)
+        private static void ListNamespaces(IKubernetes client)
         {
             var list = client.ListNamespace();
             foreach (var item in list.Items)
@@ -22,14 +22,14 @@ static void ListNamespaces(IKubernetes client)
             }
         }
 
-        static async Task DeleteAsync(IKubernetes client, string name, int delayMillis)
+        private static async Task DeleteAsync(IKubernetes client, string name, int delayMillis)
         {
             while (true)
             {
-                await Task.Delay(delayMillis);
+                await Task.Delay(delayMillis).ConfigureAwait(false);
                 try
                 {
-                    await client.ReadNamespaceAsync(name);
+                    await client.ReadNamespaceAsync(name).ConfigureAwait(false);
                 }
                 catch (AggregateException ex)
                 {
@@ -43,7 +43,7 @@ static async Task DeleteAsync(IKubernetes client, string name, int delayMillis)
                                 return;
                             }
 
-                            throw ex;
+                            throw;
                         }
                     }
                 }
@@ -54,12 +54,12 @@ static async Task DeleteAsync(IKubernetes client, string name, int delayMillis)
                         return;
                     }
 
-                    throw ex;
+                    throw;
                 }
             }
         }
 
-        static void Delete(IKubernetes client, string name, int delayMillis)
+        private static void Delete(IKubernetes client, string name, int delayMillis)
         {
             DeleteAsync(client, name, delayMillis).Wait();
         }

diff --git a/gen/KubernetesWatchGenerator/KubernetesWatchGenerator.csproj b/gen/KubernetesWatchGenerator/KubernetesWatchGenerator.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

diff --git a/gen/KubernetesWatchGenerator/ModelOperators.cs.template b/gen/KubernetesWatchGenerator/ModelOperators.cs.template
@@ -1,3 +1,8 @@
+// <auto-generated>
+// Code generated by gen/KubernetesWatchGenerator
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+// </auto-generated>
 using k8s.Versioning;
 
 namespace k8s.Models

diff --git a/gen/KubernetesWatchGenerator/Program.cs b/gen/KubernetesWatchGenerator/Program.cs
@@ -11,15 +11,15 @@
 
 namespace KubernetesWatchGenerator
 {
-    class Program
+    internal class Program
     {
         private static HashSet<string> _classesWithValidation;
-        static readonly Dictionary<string, string> ClassNameMap = new Dictionary<string, string>();
+        private static readonly Dictionary<string, string> ClassNameMap = new Dictionary<string, string>();
         private static Dictionary<JsonSchema4, string> _schemaToNameMap;
         private static HashSet<string> _schemaDefinitionsInMultipleGroups;
         private static Dictionary<string, string> _classNameToPluralMap;
 
-        static async Task Main(string[] args)
+        private static async Task Main(string[] args)
         {
             if (args.Length < 2)
             {
@@ -31,7 +31,7 @@ static async Task Main(string[] args)
 
             // Read the spec trimmed
             // here we cache all name in gen project for later use
-            var swagger = await SwaggerDocument.FromFileAsync(Path.Combine(args[1], "swagger.json"));
+            var swagger = await SwaggerDocument.FromFileAsync(Path.Combine(args[1], "swagger.json")).ConfigureAwait(false);
             foreach (var (k, v) in swagger.Definitions)
             {
                 if (v.ExtensionData?.TryGetValue("x-kubernetes-group-version-kind", out var _) == true)
@@ -46,9 +46,8 @@ static async Task Main(string[] args)
                 }
             }
 
-
             // gen project removed all watch operations, so here we switch back to unprocessed version
-            swagger = await SwaggerDocument.FromFileAsync(Path.Combine(args[1], "swagger.json.unprocessed"));
+            swagger = await SwaggerDocument.FromFileAsync(Path.Combine(args[1], "swagger.json.unprocessed")).ConfigureAwait(false);
             _schemaToNameMap = swagger.Definitions.ToDictionary(x => x.Value, x => x.Key);
             _schemaDefinitionsInMultipleGroups = _schemaToNameMap.Values.Select(x =>
                 {
@@ -90,7 +89,6 @@ static async Task Main(string[] args)
                 .Union(_classNameToPluralMap)
                 .ToDictionary(x => x.Key, x => x.Value);
 
-
             // Register helpers used in the templating.
             Helpers.Register(nameof(ToXmlDoc), ToXmlDoc);
             Helpers.Register(nameof(GetClassName), GetClassName);
@@ -166,12 +164,9 @@ static async Task Main(string[] args)
 
             Render.FileToFile("VersionConverter.cs.template", versionConverterPairs, Path.Combine(outputDirectory, "VersionConverter.cs"));
             Render.FileToFile("ModelOperators.cs.template", typePairs, Path.Combine(outputDirectory, "ModelOperators.cs"));
-
         }
 
-
-
-        static void ToXmlDoc(RenderContext context, IList<object> arguments, IDictionary<string, object> options,
+        private static void ToXmlDoc(RenderContext context, IList<object> arguments, IDictionary<string, object> options,
             RenderBlock fn, RenderBlock inverse)
         {
             if (arguments != null && arguments.Count > 0 && arguments[0] != null && arguments[0] is string)
@@ -199,7 +194,7 @@ static void ToXmlDoc(RenderContext context, IList<object> arguments, IDictionary
             }
         }
 
-        static void GetTuple(RenderContext context, IList<object> arguments, IDictionary<string, object> options, RenderBlock fn, RenderBlock inverse)
+        private static void GetTuple(RenderContext context, IList<object> arguments, IDictionary<string, object> options, RenderBlock fn, RenderBlock inverse)
         {
             if (arguments != null && arguments.Count > 0 && arguments[0] is ITuple && options.TryGetValue("index", out var indexObj) && int.TryParse(indexObj?.ToString(), out var index))
             {
@@ -209,9 +204,7 @@ static void GetTuple(RenderContext context, IList<object> arguments, IDictionary
             }
         }
 
-
-
-        static void GetClassName(RenderContext context, IList<object> arguments, IDictionary<string, object> options,
+        private static void GetClassName(RenderContext context, IList<object> arguments, IDictionary<string, object> options,
             RenderBlock fn, RenderBlock inverse)
         {
             if (arguments != null && arguments.Count > 0 && arguments[0] != null && arguments[0] is SwaggerOperation)
@@ -224,7 +217,7 @@ static void GetClassName(RenderContext context, IList<object> arguments, IDictio
             }
         }
 
-        static string GetClassName(SwaggerOperation watchOperation)
+        private static string GetClassName(SwaggerOperation watchOperation)
         {
             var groupVersionKind =
                 (Dictionary<string, object>)watchOperation.ExtensionData["x-kubernetes-group-version-kind"];
@@ -257,7 +250,7 @@ private static void GetInterfaceName(RenderContext context, IList<object> argume
             }
         }
 
-        static string GetClassNameForSchemaDefinition(JsonSchema4 definition)
+        private static string GetClassNameForSchemaDefinition(JsonSchema4 definition)
         {
             if (definition.ExtensionData != null &&
                 definition.ExtensionData.ContainsKey("x-kubernetes-group-version-kind"))
@@ -280,7 +273,7 @@ static string GetClassNameForSchemaDefinition(JsonSchema4 definition)
             return className;
         }
 
-        static string GetInterfaceName(JsonSchema4 definition)
+        private static string GetInterfaceName(JsonSchema4 definition)
         {
             var groupVersionKindElements = (object[])definition.ExtensionData["x-kubernetes-group-version-kind"];
             var groupVersionKind = (Dictionary<string, object>)groupVersionKindElements[0];
@@ -321,8 +314,7 @@ static string GetInterfaceName(JsonSchema4 definition)
             return result;
         }
 
-
-        static void GetKind(RenderContext context, IList<object> arguments, IDictionary<string, object> options,
+        private static void GetKind(RenderContext context, IList<object> arguments, IDictionary<string, object> options,
             RenderBlock fn, RenderBlock inverse)
         {
             if (arguments != null && arguments.Count > 0 && arguments[0] != null && arguments[0] is JsonSchema4)
@@ -339,7 +331,7 @@ private static string GetKind(JsonSchema4 definition)
             return groupVersionKind["kind"] as string;
         }
 
-        static void GetPlural(RenderContext context, IList<object> arguments, IDictionary<string, object> options,
+        private static void GetPlural(RenderContext context, IList<object> arguments, IDictionary<string, object> options,
             RenderBlock fn, RenderBlock inverse)
         {
             if (arguments != null && arguments.Count > 0 && arguments[0] != null && arguments[0] is JsonSchema4)
@@ -362,7 +354,7 @@ private static string GetPlural(JsonSchema4 definition)
             return _classNameToPluralMap.GetValueOrDefault(className, null);
         }
 
-        static void GetGroup(RenderContext context, IList<object> arguments, IDictionary<string, object> options,
+        private static void GetGroup(RenderContext context, IList<object> arguments, IDictionary<string, object> options,
             RenderBlock fn, RenderBlock inverse)
         {
             if (arguments != null && arguments.Count > 0 && arguments[0] != null && arguments[0] is JsonSchema4)
@@ -379,7 +371,7 @@ private static string GetGroup(JsonSchema4 definition)
             return groupVersionKind["group"] as string;
         }
 
-        static void GetMethodName(RenderContext context, IList<object> arguments, IDictionary<string, object> options,
+        private static void GetMethodName(RenderContext context, IList<object> arguments, IDictionary<string, object> options,
             RenderBlock fn, RenderBlock inverse)
         {
             if (arguments != null && arguments.Count > 0 && arguments[0] != null && arguments[0] is SwaggerOperation)
@@ -388,8 +380,7 @@ static void GetMethodName(RenderContext context, IList<object> arguments, IDicti
             }
         }
 
-
-        static string GetMethodName(SwaggerOperation watchOperation)
+        private static string GetMethodName(SwaggerOperation watchOperation)
         {
             var tag = watchOperation.Tags[0];
             tag = tag.Replace("_", string.Empty);
@@ -402,7 +393,7 @@ static string GetMethodName(SwaggerOperation watchOperation)
             return methodName;
         }
 
-        static void GetDotNetType(RenderContext context, IList<object> arguments, IDictionary<string, object> options,
+        private static void GetDotNetType(RenderContext context, IList<object> arguments, IDictionary<string, object> options,
             RenderBlock fn, RenderBlock inverse)
         {
             if (arguments != null && arguments.Count > 0 && arguments[0] != null && arguments[0] is SwaggerParameter)
@@ -463,7 +454,7 @@ private static string GetDotNetType(JsonObjectType jsonType, string name, bool r
             }
         }
 
-        static void GetDotNetName(RenderContext context, IList<object> arguments, IDictionary<string, object> options,
+        private static void GetDotNetName(RenderContext context, IList<object> arguments, IDictionary<string, object> options,
             RenderBlock fn, RenderBlock inverse)
         {
             if (arguments != null && arguments.Count > 0 && arguments[0] != null && arguments[0] is SwaggerParameter)
@@ -492,7 +483,7 @@ private static string GetDotNetName(string jsonName)
             return jsonName;
         }
 
-        static void GetPathExpression(RenderContext context, IList<object> arguments,
+        private static void GetPathExpression(RenderContext context, IList<object> arguments,
             IDictionary<string, object> options, RenderBlock fn, RenderBlock inverse)
         {
             if (arguments != null && arguments.Count > 0 && arguments[0] != null &&
@@ -516,7 +507,7 @@ private static string GetPathExpression(SwaggerOperationDescription operation)
             return pathExpression;
         }
 
-        static void GetApiVersion(RenderContext context, IList<object> arguments, IDictionary<string, object> options,
+        private static void GetApiVersion(RenderContext context, IList<object> arguments, IDictionary<string, object> options,
             RenderBlock fn, RenderBlock inverse)
         {
             if (arguments != null && arguments.Count > 0 && arguments[0] != null && arguments[0] is JsonSchema4)